From: Andreas Dilger <adilger@sun.com>
Date: Sat, 2 Feb 2008 08:17:44 +0000 (-0700)
Subject: e2fsprogs-extended_ops.patch
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cbdfe208e1ff75a7286181e9e5630a9ee7facfaf;p=thirdparty%2Fe2fsprogs.git

e2fsprogs-extended_ops.patch

Minor reformatting patch to make applying later patches easier.

Signed-off-by: Andreas Dilger <adilger@sun.com>
---

diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index 4ca13dcaa..c14c70633 100644
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -540,14 +540,13 @@ static void parse_extended_opts(e2fsck_t ctx, const char *opts)
 				continue;
 			}
 			ea_ver = strtoul(arg, &p, 0);
-			if (*p ||
-			    ((ea_ver != 1) && (ea_ver != 2))) {
-				fprintf(stderr,
-					_("Invalid EA version.\n"));
+			if (*p == '\0' && (ea_ver == 1 || ea_ver == 2)) {
+				ctx->ext_attr_ver = ea_ver;
+			} else {
+				fprintf(stderr, _("Invalid EA version.\n"));
 				extended_usage++;
 				continue;
 			}
-			ctx->ext_attr_ver = ea_ver;
 		} else {
 			fprintf(stderr, _("Unknown extended option: %s\n"),
 				token);
@@ -561,7 +560,8 @@ static void parse_extended_opts(e2fsck_t ctx, const char *opts)
 		       "and may take an argument which\n"
 		       "is set off by an equals ('=') sign.  "
 			"Valid extended options are:\n"
-		       "\tea_ver=<ea_version (1 or 2)>\n\n"), stderr);
+		       "\tea_ver=<ea_version (1 or 2)>\n"
+		       "\n"), stderr);
 		exit(1);
 	}
 }