new configuration system

[pkg/abook.git] / edit.c

diff --git a/edit.c b/edit.c
index 90cc07d763241195b57b322d7ed98cc993fec956..d8e3278065bff4922588d90ac446958e0f22e53d 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -182,11 +182,27 @@ editor_print_data(int tab, int item)
        }
 }
 
+/*
+ * function: change_field
+ *
+ * parameters:
+ *  (char *msg)
+ *   message to display as a prompt
+ *  (char **field)
+ *   a pointer to a pointer which will point a new string. if the latter
+ *   pointer != NULL it will be freed (if user doesn't cancel)
+ *
+ * returns (int)
+ *  a nonzero value if user has cancelled and zero if user has typed a
+ *  valid string
+ */
+
 static int
 change_field(char *msg, char **field)
 {
        int max_len = MAX_FIELD_LEN;
        char *old;
+       int ret = 0;
 
        if( !strncmp("E-mail", msg, 6) )
                max_len = MAX_EMAIL_LEN;
@@ -195,12 +211,19 @@ change_field(char *msg, char **field)
 
        *field = ui_readline(msg, old, max_len - 1, 0);
 
-       free(old);
+       if(*field) {
+               free(old);
+               if(!**field)
+                       my_free(*field);
+       } else {
+               *field = old;
+               ret = 1;
+       }
 
        clear_statusline();
        refresh_statusline();
 
-       return 0;
+       return ret;
 }
 
 static void
@@ -238,12 +261,9 @@ edit_emails(char c, int item)
        split_emailstr(item, emails);
        field = strdup(emails[email_num]);
 
-       if(change_field("E-mail: ", &field)) {
-#ifdef DEBUG
-               fprintf(stderr, "change_field = TRUE\n");
-#endif
-               return;
-       }
+       if(change_field("E-mail: ", &field))
+               return; /* user cancelled ( C-g ) */
+
        if(field) {
                strncpy(emails[email_num], field, MAX_EMAIL_LEN);
                fix_email_str(emails[email_num]);