git: simplify environment save/restore logic
[gitweb.git] / alias.c
diff --git a/alias.c b/alias.c
index 995f3e6a0ac84fa71c3196de6673225d4a5d8231..a11229db9e67b7b651356be3fb1d4b3d1014a8bd 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -1,23 +1,77 @@
 #include "cache.h"
 
-static const char *alias_key;
-static char *alias_val;
+char *alias_lookup(const char *alias)
+{
+       char *v = NULL;
+       struct strbuf key = STRBUF_INIT;
+       strbuf_addf(&key, "alias.%s", alias);
+       if (git_config_key_is_valid(key.buf))
+               git_config_get_string(key.buf, &v);
+       strbuf_release(&key);
+       return v;
+}
 
-static int alias_lookup_cb(const char *k, const char *v, void *cb)
+#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)
 {
-       if (!prefixcmp(k, "alias.") && !strcmp(k+6, alias_key)) {
-               if (!v)
-                       return config_error_nonbool(k);
-               alias_val = xstrdup(v);
-               return 0;
+       int src, dst, count = 0, size = 16;
+       char quoted = 0;
+
+       *argv = xmalloc(sizeof(**argv) * size);
+
+       /* split alias_string */
+       (*argv)[count++] = cmdline;
+       for (src = dst = 0; cmdline[src];) {
+               char c = cmdline[src];
+               if (!quoted && isspace(c)) {
+                       cmdline[dst++] = 0;
+                       while (cmdline[++src]
+                                       && isspace(cmdline[src]))
+                               ; /* skip */
+                       ALLOC_GROW(*argv, count + 1, size);
+                       (*argv)[count++] = cmdline + dst;
+               } else if (!quoted && (c == '\'' || c == '"')) {
+                       quoted = c;
+                       src++;
+               } else if (c == quoted) {
+                       quoted = 0;
+                       src++;
+               } else {
+                       if (c == '\\' && quoted != '\'') {
+                               src++;
+                               c = cmdline[src];
+                               if (!c) {
+                                       free(*argv);
+                                       *argv = NULL;
+                                       return -SPLIT_CMDLINE_BAD_ENDING;
+                               }
+                       }
+                       cmdline[dst++] = c;
+                       src++;
+               }
        }
-       return 0;
+
+       cmdline[dst] = 0;
+
+       if (quoted) {
+               free(*argv);
+               *argv = NULL;
+               return -SPLIT_CMDLINE_UNCLOSED_QUOTE;
+       }
+
+       ALLOC_GROW(*argv, count + 1, size);
+       (*argv)[count] = NULL;
+
+       return count;
 }
 
-char *alias_lookup(const char *alias)
+const char *split_cmdline_strerror(int split_cmdline_errno)
 {
-       alias_key = alias;
-       alias_val = NULL;
-       git_config(alias_lookup_cb, NULL);
-       return alias_val;
+       return split_cmdline_errors[-split_cmdline_errno - 1];
 }