X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=options.c;h=fbbd2a3987574d69c881f6726a1588f38ee696e6;hb=addc54efb596b39b0e4e6ce219ee0f1506337475;hp=8196bcd50a74e1498dc08c52a8593b8bfe79c6e0;hpb=c5d8ef5198f2bfd02f678b7a709b6538ef83cd44;p=pkg%2Fabook.git

diff --git a/options.c b/options.c
index 8196bcd..fbbd2a3 100644
--- a/options.c
+++ b/options.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: options.c,v 1.21 2003/12/05 18:11:55 jheinonen Exp $
+ * $Id: options.c,v 1.25 2005/08/13 10:49:25 jheinonen Exp $
  *
  * by JH <jheinonen@users.sourceforge.net>
  *
@@ -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);
@@ -260,7 +262,7 @@ opt_set_set_option(char *var, char *p, struct option *opt)
 		default:
 			assert(0);
 	}
-	
+
 	return NULL;
 }
 
@@ -275,13 +277,13 @@ 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";
 }
 
@@ -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);