4960e5c7bd
To store the strategy options rebase prepends " --" to each one and writes them to a file. To load them it reads the file and passes the contents to split_cmdline(). This roughly mimics the behavior of the scripted rebase but has a couple of limitations, (1) options containing whitespace are not properly preserved (this is true of the scripted rebase as well) and (2) options containing '"' or '\' are incorrectly parsed and may cause the parser to return an error. Fix these limitations by quoting each option when they are stored so that they can be parsed correctly. Now that "--preserve-merges" no longer exist this change also stops prepending "--" to the options when they are stored as that was an artifact of the scripted rebase. These changes are backwards compatible so the files written by an older version of git can still be read. They are also forwards compatible, the file can still be parsed by recent versions of git as they treat the "--" prefix as optional. Reviewed-by: Elijah Newren <newren@gmail.com> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
136 lines
2.7 KiB
C
136 lines
2.7 KiB
C
#include "git-compat-util.h"
|
|
#include "alias.h"
|
|
#include "alloc.h"
|
|
#include "config.h"
|
|
#include "gettext.h"
|
|
#include "strbuf.h"
|
|
#include "string-list.h"
|
|
|
|
struct config_alias_data {
|
|
const char *alias;
|
|
char *v;
|
|
struct string_list *list;
|
|
};
|
|
|
|
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))
|
|
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)
|
|
{
|
|
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);
|
|
}
|
|
|
|
void quote_cmdline(struct strbuf *buf, const char **argv)
|
|
{
|
|
for (const char **argp = argv; *argp; argp++) {
|
|
if (argp != argv)
|
|
strbuf_addch(buf, ' ');
|
|
strbuf_addch(buf, '"');
|
|
for (const char *p = *argp; *p; p++) {
|
|
const char c = *p;
|
|
|
|
if (c == '"' || c =='\\')
|
|
strbuf_addch(buf, '\\');
|
|
strbuf_addch(buf, c);
|
|
}
|
|
strbuf_addch(buf, '"');
|
|
}
|
|
}
|
|
|
|
#define SPLIT_CMDLINE_BAD_ENDING 1
|
|
#define SPLIT_CMDLINE_UNCLOSED_QUOTE 2
|
|
#define SPLIT_CMDLINE_ARGC_OVERFLOW 3
|
|
static const char *split_cmdline_errors[] = {
|
|
N_("cmdline ends with \\"),
|
|
N_("unclosed quote"),
|
|
N_("too many arguments"),
|
|
};
|
|
|
|
int split_cmdline(char *cmdline, const char ***argv)
|
|
{
|
|
size_t 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_AND_NULL(*argv);
|
|
return -SPLIT_CMDLINE_BAD_ENDING;
|
|
}
|
|
}
|
|
cmdline[dst++] = c;
|
|
src++;
|
|
}
|
|
}
|
|
|
|
cmdline[dst] = 0;
|
|
|
|
if (quoted) {
|
|
FREE_AND_NULL(*argv);
|
|
return -SPLIT_CMDLINE_UNCLOSED_QUOTE;
|
|
}
|
|
|
|
if (count >= INT_MAX) {
|
|
FREE_AND_NULL(*argv);
|
|
return -SPLIT_CMDLINE_ARGC_OVERFLOW;
|
|
}
|
|
|
|
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];
|
|
}
|