*: random code shrink

[oweals/busybox.git] / e2fsprogs / lsattr.c

diff --git a/e2fsprogs/lsattr.c b/e2fsprogs/lsattr.c
index eb28fcbabc1dffa0c472aea815701e823d2b4371..7d475a96913fad29906277ff90b0ce7426871508 100644 (file)
--- a/e2fsprogs/lsattr.c
+++ b/e2fsprogs/lsattr.c
@@ -18,111 +18,93 @@
  * 98/12/29    - Display version info only when -V specified (G M Sipe)
  */
 
-#include <sys/types.h>
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <getopt.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#include "ext2fs/ext2_fs.h"
-#include "e2fsbb.h"
-#include "e2p/e2p.h"
-
-#define OPT_RECUR 1
-#define OPT_ALL 2
-#define OPT_DIRS_OPT 4
-#define OPT_PF_LONG 8
-#define OPT_GENERATION 16
-static int flags;
+#include "libbb.h"
+#include "e2fs_lib.h"
+
+enum {
+       OPT_RECUR      = 0x1,
+       OPT_ALL        = 0x2,
+       OPT_DIRS_OPT   = 0x4,
+       OPT_PF_LONG    = 0x8,
+       OPT_GENERATION = 0x10,
+};
 
 static void list_attributes(const char *name)
 {
        unsigned long fsflags;
        unsigned long generation;
 
-       if (fgetflags(name, &fsflags) == -1)
+       if (fgetflags(name, &fsflags) != 0)
                goto read_err;
-       if (flags & OPT_GENERATION) {
-               if (fgetversion(name, &generation) == -1)
+
+       if (option_mask32 & OPT_GENERATION) {
+               if (fgetversion(name, &generation) != 0)
                        goto read_err;
                printf("%5lu ", generation);
        }
 
-       if (flags & OPT_PF_LONG) {
+       if (option_mask32 & OPT_PF_LONG) {
                printf("%-28s ", name);
-               print_flags(stdout, fsflags, PFOPT_LONG);
-               puts("");
+               print_e2flags(stdout, fsflags, PFOPT_LONG);
+               bb_putchar('\n');
        } else {
-               print_flags(stdout, fsflags, 0);
+               print_e2flags(stdout, fsflags, 0);
                printf(" %s\n", name);
        }
 
        return;
-read_err:
+ read_err:
        bb_perror_msg("reading %s", name);
 }
 
-static int lsattr_dir_proc(const char *, struct dirent *, void *);
-
-static void lsattr_args(const char *name)
-{
-       struct stat st;
-
-       if (lstat(name, &st) == -1) {
-               bb_perror_msg("stating %s", name);
-       } else {
-               if (S_ISDIR(st.st_mode) && !(flags & OPT_DIRS_OPT))
-                       iterate_on_dir(name, lsattr_dir_proc, NULL);
-               else
-                       list_attributes(name);
-       }
-}
-
-static int lsattr_dir_proc(const char *dir_name, struct dirent *de,
-                          void *private)
+static int FAST_FUNC lsattr_dir_proc(const char *dir_name,
+               struct dirent *de,
+               void *private UNUSED_PARAM)
 {
        struct stat st;
        char *path;
 
        path = concat_path_file(dir_name, de->d_name);
 
-       if (lstat(path, &st) == -1)
-               bb_perror_msg(path);
-       else {
-               if (de->d_name[0] != '.' || (flags & OPT_ALL)) {
-                       list_attributes(path);
-                       if (S_ISDIR(st.st_mode) && (flags & OPT_RECUR) &&
-                          (de->d_name[0] != '.' && (de->d_name[1] != '\0' ||
-                          (de->d_name[1] != '.' && de->d_name[2] != '\0')))) {
-                               printf("\n%s:\n", path);
-                               iterate_on_dir(path, lsattr_dir_proc, NULL);
-                               puts("");
-                       }
+       if (lstat(path, &st) != 0)
+               bb_perror_msg("stat %s", path);
+       else if (de->d_name[0] != '.' || (option_mask32 & OPT_ALL)) {
+               list_attributes(path);
+               if (S_ISDIR(st.st_mode) && (option_mask32 & OPT_RECUR)
+                && !DOT_OR_DOTDOT(de->d_name)
+               ) {
+                       printf("\n%s:\n", path);
+                       iterate_on_dir(path, lsattr_dir_proc, NULL);
+                       bb_putchar('\n');
                }
        }
 
        free(path);
-
        return 0;
 }
 
-int lsattr_main(int argc, char **argv)
+static void lsattr_args(const char *name)
 {
-       int i;
+       struct stat st;
+
+       if (lstat(name, &st) == -1) {
+               bb_perror_msg("stat %s", name);
+       } else if (S_ISDIR(st.st_mode) && !(option_mask32 & OPT_DIRS_OPT)) {
+               iterate_on_dir(name, lsattr_dir_proc, NULL);
+       } else {
+               list_attributes(name);
+       }
+}
 
-       flags = getopt32(argc, argv, "Radlv");
+int lsattr_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int lsattr_main(int argc UNUSED_PARAM, char **argv)
+{
+       getopt32(argv, "Radlv");
+       argv += optind;
 
-       if (optind > argc - 1)
-               lsattr_args(".");
-       else
-               for (i = optind; i < argc; i++)
-                       lsattr_args(argv[i]);
+       if (!*argv)
+               *--argv = (char*)".";
+       do lsattr_args(*argv++); while (*argv);
 
        return EXIT_SUCCESS;
 }