Move global variables + callback functions into shared.c

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

4 files changed, 86 insertions, 82 deletions

diff --git a/Makefile b/Makefile
index 4e532d0..c029637 100644
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,28 @@
 CGIT_VERSION = 0.1-pre
 
 INSTALL_BIN = /var/www/htdocs/cgit.cgi
 INSTALL_CSS = /var/www/htdocs/cgit.css
 CACHE_ROOT = /var/cache/cgit
 
 EXTLIBS = ../git/libgit.a ../git/xdiff/lib.a -lz -lcrypto
-OBJECTS = cache.o parsing.o html.o ui-shared.o ui-repolist.o ui-summary.o \
-        ui-log.o ui-view.c
+OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
+        ui-summary.o ui-log.o ui-view.c
 
 CFLAGS += -Wall
 
 all: cgit
 
 install: all
         install cgit $(INSTALL_BIN)
         install cgit.css $(INSTALL_CSS)
         rm -rf $(CACHE_ROOT)/*
 
 cgit: cgit.c cgit.h git.h $(OBJECTS)
         $(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \
                 $(OBJECTS) $(EXTLIBS)
 
 $(OBJECTS): cgit.h git.h
 
 .PHONY: clean
 clean:
         rm -f cgit *.o
diff --git a/cgit.c b/cgit.c
index 52d9bd3..d1abaa0 100644
--- a/cgit.c
+++ b/cgit.c
@@ -1,171 +1,100 @@
 /* cgit.c: cgi for the git scm
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
 const char cgit_version[] = CGIT_VERSION;
 
-int htmlfd = 0;
-
-char *cgit_root         = "/usr/src/git";
-char *cgit_root_title   = "Git repository browser";
-char *cgit_css          = "/cgit.css";
-char *cgit_logo         = "/git-logo.png";
-char *cgit_logo_link    = "http://www.kernel.org/pub/software/scm/git/docs/";
-char *cgit_virtual_root = NULL;
-
-char *cgit_cache_root   = "/var/cache/cgit";
-
-int cgit_max_lock_attempts     =  5;
-int cgit_cache_root_ttl        =  5;
-int cgit_cache_repo_ttl        =  5;
-int cgit_cache_dynamic_ttl     =  5;
-int cgit_cache_static_ttl      = -1;
-int cgit_cache_max_create_time =  5;
-
-char *cgit_repo_name    = NULL;
-char *cgit_repo_desc    = NULL;
-char *cgit_repo_owner   = NULL;
-
-int cgit_query_has_symref = 0;
-int cgit_query_has_sha1   = 0;
-
-char *cgit_querystring  = NULL;
-char *cgit_query_repo   = NULL;
-char *cgit_query_page   = NULL;
-char *cgit_query_head   = NULL;
-char *cgit_query_sha1   = NULL;
-
-struct cacheitem cacheitem;
-
-void cgit_global_config_cb(const char *name, const char *value)
-{
-        if (!strcmp(name, "root"))
-                cgit_root = xstrdup(value);
-        else if (!strcmp(name, "root-title"))
-                cgit_root_title = xstrdup(value);
-        else if (!strcmp(name, "css"))
-                cgit_css = xstrdup(value);
-        else if (!strcmp(name, "logo"))
-                cgit_logo = xstrdup(value);
-        else if (!strcmp(name, "logo-link"))
-                cgit_logo_link = xstrdup(value);
-        else if (!strcmp(name, "virtual-root"))
-                cgit_virtual_root = xstrdup(value);
-}
-
-void cgit_repo_config_cb(const char *name, const char *value)
-{
-        if (!strcmp(name, "name"))
-                cgit_repo_name = xstrdup(value);
-        else if (!strcmp(name, "desc"))
-                cgit_repo_desc = xstrdup(value);
-        else if (!strcmp(name, "owner"))
-                cgit_repo_owner = xstrdup(value);
-}
-
-void cgit_querystring_cb(const char *name, const char *value)
-{
-        if (!strcmp(name,"r"))
-                cgit_query_repo = xstrdup(value);
-        else if (!strcmp(name, "p"))
-                cgit_query_page = xstrdup(value);
-        else if (!strcmp(name, "h")) {
-                cgit_query_head = xstrdup(value);
-                cgit_query_has_symref = 1;
-        } else if (!strcmp(name, "id")) {
-                cgit_query_sha1 = xstrdup(value);
-                cgit_query_has_sha1 = 1;
-        }
-}
-
 static void cgit_print_repo_page(struct cacheitem *item)
 {
         if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || 
             cgit_read_config("info/cgit", cgit_repo_config_cb)) {
                 char *title = fmt("%s - %s", cgit_root_title, "Bad request");
                 cgit_print_docstart(title, item);
                 cgit_print_pageheader(title);
                 cgit_print_error(fmt("Unable to scan repository: %s",
                                      strerror(errno)));
                 cgit_print_docend();
                 return;
         }
         setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1);
         char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc);
         cgit_print_docstart(title, item);
         cgit_print_pageheader(title);
         if (!cgit_query_page)
                 cgit_print_summary();
         else if (!strcmp(cgit_query_page, "log")) {
                 cgit_print_log(cgit_query_head, 0, 100);
         } else if (!strcmp(cgit_query_page, "view")) {
                 cgit_print_view(cgit_query_sha1);
         }
         cgit_print_docend();
 }
 
 static void cgit_fill_cache(struct cacheitem *item)
 {
         htmlfd = item->fd;
         item->st.st_mtime = time(NULL);
         if (cgit_query_repo)
                 cgit_print_repo_page(item);
         else
                 cgit_print_repolist(item);
 }
 
-static void cgit_refresh_cache(struct cacheitem *item)
+static void cgit_check_cache(struct cacheitem *item)
 {
         int i = 0;
 
         cache_prepare(item);
  top:
         if (++i > cgit_max_lock_attempts) {
                 die("cgit_refresh_cache: unable to lock %s: %s",
                     item->name, strerror(errno));
         }
         if (!cache_exist(item)) {
                 if (!cache_lock(item)) {
                         sleep(1);
                         goto top;
                 }
                 if (!cache_exist(item))
                         cgit_fill_cache(item);
                 cache_unlock(item);
         } else if (cache_expired(item) && cache_lock(item)) {
                 if (cache_expired(item))
                         cgit_fill_cache(item);
                 cache_unlock(item);
         }
 }
 
 static void cgit_print_cache(struct cacheitem *item)
 {
         static char buf[4096];
         ssize_t i;
 
         int fd = open(item->name, O_RDONLY);
         if (fd<0)
                 die("Unable to open cached file %s", item->name);
 
         while((i=read(fd, buf, sizeof(buf))) > 0)
                 write(STDOUT_FILENO, buf, i);
 
         close(fd);
 }
 
 int main(int argc, const char **argv)
 {
+        struct cacheitem item;
+
         cgit_read_config("/etc/cgitrc", cgit_global_config_cb);
         cgit_querystring = xstrdup(getenv("QUERY_STRING"));
         cgit_parse_query(cgit_querystring, cgit_querystring_cb);
-        cgit_refresh_cache(&cacheitem);
-        cgit_print_cache(&cacheitem);
+
+        cgit_check_cache(&item);
+        cgit_print_cache(&item);
         return 0;
 }
diff --git a/cgit.h b/cgit.h
index 9c7f0b4..c1dcc97 100644
--- a/cgit.h
+++ b/cgit.h
@@ -18,68 +18,69 @@ struct cacheitem {
 extern const char cgit_version[];
 
 extern char *cgit_root;
 extern char *cgit_root_title;
 extern char *cgit_css;
 extern char *cgit_logo;
 extern char *cgit_logo_link;
 extern char *cgit_virtual_root;
 extern char *cgit_cache_root;
 
 extern int cgit_max_lock_attempts;
 extern int cgit_cache_root_ttl;
 extern int cgit_cache_repo_ttl;
 extern int cgit_cache_dynamic_ttl;
 extern int cgit_cache_static_ttl;
 extern int cgit_cache_max_create_time;
 
 extern char *cgit_repo_name;
 extern char *cgit_repo_desc;
 extern char *cgit_repo_owner;
 
 extern int cgit_query_has_symref;
 extern int cgit_query_has_sha1;
 
 extern char *cgit_querystring;
 extern char *cgit_query_repo;
 extern char *cgit_query_page;
 extern char *cgit_query_head;
 extern char *cgit_query_sha1;
 
 extern int htmlfd;
 
+extern void cgit_global_config_cb(const char *name, const char *value);
+extern void cgit_repo_config_cb(const char *name, const char *value);
+extern void cgit_querystring_cb(const char *name, const char *value);
+
 extern char *fmt(const char *format,...);
 
 extern void html(const char *txt);
 extern void htmlf(const char *format,...);
 extern void html_txt(char *txt);
 extern void html_attr(char *txt);
 extern void html_link_open(char *url, char *title, char *class);
 extern void html_link_close(void);
 
 extern int cgit_read_config(const char *filename, configfn fn);
 extern int cgit_parse_query(char *txt, configfn fn);
 
 extern void cache_prepare(struct cacheitem *item);
 extern int cache_lock(struct cacheitem *item);
 extern int cache_unlock(struct cacheitem *item);
 extern int cache_exist(struct cacheitem *item);
 extern int cache_expired(struct cacheitem *item);
 
 extern char *cgit_repourl(const char *reponame);
 extern char *cgit_pageurl(const char *reponame, const char *pagename, 
                           const char *query);
 
 extern void cgit_print_error(char *msg);
 extern void cgit_print_docstart(char *title, struct cacheitem *item);
 extern void cgit_print_docend();
 extern void cgit_print_pageheader(char *title);
 
 extern void cgit_print_repolist(struct cacheitem *item);
 extern void cgit_print_summary();
 extern void cgit_print_log(const char *tip, int ofs, int cnt);
 extern void cgit_print_view(char *hex);
 
-extern void cgit_repo_config_cb(const char *name, const char *value);
-
-
 #endif /* CGIT_H */
diff --git a/shared.c b/shared.c
new file mode 100644
index 0000000..c58a2ff
--- a/dev/null
+++ b/shared.c
@@ -0,0 +1,74 @@
+#include "cgit.h"
+
+char *cgit_root         = "/usr/src/git";
+char *cgit_root_title   = "Git repository browser";
+char *cgit_css          = "/cgit.css";
+char *cgit_logo         = "/git-logo.png";
+char *cgit_logo_link    = "http://www.kernel.org/pub/software/scm/git/docs/";
+char *cgit_virtual_root = NULL;
+
+char *cgit_cache_root   = "/var/cache/cgit";
+
+int cgit_max_lock_attempts     =  5;
+int cgit_cache_root_ttl        =  5;
+int cgit_cache_repo_ttl        =  5;
+int cgit_cache_dynamic_ttl     =  5;
+int cgit_cache_static_ttl      = -1;
+int cgit_cache_max_create_time =  5;
+
+char *cgit_repo_name    = NULL;
+char *cgit_repo_desc    = NULL;
+char *cgit_repo_owner   = NULL;
+
+int cgit_query_has_symref = 0;
+int cgit_query_has_sha1   = 0;
+
+char *cgit_querystring  = NULL;
+char *cgit_query_repo   = NULL;
+char *cgit_query_page   = NULL;
+char *cgit_query_head   = NULL;
+char *cgit_query_sha1   = NULL;
+
+int htmlfd = 0;
+
+void cgit_global_config_cb(const char *name, const char *value)
+{
+        if (!strcmp(name, "root"))
+                cgit_root = xstrdup(value);
+        else if (!strcmp(name, "root-title"))
+                cgit_root_title = xstrdup(value);
+        else if (!strcmp(name, "css"))
+                cgit_css = xstrdup(value);
+        else if (!strcmp(name, "logo"))
+                cgit_logo = xstrdup(value);
+        else if (!strcmp(name, "logo-link"))
+                cgit_logo_link = xstrdup(value);
+        else if (!strcmp(name, "virtual-root"))
+                cgit_virtual_root = xstrdup(value);
+}
+
+void cgit_repo_config_cb(const char *name, const char *value)
+{
+        if (!strcmp(name, "name"))
+                cgit_repo_name = xstrdup(value);
+        else if (!strcmp(name, "desc"))
+                cgit_repo_desc = xstrdup(value);
+        else if (!strcmp(name, "owner"))
+                cgit_repo_owner = xstrdup(value);
+}
+
+void cgit_querystring_cb(const char *name, const char *value)
+{
+        if (!strcmp(name,"r"))
+                cgit_query_repo = xstrdup(value);
+        else if (!strcmp(name, "p"))
+                cgit_query_page = xstrdup(value);
+        else if (!strcmp(name, "h")) {
+                cgit_query_head = xstrdup(value);
+                cgit_query_has_symref = 1;
+        } else if (!strcmp(name, "id")) {
+                cgit_query_sha1 = xstrdup(value);
+                cgit_query_has_sha1 = 1;
+        }
+}
+