use strchr instead of strstr where appropriate. oops.

git-svn-id: svn://katsu.triplehelix.org/dgamelaunch/trunk@27 db0b04b0-f4d1-0310-9a6d-de3e77497b0e
This commit is contained in:
Joshua Kwan 2004-01-01 02:06:19 +00:00
parent a426f247c3
commit f39e3e4e38
1 changed files with 14 additions and 8 deletions

View File

@ -87,8 +87,6 @@ char rcfilename[80];
char ttyrec_filename[100]; char ttyrec_filename[100];
char *chosen_name; char *chosen_name;
/* preallocate this mem. bad, but ohwell. is only for pointers */
/* makes a max number of users compiled in */
int f_num = 0; int f_num = 0;
struct dg_user **users = NULL; struct dg_user **users = NULL;
struct dg_user *me = NULL; struct dg_user *me = NULL;
@ -218,7 +216,12 @@ loadbanner (struct dg_banner *ban)
ban->lines[ban->len - 1] = strdup (buf); ban->lines[ban->len - 1] = strdup (buf);
memset (buf, 0, 80); memset (buf, 0, 80);
if (ban->len == 14) /* menu itself needs 10 lines, 24 - 10 */
break;
} }
fclose (bannerfile);
} }
void void
@ -288,7 +291,7 @@ inprogressmenu ()
/* stat to check idle status */ /* stat to check idle status */
snprintf (ttyrecname, 130, "%s%s", LOC_TTYRECDIR, snprintf (ttyrecname, 130, "%s%s", LOC_TTYRECDIR,
pdirent->d_name); pdirent->d_name);
replacestr = strstr (ttyrecname, ":"); replacestr = strchr (ttyrecname, ':');
if (!replacestr) if (!replacestr)
exit (145); exit (145);
replacestr[0] = '/'; replacestr[0] = '/';
@ -331,13 +334,16 @@ inprogressmenu ()
snprintf (ttyrecname, 130, "%s%s", LOC_TTYRECDIR, snprintf (ttyrecname, 130, "%s%s", LOC_TTYRECDIR,
games[menuchoice - 97]); games[menuchoice - 97]);
chosen_name = strdup (games[menuchoice - 97]); chosen_name = strdup (games[menuchoice - 97]);
if (!(replacestr = strstr (chosen_name, ":"))) if (!(replacestr = strchr (chosen_name, ':')))
exit (145); exit (145);
else else
*replacestr = '\0'; *replacestr = '\0';
replacestr = strstr (ttyrecname, ":");
replacestr = strchr (ttyrecname, ':');
if (!replacestr) if (!replacestr)
exit (145); exit (145);
replacestr[0] = '/'; replacestr[0] = '/';
clear (); clear ();
@ -395,7 +401,7 @@ changepw ()
if (buf && *buf == '\0') if (buf && *buf == '\0')
return; return;
if (strstr (buf, ":") != NULL) if (strchr (buf, ':') != NULL)
exit (112); exit (112);
mvaddstr (12, 1, "And again:"); mvaddstr (12, 1, "And again:");
@ -721,7 +727,7 @@ newuser ()
refresh (); refresh ();
getnstr (buf, 80); getnstr (buf, 80);
if (strstr (buf, ":") != NULL) if (strchr (buf, ':') != NULL)
exit (113); exit (113);
me->email = strdup (buf); me->email = strdup (buf);
@ -1057,7 +1063,7 @@ main (void)
break; break;
case 'q': case 'q':
endwin (); endwin ();
exit (1); return 0;
/* break; */ /* break; */
case 'r': case 'r':
if (!loggedin) /*not visible to loggedin */ if (!loggedin) /*not visible to loggedin */