tests: clean up test names

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

diff --git a/misc/lsattr.c b/misc/lsattr.c
index 093f50f..72f4c68 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
@@ -42,8 +43,8 @@ extern char *optarg;
 #include "et/com_err.h"
 #include "e2p/e2p.h"
 
+#include "support/nls-enable.h"
 #include "../version.h"
-#include "nls-enable.h"
 
 #ifdef __GNUC__
 #define EXT2FS_ATTR(x) __attribute__(x)
@@ -59,6 +60,7 @@ static unsigned pf_options;
 static int recursive;
 static int verbose;
 static int generation_opt;
+static int project_opt;
 
 #ifdef _LFS64_LARGEFILE
 #define LSTAT          lstat64
@@ -70,28 +72,38 @@ static int generation_opt;
 
 static void usage(void)
 {
-       fprintf(stderr, _("Usage: %s [-RVadlv] [files...]\n"), program_name);
+       fprintf(stderr, _("Usage: %s [-RVadlpv] [files...]\n"), program_name);
        exit(1);
 }
 
-static void list_attributes (const char * name)
+static int list_attributes (const char * name)
 {
        unsigned long flags;
        unsigned long generation;
+       unsigned long project;
 
        if (fgetflags (name, &flags) == -1) {
                com_err (program_name, errno, _("While reading flags on %s"),
                         name);
-               return;
+               return -1;
+       }
+       if (project_opt) {
+               if (fgetproject(name, &project) == -1) {
+                       com_err (program_name, errno,
+                                _("While reading project on %s"),
+                                name);
+                       return -1;
+               }
+               printf ("%5lu ", project);
        }
        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);
+               printf ("%-10lu ", generation);
        }
        if (pf_options & PFOPT_LONG) {
                printf("%-28s ", name);
@@ -101,26 +113,30 @@ 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;
@@ -128,6 +144,11 @@ static int lsattr_dir_proc (const char * dir_name, struct dirent * de,
        int dir_len = strlen(dir_name);
 
        path = malloc(dir_len + strlen (de->d_name) + 2);
+       if (!path) {
+               fputs(_("Couldn't allocate path variable in lsattr_dir_proc\n"),
+                       stderr);
+               return -1;
+       }
 
        if (dir_len && dir_name[dir_len-1] == '/')
                sprintf (path, "%s%s", dir_name, de->d_name);
@@ -155,16 +176,20 @@ 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;
-       while ((c = getopt (argc, argv, "RVadlv")) != EOF)
+       else
+               usage();
+       while ((c = getopt (argc, argv, "RVadlvp")) != EOF)
                switch (c)
                {
                        case 'R':
@@ -185,6 +210,9 @@ int main (int argc, char ** argv)
                        case 'v':
                                generation_opt = 1;
                                break;
+                       case 'p':
+                               project_opt = 1;
+                               break;
                        default:
                                usage();
                }
@@ -192,10 +220,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);
 }