X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=options.c;h=f698fb823f089e57c8f3a0a151e42110876e52fe;hb=781c0d657fffe80e45d0fda6ed5ddbf5f796fefb;hp=82aae49cef02ae9566945f4559608d54e061a2e4;hpb=c38bc4bc5254bd5925d8567e7ff1554a7844b8c7;p=pkg%2Fabook.git diff --git a/options.c b/options.c index 82aae49..f698fb8 100644 --- a/options.c +++ b/options.c @@ -16,6 +16,7 @@ #include "options.h" #include "abook.h" #include "misc.h" +#include "xmalloc.h" #ifndef FALSE # define FALSE 0 @@ -55,26 +56,30 @@ static struct option abook_vars[] = { { "mutt_command", OT_STR, STR_MUTT_COMMAND, UL "mutt" }, { "mutt_return_all_emails", OT_BOOL, BOOL_MUTT_RETURN_ALL_EMAILS, TRUE }, - + { "print_command", OT_STR, STR_PRINT_COMMAND, UL "lpr" }, { "www_command", OT_STR, STR_WWW_COMMAND, UL "lynx" }, - + { "address_style", OT_STR, STR_ADDRESS_STYLE, UL "eu" }, { "use_ascii_only", OT_BOOL, BOOL_USE_ASCII_ONLY, FALSE }, + { "add_email_prevent_duplicates", OT_BOOL, BOOL_ADD_EMAIL_PREVENT_DUPLICATES, FALSE }, + { "sort_field", OT_STR, STR_SORT_FIELD, UL "nick" }, + { "show_cursor", OT_BOOL, BOOL_SHOW_CURSOR, FALSE }, + { NULL } }; static unsigned char bool_opts[BOOL_MAX]; -static int int_opts[INT_MAX]; +static int int_opts[INT_MAXIMUM]; static char *str_opts[STR_MAX]; static void set_int(enum int_opts opt, int value) { - assert(opt >= 0 && opt < INT_MAX); + assert(opt >= 0 && opt < INT_MAXIMUM); int_opts[opt] = value; } @@ -95,13 +100,13 @@ set_str(enum str_opts opt, char *value) if(str_opts[opt]) free(str_opts[opt]); - str_opts[opt] = strdup(value); + str_opts[opt] = xstrdup(value); } int opt_get_int(enum int_opts opt) { - assert(opt >= 0 && opt < INT_MAX); + assert(opt >= 0 && opt < INT_MAXIMUM); return int_opts[opt]; } @@ -109,7 +114,7 @@ opt_get_int(enum int_opts opt) bool opt_get_bool(enum bool_opts opt) { - assert(opt >= 0 && opt < STR_MAX); + assert(opt >= 0 && opt < BOOL_MAX); return bool_opts[opt]; } @@ -168,6 +173,10 @@ free_opts() * file parsing */ +typedef struct { + char *data, *ptr; +} buffer; + static void opt_line_remove_comments(char *p) { @@ -198,35 +207,31 @@ opt_line_remove_comments(char *p) } } -static char * -get_token_start(char *p) +void +find_token_start(buffer *b) { - assert(p); - - for(; ISSPACE(*p); p++); + assert(b); - return p; + for(; ISSPACE(*b -> ptr); b -> ptr ++); } -static char * -get_token_end(char *p) +void +find_token_end(buffer *b) { - assert(p); + assert(b); - for(p = get_token_start(p); *p; p++) { - if(ISSPACE(*p)) { + for(find_token_start(b); *(b -> ptr); b -> ptr ++) { + if(ISSPACE(*(b -> ptr))) { break; } } - - return p; } static char * opt_set_set_option(char *var, char *p, struct option *opt) { int len; - + strtrim(p); len = strlen(p); @@ -246,46 +251,75 @@ opt_set_set_option(char *var, char *p, struct option *opt) set_int(opt -> data, safe_atoi(p)); break; case OT_BOOL: - if(!strcasecmp(p, "true") && !strcasecmp(p, "on")) + if(!strcasecmp(p, "true") || !strcasecmp(p, "on")) set_bool(opt -> data, TRUE); - else if(!strcasecmp(p, "false") && + else if(!strcasecmp(p, "false") || !strcasecmp(p, "off")) set_bool(opt -> data, FALSE); else return "invalid value"; break; + default: + assert(0); } - + return NULL; } static char * -opt_parse_set(char *p) +opt_parse_set(buffer *b) { - char *var; int i; + char *p; - var = get_token_start(p); - if((p = strchr(var, '='))) + find_token_start(b); + if((p = strchr(b -> ptr, '='))) *p++ = 0; else return "invalid value assignment"; - - strtrim(var); + + strtrim(b -> ptr); for(i = 0;abook_vars[i].option; i++) - if(!strcmp(abook_vars[i].option, var)) - return opt_set_set_option(var, p, &abook_vars[i]); - + if(!strcmp(abook_vars[i].option, b -> ptr)) + return opt_set_set_option(b -> ptr, p, &abook_vars[i]); + return "unknown option"; } +#include "database.h" /* needed for change_custom_field_name */ + +static char * +opt_parse_customfield(buffer *b) +{ + char *p, num[5]; + int n; + size_t len; + + find_token_start(b); + p = b -> ptr; + find_token_end(b); + + memset(num, 0, sizeof(num)); + + len = (b -> ptr - p); + strncpy(num, p, min(sizeof(num) - 1, len)); + n = safe_atoi(num); + + find_token_start(b); + + if(change_custom_field_name(b->ptr, n) == -1) + return "invalid custom field number"; + + return NULL; +} static struct { char *token; - char * (*func) (char *line); + char * (*func) (buffer *line); } opt_parsers[] = { { "set", opt_parse_set }, + { "customfield", opt_parse_customfield }, { NULL } }; @@ -293,33 +327,40 @@ static bool opt_parse_line(char *line, int n, char *fn) { int i; - char *p; char *err = NULL; - + char *token; + buffer b; + assert(line && fn); - line = get_token_start(line); - p = get_token_end(line); - *p++ = 0; + b.ptr = line; + + find_token_start(&b); + b.data = b.ptr; + find_token_end(&b); + *b.ptr++ = 0; if(!*line) return FALSE; - strtrim(line); - strtrim(p); + strtrim(b.data); + strtrim(b.ptr); + + token = b.data; + b.data = b.ptr = b.ptr; for(i = 0; opt_parsers[i].token; i++) - if(!strcmp(opt_parsers[i].token, line)) { - if(!(err = opt_parsers[i].func(p))) + if(!strcmp(opt_parsers[i].token, token)) { + if(!(err = opt_parsers[i].func(&b))) return FALSE; break; } - + fprintf(stderr, "%s: parse error at line %d: ", fn, n); if(err) fprintf(stderr, "%s\n", err); else - fprintf(stderr, "unknown token %s\n", line); + fprintf(stderr, "unknown token %s\n", token); return TRUE; } @@ -330,12 +371,12 @@ load_opts(char *filename) FILE *in; char *line = NULL; int n; - bool err = FALSE; - + int err = 0; + if((in = fopen(filename, "r")) == NULL) return -1; - + for(n = 1;!feof(in); n++) { line = getaline(in); @@ -345,19 +386,15 @@ load_opts(char *filename) if(line && *line) { opt_line_remove_comments(line); if(*line) - err = opt_parse_line(line, n, filename); + err += opt_parse_line(line, n, filename) ? 1:0; } - my_free(line); + free(line); + line = NULL; } free(line); - if(err) { - printf("Press any key to continue...\n"); - fgetc(stdin); - } - return err; }