fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

getstring() calls in config_notify_bar() and add_item() updated

Browse Source
This commit is contained in:
Frederic Culot 2006-10-28 10:32:29 +00:00
parent 5e112e69e5
commit c4327e6d86
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/calcurse.c
View File

@ -1,4 +1,4 @@
/* $calcurse: calcurse.c,v 1.23 2006/09/30 14:23:07 culot Exp $ */ /* $calcurse: calcurse.c,v 1.24 2006/10/28 10:32:29 culot Exp $ */
/* /*
* Calcurse - text-based organizer * Calcurse - text-based organizer
@ -809,6 +809,7 @@ void config_notify_bar(void)
} }
status_mesg(number_str, ""); status_mesg(number_str, "");
print_notify_options(conf_win); print_notify_options(conf_win);
strcpy(buf, "");
ch = wgetch(swin); ch = wgetch(swin);
switch (ch) { switch (ch) {
@ -828,8 +829,7 @@ void config_notify_bar(void)
break; break;
case '2': case '2':
status_mesg(date_str, ""); status_mesg(date_str, "");
getstring(swin, colr, buf, 0, 1); if (getstring(swin, colr, buf, 0, 1) == 0) {
if (strlen(buf) != 0) {
pthread_mutex_lock(&nbar->mutex); pthread_mutex_lock(&nbar->mutex);
strncpy(nbar->datefmt, buf, strlen(buf) + 1); strncpy(nbar->datefmt, buf, strlen(buf) + 1);
pthread_mutex_unlock(&nbar->mutex); pthread_mutex_unlock(&nbar->mutex);
@ -838,8 +838,7 @@ void config_notify_bar(void)
break; break;
case '3': case '3':
status_mesg(time_str, ""); status_mesg(time_str, "");
getstring(swin, colr, buf, 0, 1); if (getstring(swin, colr, buf, 0, 1) == 0 ) {
if (strlen(buf) != 0 ) {
pthread_mutex_lock(&nbar->mutex); pthread_mutex_lock(&nbar->mutex);
strncpy(nbar->timefmt, buf, strlen(buf) + 1); strncpy(nbar->timefmt, buf, strlen(buf) + 1);
pthread_mutex_unlock(&nbar->mutex); pthread_mutex_unlock(&nbar->mutex);
@ -848,9 +847,9 @@ void config_notify_bar(void)
break; break;
case '4': case '4':
status_mesg(count_str, ""); status_mesg(count_str, "");
getstring(swin, colr, buf, 0, 1); if (getstring(swin, colr, buf, 0, 1) == 0 &&
if (strlen(buf) != 0 && is_all_digit(buf) && is_all_digit(buf) && atoi(buf) >= 0 &&
atoi(buf) >= 0 && atoi(buf) <= DAYINSEC) { atoi(buf) <= DAYINSEC) {
pthread_mutex_lock(&nbar->mutex); pthread_mutex_lock(&nbar->mutex);
nbar->cntdwn = atoi(buf); nbar->cntdwn = atoi(buf);
pthread_mutex_unlock(&nbar->mutex); pthread_mutex_unlock(&nbar->mutex);
@ -1084,8 +1083,8 @@ void add_item(void)
char *format_message_2 = _("You entered an invalid end time, should be [h:mm] or [hh:mm] or [mm]"); char *format_message_2 = _("You entered an invalid end time, should be [h:mm] or [hh:mm] or [mm]");
char *enter_str = _("Press [Enter] to continue"); char *enter_str = _("Press [Enter] to continue");
int Id; int Id;
char item_time[MAX_LENGTH]; char item_time[MAX_LENGTH] = "";
char item_mesg[MAX_LENGTH]; char item_mesg[MAX_LENGTH] = "";
long apoint_duration, apoint_start; long apoint_duration, apoint_start;
apoint_llist_node_t *apoint_pointeur; apoint_llist_node_t *apoint_pointeur;
struct event_s *event_pointeur; struct event_s *event_pointeur;
@ -1094,18 +1093,18 @@ void add_item(void)
int is_appointment = 1; int is_appointment = 1;
/* Get the starting time */ /* Get the starting time */
strncpy(item_time, " ", 6);
while (check_time(item_time) != 1) { while (check_time(item_time) != 1) {
status_mesg(mesg_1, ""); status_mesg(mesg_1, "");
getstring(swin, colr, item_time, 0, 1); if (getstring(swin, colr, item_time, 0, 1) == 0) {
if (strlen(item_time) == 0){ if (strlen(item_time) == 0){
is_appointment = 0; is_appointment = 0;
break; break;
} else if (check_time(item_time) != 1) { } else if (check_time(item_time) != 1) {
status_mesg(format_message_1, enter_str); status_mesg(format_message_1, enter_str);
wgetch(swin); wgetch(swin);
} else } else
sscanf(item_time, "%u:%u", &heures, &minutes); sscanf(item_time, "%u:%u", &heures, &minutes);
}
} }
/* /*
* Check if an event or appointment is entered, * Check if an event or appointment is entered,
@ -1113,11 +1112,10 @@ void add_item(void)
* corresponding item. * corresponding item.
*/ */
if (is_appointment){ /* Get the appointment duration */ if (is_appointment){ /* Get the appointment duration */
strncpy(item_time, " ", 6); strcpy(item_time, "");
while (check_time(item_time) == 0) { while (check_time(item_time) == 0) {
status_mesg(mesg_2, ""); status_mesg(mesg_2, "");
getstring(swin, colr, item_time, 0, 1); if (getstring(swin, colr, item_time, 0, 1) != 0)
if (strlen(item_time) == 0)
return; //nothing entered, cancel adding of event return; //nothing entered, cancel adding of event
else if (check_time(item_time) == 0) { else if (check_time(item_time) == 0) {
status_mesg(format_message_2, enter_str); status_mesg(format_message_2, enter_str);
@ -1145,8 +1143,7 @@ void add_item(void)
} }
// get the item description // get the item description
status_mesg(mesg_3, ""); status_mesg(mesg_3, "");
getstring(swin, colr, item_mesg, 0, 1); if (getstring(swin, colr, item_mesg, 0, 1) == 0) {
if (strlen(item_mesg) != 0) {
if (is_appointment){ if (is_appointment){
// insert the appointment in list // insert the appointment in list
apoint_start = date2sec(sel_year, sel_month, sel_day, apoint_start = date2sec(sel_year, sel_month, sel_day,