From patchwork Fri Dec 18 14:28:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jemma Denson X-Patchwork-Id: 7885211 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9858CBEEE5 for ; Fri, 18 Dec 2015 14:29:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DB2A3201BB for ; Fri, 18 Dec 2015 14:29:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E93BC2047D for ; Fri, 18 Dec 2015 14:29:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964939AbbLRO3h (ORCPT ); Fri, 18 Dec 2015 09:29:37 -0500 Received: from mail-wm0-f46.google.com ([74.125.82.46]:35888 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933164AbbLRO3c (ORCPT ); Fri, 18 Dec 2015 09:29:32 -0500 Received: by mail-wm0-f46.google.com with SMTP id p187so65899700wmp.1 for ; Fri, 18 Dec 2015 06:29:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XlHVzb/yOBv8Wc00eXvlrYLKQOSG6diPDGd+VJNrVCU=; b=raKnyMpXY+DweN910ITOw79XjRS9Kmzq1FpLM1YQdrae+toQaTPRZHLxYVhtRh+MMp lwblQXYP+mvqN2Mtouf/dLZeTxvpvAm2Rd3kPm0+K+cr+pRGvp16vpPuVdK2YF5fBznv gel31BMfO8NbdPts5EcWyAr2FGZvhAfdj2z5dZWlmRXVIn8xaQOhZTmOXn4eZoLwpSxg ny+4Azgmr2C3m1AmOzZslnqGCn3wHu71g5NxSsAx6qQEm1KB2ctaQUDTLWCs0rwtCgSp 7qzd5erigu7ixrIxQIiqFI8lhIQYGwMgvvIdHWXUqLYuYz/SMXhHRPEIQrbE5IQQuBCb kzyA== X-Received: by 10.28.8.15 with SMTP id 15mr3649745wmi.50.1450448971364; Fri, 18 Dec 2015 06:29:31 -0800 (PST) Received: from localhost.brock (navahotech.plus.com. [84.92.64.232]) by smtp.gmail.com with ESMTPSA id 67sm6927998wmm.6.2015.12.18.06.29.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Dec 2015 06:29:30 -0800 (PST) From: Jemma Denson To: mchehab@osg.samsung.com Cc: linux-media@vger.kernel.org Subject: [v4l-utils PATCH-v2 1/4] dvbv5-zap.c: fix setting signal handlers Date: Fri, 18 Dec 2015 14:28:23 +0000 Message-Id: <1450448906-17000-2-git-send-email-jdenson@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1450448906-17000-1-git-send-email-jdenson@gmail.com> References: <1450448906-17000-1-git-send-email-jdenson@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signal handlers are currently out of order - SIGALRM is always set, and SIGINT only set when timeout is set. These should be the other way round. Signed-off-by: Jemma Denson --- utils/dvb/dvbv5-zap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/dvb/dvbv5-zap.c b/utils/dvb/dvbv5-zap.c index e19d7c2..e927383 100644 --- a/utils/dvb/dvbv5-zap.c +++ b/utils/dvb/dvbv5-zap.c @@ -959,10 +959,10 @@ int main(int argc, char **argv) goto err; } - signal(SIGALRM, do_timeout); signal(SIGTERM, do_timeout); + signal(SIGINT, do_timeout); if (args.timeout > 0) { - signal(SIGINT, do_timeout); + signal(SIGALRM, do_timeout); alarm(args.timeout); }