author | Lars Hjemli <hjemli@gmail.com> | 2007-05-20 20:09:55 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-20 20:09:55 (UTC) |
commit | dc3ac3f76077c5d612d42e8beb4878e43acfc58a (patch) (side-by-side diff) | |
tree | dfb996c0ce9833841578e1f0accbb5a387c01237 /cache.c | |
parent | 977a0b173df6fe1a4d362fe4c70f9badff1fd46c (diff) | |
parent | 3de63b264c36888dfd42dfdf3fc0aad4ce0c2b5c (diff) | |
download | cgit-dc3ac3f76077c5d612d42e8beb4878e43acfc58a.zip cgit-dc3ac3f76077c5d612d42e8beb4878e43acfc58a.tar.gz cgit-dc3ac3f76077c5d612d42e8beb4878e43acfc58a.tar.bz2 |
Merge branch 'virtual-url'
* virtual-url:
Don't be fooled by trailing '/' in url-parameter
cache_safe_filename() needs more buffers
Enable url=value querystring parameter
Add lookup-function for valid repo commands
Move cgit_get_repoinfo into shared.c
-rw-r--r-- | cache.c | 22 |
1 files changed, 15 insertions, 7 deletions
@@ -1,111 +1,119 @@ /* cache.c: cache management * * Copyright (C) 2006 Lars Hjemli * * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ #include "cgit.h" const int NOLOCK = -1; char *cache_safe_filename(const char *unsafe) { - static char buf[PATH_MAX]; - char *s = buf; + static char buf[4][PATH_MAX]; + static int bufidx; + char *s; char c; + bufidx++; + bufidx &= 3; + s = buf[bufidx]; + while(unsafe && (c = *unsafe++) != 0) { - if (c == '/' || c == ' ' || c == '&' || c == '|' || + if (c == '/' || c == ' ' || c == '&' || c == '|' || c == '>' || c == '<' || c == '.') c = '_'; *s++ = c; } *s = '\0'; - return buf; + return buf[bufidx]; } int cache_exist(struct cacheitem *item) { if (stat(item->name, &item->st)) { item->st.st_mtime = 0; return 0; } return 1; } int cache_create_dirs() { char *path; path = fmt("%s", cgit_cache_root); if (mkdir(path, S_IRWXU) && errno!=EEXIST) return 0; - if (!cgit_query_repo) + if (!cgit_repo) return 0; - path = fmt("%s/%s", cgit_cache_root, cgit_query_repo); + path = fmt("%s/%s", cgit_cache_root, + cache_safe_filename(cgit_repo->url)); + if (mkdir(path, S_IRWXU) && errno!=EEXIST) return 0; if (cgit_query_page) { - path = fmt("%s/%s/%s", cgit_cache_root, cgit_query_repo, + path = fmt("%s/%s/%s", cgit_cache_root, + cache_safe_filename(cgit_repo->url), cgit_query_page); if (mkdir(path, S_IRWXU) && errno!=EEXIST) return 0; } return 1; } int cache_refill_overdue(const char *lockfile) { struct stat st; if (stat(lockfile, &st)) return 0; else return (time(NULL) - st.st_mtime > cgit_cache_max_create_time); } int cache_lock(struct cacheitem *item) { int i = 0; char *lockfile = xstrdup(fmt("%s.lock", item->name)); top: if (++i > cgit_max_lock_attempts) die("cache_lock: unable to lock %s: %s", item->name, strerror(errno)); item->fd = open(lockfile, O_WRONLY|O_CREAT|O_EXCL, S_IRUSR|S_IWUSR); if (item->fd == NOLOCK && errno == ENOENT && cache_create_dirs()) goto top; if (item->fd == NOLOCK && errno == EEXIST && cache_refill_overdue(lockfile) && !unlink(lockfile)) goto top; free(lockfile); return (item->fd > 0); } int cache_unlock(struct cacheitem *item) { close(item->fd); return (rename(fmt("%s.lock", item->name), item->name) == 0); } int cache_cancel_lock(struct cacheitem *item) { return (unlink(fmt("%s.lock", item->name)) == 0); } int cache_expired(struct cacheitem *item) { if (item->ttl < 0) return 0; return item->st.st_mtime + item->ttl * 60 < time(NULL); } |