Sanitize for_each_reflog_ent()

It used to ignore the return value of the helper function; now, it
expects it to return 0, and stops iteration upon non-zero return
values; this value is then passed on as the return value of
for_each_reflog_ent().

Further, it makes no sense to force the parsing upon the helper
functions; for_each_reflog_ent() now calls the helper function with
old and new sha1, the email, the timestamp & timezone, and the message.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/builtin-reflog.c b/builtin-reflog.c
index a967117661c4cf888f992a198955d542f9182f21..ca22452e64f99a24f5f13923d2d6a756bcf82ade 100644 (file)
--- a/builtin-reflog.c
+++ b/builtin-reflog.c
@@ -195,19 +195,12 @@ static int keep_entry(struct commit **it, unsigned char *sha1)
 }
 
 static int expire_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
 }
 
 static int expire_reflog_ent(unsigned char *osha1, unsigned char *nsha1,

-                            char *data, void *cb_data)
+               const char *email, unsigned long timestamp, int tz,
+               const char *message, void *cb_data)

 {
        struct expire_reflog_cb *cb = cb_data;
 {
        struct expire_reflog_cb *cb = cb_data;

-       unsigned long timestamp;
-       char *cp, *ep;

        struct commit *old, *new;
 
        struct commit *old, *new;
 

-       cp = strchr(data, '>');
-       if (!cp || *++cp != ' ')
-               goto prune;
-       timestamp = strtoul(cp, &ep, 10);
-       if (*ep != ' ')
-               goto prune;

        if (timestamp < cb->cmd->expire_total)
                goto prune;
 
        if (timestamp < cb->cmd->expire_total)
                goto prune;
 


@@ -221,15 +214,20 @@ static int expire_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
             (new && !in_merge_bases(new, cb->ref_commit))))
                goto prune;
 
             (new && !in_merge_bases(new, cb->ref_commit))))
                goto prune;
 

-       if (cb->newlog)
-               fprintf(cb->newlog, "%s %s %s",
-                       sha1_to_hex(osha1), sha1_to_hex(nsha1), data);
+       if (cb->newlog) {
+               char sign = (tz < 0) ? '-' : '+';
+               int zone = (tz < 0) ? (-tz) : tz;
+               fprintf(cb->newlog, "%s %s %s %lu %c%04d\t%s",
+                       sha1_to_hex(osha1), sha1_to_hex(nsha1),
+                       email, timestamp, sign, zone,
+                       message);
+       }

        if (cb->cmd->verbose)
        if (cb->cmd->verbose)

-               printf("keep %s", data);
+               printf("keep %s", message);

        return 0;
  prune:
        if (!cb->newlog || cb->cmd->verbose)
        return 0;
  prune:
        if (!cb->newlog || cb->cmd->verbose)

-               printf("%sprune %s", cb->newlog ? "" : "would ", data);
+               printf("%sprune %s", cb->newlog ? "" : "would ", message);

        return 0;
 }
 
        return 0;
 }
 

diff --git a/fsck-objects.c b/fsck-objects.c
index 1cc3b399bcf2b8ef875ded8dfcff5aef0f345811..0d8a8ebb4615c832a116a0278dfac3da1a737268 100644 (file)
--- a/fsck-objects.c
+++ b/fsck-objects.c
@@ -399,7 +399,9 @@ static void fsck_dir(int i, char *path)
 
 static int default_refs;
 
 
 static int default_refs;
 

-static int fsck_handle_reflog_ent(unsigned char *osha1, unsigned char *nsha1, char *datail, void *cb_data)
+static int fsck_handle_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
+               const char *email, unsigned long timestamp, int tz,
+               const char *message, void *cb_data)

 {
        struct object *obj;
 
 {
        struct object *obj;
 

diff --git a/reachable.c b/reachable.c
index 4dfee1dbe8acb4bb6dbf2570585974d0cca6f757..a6a334822a91f7325399740b0aa05e95f6fb4a70 100644 (file)
--- a/reachable.c
+++ b/reachable.c
@@ -104,7 +104,9 @@ static void walk_commit_list(struct rev_info *revs)
        }
 }
 
        }
 }
 

-static int add_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1, char *datail, void *cb_data)
+static int add_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
+               const char *email, unsigned long timestamp, int tz,
+               const char *message, void *cb_data)

 {
        struct object *object;
        struct rev_info *revs = (struct rev_info *)cb_data;
 {
        struct object *object;
        struct rev_info *revs = (struct rev_info *)cb_data;

diff --git a/refs.c b/refs.c
index 4d6fad8879561ec86a5f37c06f129a19ae5c2f7d..d189d8ad99de2dd7a65a2b10dc2e353055c55509 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -1097,7 +1097,7 @@ int read_ref_at(const char *ref, unsigned long at_time, int cnt, unsigned char *
        return 0;
 }
 
        return 0;
 }
 

-void for_each_reflog_ent(const char *ref, each_reflog_ent_fn fn, void *cb_data)
+int for_each_reflog_ent(const char *ref, each_reflog_ent_fn fn, void *cb_data)

 {
        const char *logfile;
        FILE *logfp;
 {
        const char *logfile;
        FILE *logfp;


@@ -1106,19 +1106,35 @@ void for_each_reflog_ent(const char *ref, each_reflog_ent_fn fn, void *cb_data)
        logfile = git_path("logs/%s", ref);
        logfp = fopen(logfile, "r");
        if (!logfp)
        logfile = git_path("logs/%s", ref);
        logfp = fopen(logfile, "r");
        if (!logfp)

-               return;
+               return -1;

        while (fgets(buf, sizeof(buf), logfp)) {
                unsigned char osha1[20], nsha1[20];
        while (fgets(buf, sizeof(buf), logfp)) {
                unsigned char osha1[20], nsha1[20];

-               int len;
+               char *email_end, *message;
+               unsigned long timestamp;
+               int len, ret, tz;

 
                /* old SP new SP name <email> SP time TAB msg LF */
                len = strlen(buf);
                if (len < 83 || buf[len-1] != '\n' ||
                    get_sha1_hex(buf, osha1) || buf[40] != ' ' ||
 
                /* old SP new SP name <email> SP time TAB msg LF */
                len = strlen(buf);
                if (len < 83 || buf[len-1] != '\n' ||
                    get_sha1_hex(buf, osha1) || buf[40] != ' ' ||

-                   get_sha1_hex(buf + 41, nsha1) || buf[81] != ' ')
+                   get_sha1_hex(buf + 41, nsha1) || buf[81] != ' ' ||
+                   !(email_end = strchr(buf + 82, '>')) ||
+                   email_end[1] != ' ' ||
+                   !(timestamp = strtoul(email_end + 2, &message, 10)) ||
+                   !message || message[0] != ' ' ||
+                   (message[1] != '+' && message[1] != '-') ||
+                   !isdigit(message[2]) || !isdigit(message[3]) ||
+                   !isdigit(message[4]) || !isdigit(message[5]) ||
+                   message[6] != '\t')

                        continue; /* corrupt? */
                        continue; /* corrupt? */

-               fn(osha1, nsha1, buf+82, cb_data);
+               email_end[1] = '\0';
+               tz = strtol(message + 1, NULL, 10);
+               message += 7;
+               ret = fn(osha1, nsha1, buf+82, timestamp, tz, message, cb_data);
+               if (ret)
+                       return ret;

        }
        fclose(logfp);
        }
        fclose(logfp);

+       return 0;

 }
 
 }
 

diff --git a/refs.h b/refs.h
index de43cc768af559538b2db9f3383bbf2e08713ae0..0e877e82ee1346c3d9d965581c62b337d596336f 100644 (file)
--- a/refs.h
+++ b/refs.h
@@ -45,8 +45,8 @@ extern int write_ref_sha1(struct ref_lock *lock, const unsigned char *sha1, cons
 extern int read_ref_at(const char *ref, unsigned long at_time, int cnt, unsigned char *sha1);
 
 /* iterate over reflog entries */
 extern int read_ref_at(const char *ref, unsigned long at_time, int cnt, unsigned char *sha1);
 
 /* iterate over reflog entries */

-typedef int each_reflog_ent_fn(unsigned char *osha1, unsigned char *nsha1, char *, void *);
-void for_each_reflog_ent(const char *ref, each_reflog_ent_fn fn, void *cb_data);
+typedef int each_reflog_ent_fn(unsigned char *osha1, unsigned char *nsha1, const char *, unsigned long, int, const char *, void *);
+int for_each_reflog_ent(const char *ref, each_reflog_ent_fn fn, void *cb_data);

 
 /** Returns 0 if target has the right format for a ref. **/
 extern int check_ref_format(const char *target);
 
 /** Returns 0 if target has the right format for a ref. **/
 extern int check_ref_format(const char *target);

diff --git a/revision.c b/revision.c
index 6e4ec463024a3e6cc4199ea1937f3b11e0a0dace..1e3b29a429e99fd04da54a3af661d07ddb870688 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -505,7 +505,9 @@ static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
        }
 }
 
        }
 }
 

-static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1, char *detail, void *cb_data)
+static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
+               const char *email, unsigned long timestamp, int tz,
+               const char *message, void *cb_data)

 {
        handle_one_reflog_commit(osha1, cb_data);
        handle_one_reflog_commit(nsha1, cb_data);
 {
        handle_one_reflog_commit(osha1, cb_data);
        handle_one_reflog_commit(nsha1, cb_data);