Use GIT-1.5.4.rc4

[ps-cgit] / ui-snapshot.c

diff --git a/ui-snapshot.c b/ui-snapshot.c
index bd34a28a41713cccffff7a52742e4a61038e0544..dfedd8f490f344f06c2fb665c3af5e33b5239466 100644 (file)
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -99,6 +99,7 @@ void cgit_print_snapshot(struct cacheitem *item, const char *head,
                memset(&args,0,sizeof(args));
                args.base = fmt("%s/", prefix);
                args.tree = commit->tree;
+               args.time = commit->date;
                cgit_print_snapshot_start(sat->mimetype, filename, item);
                (*sat->write_func)(&args);
                return;
@@ -129,7 +130,7 @@ int cgit_parse_snapshots_mask(const char *str)
 {
        const struct snapshot_archive_t* sat;
        static const char *delim = " \t,:/|;";
-       int f, tl, rv = 0;
+       int f, tl, sl, rv = 0;
 
        /* favor legacy setting */
        if(atoi(str))
@@ -141,8 +142,9 @@ int cgit_parse_snapshots_mask(const char *str)
                        break;
                for(f=0; f<snapshot_archives_len; f++) {
                        sat = &snapshot_archives[f];
-                       if(!(strncmp(sat->suffix, str, tl) &&
-                            strncmp(sat->suffix+1, str, tl-1))) {
+                       sl = strlen(sat->suffix);
+                       if((tl == sl && !strncmp(sat->suffix, str, tl)) ||
+                          (tl == sl-1 && !strncmp(sat->suffix+1, str, tl-1))) {
                                rv |= sat->bit;
                                break;
                        }