aboutsummaryrefslogtreecommitdiff
path: root/ui-snapshot.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2008-01-13 17:34:37 +0000
committerLars Hjemli <hjemli@gmail.com>2008-01-13 17:34:37 +0000
commit2122c696a34133a616b9ec6d72abe9eb89e728aa (patch)
treefc3c4693f77b04c1eaf549841d5bae46d9801608 /ui-snapshot.c
parentf39c3c99a12154cdafcdc501a821e3fadd3c0602 (diff)
parentb74cc91574a9284d2f6446fd2ef3df6298ed6992 (diff)
downloadcgit-2122c696a34133a616b9ec6d72abe9eb89e728aa.tar
cgit-2122c696a34133a616b9ec6d72abe9eb89e728aa.tar.gz
cgit-2122c696a34133a616b9ec6d72abe9eb89e728aa.zip
Merge branch 'stable'
* stable: CGIT 0.7.2 Use GIT-1.5.3.8 Compare string lengths when parsing the snapshot mask Default repo description to "[no description]"
Diffstat (limited to 'ui-snapshot.c')
-rw-r--r--ui-snapshot.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 4d1aa88..dfedd8f 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -130,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))
@@ -142,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;
}