From: Bruno Haible <bruno@clisp.org>
Date: Sat, 22 Aug 2009 23:37:15 +0000 (+0200)
Subject: Fix test of fcntl's return value.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27089d6d0d388650eb8380ee178458700ffc3bcf;p=pspp

Fix test of fcntl's return value.
---

diff --git a/ChangeLog b/ChangeLog
index b8aff86cf5..5b865c823c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-08-22  Bruno Haible  <bruno@clisp.org>
+
+	* lib/pipe-filter-ii.c (pipe_filter_ii_execute): Fix test of fcntl's
+	return value.
+	* lib/pipe-filter-gi.c (filter_init): Likewise.
+	Reported by Eric Blake.
+
 2009-08-22  Bruno Haible  <bruno@clisp.org>
 
 	* lib/pipe.c (create_pipe): Use pipe2 instead of _pipe.
diff --git a/lib/pipe-filter-gi.c b/lib/pipe-filter-gi.c
index 886820a414..340b38af0c 100644
--- a/lib/pipe-filter-gi.c
+++ b/lib/pipe-filter-gi.c
@@ -248,9 +248,9 @@ filter_init (struct pipe_filter_gi *filter)
     int fcntl_flags;
 
     if ((fcntl_flags = fcntl (filter->fd[1], F_GETFL, 0)) < 0
-	|| fcntl (filter->fd[1], F_SETFL, fcntl_flags | O_NONBLOCK) < 0
+	|| fcntl (filter->fd[1], F_SETFL, fcntl_flags | O_NONBLOCK) == -1
 	|| (fcntl_flags = fcntl (filter->fd[0], F_GETFL, 0)) < 0
-	|| fcntl (filter->fd[0], F_SETFL, fcntl_flags | O_NONBLOCK) < 0)
+	|| fcntl (filter->fd[0], F_SETFL, fcntl_flags | O_NONBLOCK) == -1)
       {
 	if (filter->exit_on_error)
 	  error (EXIT_FAILURE, errno,
diff --git a/lib/pipe-filter-ii.c b/lib/pipe-filter-ii.c
index 8281ad0119..cbdaf94f6e 100644
--- a/lib/pipe-filter-ii.c
+++ b/lib/pipe-filter-ii.c
@@ -289,9 +289,9 @@ pipe_filter_ii_execute (const char *progname,
       int fcntl_flags;
 
       if ((fcntl_flags = fcntl (fd[1], F_GETFL, 0)) < 0
-	  || fcntl (fd[1], F_SETFL, fcntl_flags | O_NONBLOCK) < 0
+	  || fcntl (fd[1], F_SETFL, fcntl_flags | O_NONBLOCK) == -1
 	  || (fcntl_flags = fcntl (fd[0], F_GETFL, 0)) < 0
-	  || fcntl (fd[0], F_SETFL, fcntl_flags | O_NONBLOCK) < 0)
+	  || fcntl (fd[0], F_SETFL, fcntl_flags | O_NONBLOCK) == -1)
 	{
 	  if (exit_on_error)
 	    error (EXIT_FAILURE, errno,