author | Lars Hjemli <hjemli@gmail.com> | 2007-05-17 22:50:46 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-18 20:51:01 (UTC) |
commit | 43d40f2b704151d145a1383b2b964210915ecae4 (patch) (unidiff) | |
tree | 2ce8d71a143aef998f6f97291b5792367db82b8a | |
parent | 305414df1246531baf0f2c959c2c61df4e93c526 (diff) | |
download | cgit-43d40f2b704151d145a1383b2b964210915ecae4.zip cgit-43d40f2b704151d145a1383b2b964210915ecae4.tar.gz cgit-43d40f2b704151d145a1383b2b964210915ecae4.tar.bz2 |
Add lookup-function for valid repo commands
This will be usefull when parsing url arguments.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.h | 12 | ||||
-rw-r--r-- | shared.c | 12 |
2 files changed, 24 insertions, 0 deletions
@@ -9,24 +9,35 @@ | |||
9 | #include <tree.h> | 9 | #include <tree.h> |
10 | #include <commit.h> | 10 | #include <commit.h> |
11 | #include <tag.h> | 11 | #include <tag.h> |
12 | #include <diff.h> | 12 | #include <diff.h> |
13 | #include <diffcore.h> | 13 | #include <diffcore.h> |
14 | #include <refs.h> | 14 | #include <refs.h> |
15 | #include <revision.h> | 15 | #include <revision.h> |
16 | #include <log-tree.h> | 16 | #include <log-tree.h> |
17 | #include <archive.h> | 17 | #include <archive.h> |
18 | #include <xdiff/xdiff.h> | 18 | #include <xdiff/xdiff.h> |
19 | 19 | ||
20 | 20 | ||
21 | /* | ||
22 | * The valid cgit repo-commands | ||
23 | */ | ||
24 | #define CMD_LOG = 1; | ||
25 | #define CMD_COMMIT = 1; | ||
26 | #define CMD_DIFF = 1; | ||
27 | #define CMD_TREE = 1; | ||
28 | #define CMD_VIEW = 1; | ||
29 | #define CMD_BLOB = 1; | ||
30 | #define CMD_SNAPSHOT = 1; | ||
31 | |||
21 | typedef void (*configfn)(const char *name, const char *value); | 32 | typedef void (*configfn)(const char *name, const char *value); |
22 | typedef void (*filepair_fn)(struct diff_filepair *pair); | 33 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
23 | typedef void (*linediff_fn)(char *line, int len); | 34 | typedef void (*linediff_fn)(char *line, int len); |
24 | 35 | ||
25 | struct cacheitem { | 36 | struct cacheitem { |
26 | char *name; | 37 | char *name; |
27 | struct stat st; | 38 | struct stat st; |
28 | int ttl; | 39 | int ttl; |
29 | int fd; | 40 | int fd; |
30 | }; | 41 | }; |
31 | 42 | ||
32 | struct repoinfo { | 43 | struct repoinfo { |
@@ -103,24 +114,25 @@ extern char *cgit_querystring; | |||
103 | extern char *cgit_query_repo; | 114 | extern char *cgit_query_repo; |
104 | extern char *cgit_query_page; | 115 | extern char *cgit_query_page; |
105 | extern char *cgit_query_search; | 116 | extern char *cgit_query_search; |
106 | extern char *cgit_query_head; | 117 | extern char *cgit_query_head; |
107 | extern char *cgit_query_sha1; | 118 | extern char *cgit_query_sha1; |
108 | extern char *cgit_query_sha2; | 119 | extern char *cgit_query_sha2; |
109 | extern char *cgit_query_path; | 120 | extern char *cgit_query_path; |
110 | extern char *cgit_query_name; | 121 | extern char *cgit_query_name; |
111 | extern int cgit_query_ofs; | 122 | extern int cgit_query_ofs; |
112 | 123 | ||
113 | extern int htmlfd; | 124 | extern int htmlfd; |
114 | 125 | ||
126 | extern int cgit_get_cmd_index(const char *cmd); | ||
115 | extern struct repoinfo *cgit_get_repoinfo(const char *url); | 127 | extern struct repoinfo *cgit_get_repoinfo(const char *url); |
116 | extern void cgit_global_config_cb(const char *name, const char *value); | 128 | extern void cgit_global_config_cb(const char *name, const char *value); |
117 | extern void cgit_repo_config_cb(const char *name, const char *value); | 129 | extern void cgit_repo_config_cb(const char *name, const char *value); |
118 | extern void cgit_querystring_cb(const char *name, const char *value); | 130 | extern void cgit_querystring_cb(const char *name, const char *value); |
119 | 131 | ||
120 | extern int chk_zero(int result, char *msg); | 132 | extern int chk_zero(int result, char *msg); |
121 | extern int chk_positive(int result, char *msg); | 133 | extern int chk_positive(int result, char *msg); |
122 | 134 | ||
123 | extern int hextoint(char c); | 135 | extern int hextoint(char c); |
124 | 136 | ||
125 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 137 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
126 | 138 | ||
@@ -42,24 +42,36 @@ char *cgit_querystring = NULL; | |||
42 | char *cgit_query_repo = NULL; | 42 | char *cgit_query_repo = NULL; |
43 | char *cgit_query_page = NULL; | 43 | char *cgit_query_page = NULL; |
44 | char *cgit_query_head = NULL; | 44 | char *cgit_query_head = NULL; |
45 | char *cgit_query_search = NULL; | 45 | char *cgit_query_search = NULL; |
46 | char *cgit_query_sha1 = NULL; | 46 | char *cgit_query_sha1 = NULL; |
47 | char *cgit_query_sha2 = NULL; | 47 | char *cgit_query_sha2 = NULL; |
48 | char *cgit_query_path = NULL; | 48 | char *cgit_query_path = NULL; |
49 | char *cgit_query_name = NULL; | 49 | char *cgit_query_name = NULL; |
50 | int cgit_query_ofs = 0; | 50 | int cgit_query_ofs = 0; |
51 | 51 | ||
52 | int htmlfd = 0; | 52 | int htmlfd = 0; |
53 | 53 | ||
54 | |||
55 | int cgit_get_cmd_index(const char *cmd) | ||
56 | { | ||
57 | static char *cmds[] = {"log", "commit", "diff", "tree", "view", "blob", "snapshot", NULL}; | ||
58 | int i; | ||
59 | |||
60 | for(i = 0; cmds[i]; i++) | ||
61 | if (!strcmp(cmd, cmds[i])) | ||
62 | return i + 1; | ||
63 | return 0; | ||
64 | } | ||
65 | |||
54 | int chk_zero(int result, char *msg) | 66 | int chk_zero(int result, char *msg) |
55 | { | 67 | { |
56 | if (result != 0) | 68 | if (result != 0) |
57 | die("%s: %s", msg, strerror(errno)); | 69 | die("%s: %s", msg, strerror(errno)); |
58 | return result; | 70 | return result; |
59 | } | 71 | } |
60 | 72 | ||
61 | int chk_positive(int result, char *msg) | 73 | int chk_positive(int result, char *msg) |
62 | { | 74 | { |
63 | if (result <= 0) | 75 | if (result <= 0) |
64 | die("%s: %s", msg, strerror(errno)); | 76 | die("%s: %s", msg, strerror(errno)); |
65 | return result; | 77 | return result; |