From 1b600bfa48cf55571e342208d6baa1c832f34bb1 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Thu, 18 Jun 2009 17:51:07 -0500 Subject: [PATCH] lsattr: exit with a non-zero status on errors lsattr doesn't return an error if you point it at a file that doesn't exist. This is slightly trickier because it can take more than one file as an arg, but ls seems to report an error if any occurred, so this does the same, it'll report the last error that was encountered. Addresses-RedHat-Bugzilla: #489841 Signed-off-by: Eric Sandeen Signed-off-by: Theodore Ts'o --- misc/lsattr.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/misc/lsattr.c b/misc/lsattr.c index 254ebb4..15b17ad 100644 --- a/misc/lsattr.c +++ b/misc/lsattr.c @@ -74,7 +74,7 @@ static void usage(void) exit(1); } -static void list_attributes (const char * name) +static int list_attributes (const char * name) { unsigned long flags; unsigned long generation; @@ -82,14 +82,14 @@ static void list_attributes (const char * name) if (fgetflags (name, &flags) == -1) { com_err (program_name, errno, _("While reading flags on %s"), name); - return; + return -1; } if (generation_opt) { if (fgetversion (name, &generation) == -1) { com_err (program_name, errno, _("While reading version on %s"), name); - return; + return -1; } printf ("%5lu ", generation); } @@ -101,23 +101,27 @@ static void list_attributes (const char * name) print_flags(stdout, flags, pf_options); printf(" %s\n", name); } + return 0; } static int lsattr_dir_proc (const char *, struct dirent *, void *); -static void lsattr_args (const char * name) +static int lsattr_args (const char * name) { STRUCT_STAT st; + int retval = 0; - if (LSTAT (name, &st) == -1) + if (LSTAT (name, &st) == -1) { com_err (program_name, errno, _("while trying to stat %s"), name); - else { + retval = -1; + } else { if (S_ISDIR(st.st_mode) && !dirs_opt) - iterate_on_dir (name, lsattr_dir_proc, NULL); + retval = iterate_on_dir (name, lsattr_dir_proc, NULL); else - list_attributes (name); + retval = list_attributes (name); } + return retval; } static int lsattr_dir_proc (const char * dir_name, struct dirent * de, @@ -155,6 +159,7 @@ int main (int argc, char ** argv) { int c; int i; + int err, retval = 0; #ifdef ENABLE_NLS setlocale(LC_MESSAGES, ""); @@ -192,10 +197,15 @@ int main (int argc, char ** argv) if (verbose) fprintf (stderr, "lsattr %s (%s)\n", E2FSPROGS_VERSION, E2FSPROGS_DATE); - if (optind > argc - 1) - lsattr_args ("."); - else - for (i = optind; i < argc; i++) - lsattr_args (argv[i]); - exit(0); + if (optind > argc - 1) { + if (lsattr_args (".") == -1) + retval = 1; + } else { + for (i = optind; i < argc; i++) { + err = lsattr_args (argv[i]); + if (err) + retval = 1; + } + } + exit(retval); } -- 1.8.3.1