Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH 3/5 v4] diff: parse detached options --stat-width n, --stat-name-width n

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:49:14

Matthieu Moy [off-list ref] writes:
Part of a campaign for unstuck forms of options.

 	switch (*arg) {
 	case '-':
-		if (!prefixcmp(arg, "-width="))
-			width = strtoul(arg + 7, &end, 10);
-		else if (!prefixcmp(arg, "-name-width="))
-			name_width = strtoul(arg + 12, &end, 10);
+		if (!prefixcmp(arg, "-width")) {
+			arg += strlen("-width");
+			if (*arg == '=')
+				width = strtoul(arg + 1, &end, 10);
+			else if (!*arg && !av[1])
+				die("Option '--stat-width' requires a value");
+			else if (!*arg) {
+				width = strtoul(av[1], &end, 10);
+				argcount = 2;
+			}
+		} else if (!prefixcmp(arg, "-name-width")) {
+			arg += strlen("-name-width");
+			if (*arg == '=')
+				name_width = strtoul(arg + 1, &end, 10);
+			else if (!*arg && !av[1])
+				die("Option '--stat-name-width' requires a value");
+			else if (!*arg) {
+				name_width = strtoul(av[1], &end, 10);
+				argcount = 2;
+			}
+		}
 		break;
 	case '=':
 		width = strtoul(arg+1, &end, 10);
This will accept "--stat-width=40", "--stat-width 40", and "--stat=40,20"
but not "--stat 40,20" --- am I reading the patch correctly?

Not a complaint but trying to double-check.  I think it is Ok not to try
guessing wrong (the user may be interested in a path 40,20, for example).

Thanks.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help