From 3e2d925717d1dac6b3862e98192c12d1080c2152 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 1 Jul 2009 17:13:39 +0100 Subject: [PATCH] All instances of 'pclose' now check for return value != 0. We are generally interested that the subcommand ran without error, ie. had exit status of 0. 'pclose' returns the exit status, so we now check that pclose (fp) != 0. --- daemon/find.c | 2 +- daemon/initrd.c | 2 +- daemon/tar.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/daemon/find.c b/daemon/find.c index 287aae3..7ceeafa 100644 --- a/daemon/find.c +++ b/daemon/find.c @@ -113,7 +113,7 @@ do_find (char *dir) return NULL; } } - if (pclose (fp) == -1) { + if (pclose (fp) != 0) { reply_with_perror ("pclose: find"); free_stringslen (res, size); return NULL; diff --git a/daemon/initrd.c b/daemon/initrd.c index 513ed8d..2d6cbdd 100644 --- a/daemon/initrd.c +++ b/daemon/initrd.c @@ -78,7 +78,7 @@ do_initrd_list (char *path) return NULL; } - if (pclose (fp) == -1) { + if (pclose (fp) != 0) { reply_with_perror ("pclose"); free_strings (filenames); return NULL; diff --git a/daemon/tar.c b/daemon/tar.c index 4d9feaa..0320604 100644 --- a/daemon/tar.c +++ b/daemon/tar.c @@ -88,7 +88,7 @@ do_tar_in (char *dir) return -1; } - if (pclose (fp) == -1) { + if (pclose (fp) != 0) { err = errno; cancel_receive (); errno = err; @@ -150,7 +150,7 @@ do_tar_out (char *dir) return -1; } - if (pclose (fp) == -1) { + if (pclose (fp) != 0) { perror (dir); send_file_end (1); /* Cancel. */ return -1; @@ -214,7 +214,7 @@ do_tgz_in (char *dir) return -1; } - if (pclose (fp) == -1) { + if (pclose (fp) != 0) { err = errno; cancel_receive (); errno = err; @@ -276,7 +276,7 @@ do_tgz_out (char *dir) return -1; } - if (pclose (fp) == -1) { + if (pclose (fp) != 0) { perror (dir); send_file_end (1); /* Cancel. */ return -1; -- 1.8.3.1