summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2011-12-09 15:30:23 +0000
committerRichard W.M. Jones <rjones@redhat.com>2011-12-09 15:35:50 +0000
commit8ea8e456dc87e4c26f2ede1b00ab617e5d69b064 (patch)
treeb03c467f95d8ab0f8bdb22e8d8621a0453972c1a
parent0e5174333ec0d99114cd1d94b5476cc117cca2e1 (diff)
downloadlibguestfs-8ea8e456dc87e4c26f2ede1b00ab617e5d69b064.tar.gz
libguestfs-8ea8e456dc87e4c26f2ede1b00ab617e5d69b064.tar.xz
libguestfs-8ea8e456dc87e4c26f2ede1b00ab617e5d69b064.zip
fuse: Return EXIT_FAILURE if fuse_main fails.
fuse_main can return any non-zero value on error. In particular on certain sorts of error such as unsupported -o options it returns 1 (not -1). Therefore make sure any non-zero return is turned into EXIT_FAILURE. (Thanks Pádraig Brady) (cherry picked from commit ae45cee728039d7724fc73e5ffb2550c8054d268)
-rw-r--r--fuse/guestmount.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fuse/guestmount.c b/fuse/guestmount.c
index 54ed947d..7782be1e 100644
--- a/fuse/guestmount.c
+++ b/fuse/guestmount.c
@@ -1227,5 +1227,5 @@ main (int argc, char *argv[])
guestfs_close (g);
free_dir_caches ();
- exit (r == -1 ? 1 : 0);
+ exit (r == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
}