mke2fs: don't fail creating the journal if /etc/mtab is missing

[tools/e2fsprogs.git] / misc / lsattr.c

diff --git a/misc/lsattr.c b/misc/lsattr.c
index ff3859f..e5e5969 100644 (file)
--- a/misc/lsattr.c
+++ b/misc/lsattr.c
@@ -19,6 +19,7 @@
 
 #define _LARGEFILE64_SOURCE
 
+#include "config.h"
 #include <sys/types.h>
 #include <dirent.h>
 #ifdef HAVE_ERRNO_H
@@ -74,7 +75,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 +83,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,34 +102,42 @@ 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, 
+static int lsattr_dir_proc (const char * dir_name, struct dirent * de,
                            void * private EXT2FS_ATTR((unused)))
 {
        STRUCT_STAT     st;
        char *path;
+       int dir_len = strlen(dir_name);
 
-       path = malloc(strlen (dir_name) + 1 + strlen (de->d_name) + 1);
+       path = malloc(dir_len + strlen (de->d_name) + 2);
 
-       sprintf (path, "%s/%s", dir_name, de->d_name);
+       if (dir_len && dir_name[dir_len-1] == '/')
+               sprintf (path, "%s%s", dir_name, de->d_name);
+       else
+               sprintf (path, "%s/%s", dir_name, de->d_name);
        if (LSTAT (path, &st) == -1)
                perror (path);
        else {
@@ -151,12 +160,14 @@ int main (int argc, char ** argv)
 {
        int c;
        int i;
+       int err, retval = 0;
 
 #ifdef ENABLE_NLS
        setlocale(LC_MESSAGES, "");
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
        if (argc && *argv)
                program_name = *argv;
@@ -188,10 +199,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);
 }