prefixcmp(): fix-up mechanical conversion.

diff --git a/builtin-for-each-ref.c b/builtin-for-each-ref.c
index 93d3d7eef06315c598952761a7f2755a2f95be2c..ac0b9f60882ff78b06c1ec25f017dfa5d5c8425e 100644 (file)
--- a/builtin-for-each-ref.c
+++ b/builtin-for-each-ref.c
@@ -6,13 +6,13 @@
 #include "tree.h"
 #include "blob.h"
 #include "quote.h"
-#include <fnmatch.h>
 
 /* Quoting styles */
 #define QUOTE_NONE 0
 #define QUOTE_SHELL 1
 #define QUOTE_PERL 2
 #define QUOTE_PYTHON 3
+#define QUOTE_TCL 4
 
 typedef enum { FIELD_STR, FIELD_ULONG, FIELD_TIME } cmp_type;
 
@@ -59,6 +59,8 @@ static struct {
        { "taggername" },
        { "taggeremail" },
        { "taggerdate", FIELD_TIME },
+       { "creator" },
+       { "creatordate", FIELD_TIME },
        { "subject" },
        { "body" },
        { "contents" },
@@ -133,7 +135,7 @@ static const char *find_next(const char *cp)
        while (*cp) {
                if (*cp == '%') {
                        /* %( is the start of an atom;
-                        * %% is a quoteed per-cent.
+                        * %% is a quoted per-cent.
                         */
                        if (cp[1] == '(')
                                return cp;
@@ -401,6 +403,29 @@ static void grab_person(const char *who, struct atom_value *val, int deref, stru
                else if (!strcmp(name + wholen, "date"))
                        grab_date(wholine, v);
        }
+
+       /* For a tag or a commit object, if "creator" or "creatordate" is
+        * requested, do something special.
+        */
+       if (strcmp(who, "tagger") && strcmp(who, "committer"))
+               return; /* "author" for commit object is not wanted */
+       if (!wholine)
+               wholine = find_wholine(who, wholen, buf, sz);
+       if (!wholine)
+               return;
+       for (i = 0; i < used_atom_cnt; i++) {
+               const char *name = used_atom[i];
+               struct atom_value *v = &val[i];
+               if (!!deref != (*name == '*'))
+                       continue;
+               if (deref)
+                       name++;
+
+               if (!strcmp(name, "creatordate"))
+                       grab_date(wholine, v);
+               else if (!strcmp(name, "creator"))
+                       v->s = copy_line(wholine);
+       }
 }
 
 static void find_subpos(const char *buf, unsigned long sz, const char **sub, const char **body)
@@ -453,9 +478,9 @@ static void grab_sub_body_contents(struct atom_value *val, int deref, struct obj
                if (!strcmp(name, "subject"))
                        v->s = copy_line(subpos);
                else if (!strcmp(name, "body"))
-                       v->s = bodypos;
+                       v->s = xstrdup(bodypos);
                else if (!strcmp(name, "contents"))
-                       v->s = subpos;
+                       v->s = xstrdup(subpos);
        }
 }
 
@@ -699,6 +724,9 @@ static void print_value(struct refinfo *ref, int atom, int quote_style)
        case QUOTE_PYTHON:
                python_quote_print(stdout, v->s);
                break;
+       case QUOTE_TCL:
+               tcl_quote_print(stdout, v->s);
+               break;
        }
 }
 
@@ -786,7 +814,7 @@ int cmd_for_each_ref(int ac, const char **av, char *prefix)
                        i++;
                        break;
                }
-               if (!strncmp(arg, "--format=", 9)) {
+               if (!prefixcmp(arg, "--format=")) {
                        if (format)
                                die("more than one --format?");
                        format = arg + 9;
@@ -810,7 +838,13 @@ int cmd_for_each_ref(int ac, const char **av, char *prefix)
                        quote_style = QUOTE_PYTHON;
                        continue;
                }
-               if (!strncmp(arg, "--count=", 8)) {
+               if (!strcmp(arg, "--tcl") ) {
+                       if (0 <= quote_style)
+                               die("more than one quoting style?");
+                       quote_style = QUOTE_TCL;
+                       continue;
+               }
+               if (!prefixcmp(arg, "--count=")) {
                        if (maxcount)
                                die("more than one --count?");
                        maxcount = atoi(arg + 8);
@@ -818,7 +852,7 @@ int cmd_for_each_ref(int ac, const char **av, char *prefix)
                                die("The number %s did not parse", arg);
                        continue;
                }
-               if (!strncmp(arg, "--sort=", 7)) {
+               if (!prefixcmp(arg, "--sort=")) {
                        struct ref_sort *s = xcalloc(1, sizeof(*s));
                        int len;