aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-01-03 14:57:44 -05:00
Code

cookies: Reject empty name in "Add server".

Browse Source 
Also, add the server in the done_handler_T of the "OK" button,
rather than in the widget_handler_T of the "Server name" field
(which check_dialog calls).  This change implies that the dialog
is closed even if an error occurs while adding the server, but
that seems to be customary elsewhere in ELinks too.
This commit is contained in:
Kalle Olavi Niemitalo 2006-05-28 12:43:29 +03:00 committed by Miciah Dashiel Butler Masters
parent 96391c17b4
commit 2c0edf6c44
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/cookies/dialogs.c
View File

@ -410,16 +410,19 @@ push_add_button(struct dialog_data *dlg_data, struct widget_data *button)
return EVENT_PROCESSED;
}
static widget_handler_status_T
set_server(struct dialog_data *dlg_data, struct widget_data *widget_data)
/* Called by ok_dialog for the "OK" button in the "Add Server" dialog.
* The data parameter points to the buffer used by the server name
* widget. */
static void
add_server_do(void *data)
{
unsigned char *value = widget_data->cdata;
unsigned char *value = data;
struct cookie *dummy_cookie = NULL;
if (!value) return EVENT_NOT_PROCESSED;
if (!value) return;
dummy_cookie = mem_calloc(1, sizeof(*dummy_cookie));
if (dummy_cookie == NULL) return EVENT_PROCESSED;
if (dummy_cookie == NULL) return;
dummy_cookie->name = stracpy("empty");
dummy_cookie->value = stracpy("1");
@ -430,11 +433,10 @@ set_server(struct dialog_data *dlg_data, struct widget_data *widget_data)
|| dummy_cookie->path == NULL || dummy_cookie->domain == NULL
|| dummy_cookie->server == NULL) {
done_cookie(dummy_cookie);
return EVENT_PROCESSED;
return;
}
accept_cookie(dummy_cookie);
return EVENT_PROCESSED;
}
static widget_handler_status_T
@ -456,8 +458,8 @@ push_add_server_button(struct dialog_data *dlg_data, struct widget_data *button)
dlg->udata = NULL;
dlg->udata2 = NULL;
text = _("Server name", term);
add_dlg_field_float(dlg, text, 0, 0, set_server, MAX_STR_LEN, name, NULL);
add_dlg_button(dlg, _("~OK", term), B_ENTER, ok_dialog, NULL);
add_dlg_field_float(dlg, text, 0, 0, check_nonempty, MAX_STR_LEN, name, NULL);
add_dlg_ok_button(dlg, _("~OK", term), B_ENTER, add_server_do, name);
add_dlg_button(dlg, _("~Cancel", term), B_ESC, cancel_dialog, NULL);
add_dlg_end(dlg, SERVER_WIDGETS_COUNT);
do_dialog(term, dlg, getml(dlg, NULL));