[src/netbsd-6]: src/usr.sbin/perfused Pull up following revision(s) (requeste...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b58241fe3e26
branches:  netbsd-6
changeset: 776832:b58241fe3e26
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Sun Dec 21 20:24:40 2014 +0000

description:
Pull up following revision(s) (requested by manu in ticket #1215):
        usr.sbin/perfused/perfused.c: revision 1.25
Survive if filesystem installs a signal handler
We tested for signal(3) to return 0 for success, which is incorrect:
signal(3) returns the previous handler. Success should be tested as
!= SIG_ERR, otherwise we fail when a signal handler was previously
installed by perfused(8) parrent process, which happens to be the
FUSE filesystem.

diffstat:

 usr.sbin/perfused/perfused.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 637c0362a72c -r b58241fe3e26 usr.sbin/perfused/perfused.c
--- a/usr.sbin/perfused/perfused.c      Sun Dec 21 20:19:21 2014 +0000
+++ b/usr.sbin/perfused/perfused.c      Sun Dec 21 20:24:40 2014 +0000
@@ -1,4 +1,4 @@
-/*  $NetBSD: perfused.c,v 1.22.2.2 2012/08/12 13:13:21 martin Exp $ */
+/*  $NetBSD: perfused.c,v 1.22.2.3 2014/12/21 20:24:40 msaitoh Exp $ */
 
 /*-
  *  Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
@@ -298,7 +298,7 @@
                     "could not open \"%s\"",
                     _PATH_VAR_RUN_PERFUSE_TRACE);
 
-       if (signal(SIGUSR1, sigusr1_handler) != 0)
+       if (signal(SIGUSR1, sigusr1_handler) == SIG_ERR)
                DERR(EX_OSERR, "signal failed");
 
        /*
@@ -399,7 +399,7 @@
                        perfuse_diagflags |= parse_debug(optarg);
                        break;
                case 's':
-                       if (signal(SIGINFO, siginfo_handler) != 0)
+                       if (signal(SIGINFO, siginfo_handler) == SIG_ERR)
                                DERR(EX_OSERR, "signal failed");
                        break;
                case 'f':