Merge remote-tracking branch 'origin/maint' into maint

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

diff --git a/misc/chattr.c b/misc/chattr.c
index efaa559..f130108 100644 (file)
--- a/misc/chattr.c
+++ b/misc/chattr.c
@@ -20,6 +20,7 @@
 
 #define _LARGEFILE64_SOURCE
 
+#include "config.h"
 #include <sys/types.h>
 #include <dirent.h>
 #include <fcntl.h>
@@ -82,7 +83,7 @@ static unsigned long sf;
 static void usage(void)
 {
        fprintf(stderr,
-               _("Usage: %s [-RVf] [-+=AacDdijsSu] [-v version] files...\n"),
+               _("Usage: %s [-RVf] [-+=aAcCdDeijsStTu] [-v version] files...\n"),
                program_name);
        exit(1);
 }
@@ -99,19 +100,21 @@ static const struct flags_char flags_array[] = {
        { EXT2_APPEND_FL, 'a' },
        { EXT2_COMPR_FL, 'c' },
        { EXT2_NODUMP_FL, 'd' },
+       { EXT4_EXTENTS_FL, 'e'},
        { EXT2_IMMUTABLE_FL, 'i' },
        { EXT3_JOURNAL_DATA_FL, 'j' },
        { EXT2_SECRM_FL, 's' },
        { EXT2_UNRM_FL, 'u' },
        { EXT2_NOTAIL_FL, 't' },
        { EXT2_TOPDIR_FL, 'T' },
+       { FS_NOCOW_FL, 'C' },
        { 0, 0 }
 };
 
 static unsigned long get_flag(char c)
 {
        const struct flags_char *fp;
-       
+
        for (fp = flags_array; fp->flag != 0; fp++) {
                if (fp->optchar == c)
                        return fp->flag;
@@ -185,9 +188,9 @@ static int decode_arg (int * i, int argc, char ** argv)
        return 1;
 }
 
-static int chattr_dir_proc (const char *, struct dirent *, void *);
+static int chattr_dir_proc(const char *, struct dirent *, void *);
 
-static int change_attributes (const char * name, int cmdline)
+static int change_attributes(const char * name)
 {
        unsigned long flags;
        STRUCT_STAT     st;
@@ -199,6 +202,12 @@ static int change_attributes (const char * name, int cmdline)
                return -1;
        }
 
+       if (fgetflags(name, &flags) == -1) {
+               if (!silent)
+                       com_err(program_name, errno,
+                                       _("while reading flags on %s"), name);
+               return -1;
+       }
        if (set) {
                if (verbose) {
                        printf (_("Flags of %s set as "), name);
@@ -208,30 +217,24 @@ static int change_attributes (const char * name, int cmdline)
                if (fsetflags (name, sf) == -1)
                        perror (name);
        } else {
-               if (fgetflags (name, &flags) == -1) {
-                       if (!silent)
-                               com_err (program_name, errno,
-                                        _("while reading flags on %s"), name);
-                       return -1;
-               } else {
-                       if (rem)
-                               flags &= ~rf;
-                       if (add)
-                               flags |= af;
-                       if (verbose) {
-                               printf (_("Flags of %s set as "), name);
-                               print_flags (stdout, flags, 0);
-                               printf ("\n");
-                       }
-                       if (!S_ISDIR(st.st_mode))
-                               flags &= ~EXT2_DIRSYNC_FL;
-                       if (fsetflags (name, flags) == -1) {
-                               if (!silent)
-                                       com_err(program_name, errno,
+               if (rem)
+                       flags &= ~rf;
+               if (add)
+                       flags |= af;
+               if (verbose) {
+                       printf(_("Flags of %s set as "), name);
+                       print_flags(stdout, flags, 0);
+                       printf("\n");
+               }
+               if (!S_ISDIR(st.st_mode))
+                       flags &= ~EXT2_DIRSYNC_FL;
+               if (fsetflags(name, flags) == -1) {
+                       if (!silent) {
+                               com_err(program_name, errno,
                                                _("while setting flags on %s"),
                                                name);
-                               return -1;
                        }
+                       return -1;
                }
        }
        if (set_version) {
@@ -260,12 +263,13 @@ static int chattr_dir_proc (const char * dir_name, struct dirent * de,
 
                path = malloc(strlen (dir_name) + 1 + strlen (de->d_name) + 1);
                if (!path) {
-                       fprintf(stderr, _("Couldn't allocate path variable "
-                                         "in chattr_dir_proc"));
+                       fprintf(stderr, "%s",
+                               _("Couldn't allocate path variable "
+                                 "in chattr_dir_proc"));
                        return -1;
                }
                sprintf(path, "%s/%s", dir_name, de->d_name);
-               ret = change_attributes(path, 0);
+               ret = change_attributes(path);
                free(path);
        }
        return ret;
@@ -282,6 +286,7 @@ int main (int argc, char ** argv)
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
        if (argc && *argv)
                program_name = *argv;
@@ -314,7 +319,7 @@ int main (int argc, char ** argv)
                fprintf (stderr, "chattr %s (%s)\n",
                         E2FSPROGS_VERSION, E2FSPROGS_DATE);
        for (j = i; j < argc; j++) {
-               err = change_attributes (argv[j], 1);
+               err = change_attributes (argv[j]);
                if (err)
                        retval = 1;
        }