X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=edit.c;h=d8e3278065bff4922588d90ac446958e0f22e53d;hb=c38bc4bc5254bd5925d8567e7ff1554a7844b8c7;hp=5edebec4d2fb2f01e1a6afcd47063d4fb55d5507;hpb=ceba9214d8bebe32d0c34c7a82916bcb9d798d69;p=pkg%2Fabook.git

diff --git a/edit.c b/edit.c
index 5edebec..d8e3278 100644
--- a/edit.c
+++ b/edit.c
@@ -184,14 +184,14 @@ editor_print_data(int tab, int item)
 
 /*
  * function: change_field
- * 
+ *
  * parameters:
  *  (char *msg)
  *   message to display as a prompt
  *  (char **field)
- *   a pointer to pointer which will point a new string. if the latter
+ *   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
@@ -200,24 +200,30 @@ editor_print_data(int tab, int item)
 static int
 change_field(char *msg, char **field)
 {
-	char tmp[MAX_FIELD_LEN];
 	int max_len = MAX_FIELD_LEN;
-	int ret;
+	char *old;
+	int ret = 0;
 
 	if( !strncmp("E-mail", msg, 6) )
 		max_len = MAX_EMAIL_LEN;
 
-	statusline_addstr(msg);
-	if( (ret = statusline_getnstr( tmp, max_len - 1, 0 ) ? 1:0 ) ) {
-		my_free(*field);
-		if( *tmp )
-			*field = strdup(tmp);
+	old = *field;
+
+	*field = ui_readline(msg, old, max_len - 1, 0);
+
+	if(*field) {
+		free(old);
+		if(!**field)
+			my_free(*field);
+	} else {
+		*field = old;
+		ret = 1;
 	}
 
 	clear_statusline();
 	refresh_statusline();
 
-	return !ret;
+	return ret;
 }
 
 static void
@@ -246,24 +252,23 @@ fix_email_str(char *str)
 static void
 edit_emails(char c, int item)
 {
-	char *field = NULL;
+	char *field;
 	char emails[MAX_EMAILS][MAX_EMAIL_LEN];
 	char tmp[MAX_EMAILSTR_LEN] = "";
 	int i, len;
+	int email_num = c - '2';
 
 	split_emailstr(item, emails);
+	field = strdup(emails[email_num]);
 
-	if(change_field("E-mail: ", &field)) {
-#ifdef DEBUG
-		fprintf(stderr, "change_field = TRUE\n");
-#endif
+	if(change_field("E-mail: ", &field))
 		return; /* user cancelled ( C-g ) */
-	}
+
 	if(field) {
-		strncpy(emails[c - '2'], field, MAX_EMAIL_LEN);
-		fix_email_str(emails[c - '2']);
+		strncpy(emails[email_num], field, MAX_EMAIL_LEN);
+		fix_email_str(emails[email_num]);
 	} else
-		*emails[c - '2'] = 0;
+		*emails[email_num] = 0;
 
 	my_free(database[item][EMAIL]);