--- lbbs/src/menu.c 2005/03/19 15:54:14 1.5 +++ lbbs/src/menu.c 2005/03/20 14:37:37 1.7 @@ -22,6 +22,7 @@ #include #include #include +#include MENU_SET bbs_menu; @@ -46,11 +47,12 @@ load_menu (MENU_SET * p_menu_set, const case '#': break; case '%': - if (ireg ("^%S_([A-Za-z0-9_]+)", buffer, 1, pmatch) == 0) + if (ireg ("^%S_([A-Za-z0-9_]+)", buffer, 2, pmatch) == 0) { - strncpy (temp, buffer + pmatch[0].rm_so, - pmatch[0].rm_eo - pmatch[0].rm_so + 1); - sprintf (screen_filename, "%sMENU_SCR_%s", app_temp_dir, temp); + strncpy (temp, buffer + pmatch[1].rm_so, + pmatch[1].rm_eo - pmatch[1].rm_so); + temp [pmatch[1].rm_eo - pmatch[1].rm_so] = '\0'; + sprintf (screen_filename, "%sMENU_SCR_%s", app_temp_dir, temp); if ((fout = fopen (screen_filename, "w")) == NULL) { @@ -76,7 +78,8 @@ load_menu (MENU_SET * p_menu_set, const strncpy (p_menu_set->p_menu[i]->name, buffer + pmatch[1].rm_so, - pmatch[1].rm_eo - pmatch[1].rm_so + 1); + pmatch[1].rm_eo - pmatch[1].rm_so); + p_menu_set->p_menu[i]->name[pmatch[1].rm_eo - pmatch[1].rm_so] = '\0'; j = 0; @@ -103,25 +106,31 @@ load_menu (MENU_SET * p_menu_set, const p_menu_set->p_menu[i]->items[j]->submenu = 1; strncpy (p_menu_set->p_menu[i]->items[j]->action, buffer + pmatch[1].rm_so, - pmatch[1].rm_eo - pmatch[1].rm_so + 1); - strncpy (temp, + pmatch[1].rm_eo - pmatch[1].rm_so); + p_menu_set->p_menu[i]->items[j]->action[pmatch[1].rm_eo - pmatch[1].rm_so] = '\0'; + strncpy (temp, buffer + pmatch[2].rm_so, - pmatch[2].rm_eo - pmatch[2].rm_so + 1); + pmatch[2].rm_eo - pmatch[2].rm_so); + temp[pmatch[2].rm_eo - pmatch[2].rm_so] = '\0'; p_menu_set->p_menu[i]->items[j]->row = atoi (temp); strncpy (temp, buffer + pmatch[3].rm_so, - pmatch[3].rm_eo - pmatch[3].rm_so + 1); - p_menu_set->p_menu[i]->items[j]->col = atoi (temp); + pmatch[3].rm_eo - pmatch[3].rm_so); + temp[pmatch[3].rm_eo - pmatch[3].rm_so] = '\0'; + p_menu_set->p_menu[i]->items[j]->col = atoi (temp); strncpy (temp, buffer + pmatch[4].rm_so, - pmatch[4].rm_eo - pmatch[4].rm_so + 1); - p_menu_set->p_menu[i]->items[j]->priv = atoi (temp); + pmatch[4].rm_eo - pmatch[4].rm_so); + temp[pmatch[4].rm_eo - pmatch[4].rm_so] = '\0'; + p_menu_set->p_menu[i]->items[j]->priv = atoi (temp); strncpy (p_menu_set->p_menu[i]->items[j]->name, buffer + pmatch[5].rm_so, - pmatch[5].rm_eo - pmatch[5].rm_so + 1); + pmatch[5].rm_eo - pmatch[5].rm_so); + p_menu_set->p_menu[i]->items[j]->name[pmatch[5].rm_eo - pmatch[5].rm_so] = '\0'; strncpy (p_menu_set->p_menu[i]->items[j]->text, buffer + pmatch[6].rm_so, - pmatch[6].rm_eo - pmatch[6].rm_so + 1); + pmatch[6].rm_eo - pmatch[6].rm_so); + p_menu_set->p_menu[i]->items[j]->text[pmatch[6].rm_eo - pmatch[6].rm_so] = '\0'; j++; continue; } @@ -135,25 +144,31 @@ load_menu (MENU_SET * p_menu_set, const p_menu_set->p_menu[i]->items[j]->submenu = 0; strncpy (p_menu_set->p_menu[i]->items[j]->action, buffer + pmatch[1].rm_so, - pmatch[1].rm_eo - pmatch[1].rm_so + 1); + pmatch[1].rm_eo - pmatch[1].rm_so); + p_menu_set->p_menu[i]->items[j]->action[pmatch[0].rm_eo - pmatch[0].rm_so] = '\0'; strncpy (temp, buffer + pmatch[2].rm_so, - pmatch[2].rm_eo - pmatch[2].rm_so + 1); + pmatch[2].rm_eo - pmatch[2].rm_so); + temp[pmatch[2].rm_eo - pmatch[2].rm_so] = '\0'; p_menu_set->p_menu[i]->items[j]->row = atoi (temp); strncpy (temp, buffer + pmatch[3].rm_so, - pmatch[3].rm_eo - pmatch[3].rm_so + 1); + pmatch[3].rm_eo - pmatch[3].rm_so); + temp[pmatch[3].rm_eo - pmatch[3].rm_so] = '\0'; p_menu_set->p_menu[i]->items[j]->col = atoi (temp); strncpy (temp, buffer + pmatch[4].rm_so, - pmatch[4].rm_eo - pmatch[4].rm_so + 1); + pmatch[4].rm_eo - pmatch[4].rm_so); + temp[pmatch[4].rm_eo - pmatch[4].rm_so] = '\0'; p_menu_set->p_menu[i]->items[j]->priv = atoi (temp); strncpy (p_menu_set->p_menu[i]->items[j]->name, buffer + pmatch[5].rm_so, - pmatch[5].rm_eo - pmatch[5].rm_so + 1); + pmatch[5].rm_eo - pmatch[5].rm_so); + p_menu_set->p_menu[i]->items[j]->name[pmatch[5].rm_eo - pmatch[5].rm_so] = '\0'; strncpy (p_menu_set->p_menu[i]->items[j]->text, buffer + pmatch[6].rm_so, - pmatch[6].rm_eo - pmatch[6].rm_so + 1); + pmatch[6].rm_eo - pmatch[6].rm_so); + p_menu_set->p_menu[i]->items[j]->text[pmatch[6].rm_eo - pmatch[6].rm_so] = '\0'; j++; continue; } @@ -164,15 +179,18 @@ load_menu (MENU_SET * p_menu_set, const { strncpy (temp, buffer + pmatch[1].rm_so, - pmatch[1].rm_eo - pmatch[1].rm_so + 1); + pmatch[1].rm_eo - pmatch[1].rm_so); + temp[pmatch[1].rm_eo - pmatch[1].rm_so] = '\0'; p_menu_set->p_menu[i]->title.row = atoi (temp); strncpy (temp, buffer + pmatch[2].rm_so, - pmatch[2].rm_eo - pmatch[2].rm_so + 1); + pmatch[2].rm_eo - pmatch[2].rm_so); + temp[pmatch[2].rm_eo - pmatch[2].rm_so] = '\0'; p_menu_set->p_menu[i]->title.col = atoi (temp); strncpy (p_menu_set->p_menu[i]->title.text, buffer + pmatch[3].rm_so, - pmatch[3].rm_eo - pmatch[3].rm_so + 1); + pmatch[3].rm_eo - pmatch[3].rm_so); + p_menu_set->p_menu[i]->title.text[pmatch[3].rm_eo - pmatch[3].rm_so] = '\0'; continue; } if (ireg ( @@ -182,15 +200,18 @@ load_menu (MENU_SET * p_menu_set, const { strncpy (temp, buffer + pmatch[1].rm_so, - pmatch[1].rm_eo - pmatch[1].rm_so + 1); + pmatch[1].rm_eo - pmatch[1].rm_so); + temp[pmatch[1].rm_eo - pmatch[1].rm_so] = '\0'; p_menu_set->p_menu[i]->screen.row = atoi (temp); strncpy (temp, buffer + pmatch[2].rm_so, - pmatch[2].rm_eo - pmatch[2].rm_so + 1); + pmatch[2].rm_eo - pmatch[2].rm_so); + temp[pmatch[2].rm_eo - pmatch[2].rm_so] = '\0'; p_menu_set->p_menu[i]->screen.col = atoi (temp); strncpy (temp, buffer + pmatch[3].rm_so, - pmatch[3].rm_eo - pmatch[3].rm_so + 1); + pmatch[3].rm_eo - pmatch[3].rm_so); + temp[pmatch[3].rm_eo - pmatch[3].rm_so] = '\0'; sprintf (p_menu_set->p_menu[i]->screen.filename, "%sMENU_SCR_%s", app_temp_dir, temp); continue; @@ -219,12 +240,10 @@ get_menu (MENU_SET * p_menu_set, const c { if (strcmp(p_menu_set->p_menu[i]->name, menu_name) == 0) { -log_std ("%s %s\n", p_menu_set->p_menu[i]->name, menu_name); return p_menu_set->p_menu[i]; } } -log_std ("%d:)\n", i); return NULL; }