X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=misc%2Fchattr.c;h=39a601697f329f1eaea3d82d0fc8c19d48eeecd9;hb=dbcd617882ee5c9da80d9257475f2594352f6698;hp=b359248ab6693baea4fa4df1251254ffafa8c1b9;hpb=1e3472c5f37ca3686dd69b079d4d02a302f5798d;p=tools%2Fe2fsprogs.git

diff --git a/misc/chattr.c b/misc/chattr.c
index b359248..39a6016 100644
--- a/misc/chattr.c
+++ b/misc/chattr.c
@@ -14,195 +14,172 @@
  * 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	- Ignore symlinks when working recursively (G M Sipe)
+ * 98/12/29	- Display version info only when -V specified (G M Sipe)
  */
 
+#define _LARGEFILE64_SOURCE
+
+#include "config.h"
 #include <sys/types.h>
 #include <dirent.h>
 #include <fcntl.h>
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <string.h>
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
 #include <sys/param.h>
 #include <sys/stat.h>
-#include <linux/ext2_fs.h>
+#include "ext2fs/ext2_fs.h"
+
+#ifdef __GNUC__
+#define EXT2FS_ATTR(x) __attribute__(x)
+#else
+#define EXT2FS_ATTR(x)
+#endif
+
+#ifndef S_ISLNK			/* So we can compile even with gcc-warn */
+# ifdef __S_IFLNK
+#  define S_ISLNK(mode)	 __S_ISTYPE((mode), __S_IFLNK)
+# else
+#  define S_ISLNK(mode)  0
+# endif
+#endif
 
 #include "et/com_err.h"
 #include "e2p/e2p.h"
 
 #include "../version.h"
+#include "nls-enable.h"
+
+static const char * program_name = "chattr";
+
+static int add;
+static int rem;
+static int set;
+static int set_version;
 
-const char * program_name = "chattr";
+static unsigned long version;
 
-int add = 0;
-int rem = 0;
-int set = 0;
-int set_version = 0;
+static int recursive;
+static int verbose;
+static int silent;
 
-unsigned long version;
+static unsigned long af;
+static unsigned long rf;
+static unsigned long sf;
 
-int recursive = 0;
-int verbose = 0;
+#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 [-RVf] [-+=AaCcDdeijsSu] [-v version] files...\n"),
+		program_name);
+	exit(1);
+}
 
-unsigned long af;
-unsigned long rf;
-unsigned long sf;
+struct flags_char {
+	unsigned long	flag;
+	char 		optchar;
+};
 
-static void volatile fatal_error (const char * fmt_string, int errcode)
+static const struct flags_char flags_array[] = {
+	{ EXT2_NOATIME_FL, 'A' },
+	{ EXT2_SYNC_FL, 'S' },
+	{ EXT2_DIRSYNC_FL, 'D' },
+	{ 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)
 {
-	fprintf (stderr, fmt_string, program_name);
-	exit (errcode);
+	const struct flags_char *fp;
+
+	for (fp = flags_array; fp->flag != 0; fp++) {
+		if (fp->optchar == c)
+			return fp->flag;
+	}
+	return 0;
 }
 
-#define usage() fatal_error ("usage: %s [-RV] [-+=acdisSu] [-v version] files...\n", \
-			     1)
 
 static int decode_arg (int * i, int argc, char ** argv)
 {
 	char * p;
 	char * tmp;
+	unsigned long fl;
 
 	switch (argv[*i][0])
 	{
 	case '-':
-		for (p = &argv[*i][1]; *p; p++)
-			switch (*p)
-			{
-			case 'R':
+		for (p = &argv[*i][1]; *p; p++) {
+			if (*p == 'R') {
 				recursive = 1;
-				break;
-			case 'S':
-				rf |= EXT2_SYNC_FL;
-				rem = 1;
-				break;
-			case 'V':
+				continue;
+			}
+			if (*p == 'V') {
 				verbose = 1;
-				break;
-#ifdef	EXT2_APPEND_FL
-			case 'a':
-				rf |= EXT2_APPEND_FL;
-				rem = 1;
-				break;
-#endif
-			case 'c':
-				rf |= EXT2_COMPR_FL;
-				rem = 1;
-				break;
-#ifdef	EXT2_NODUMP_FL
-			case 'd':
-				rf |= EXT2_NODUMP_FL;
-				rem = 1;
-				break;
-#endif
-#ifdef	EXT2_IMMUTABLE_FL
-			case 'i':
-				rf |= EXT2_IMMUTABLE_FL;
-				rem = 1;
-				break;
-#endif
-			case 's':
-				rf |= EXT2_SECRM_FL;
-				rem = 1;
-				break;
-			case 'u':
-				rf |= EXT2_UNRM_FL;
-				rem = 1;
-				break;
-			case 'v':
+				continue;
+			}
+			if (*p == 'f') {
+				silent = 1;
+				continue;
+			}
+			if (*p == 'v') {
 				(*i)++;
 				if (*i >= argc)
 					usage ();
 				version = strtol (argv[*i], &tmp, 0);
-				if (*tmp)
-				{
+				if (*tmp) {
 					com_err (program_name, 0,
-						 "bad version - %s\n", argv[*i]);
+						 _("bad version - %s\n"),
+						 argv[*i]);
 					usage ();
 				}
 				set_version = 1;
-				break;
-			default:
-				fprintf (stderr, "%s: Unrecognized argument: %c\n",
-					 program_name, *p);
-				usage ();
+				continue;
 			}
+			if ((fl = get_flag(*p)) == 0)
+				usage();
+			rf |= fl;
+			rem = 1;
+		}
 		break;
 	case '+':
 		add = 1;
-		for (p = &argv[*i][1]; *p; p++)
-			switch (*p)
-			{
-			case 'S':
-				af |= EXT2_SYNC_FL;
-				break;
-#ifdef	EXT2_APPEND_FL
-			case 'a':
-				af |= EXT2_APPEND_FL;
-				break;
-#endif
-			case 'c':
-				af |= EXT2_COMPR_FL;
-				break;
-#ifdef	EXT2_NODUMP_FL
-			case 'd':
-				af |= EXT2_NODUMP_FL;
-				break;
-#endif
-#ifdef	EXT2_IMMUTABLE_FL
-			case 'i':
-				af |= EXT2_IMMUTABLE_FL;
-				break;
-#endif
-			case 's':
-				af |= EXT2_SECRM_FL;
-				break;
-			case 'u':
-				af |= EXT2_UNRM_FL;
-				break;
-			default:
-				usage ();
-			}
+		for (p = &argv[*i][1]; *p; p++) {
+			if ((fl = get_flag(*p)) == 0)
+				usage();
+			af |= fl;
+		}
 		break;
 	case '=':
 		set = 1;
-		for (p = &argv[*i][1]; *p; p++)
-			switch (*p)
-			{
-			case 'S':
-				sf |= EXT2_SYNC_FL;
-				break;
-#ifdef	EXT2_APPEND_FL
-			case 'a':
-				sf |= EXT2_APPEND_FL;
-				break;
-#endif
-			case 'c':
-				sf |= EXT2_COMPR_FL;
-				break;
-#ifdef	EXT2_NODUMP_FL
-			case 'd':
-				sf |= EXT2_NODUMP_FL;
-				break;
-#endif
-#ifdef	EXT2_IMMUTABLE_FL
-			case 'i':
-				sf |= EXT2_IMMUTABLE_FL;
-				break;
-#endif
-			case 's':
-				sf |= EXT2_SECRM_FL;
-				break;
-			case 'u':
-				sf |= EXT2_UNRM_FL;
-				break;
-			default:
-				usage ();
-			}
+		for (p = &argv[*i][1]; *p; p++) {
+			if ((fl = get_flag(*p)) == 0)
+				usage();
+			sf |= fl;
+		}
 		break;
 	default:
 		return EOF;
@@ -211,110 +188,140 @@ 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 void change_attributes (const char * name)
+static int change_attributes(const char * name)
 {
 	unsigned long flags;
-	struct stat st;
+	STRUCT_STAT	st;
 
-	if (lstat (name, &st) == -1)
-	{
-		com_err (program_name, errno, "while stating %s", name);
-		return;
+	if (LSTAT (name, &st) == -1) {
+		if (!silent)
+			com_err (program_name, errno,
+				 _("while trying to stat %s"), name);
+		return -1;
 	}
-	if (set)
-	{
-		if (verbose)
-		{
-			printf ("Flags of %s set as ", name);
+
+	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);
 			print_flags (stdout, sf, 0);
 			printf ("\n");
 		}
 		if (fsetflags (name, sf) == -1)
 			perror (name);
-	}
-	else
-	{
-		if (fgetflags (name, &flags) == -1)
-			com_err (program_name, errno,
-			         "while reading flags on %s", name);
-		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");
+	} 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,
+						_("while setting flags on %s"),
+						name);
 			}
-			if (fsetflags (name, flags) == -1)
-				com_err (program_name, errno,
-				         "while setting flags on %s", name);
+			return -1;
 		}
 	}
-	if (set_version)
-	{
+	if (set_version) {
 		if (verbose)
-			printf ("Version of %s set as %lu\n", name, version);
-		if (fsetversion (name, version) == -1)
-			com_err (program_name, errno,
-			         "while setting version on %s", name);
+			printf (_("Version of %s set as %lu\n"), name, version);
+		if (fsetversion (name, version) == -1) {
+			if (!silent)
+				com_err (program_name, errno,
+					 _("while setting version on %s"),
+					 name);
+			return -1;
+		}
 	}
 	if (S_ISDIR(st.st_mode) && recursive)
-		iterate_on_dir (name, chattr_dir_proc, (void *) NULL);
+		return iterate_on_dir (name, chattr_dir_proc, NULL);
+	return 0;
 }
 
-static int chattr_dir_proc (const char * dir_name, struct dirent * de, void * private)
+static int chattr_dir_proc (const char * dir_name, struct dirent * de,
+			    void * private EXT2FS_ATTR((unused)))
 {
-	if (strcmp (de->d_name, ".") && strcmp (de->d_name, ".."))
-	{
+	int ret = 0;
+
+	if (strcmp (de->d_name, ".") && strcmp (de->d_name, "..")) {
 	        char *path;
 
 		path = malloc(strlen (dir_name) + 1 + strlen (de->d_name) + 1);
-		if (!path)
-			fatal_error("Couldn't allocate path variable "
-				    "in chattr_dir_proc", 1);
-		sprintf (path, "%s/%s", dir_name, de->d_name);
-		change_attributes (path);
+		if (!path) {
+			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);
 		free(path);
 	}
-	return 0;
+	return ret;
 }
 
-void main (int argc, char ** argv)
+int main (int argc, char ** argv)
 {
 	int i, j;
 	int end_arg = 0;
+	int err, retval = 0;
 
-	fprintf (stderr, "chattr %s, %s for EXT2 FS %s, %s\n",
-		 E2FSPROGS_VERSION, E2FSPROGS_DATE,
-		 EXT2FS_VERSION, EXT2FS_DATE);
+#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;
 	i = 1;
-	while (i < argc && !end_arg)
-	{
-		if (decode_arg (&i, argc, argv) == EOF)
+	while (i < argc && !end_arg) {
+		/* '--' arg should end option processing */
+		if (strcmp(argv[i], "--") == 0) {
+			i++;
+			end_arg = 1;
+		} else if (decode_arg (&i, argc, argv) == EOF)
 			end_arg = 1;
 		else
 			i++;
 	}
 	if (i >= argc)
 		usage ();
-	if (set && (add || rem))
-	{
-		fprintf (stderr, "= is incompatible with - and +\n");
+	if (set && (add || rem)) {
+		fputs(_("= is incompatible with - and +\n"), stderr);
 		exit (1);
 	}
-	if (!(add || rem || set || set_version))
-	{
-		fprintf (stderr, "Must use '-v', =, - or +\n");
+	if ((rf & af) != 0) {
+		fputs("Can't both set and unset same flag.\n", stderr);
 		exit (1);
 	}
-	for (j = i; j < argc; j++)
-		change_attributes (argv[j]);
+	if (!(add || rem || set || set_version)) {
+		fputs(_("Must use '-v', =, - or +\n"), stderr);
+		exit (1);
+	}
+	if (verbose)
+		fprintf (stderr, "chattr %s (%s)\n",
+			 E2FSPROGS_VERSION, E2FSPROGS_DATE);
+	for (j = i; j < argc; j++) {
+		err = change_attributes (argv[j]);
+		if (err)
+			retval = 1;
+	}
+	exit(retval);
 }