packaging: Add contrib installation

[platform/upstream/git.git] / alias.c

diff --git a/alias.c b/alias.c
index 758c867..c471538 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -1,33 +1,54 @@
 #include "cache.h"
+#include "alias.h"
+#include "config.h"
+#include "string-list.h"
 
-static const char *alias_key;
-static char *alias_val;
+struct config_alias_data {
+       const char *alias;
+       char *v;
+       struct string_list *list;
+};
 
-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)
 {
-       const char *name;
-       if (skip_prefix(k, "alias.", &name) && !strcmp(name, alias_key)) {
-               if (!v)
-                       return config_error_nonbool(k);
-               alias_val = xstrdup(v);
+       struct config_alias_data *data = d;
+       const char *p;
+
+       if (!skip_prefix(key, "alias.", &p))
                return 0;
+
+       if (data->alias) {
+               if (!strcasecmp(p, data->alias))
+                       return git_config_string((const char **)&data->v,
+                                                key, value);
+       } else if (data->list) {
+               string_list_append(data->list, p);
        }
+
        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;
+}
+
+void list_aliases(struct string_list *list)
+{
+       struct config_alias_data data = { NULL, NULL, list };
+
+       read_early_config(config_alias_cb, &data);
 }
 
 #define SPLIT_CMDLINE_BAD_ENDING 1
 #define SPLIT_CMDLINE_UNCLOSED_QUOTE 2
 static const char *split_cmdline_errors[] = {
-       "cmdline ends with \\",
-       "unclosed quote"
+       N_("cmdline ends with \\"),
+       N_("unclosed quote")
 };
 
 int split_cmdline(char *cmdline, const char ***argv)
@@ -35,7 +56,7 @@ int split_cmdline(char *cmdline, const char ***argv)
        int src, dst, count = 0, size = 16;
        char quoted = 0;
 
-       *argv = xmalloc(sizeof(**argv) * size);
+       ALLOC_ARRAY(*argv, size);
 
        /* split alias_string */
        (*argv)[count++] = cmdline;
@@ -59,8 +80,7 @@ int split_cmdline(char *cmdline, const char ***argv)
                                src++;
                                c = cmdline[src];
                                if (!c) {
-                                       free(*argv);
-                                       *argv = NULL;
+                                       FREE_AND_NULL(*argv);
                                        return -SPLIT_CMDLINE_BAD_ENDING;
                                }
                        }
@@ -72,8 +92,7 @@ int split_cmdline(char *cmdline, const char ***argv)
        cmdline[dst] = 0;
 
        if (quoted) {
-               free(*argv);
-               *argv = NULL;
+               FREE_AND_NULL(*argv);
                return -SPLIT_CMDLINE_UNCLOSED_QUOTE;
        }