unquote_c_style: fix off-by-one.

[git.git] / builtin-tag.c
diff --git a/builtin-tag.c b/builtin-tag.c

index 517419fd3d885d677e8c2eeb533fc14f3df501f5..4a4a88c10b4b2f9e55662bd4c1c17051ae7e6aac 100644 (file)
--- a/builtin-tag.c
+++ b/builtin-tag.c
@@ -16,7 +16,7 @@
  static const char * const git_tag_usage[] = {
         "git-tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]",
         "git-tag -d <tagname>...",
-       "git-tag [-n [<num>]] -l [<pattern>]",
+       "git-tag -l [-n [<num>]] [<pattern>]",
         "git-tag -v <tagname>...",
         NULL
  };
@@ -47,7 +47,19 @@ void launch_editor(const char *path, struct strbuf *buffer, const char *const *e
                 editor = "vi";
  
         if (strcmp(editor, ":")) {
-               const char *args[] = { editor, path, NULL };
+               size_t len = strlen(editor);
+               int i = 0;
+               const char *args[6];
+
+               if (strcspn(editor, "$ \t'") != len) {
+                       /* there are specials */
+                       args[i++] = "sh";
+                       args[i++] = "-c";
+                       args[i++] = "$0 \"$@\"";
+               }
+               args[i++] = editor;
+               args[i++] = path;
+               args[i] = NULL;
  
                 if (run_command_v_opt_cd_env(args, 0, NULL, env))
                         die("There was a problem with the editor %s.", editor);
@@ -236,14 +248,18 @@ static const char tag_template[] =
         "# Write a tag message\n"
         "#\n";
  
+static void set_signingkey(const char *value)
+{
+       if (strlcpy(signingkey, value, sizeof(signingkey)) >= sizeof(signingkey))
+               die("signing key value too long (%.10s...)", value);
+}
+
  static int git_tag_config(const char *var, const char *value)
  {
         if (!strcmp(var, "user.signingkey")) {
                 if (!value)
-                       die("user.signingkey without value");
-               if (strlcpy(signingkey, value, sizeof(signingkey))
-                                               >= sizeof(signingkey))
-                       die("user.signingkey value too long");
+                       return config_error_nonbool(value);
+               set_signingkey(value);
                 return 0;
         }
  
@@ -366,13 +382,11 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
         struct ref_lock *lock;
  
         int annotate = 0, sign = 0, force = 0, lines = 0,
-                                       delete = 0, verify = 0;
-       char *list = NULL, *msgfile = NULL, *keyid = NULL;
-       const char *no_pattern = "NO_PATTERN";
+               list = 0, delete = 0, verify = 0;
+       char *msgfile = NULL, *keyid = NULL;
         struct msg_arg msg = { 0, STRBUF_INIT };
         struct option options[] = {
-               { OPTION_STRING, 'l', NULL, &list, "pattern", "list tag names",
-                       PARSE_OPT_OPTARG, NULL, (intptr_t) no_pattern },
+               OPT_BOOLEAN('l', NULL, &list, "list tag names"),
                 { OPTION_INTEGER, 'n', NULL, &lines, NULL,
                                 "print n lines of each tag message",
                                 PARSE_OPT_OPTARG, NULL, 1 },
@@ -396,11 +410,15 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
  
         argc = parse_options(argc, argv, options, git_tag_usage, 0);
  
+       if (keyid) {
+               sign = 1;
+               set_signingkey(keyid);
+       }
         if (sign)
                 annotate = 1;
  
         if (list)
-               return list_tags(list == no_pattern ? NULL : list, lines);
+               return list_tags(argv[0], lines);
         if (delete)
                 return for_each_tag_name(argv, delete_tag);
         if (verify)