X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=misc%2Flsattr.c;h=e5e59690f493c7f2c5b7b119ae77d1f1ec865248;hb=f21c6a5134cedb9ae50917c2ae3ebde04e3dff94;hp=73823cce846c4a2beae5aa70c30f39d7e60a17a2;hpb=818180cdfcff84b9048ecdc5dc86323f0fefba24;p=tools%2Fe2fsprogs.git diff --git a/misc/lsattr.c b/misc/lsattr.c index 73823cc..e5e5969 100644 --- a/misc/lsattr.c +++ b/misc/lsattr.c @@ -14,8 +14,12 @@ * 93/10/30 - Creation * 93/11/13 - Replace stat() calls by lstat() to avoid loops * 94/02/27 - Integrated in Ted's distribution + * 98/12/29 - Display version info only when -V specified (G M Sipe) */ +#define _LARGEFILE64_SOURCE + +#include "config.h" #include #include #ifdef HAVE_ERRNO_H @@ -34,73 +38,107 @@ extern char *optarg; #include #include #include -#include +#include "ext2fs/ext2_fs.h" #include "et/com_err.h" #include "e2p/e2p.h" #include "../version.h" +#include "nls-enable.h" + +#ifdef __GNUC__ +#define EXT2FS_ATTR(x) __attribute__(x) +#else +#define EXT2FS_ATTR(x) +#endif -const char * program_name = "lsattr"; +static const char * program_name = "lsattr"; -int all = 0; -int d_opt = 0; -int l_opt = 0; -int recursive = 0; -int v_opt = 0; +static int all; +static int dirs_opt; +static unsigned pf_options; +static int recursive; +static int verbose; +static int generation_opt; + +#ifdef _LFS64_LARGEFILE +#define LSTAT lstat64 +#define STRUCT_STAT struct stat64 +#else +#define LSTAT lstat +#define STRUCT_STAT struct stat +#endif static void usage(void) { - fprintf(stderr, "Usage: %s [-Radlv] [files...]\n", program_name); + fprintf(stderr, _("Usage: %s [-RVadlv] [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 version; + unsigned long generation; - if (fgetflags (name, &flags) == -1) - com_err (program_name, errno, "While reading flags on %s", - name); - else if (fgetversion (name, &version) == -1) - com_err (program_name, errno, "While reading version on %s", + if (fgetflags (name, &flags) == -1) { + com_err (program_name, errno, _("While reading flags on %s"), name); - else - { - if (v_opt) - printf ("%5lu ", version); - print_flags (stdout, flags, l_opt); - printf (" %s\n", name); + return -1; + } + if (generation_opt) { + if (fgetversion (name, &generation) == -1) { + com_err (program_name, errno, + _("While reading version on %s"), + name); + return -1; + } + printf ("%5lu ", generation); } + if (pf_options & PFOPT_LONG) { + printf("%-28s ", name); + print_flags(stdout, flags, pf_options); + fputc('\n', stdout); + } else { + 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; + STRUCT_STAT st; + int retval = 0; - if (lstat (name, &st) == -1) - com_err (program_name, errno, "while stating %s", name); - else - { - if (S_ISDIR(st.st_mode) && !d_opt) - iterate_on_dir (name, lsattr_dir_proc, (void *) NULL); + if (LSTAT (name, &st) == -1) { + com_err (program_name, errno, _("while trying to stat %s"), + name); + retval = -1; + } else { + if (S_ISDIR(st.st_mode) && !dirs_opt) + 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, void * private) +static int lsattr_dir_proc (const char * dir_name, struct dirent * de, + void * private EXT2FS_ATTR((unused))) { - struct stat st; + 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 (lstat (path, &st) == -1) + 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 { if (de->d_name[0] != '.' || all) { @@ -109,8 +147,7 @@ static int lsattr_dir_proc (const char * dir_name, struct dirent * de, void * pr strcmp(de->d_name, ".") && strcmp(de->d_name, "..")) { printf ("\n%s:\n", path); - iterate_on_dir (path, lsattr_dir_proc, - (void *) NULL); + iterate_on_dir (path, lsattr_dir_proc, NULL); printf ("\n"); } } @@ -123,38 +160,54 @@ int main (int argc, char ** argv) { int c; int i; - - fprintf (stderr, "lsattr %s, %s for EXT2 FS %s, %s\n", - E2FSPROGS_VERSION, E2FSPROGS_DATE, - EXT2FS_VERSION, EXT2FS_DATE); + 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, "Radlv")) != EOF) + while ((c = getopt (argc, argv, "RVadlv")) != EOF) switch (c) { case 'R': recursive = 1; break; + case 'V': + verbose = 1; + break; case 'a': all = 1; break; case 'd': - d_opt = 1; + dirs_opt = 1; break; case 'l': - l_opt = 1; + pf_options = PFOPT_LONG; break; case 'v': - v_opt = 1; + generation_opt = 1; break; default: usage(); } - if (optind > argc - 1) - lsattr_args ("."); - else - for (i = optind; i < argc; i++) - lsattr_args (argv[i]); - exit(0); + if (verbose) + fprintf (stderr, "lsattr %s (%s)\n", + E2FSPROGS_VERSION, E2FSPROGS_DATE); + 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); }