custom field update

[pkg/abook.git] / options.c

diff --git a/options.c b/options.c
index fb5c7a635d61e10c8340e774bf280e1766bdb555..9724103818794cc5db1075b025a5c56850347e24 100644 (file)
--- a/options.c
+++ b/options.c
@@ -283,6 +283,8 @@ opt_parse_set(buffer *b)
        return "unknown option";
 }
 
+#include "database.h" /* needed for change_custom_field_name */
+
 static char *
 opt_parse_customfield(buffer *b)
 {
@@ -298,10 +300,8 @@ opt_parse_customfield(buffer *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));
+       len = (b -> ptr - p);
+       strncpy(num, p, min(sizeof(num) - 1, len));
        n = atoi(num);
 
        find_token_start(b);