ChangeLog, lsattr.c:
lsattr.c (list_attributes): Minor cleanup to smooth out logic flow.
Also removed static initialized variables to zero.
ChangeLog, lsattr.1.in:
lsattr.1.in: Add pointer to chattr man page for definition of the file
attributes.
diff --git a/misc/lsattr.c b/misc/lsattr.c
index 9b9dc54..857c481 100644
--- a/misc/lsattr.c
+++ b/misc/lsattr.c
@@ -45,12 +45,12 @@
static const char * program_name = "lsattr";
-static int all = 0;
-static int dirs_opt = 0;
-static unsigned pf_options = 0;
-static int recursive = 0;
-static int verbose = 0;
-static int generation_opt = 0;
+static int all;
+static int dirs_opt;
+static unsigned pf_options;
+static int recursive;
+static int verbose;
+static int generation_opt;
static void usage(void)
{
@@ -63,24 +63,27 @@
unsigned long flags;
unsigned long generation;
- if (fgetflags (name, &flags) == -1)
+ if (fgetflags (name, &flags) == -1) {
com_err (program_name, errno, _("While reading flags on %s"),
name);
- else if (fgetversion (name, &generation) == -1)
- com_err (program_name, errno, _("While reading version on %s"),
- name);
- else
- {
- if (generation_opt)
- 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;
+ }
+ if (generation_opt) {
+ if (fgetversion (name, &generation) == -1) {
+ com_err (program_name, errno,
+ _("While reading version on %s"),
+ name);
+ return;
}
+ 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);
}
}