undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/am-read-author-file'

Browse Source 
Extract a small helper out of the function that reads the authors
script file "git am" internally uses.

* jc/am-read-author-file:
  am: refactor read_author_script()
This commit is contained in:
Junio C Hamano 2016-09-12 15:34:32 -07:00
commit 87f5de387c
1 changed files with 44 additions and 57 deletions

101
builtin/am.c
View File

@ -28,6 +28,7 @@
#include "rerere.h" #include "rerere.h"
#include "prompt.h" #include "prompt.h"
#include "mailinfo.h" #include "mailinfo.h"
#include "string-list.h"
/** /**
* Returns 1 if the file is empty or does not exist, 0 otherwise. * Returns 1 if the file is empty or does not exist, 0 otherwise.
@ -258,38 +259,29 @@ static int read_state_file(struct strbuf *sb, const struct am_state *state,
} }
/** /**
* Reads a KEY=VALUE shell variable assignment from `fp`, returning the VALUE * Take a series of KEY='VALUE' lines where VALUE part is
* as a newly-allocated string. VALUE must be a quoted string, and the KEY must * sq-quoted, and append <KEY, VALUE> at the end of the string list
* match `key`. Returns NULL on failure.
*
* This is used by read_author_script() to read the GIT_AUTHOR_* variables from
* the author-script.
*/ */
static char *read_shell_var(FILE *fp, const char *key) static int parse_key_value_squoted(char *buf, struct string_list *list)
{ {
struct strbuf sb = STRBUF_INIT; while (*buf) {
const char *str; struct string_list_item *item;
char *np;
char *cp = strchr(buf, '=');
if (!cp)
return -1;
np = strchrnul(cp, '\n');
*cp++ = '\0';
item = string_list_append(list, buf);
if (strbuf_getline_lf(&sb, fp)) buf = np + (*np == '\n');
goto fail; *np = '\0';
cp = sq_dequote(cp);
if (!skip_prefix(sb.buf, key, &str)) if (!cp)
goto fail; return -1;
item->util = xstrdup(cp);
if (!skip_prefix(str, "=", &str)) }
goto fail; return 0;
strbuf_remove(&sb, 0, str - sb.buf);
str = sq_dequote(sb.buf);
if (!str)
goto fail;
return strbuf_detach(&sb, NULL);
fail:
strbuf_release(&sb);
return NULL;
} }
/** /**
@ -311,44 +303,39 @@ fail:
static int read_author_script(struct am_state *state) static int read_author_script(struct am_state *state)
{ {
const char *filename = am_path(state, "author-script"); const char *filename = am_path(state, "author-script");
FILE *fp; struct strbuf buf = STRBUF_INIT;
struct string_list kv = STRING_LIST_INIT_DUP;
int retval = -1; /* assume failure */
int fd;
assert(!state->author_name); assert(!state->author_name);
assert(!state->author_email); assert(!state->author_email);
assert(!state->author_date); assert(!state->author_date);
fp = fopen(filename, "r"); fd = open(filename, O_RDONLY);
if (!fp) { if (fd < 0) {
if (errno == ENOENT) if (errno == ENOENT)
return 0; return 0;
die_errno(_("could not open '%s' for reading"), filename); die_errno(_("could not open '%s' for reading"), filename);
} }
strbuf_read(&buf, fd, 0);
close(fd);
if (parse_key_value_squoted(buf.buf, &kv))
goto finish;
state->author_name = read_shell_var(fp, "GIT_AUTHOR_NAME"); if (kv.nr != 3 ||
if (!state->author_name) { strcmp(kv.items[0].string, "GIT_AUTHOR_NAME") ||
fclose(fp); strcmp(kv.items[1].string, "GIT_AUTHOR_EMAIL") ||
return -1; strcmp(kv.items[2].string, "GIT_AUTHOR_DATE"))
} goto finish;
state->author_name = kv.items[0].util;
state->author_email = read_shell_var(fp, "GIT_AUTHOR_EMAIL"); state->author_email = kv.items[1].util;
if (!state->author_email) { state->author_date = kv.items[2].util;
fclose(fp); retval = 0;
return -1; finish:
} string_list_clear(&kv, !!retval);
strbuf_release(&buf);
state->author_date = read_shell_var(fp, "GIT_AUTHOR_DATE"); return retval;
if (!state->author_date) {
fclose(fp);
return -1;
}
if (fgetc(fp) != EOF) {
fclose(fp);
return -1;
}
fclose(fp);
return 0;
} }
/** /**