diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2007-07-22 23:57:48 +0200 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2007-07-22 23:57:56 +0200 |
| commit | 1d4aaff696ee1b9085dda0f0f3d84d9d20d96db0 (patch) | |
| tree | 6674c5168d967c3efdbf8f445e7e975d54e43629 /shared.c | |
| parent | Add ui-tag.c (diff) | |
| parent | link raw blob from tree file view (diff) | |
| download | cgit-pink-1d4aaff696ee1b9085dda0f0f3d84d9d20d96db0.tar.gz cgit-pink-1d4aaff696ee1b9085dda0f0f3d84d9d20d96db0.zip | |
Merge branch 'master' of git://git.klever.net/patchwork/cgit
* 'master' of git://git.klever.net/patchwork/cgit: link raw blob from tree file view fix: changed view link to blob in summary. allow selective enabling of snapshots shorten snapshot names to repo basename introduce cgit_repobasename added snapshot filename to the link add plain uncompressed tar snapshort format introduced .tar.bz2 snapshots compress .tar.gz using gzip as a filter added a chk_non_negative check css: adjust vertical-align of commit info th cells add support for snapshot tarballs Conflicts: ui-summary.c Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'shared.c')
| -rw-r--r-- | shared.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/shared.c b/shared.c index 06693b0..077934f 100644 --- a/shared.c +++ b/shared.c @@ -86,6 +86,13 @@ int chk_positive(int result, char *msg) return result; } +int chk_non_negative(int result, char *msg) +{ + if (result < 0) + die("%s: %s",msg, strerror(errno)); + return result; +} + struct repoinfo *add_repo(const char *url) { struct repoinfo *ret; @@ -148,7 +155,7 @@ void cgit_global_config_cb(const char *name, const char *value) else if (!strcmp(name, "nocache")) cgit_nocache = atoi(value); else if (!strcmp(name, "snapshots")) - cgit_snapshots = atoi(value); + cgit_snapshots = cgit_parse_snapshots_mask(value); else if (!strcmp(name, "enable-index-links")) cgit_enable_index_links = atoi(value); else if (!strcmp(name, "enable-log-filecount")) @@ -190,7 +197,7 @@ void cgit_global_config_cb(const char *name, const char *value) else if (cgit_repo && !strcmp(name, "repo.defbranch")) cgit_repo->defbranch = xstrdup(value); else if (cgit_repo && !strcmp(name, "repo.snapshots")) - cgit_repo->snapshots = cgit_snapshots * atoi(value); + cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) |