read-cache: avoid allocating every ondisk entry when writing

diff --git a/alias.c b/alias.c
index ccb1108c94436035d0da8b1d6f08f859b68294a3..bf146e526329309df360b9f1028ca2f767743efa 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -1,33 +1,44 @@
 #include "cache.h"
+#include "config.h"
 
-static const char *alias_key;
-static char *alias_val;
+struct config_alias_data {
+       const char *alias;
+       char *v;
+};
 
-static int alias_lookup_cb(const char *k, const char *v, void *cb)
+static int config_alias_cb(const char *key, const char *value, void *d)
 {
-       if (!prefixcmp(k, "alias.") && !strcmp(k+6, alias_key)) {
-               if (!v)
-                       return config_error_nonbool(k);
-               alias_val = xstrdup(v);
-               return 0;
-       }
+       struct config_alias_data *data = d;
+       const char *p;
+
+       if (skip_prefix(key, "alias.", &p) && !strcasecmp(p, data->alias))
+               return git_config_string((const char **)&data->v, key, value);
+
        return 0;
 }
 
 char *alias_lookup(const char *alias)
 {
-       alias_key = alias;
-       alias_val = NULL;
-       git_config(alias_lookup_cb, NULL);
-       return alias_val;
+       struct config_alias_data data = { alias, NULL };
+
+       read_early_config(config_alias_cb, &data);
+
+       return data.v;
 }
 
+#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;
        char quoted = 0;
 
-       *argv = xmalloc(sizeof(char*) * size);
+       ALLOC_ARRAY(*argv, size);
 
        /* split alias_string */
        (*argv)[count++] = cmdline;
@@ -38,10 +49,7 @@ int split_cmdline(char *cmdline, const char ***argv)
                        while (cmdline[++src]
                                        && isspace(cmdline[src]))
                                ; /* skip */
-                       if (count >= size) {
-                               size += 16;
-                               *argv = xrealloc(*argv, sizeof(char*) * size);
-                       }
+                       ALLOC_GROW(*argv, count + 1, size);
                        (*argv)[count++] = cmdline + dst;
                } else if (!quoted && (c == '\'' || c == '"')) {
                        quoted = c;
@@ -54,9 +62,8 @@ int split_cmdline(char *cmdline, const char ***argv)
                                src++;
                                c = cmdline[src];
                                if (!c) {
-                                       free(*argv);
-                                       *argv = NULL;
-                                       return error("cmdline ends with \\");
+                                       FREE_AND_NULL(*argv);
+                                       return -SPLIT_CMDLINE_BAD_ENDING;
                                }
                        }
                        cmdline[dst++] = c;
@@ -67,11 +74,17 @@ int split_cmdline(char *cmdline, const char ***argv)
        cmdline[dst] = 0;
 
        if (quoted) {
-               free(*argv);
-               *argv = NULL;
-               return error("unclosed quote");
+               FREE_AND_NULL(*argv);
+               return -SPLIT_CMDLINE_UNCLOSED_QUOTE;
        }
 
+       ALLOC_GROW(*argv, count + 1, size);
+       (*argv)[count] = NULL;
+
        return count;
 }
 
+const char *split_cmdline_strerror(int split_cmdline_errno)
+{
+       return split_cmdline_errors[-split_cmdline_errno - 1];
+}