643df7e234
It is totally legitimate to add CamelCased aliases, but due to the way
config keys are compared, the case does not matter.
Therefore, we must compare the alias name insensitively to the config
keys.
This fixes a regression introduced by a9bcf6586d (alias: use
the early config machinery to expand aliases, 2017-06-14).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
92 lines
1.8 KiB
C
92 lines
1.8 KiB
C
#include "cache.h"
|
|
|
|
struct config_alias_data {
|
|
const char *alias;
|
|
char *v;
|
|
};
|
|
|
|
static int config_alias_cb(const char *key, const char *value, void *d)
|
|
{
|
|
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)
|
|
{
|
|
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;
|
|
|
|
ALLOC_ARRAY(*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++;
|
|
}
|
|
}
|
|
|
|
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;
|
|
}
|
|
|
|
const char *split_cmdline_strerror(int split_cmdline_errno)
|
|
{
|
|
return split_cmdline_errors[-split_cmdline_errno - 1];
|
|
}
|