- add xstrdup to have proper checking for memory allocation failures

[pkg/abook.git] / options.c

diff --git a/options.c b/options.c
index fb5c7a635d61e10c8340e774bf280e1766bdb555..f698fb823f089e57c8f3a0a151e42110876e52fe 100644 (file)
--- 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,17 +56,18 @@ 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 }
 };
@@ -98,7 +100,7 @@ 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
@@ -209,7 +211,7 @@ void
 find_token_start(buffer *b)
 {
        assert(b);
-       
+
        for(; ISSPACE(*b -> ptr); b -> ptr ++);
 }
 
@@ -229,7 +231,7 @@ static char *
 opt_set_set_option(char *var, char *p, struct option *opt)
 {
        int len;
-       
+
        strtrim(p);
 
        len = strlen(p);
@@ -257,8 +259,10 @@ opt_set_set_option(char *var, char *p, struct option *opt)
                        else
                                return "invalid value";
                        break;
+               default:
+                       assert(0);
        }
-       
+
        return NULL;
 }
 
@@ -273,16 +277,18 @@ opt_parse_set(buffer *b)
                *p++ = 0;
        else
                return "invalid value assignment";
-       
+
        strtrim(b -> ptr);
 
        for(i = 0;abook_vars[i].option; 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)
 {
@@ -291,18 +297,14 @@ opt_parse_customfield(buffer *b)
        size_t len;
 
        find_token_start(b);
-
        p = b -> ptr;
-
        find_token_end(b);
 
        memset(num, 0, sizeof(num));
 
-       if((len = (b -> ptr - p)) > sizeof(num))
-               return "invalid custom field number";
-
-       strncpy(num, p, min(sizeof(num), len));
-       n = atoi(num);
+       len = (b -> ptr - p);
+       strncpy(num, p, min(sizeof(num) - 1, len));
+       n = safe_atoi(num);
 
        find_token_start(b);
 
@@ -328,7 +330,7 @@ opt_parse_line(char *line, int n, char *fn)
        char *err = NULL;
        char *token;
        buffer b;
-       
+
        assert(line && fn);
 
        b.ptr = line;
@@ -353,7 +355,7 @@ opt_parse_line(char *line, int n, char *fn)
                                return FALSE;
                        break;
                }
-       
+
        fprintf(stderr, "%s: parse error at line %d: ", fn, n);
        if(err)
                fprintf(stderr, "%s\n", err);
@@ -370,11 +372,11 @@ load_opts(char *filename)
        char *line = NULL;
        int n;
        int err = 0;
-       
+
        if((in = fopen(filename, "r")) == NULL)
                return -1;
 
-       
+
        for(n = 1;!feof(in); n++) {
                line = getaline(in);
 
@@ -387,7 +389,8 @@ load_opts(char *filename)
                                err += opt_parse_line(line, n, filename) ? 1:0;
                }
 
-               my_free(line);
+               free(line);
+               line = NULL;
        }
 
        free(line);