mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-21 16:08:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move function for configfile parsing into configfile.[ch]

Browse Source 
This is a generic function which wanted its own little object file.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Lars Hjemli 2008-03-28 00:09:11 +01:00
parent ee4056bd2c
commit 20a33548b9
6 changed files with 99 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -51,6 +51,7 @@ OBJECTS =
OBJECTS += cache.o
OBJECTS += cgit.o
OBJECTS += cmd.o
OBJECTS += configfile.o
OBJECTS += html.o
OBJECTS += parsing.o
OBJECTS += shared.o

5
cgit.c
View File

@ -9,6 +9,7 @@
#include "cgit.h"
#include "cache.h"
#include "cmd.h"
#include "configfile.h"
#include "ui-shared.h"
const char *cgit_version = CGIT_VERSION;
@ -103,7 +104,7 @@ void config_cb(const char *name, const char *value)
else
ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value));
} else if (!strcmp(name, "include"))
cgit_read_config(value, config_cb);
parse_configfile(value, config_cb);
}
static void querystring_cb(const char *name, const char *value)
@ -436,7 +437,7 @@ int main(int argc, const char **argv)
cgit_repolist.count = 0;
cgit_repolist.repos = NULL;
cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG,
parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG,
config_cb);
if (getenv("SCRIPT_NAME"))
ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME"));

1
cgit.h
View File

@ -214,7 +214,6 @@ extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
extern char *fmt(const char *format,...);
extern int cgit_read_config(const char *filename, configfn fn);
extern int cgit_parse_query(char *txt, configfn fn);
extern struct commitinfo *cgit_parse_commit(struct commit *commit);
extern struct taginfo *cgit_parse_tag(struct tag *tag);

87
configfile.c Normal file
View File

@ -0,0 +1,87 @@
/* configfile.c: parsing of config files
*
* Copyright (C) 2008 Lars Hjemli
*
* Licensed under GNU General Public License v2
* (see COPYING for full license text)
*/
#include <ctype.h>
#include <stdio.h>
#include "configfile.h"
int next_char(FILE *f)
{
int c = fgetc(f);
if (c=='\r') {
c = fgetc(f);
if (c!='\n') {
ungetc(c, f);
c = '\r';
}
}
return c;
}
void skip_line(FILE *f)
{
int c;
while((c=next_char(f)) && c!='\n' && c!=EOF)
;
}
int read_config_line(FILE *f, char *line, const char **value, int bufsize)
{
int i = 0, isname = 0;
*value = NULL;
while(i<bufsize-1) {
int c = next_char(f);
if (!isname && (c=='#' || c==';')) {
skip_line(f);
continue;
}
if (!isname && isspace(c))
continue;
if (c=='=' && !*value) {
line[i] = 0;
*value = &line[i+1];
} else if (c=='\n' && !isname) {
i = 0;
continue;
} else if (c=='\n' || c==EOF) {
line[i] = 0;
break;
} else {
line[i]=c;
}
isname = 1;
i++;
}
line[i+1] = 0;
return i;
}
int parse_configfile(const char *filename, configfile_value_fn fn)
{
static int nesting;
int len;
char line[256];
const char *value;
FILE *f;
/* cancel deeply nested include-commands */
if (nesting > 8)
return -1;
if (!(f = fopen(filename, "r")))
return -1;
nesting++;
while((len = read_config_line(f, line, &value, sizeof(line))) > 0)
fn(line, value);
nesting--;
fclose(f);
return 0;
}

8
configfile.h Normal file
View File

@ -0,0 +1,8 @@
#ifndef CONFIGFILE_H
#define CONFIGFILE_H
typedef void (*configfile_value_fn)(const char *name, const char *value);
extern int parse_configfile(const char *filename, configfile_value_fn fn);
#endif /* CONFIGFILE_H */

75
parsing.c
View File

@ -8,81 +8,6 @@
#include "cgit.h"
int next_char(FILE *f)
{
int c = fgetc(f);
if (c=='\r') {
c = fgetc(f);
if (c!='\n') {
ungetc(c, f);
c = '\r';
}
}
return c;
}
void skip_line(FILE *f)
{
int c;
while((c=next_char(f)) && c!='\n' && c!=EOF)
;
}
int read_config_line(FILE *f, char *line, const char **value, int bufsize)
{
int i = 0, isname = 0;
*value = NULL;
while(i<bufsize-1) {
int c = next_char(f);
if (!isname && (c=='#' || c==';')) {
skip_line(f);
continue;
}
if (!isname && isspace(c))
continue;
if (c=='=' && !*value) {
line[i] = 0;
*value = &line[i+1];
} else if (c=='\n' && !isname) {
i = 0;
continue;
} else if (c=='\n' || c==EOF) {
line[i] = 0;
break;
} else {
line[i]=c;
}
isname = 1;
i++;
}
line[i+1] = 0;
return i;
}
int cgit_read_config(const char *filename, configfn fn)
{
static int nesting;
int len;
char line[256];
const char *value;
FILE *f;
/* cancel deeply nested include-commands */
if (nesting > 8)
return -1;
if (!(f = fopen(filename, "r")))
return -1;
nesting++;
while((len = read_config_line(f, line, &value, sizeof(line))) > 0)
(*fn)(line, value);
nesting--;
fclose(f);
return 0;
}
char *convert_query_hexchar(char *txt)
{
int d1, d2;