const char *args[3];
int fd;
- editor = getenv("VISUAL");
+ editor = getenv("GIT_EDITOR");
+ if (!editor && editor_program)
+ editor = editor_program;
+ if (!editor)
+ editor = getenv("VISUAL");
if (!editor)
editor = getenv("EDITOR");
printf("%-15s ", refname);
sp = buf = read_sha1_file(sha1, &type, &size);
- if (!buf || !size)
+ if (!buf)
+ return 0;
+ if (!size) {
+ free(buf);
return 0;
+ }
/* skip header */
while (sp + 1 < buf + size &&
!(sp[0] == '\n' && sp[1] == '\n'))
sp++;
/* only take up to "lines" lines, and strip the signature */
- for (i = 0, sp += 2; i < filter->lines && sp < buf + size &&
+ for (i = 0, sp += 2;
+ i < filter->lines && sp < buf + size &&
prefixcmp(sp, PGP_SIGNATURE "\n");
i++) {
if (i)
static int list_tags(const char *pattern, int lines)
{
struct tag_filter filter;
- char *newpattern;
if (pattern == NULL)
- pattern = "";
+ pattern = "*";
- /* prepend/append * to the shell pattern: */
- newpattern = xmalloc(strlen(pattern) + 3);
- sprintf(newpattern, "*%s*", pattern);
-
- filter.pattern = newpattern;
+ filter.pattern = pattern;
filter.lines = lines;
for_each_tag_ref(show_reference, (void *) &filter);
- free(newpattern);
-
return 0;
}
-typedef int (*func_tag)(const char *name, const char *ref,
+typedef int (*each_tag_name_fn)(const char *name, const char *ref,
const unsigned char *sha1);
-static int do_tag_names(const char **argv, func_tag fn)
+static int for_each_tag_name(const char **argv, each_tag_name_fn fn)
{
const char **p;
char ref[PATH_MAX];
if (!*signingkey) {
if (strlcpy(signingkey, git_committer_info(1),
- sizeof(signingkey)) >= sizeof(signingkey))
+ sizeof(signingkey)) > sizeof(signingkey) - 1)
return error("committer info too long.");
bracket = strchr(signingkey, '>');
if (bracket)
bracket[1] = '\0';
}
+ /* When the username signingkey is bad, program could be terminated
+ * because gpg exits without reading and then write gets SIGPIPE. */
+ signal(SIGPIPE, SIG_IGN);
+
memset(&gpg, 0, sizeof(gpg));
gpg.argv = args;
gpg.in = -1;
if (start_command(&gpg))
return error("could not run gpg.");
- write_or_die(gpg.in, buffer, size);
+ if (write_in_full(gpg.in, buffer, size) != size) {
+ close(gpg.in);
+ finish_command(&gpg);
+ return error("gpg did not accept the tag data");
+ }
close(gpg.in);
gpg.close_in = 0;
len = read_in_full(gpg.out, buffer + size, max - size);
- finish_command(&gpg);
+ if (finish_command(&gpg) || !len || len < 0)
+ return error("gpg failed to sign the tag");
if (len == max - size)
return error("could not read the entire signature from gpg.");
char *message, int sign, unsigned char *result)
{
enum object_type type;
- char header_buf[1024], *buffer;
+ char header_buf[1024], *buffer = NULL;
int header_len, max_size;
- unsigned long size;
+ unsigned long size = 0;
type = sha1_object_info(object, NULL);
- if (type <= 0)
+ if (type <= OBJ_NONE)
die("bad object type.");
header_len = snprintf(header_buf, sizeof(header_buf),
tag,
git_committer_info(1));
- if (header_len >= sizeof(header_buf))
+ if (header_len > sizeof(header_buf) - 1)
die("tag header too big.");
if (!message) {
size += header_len;
if (sign) {
- size = do_sign(buffer, size, max_size);
- if (size < 0)
+ ssize_t r = do_sign(buffer, size, max_size);
+ if (r < 0)
die("unable to sign the tag");
+ size = r;
}
if (write_sha1_file(buffer, size, tag_type, result) < 0)
i++;
if (i == argc)
die("option -m needs an argument.");
+ if (message)
+ die("only one -F or -m option is allowed.");
message = xstrdup(argv[i]);
continue;
}
i++;
if (i == argc)
die("option -F needs an argument.");
+ if (message)
+ die("only one -F or -m option is allowed.");
if (!strcmp(argv[i], "-"))
fd = 0;
die("argument to option -u too long");
continue;
}
- if (!strcmp(arg, "-l")) {
+ if (!strcmp(arg, "-l"))
return list_tags(argv[i + 1], lines);
- }
- if (!strcmp(arg, "-d")) {
- return do_tag_names(argv + i + 1, delete_tag);
- }
- if (!strcmp(arg, "-v")) {
- return do_tag_names(argv + i + 1, verify_tag);
- }
+ if (!strcmp(arg, "-d"))
+ return for_each_tag_name(argv + i + 1, delete_tag);
+ if (!strcmp(arg, "-v"))
+ return for_each_tag_name(argv + i + 1, verify_tag);
usage(builtin_tag_usage);
}
if (get_sha1(object_ref, object))
die("Failed to resolve '%s' as a valid ref.", object_ref);
- if (snprintf(ref, sizeof(ref), "refs/tags/%s", tag) >= sizeof(ref))
+ if (snprintf(ref, sizeof(ref), "refs/tags/%s", tag) > sizeof(ref) - 1)
die("tag name too long: %.*s...", 50, tag);
if (check_ref_format(ref))
die("'%s' is not a valid tag name.", tag);