Merge branch 'gb/split-cmdline-errmsg'

gitster · gitster · commit b95d0a2f8cb2 · 2010-08-21T23:28:55.000-07:00
* gb/split-cmdline-errmsg:
  split_cmdline: Allow caller to access error string
diff --git a/alias.c b/alias.c
@@ -22,6 +22,13 @@ char *alias_lookup(const char *alias)
 	return alias_val;
 }
 
+#define SPLIT_CMDLINE_BAD_ENDING 1
+#define SPLIT_CMDLINE_UNCLOSED_QUOTE 2
+static const char *split_cmdline_errors[] = {
+	"cmdline ends with \\",
+	"unclosed quote"
+};
+
 int split_cmdline(char *cmdline, const char ***argv)
 {
 	int src, dst, count = 0, size = 16;
@@ -53,7 +60,7 @@ int split_cmdline(char *cmdline, const char ***argv)
 				if (!c) {
 					free(*argv);
 					*argv = NULL;
-					return error("cmdline ends with \\");
+					return -SPLIT_CMDLINE_BAD_ENDING;
 				}
 			}
 			cmdline[dst++] = c;
@@ -66,7 +73,7 @@ int split_cmdline(char *cmdline, const char ***argv)
 	if (quoted) {
 		free(*argv);
 		*argv = NULL;
-		return error("unclosed quote");
+		return -SPLIT_CMDLINE_UNCLOSED_QUOTE;
 	}
 
 	ALLOC_GROW(*argv, count+1, size);
@@ -75,3 +82,6 @@ int split_cmdline(char *cmdline, const char ***argv)
 	return count;
 }
 
+const char *split_cmdline_strerror(int split_cmdline_errno) {
+	return split_cmdline_errors[-split_cmdline_errno-1];
+}
diff --git a/builtin/merge.c b/builtin/merge.c
@@ -486,7 +486,8 @@ static int git_merge_config(const char *k, const char *v, void *cb)
 		buf = xstrdup(v);
 		argc = split_cmdline(buf, &argv);
 		if (argc < 0)
-			die("Bad branch.%s.mergeoptions string", branch);
+			die("Bad branch.%s.mergeoptions string: %s", branch,
+			    split_cmdline_strerror(argc));
 		argv = xrealloc(argv, sizeof(*argv) * (argc + 2));
 		memmove(argv + 1, argv, sizeof(*argv) * (argc + 1));
 		argc++;
diff --git a/cache.h b/cache.h
@@ -1099,6 +1099,8 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix);
 
 char *alias_lookup(const char *alias);
 int split_cmdline(char *cmdline, const char ***argv);
+/* Takes a negative value returned by split_cmdline */
+const char *split_cmdline_strerror(int cmdline_errno);
 
 /* builtin/merge.c */
 int checkout_fast_forward(const unsigned char *from, const unsigned char *to);
diff --git a/git.c b/git.c
@@ -188,7 +188,8 @@ static int handle_alias(int *argcp, const char ***argv)
 		}
 		count = split_cmdline(alias_string, &new_argv);
 		if (count < 0)
-			die("Bad alias.%s string", alias_command);
+			die("Bad alias.%s string: %s", alias_command,
+			    split_cmdline_strerror(count));
 		option_count = handle_options(&new_argv, &count, &envchanged);
 		if (envchanged)
 			die("alias '%s' changes environment variables\n"

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,13 @@ char alias_lookup(const char alias)`
`22`	`22`	`return alias_val;`
`23`	`23`	`}`
`24`	`24`
	`25`	`+#define SPLIT_CMDLINE_BAD_ENDING 1`
	`26`	`+#define SPLIT_CMDLINE_UNCLOSED_QUOTE 2`
	`27`	`+static const char *split_cmdline_errors[] = {`
	`28`	`+ "cmdline ends with \\",`
	`29`	`+ "unclosed quote"`
	`30`	`+};`
	`31`	`+`
`25`	`32`	`int split_cmdline(char cmdline, const char **argv)`
`26`	`33`	`{`
`27`	`34`	`int src, dst, count = 0, size = 16;`
`@@ -53,7 +60,7 @@ int split_cmdline(char cmdline, const char **argv)`
`53`	`60`	`if (!c) {`
`54`	`61`	`free(*argv);`
`55`	`62`	`*argv = NULL;`
`56`		`- return error("cmdline ends with \\");`
	`63`	`+ return -SPLIT_CMDLINE_BAD_ENDING;`
`57`	`64`	`}`
`58`	`65`	`}`
`59`	`66`	`cmdline[dst++] = c;`
`@@ -66,7 +73,7 @@ int split_cmdline(char cmdline, const char **argv)`
`66`	`73`	`if (quoted) {`
`67`	`74`	`free(*argv);`
`68`	`75`	`*argv = NULL;`
`69`		`- return error("unclosed quote");`
	`76`	`+ return -SPLIT_CMDLINE_UNCLOSED_QUOTE;`
`70`	`77`	`}`
`71`	`78`
`72`	`79`	`ALLOC_GROW(*argv, count+1, size);`
`@@ -75,3 +82,6 @@ int split_cmdline(char cmdline, const char **argv)`
`75`	`82`	`return count;`
`76`	`83`	`}`
`77`	`84`
	`85`	`+const char *split_cmdline_strerror(int split_cmdline_errno) {`
	`86`	`+ return split_cmdline_errors[-split_cmdline_errno-1];`
	`87`	`+}`