From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 20 Jan 2004 18:39:01 +0000 (-0500)
Subject: chattr.c (main): Add support for '--' to stop options
X-Git-Tag: E2FSPROGS-1_35-WIP-0131~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2293a4d5deb30b02d90c4d0aee516e8280092a58;p=thirdparty%2Fe2fsprogs.git

chattr.c (main): Add support for '--' to stop options
	processing.  (Addresses Debian bug #225188).
---

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 652f3da5e..e6d60868f 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-20  root  <tytso@mit.edu>
+
+	* chattr.c (main): Add support for '--' to stop options
+		processing.  (Addresses Debian bug #225188).
+
 2003-12-26  Theodore Ts'o  <tytso@mit.edu>
 
 	* chattr.1.in: Update text indicating the 'c', 's', and 'u'
diff --git a/misc/chattr.c b/misc/chattr.c
index b4b1ca3b4..bb9686460 100644
--- a/misc/chattr.c
+++ b/misc/chattr.c
@@ -276,7 +276,11 @@ int main (int argc, char ** argv)
 		program_name = *argv;
 	i = 1;
 	while (i < argc && !end_arg) {
-		if (decode_arg (&i, argc, argv) == EOF)
+		/* '--' 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++;