Add support for repo-local cgitrc file

When recursively scanning a directory tree looking for git repositories, cgit will now parse cgitrc files found within such repositories. The repo-specific config files can include any repo-specific options except 'repo.url' and 'repo.path'. Also, in such config files the 'repo.' prefix can not be used, i.e. the valid options then becomes: * name * clone-url * desc * ower * defbranch * snapshots * enable-log-filecount * enable-log-linecount * max-stats * module-link * section * about-filter * commit-filter * source-filter * readme Signed-off-by: Lars Hjemli <hjemli@gmail.com>
author: Lars Hjemli <hjemli@gmail.com> 2009-08-23 22:04:58 (UTC)
committer: Lars Hjemli <hjemli@gmail.com> 2009-08-24 08:22:58 (UTC)
commit: 74061ed5f03e72796450aa3b8ca1cf6ced5d59e2 (patch) (unidiff)
tree: 235ab2c29c027f19b00da815af3bf1d2856edc21 /cgit.c
parent: a1b3938f711c9b0e5eedad1678535e5779da82c1 (diff)
download: cgit-74061ed5f03e72796450aa3b8ca1cf6ced5d59e2.zip
cgit-74061ed5f03e72796450aa3b8ca1cf6ced5d59e2.tar.gz
cgit-74061ed5f03e72796450aa3b8ca1cf6ced5d59e2.tar.bz2
1 files changed, 4 insertions, 4 deletions
diff --git a/cgit.c b/cgit.c
index 90ae124..e281aa9 100644
--- a/cgit.c
+++ b/cgit.c
@@ -155,33 +155,33 @@ void config_cb(const char *name, const char *value)
        else if (!strcmp(name, "commit-filter"))
                ctx.cfg.commit_filter = new_filter(value, 0);
        else if (!strcmp(name, "embedded"))
                ctx.cfg.embedded = atoi(value);
        else if (!strcmp(name, "max-message-length"))
                ctx.cfg.max_msg_len = atoi(value);
        else if (!strcmp(name, "max-repodesc-length"))
                ctx.cfg.max_repodesc_len = atoi(value);
        else if (!strcmp(name, "max-repo-count"))
                ctx.cfg.max_repo_count = atoi(value);
        else if (!strcmp(name, "max-commit-count"))
                ctx.cfg.max_commit_count = atoi(value);
        else if (!strcmp(name, "scan-path"))
                if (!ctx.cfg.nocache && ctx.cfg.cache_size)
                        process_cached_repolist(value);
                else
-                        scan_tree(value);
+                        scan_tree(value, repo_config);
        else if (!strcmp(name, "source-filter"))
                ctx.cfg.source_filter = new_filter(value, 1);
        else if (!strcmp(name, "summary-log"))
                ctx.cfg.summary_log = atoi(value);
        else if (!strcmp(name, "summary-branches"))
                ctx.cfg.summary_branches = atoi(value);
        else if (!strcmp(name, "summary-tags"))
                ctx.cfg.summary_tags = atoi(value);
        else if (!strcmp(name, "agefile"))
                ctx.cfg.agefile = xstrdup(value);
        else if (!strcmp(name, "renamelimit"))
                ctx.cfg.renamelimit = atoi(value);
        else if (!strcmp(name, "robots"))
                ctx.cfg.robots = xstrdup(value);
        else if (!strcmp(name, "clone-prefix"))
                ctx.cfg.clone_prefix = xstrdup(value);
@@ -463,57 +463,57 @@ static int generate_cached_repolist(const char *path, const char *cached_rc)
        char *locked_rc;
        int idx;
        FILE *f;
        locked_rc = xstrdup(fmt("%s.lock", cached_rc));
        f = fopen(locked_rc, "wx");
        if (!f) {
                /* Inform about the error unless the lockfile already existed,
                 * since that only means we've got concurrent requests.
                 */
                if (errno != EEXIST)
                        fprintf(stderr, "[cgit] Error opening %s: %s (%d)\n",
                                locked_rc, strerror(errno), errno);
                return errno;
        }
        idx = cgit_repolist.count;
-        scan_tree(path);
+        scan_tree(path, repo_config);
        print_repolist(f, &cgit_repolist, idx);
        if (rename(locked_rc, cached_rc))
                fprintf(stderr, "[cgit] Error renaming %s to %s: %s (%d)\n",
                        locked_rc, cached_rc, strerror(errno), errno);
        fclose(f);
        return 0;
 }
 static void process_cached_repolist(const char *path)
 {
        struct stat st;
        char *cached_rc;
        time_t age;
        cached_rc = xstrdup(fmt("%s/rc-%8x", ctx.cfg.cache_root,
                hash_str(path)));
        if (stat(cached_rc, &st)) {
                /* Nothing is cached, we need to scan without forking. And
                 * if we fail to generate a cached repolist, we need to
                 * invoke scan_tree manually.
                 */
                if (generate_cached_repolist(path, cached_rc))
-                        scan_tree(path);
+                        scan_tree(path, repo_config);
                return;
        }
        parse_configfile(cached_rc, config_cb);
        /* If the cached configfile hasn't expired, lets exit now */
        age = time(NULL) - st.st_mtime;
        if (age <= (ctx.cfg.cache_scanrc_ttl * 60))
                return;
        /* The cached repolist has been parsed, but it was old. So lets
         * rescan the specified path and generate a new cached repolist
         * in a child-process to avoid latency for the current request.
         */
        if (fork())
                return;
@@ -546,33 +546,33 @@ static void cgit_parse_args(int argc, const char **argv)
                        ctx.qry.page = xstrdup(argv[i]+7);
                }
                if (!strncmp(argv[i], "--head=", 7)) {
                        ctx.qry.head = xstrdup(argv[i]+7);
                        ctx.qry.has_symref = 1;
                }
                if (!strncmp(argv[i], "--sha1=", 7)) {
                        ctx.qry.sha1 = xstrdup(argv[i]+7);
                        ctx.qry.has_sha1 = 1;
                }
                if (!strncmp(argv[i], "--ofs=", 6)) {
                        ctx.qry.ofs = atoi(argv[i]+6);
                }
                if (!strncmp(argv[i], "--scan-tree=", 12) ||
                    !strncmp(argv[i], "--scan-path=", 12)) {
                        scan++;
-                        scan_tree(argv[i] + 12);
+                        scan_tree(argv[i] + 12, repo_config);
                }
        }
        if (scan) {
                qsort(cgit_repolist.repos, cgit_repolist.count,
                        sizeof(struct cgit_repo), cmp_repos);
                print_repolist(stdout, &cgit_repolist, 0);
                exit(0);
        }
 }
 static int calc_ttl()
 {
        if (!ctx.repo)
                return ctx.cfg.cache_root_ttl;
        if (!ctx.qry.page)
author	Lars Hjemli <hjemli@gmail.com>	2009-08-23 22:04:58 (UTC)
committer	Lars Hjemli <hjemli@gmail.com>	2009-08-24 08:22:58 (UTC)
commit	74061ed5f03e72796450aa3b8ca1cf6ced5d59e2 (patch) (unidiff)
tree	235ab2c29c027f19b00da815af3bf1d2856edc21 /cgit.c
parent	a1b3938f711c9b0e5eedad1678535e5779da82c1 (diff)
download	cgit-74061ed5f03e72796450aa3b8ca1cf6ced5d59e2.zip cgit-74061ed5f03e72796450aa3b8ca1cf6ced5d59e2.tar.gz cgit-74061ed5f03e72796450aa3b8ca1cf6ced5d59e2.tar.bz2

diff --git a/cgit.c b/cgit.c index 90ae124..e281aa9 100644 --- a/cgit.c +++ b/cgit.c
@@ -155,33 +155,33 @@ void config_cb(const char name, const char value)
155	else if (!strcmp(name, "commit-filter"))	155	else if (!strcmp(name, "commit-filter"))
156	ctx.cfg.commit_filter = new_filter(value, 0);	156	ctx.cfg.commit_filter = new_filter(value, 0);
157	else if (!strcmp(name, "embedded"))	157	else if (!strcmp(name, "embedded"))
158	ctx.cfg.embedded = atoi(value);	158	ctx.cfg.embedded = atoi(value);
159	else if (!strcmp(name, "max-message-length"))	159	else if (!strcmp(name, "max-message-length"))
160	ctx.cfg.max_msg_len = atoi(value);	160	ctx.cfg.max_msg_len = atoi(value);
161	else if (!strcmp(name, "max-repodesc-length"))	161	else if (!strcmp(name, "max-repodesc-length"))
162	ctx.cfg.max_repodesc_len = atoi(value);	162	ctx.cfg.max_repodesc_len = atoi(value);
163	else if (!strcmp(name, "max-repo-count"))	163	else if (!strcmp(name, "max-repo-count"))
164	ctx.cfg.max_repo_count = atoi(value);	164	ctx.cfg.max_repo_count = atoi(value);
165	else if (!strcmp(name, "max-commit-count"))	165	else if (!strcmp(name, "max-commit-count"))
166	ctx.cfg.max_commit_count = atoi(value);	166	ctx.cfg.max_commit_count = atoi(value);
167	else if (!strcmp(name, "scan-path"))	167	else if (!strcmp(name, "scan-path"))
168	if (!ctx.cfg.nocache && ctx.cfg.cache_size)	168	if (!ctx.cfg.nocache && ctx.cfg.cache_size)
169	process_cached_repolist(value);	169	process_cached_repolist(value);
170	else	170	else
171	scan_tree(value);	171	scan_tree(value, repo_config);
172	else if (!strcmp(name, "source-filter"))	172	else if (!strcmp(name, "source-filter"))
173	ctx.cfg.source_filter = new_filter(value, 1);	173	ctx.cfg.source_filter = new_filter(value, 1);
174	else if (!strcmp(name, "summary-log"))	174	else if (!strcmp(name, "summary-log"))
175	ctx.cfg.summary_log = atoi(value);	175	ctx.cfg.summary_log = atoi(value);
176	else if (!strcmp(name, "summary-branches"))	176	else if (!strcmp(name, "summary-branches"))
177	ctx.cfg.summary_branches = atoi(value);	177	ctx.cfg.summary_branches = atoi(value);
178	else if (!strcmp(name, "summary-tags"))	178	else if (!strcmp(name, "summary-tags"))
179	ctx.cfg.summary_tags = atoi(value);	179	ctx.cfg.summary_tags = atoi(value);
180	else if (!strcmp(name, "agefile"))	180	else if (!strcmp(name, "agefile"))
181	ctx.cfg.agefile = xstrdup(value);	181	ctx.cfg.agefile = xstrdup(value);
182	else if (!strcmp(name, "renamelimit"))	182	else if (!strcmp(name, "renamelimit"))
183	ctx.cfg.renamelimit = atoi(value);	183	ctx.cfg.renamelimit = atoi(value);
184	else if (!strcmp(name, "robots"))	184	else if (!strcmp(name, "robots"))
185	ctx.cfg.robots = xstrdup(value);	185	ctx.cfg.robots = xstrdup(value);
186	else if (!strcmp(name, "clone-prefix"))	186	else if (!strcmp(name, "clone-prefix"))
187	ctx.cfg.clone_prefix = xstrdup(value);	187	ctx.cfg.clone_prefix = xstrdup(value);
@@ -463,57 +463,57 @@ static int generate_cached_repolist(const char path, const char cached_rc)
463	char *locked_rc;	463	char *locked_rc;
464	int idx;	464	int idx;
465	FILE *f;	465	FILE *f;
466		466
467	locked_rc = xstrdup(fmt("%s.lock", cached_rc));	467	locked_rc = xstrdup(fmt("%s.lock", cached_rc));
468	f = fopen(locked_rc, "wx");	468	f = fopen(locked_rc, "wx");
469	if (!f) {	469	if (!f) {
470	/* Inform about the error unless the lockfile already existed,	470	/* Inform about the error unless the lockfile already existed,
471	* since that only means we've got concurrent requests.	471	* since that only means we've got concurrent requests.
472	*/	472	*/
473	if (errno != EEXIST)	473	if (errno != EEXIST)
474	fprintf(stderr, "[cgit] Error opening %s: %s (%d)\n",	474	fprintf(stderr, "[cgit] Error opening %s: %s (%d)\n",
475	locked_rc, strerror(errno), errno);	475	locked_rc, strerror(errno), errno);
476	return errno;	476	return errno;
477	}	477	}
478	idx = cgit_repolist.count;	478	idx = cgit_repolist.count;
479	scan_tree(path);	479	scan_tree(path, repo_config);
480	print_repolist(f, &cgit_repolist, idx);	480	print_repolist(f, &cgit_repolist, idx);
481	if (rename(locked_rc, cached_rc))	481	if (rename(locked_rc, cached_rc))
482	fprintf(stderr, "[cgit] Error renaming %s to %s: %s (%d)\n",	482	fprintf(stderr, "[cgit] Error renaming %s to %s: %s (%d)\n",
483	locked_rc, cached_rc, strerror(errno), errno);	483	locked_rc, cached_rc, strerror(errno), errno);
484	fclose(f);	484	fclose(f);
485	return 0;	485	return 0;
486	}	486	}
487		487
488	static void process_cached_repolist(const char *path)	488	static void process_cached_repolist(const char *path)
489	{	489	{
490	struct stat st;	490	struct stat st;
491	char *cached_rc;	491	char *cached_rc;
492	time_t age;	492	time_t age;
493		493
494	cached_rc = xstrdup(fmt("%s/rc-%8x", ctx.cfg.cache_root,	494	cached_rc = xstrdup(fmt("%s/rc-%8x", ctx.cfg.cache_root,
495	hash_str(path)));	495	hash_str(path)));
496		496
497	if (stat(cached_rc, &st)) {	497	if (stat(cached_rc, &st)) {
498	/* Nothing is cached, we need to scan without forking. And	498	/* Nothing is cached, we need to scan without forking. And
499	* if we fail to generate a cached repolist, we need to	499	* if we fail to generate a cached repolist, we need to
500	* invoke scan_tree manually.	500	* invoke scan_tree manually.
501	*/	501	*/
502	if (generate_cached_repolist(path, cached_rc))	502	if (generate_cached_repolist(path, cached_rc))
503	scan_tree(path);	503	scan_tree(path, repo_config);
504	return;	504	return;
505	}	505	}
506		506
507	parse_configfile(cached_rc, config_cb);	507	parse_configfile(cached_rc, config_cb);
508		508
509	/* If the cached configfile hasn't expired, lets exit now */	509	/* If the cached configfile hasn't expired, lets exit now */
510	age = time(NULL) - st.st_mtime;	510	age = time(NULL) - st.st_mtime;
511	if (age <= (ctx.cfg.cache_scanrc_ttl * 60))	511	if (age <= (ctx.cfg.cache_scanrc_ttl * 60))
512	return;	512	return;
513		513
514	/* The cached repolist has been parsed, but it was old. So lets	514	/* The cached repolist has been parsed, but it was old. So lets
515	* rescan the specified path and generate a new cached repolist	515	* rescan the specified path and generate a new cached repolist
516	* in a child-process to avoid latency for the current request.	516	* in a child-process to avoid latency for the current request.
517	*/	517	*/
518	if (fork())	518	if (fork())
519	return;	519	return;
@@ -546,33 +546,33 @@ static void cgit_parse_args(int argc, const char **argv)
546	ctx.qry.page = xstrdup(argv[i]+7);	546	ctx.qry.page = xstrdup(argv[i]+7);
547	}	547	}
548	if (!strncmp(argv[i], "--head=", 7)) {	548	if (!strncmp(argv[i], "--head=", 7)) {
549	ctx.qry.head = xstrdup(argv[i]+7);	549	ctx.qry.head = xstrdup(argv[i]+7);
550	ctx.qry.has_symref = 1;	550	ctx.qry.has_symref = 1;
551	}	551	}
552	if (!strncmp(argv[i], "--sha1=", 7)) {	552	if (!strncmp(argv[i], "--sha1=", 7)) {
553	ctx.qry.sha1 = xstrdup(argv[i]+7);	553	ctx.qry.sha1 = xstrdup(argv[i]+7);
554	ctx.qry.has_sha1 = 1;	554	ctx.qry.has_sha1 = 1;
555	}	555	}
556	if (!strncmp(argv[i], "--ofs=", 6)) {	556	if (!strncmp(argv[i], "--ofs=", 6)) {
557	ctx.qry.ofs = atoi(argv[i]+6);	557	ctx.qry.ofs = atoi(argv[i]+6);
558	}	558	}
559	if (!strncmp(argv[i], "--scan-tree=", 12) \|\|	559	if (!strncmp(argv[i], "--scan-tree=", 12) \|\|
560	!strncmp(argv[i], "--scan-path=", 12)) {	560	!strncmp(argv[i], "--scan-path=", 12)) {
561	scan++;	561	scan++;
562	scan_tree(argv[i] + 12);	562	scan_tree(argv[i] + 12, repo_config);
563	}	563	}
564	}	564	}
565	if (scan) {	565	if (scan) {
566	qsort(cgit_repolist.repos, cgit_repolist.count,	566	qsort(cgit_repolist.repos, cgit_repolist.count,
567	sizeof(struct cgit_repo), cmp_repos);	567	sizeof(struct cgit_repo), cmp_repos);
568	print_repolist(stdout, &cgit_repolist, 0);	568	print_repolist(stdout, &cgit_repolist, 0);
569	exit(0);	569	exit(0);
570	}	570	}
571	}	571	}
572		572
573	static int calc_ttl()	573	static int calc_ttl()
574	{	574	{
575	if (!ctx.repo)	575	if (!ctx.repo)
576	return ctx.cfg.cache_root_ttl;	576	return ctx.cfg.cache_root_ttl;
577		577
578	if (!ctx.qry.page)	578	if (!ctx.qry.page)