about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--cache.c2
-rw-r--r--cache.h2
-rwxr-xr-xfilters/syntax-highlighting.sh2
-rwxr-xr-xtests/t0109-gitconfig.sh10
4 files changed, 8 insertions, 8 deletions
diff --git a/cache.c b/cache.c index 2ccdc4e..0901e6e 100644 --- a/cache.c +++ b/cache.c
@@ -318,7 +318,7 @@ static int process_slot(struct cache_slot *slot)
318 /* If the cache slot does not exist (or its key doesn't match the 318 /* If the cache slot does not exist (or its key doesn't match the
319 * current key), lets try to create a new cache slot for this 319 * current key), lets try to create a new cache slot for this
320 * request. If this fails (for whatever reason), lets just generate 320 * request. If this fails (for whatever reason), lets just generate
321 * the content without caching it and fool the caller to belive 321 * the content without caching it and fool the caller to believe
322 * everything worked out (but print a warning on stdout). 322 * everything worked out (but print a warning on stdout).
323 */ 323 */
324 324
diff --git a/cache.h b/cache.h index 9392836..470da4f 100644 --- a/cache.h +++ b/cache.h
@@ -19,7 +19,7 @@ typedef void (*cache_fill_fn)(void);
19 * fn content generator function for this key 19 * fn content generator function for this key
20 * 20 *
21 * Return value 21 * Return value
22 * 0 indicates success, everyting else is an error 22 * 0 indicates success, everything else is an error
23 */ 23 */
24extern int cache_process(int size, const char *path, const char *key, int ttl, 24extern int cache_process(int size, const char *path, const char *key, int ttl,
25 cache_fill_fn fn); 25 cache_fill_fn fn);
diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh index 4fa7928..840bc34 100755 --- a/filters/syntax-highlighting.sh +++ b/filters/syntax-highlighting.sh
@@ -1,6 +1,6 @@
1#!/bin/sh 1#!/bin/sh
2# This script can be used to implement syntax highlighting in the cgit 2# This script can be used to implement syntax highlighting in the cgit
3# tree-view by refering to this file with the source-filter or repo.source- 3# tree-view by referring to this file with the source-filter or repo.source-
4# filter options in cgitrc. 4# filter options in cgitrc.
5# 5#
6# This script requires a shell supporting the ${var##pattern} syntax. 6# This script requires a shell supporting the ${var##pattern} syntax.
diff --git a/tests/t0109-gitconfig.sh b/tests/t0109-gitconfig.sh index 5a84258..3ba6684 100755 --- a/tests/t0109-gitconfig.sh +++ b/tests/t0109-gitconfig.sh
@@ -10,16 +10,16 @@ test -n "$(which strace 2>/dev/null)" || {
10} 10}
11 11
12test_no_home_access () { 12test_no_home_access () {
13 non_existant_path="/path/to/some/place/that/does/not/possibly/exist" 13 non_existent_path="/path/to/some/place/that/does/not/possibly/exist"
14 while test -d "$non_existant_path"; do 14 while test -d "$non_existent_path"; do
15 non_existant_path="$non_existant_path/$(date +%N)" 15 non_existent_path="$non_existent_path/$(date +%N)"
16 done && 16 done &&
17 strace \ 17 strace \
18 -E HOME="$non_existant_path" \ 18 -E HOME="$non_existent_path" \
19 -E CGIT_CONFIG="$PWD/cgitrc" \ 19 -E CGIT_CONFIG="$PWD/cgitrc" \
20 -E QUERY_STRING="url=$1" \ 20 -E QUERY_STRING="url=$1" \
21 -e access -f -o strace.out cgit && 21 -e access -f -o strace.out cgit &&
22 test_must_fail grep "$non_existant_path" strace.out 22 test_must_fail grep "$non_existent_path" strace.out
23} 23}
24 24
25test_no_home_access_success() { 25test_no_home_access_success() {