empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(login): Fix reading of country name and, if we lack getpass(),

Browse source 
password.  Used to strip \r from country name (superflous), and not to
strip \n from password (required).
This commit is contained in:
Markus Armbruster 2004-01-08 05:57:38 +00:00
parent 1332ab9dba
commit f5d8f30606
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/client/login.c
View file

@ -57,6 +57,7 @@ int kill_proc;
s_char buf[1024]; s_char buf[1024];
s_char *ptr; s_char *ptr;
s_char *p; s_char *p;
int len;
if (!expect(s, C_INIT, buf)) if (!expect(s, C_INIT, buf))
return 0; return 0;
@ -65,14 +66,13 @@ int kill_proc;
return 0; return 0;
if (cname == 0) { if (cname == 0) {
(void)printf("Country name? "); (void)printf("Country name? ");
cname = fgets(tmp, 128, stdin); cname = fgets(tmp, sizeof(tmp), stdin);
if (cname == 0 || *cname == 0) if (cname == 0 || *cname == 0)
return 0; return 0;
} }
if (cname[strlen(cname) - 1] == '\n') len = strlen(cname);
cname[strlen(cname) - 1] = 0; if (cname[len-1] == '\n')
if (cname[strlen(cname) - 1] == '\r') cname[len-1] = 0;
cname[strlen(cname) - 1] = 0;
(void)sendcmd(s, COUN, cname); (void)sendcmd(s, COUN, cname);
if (!expect(s, C_CMDOK, buf)) { if (!expect(s, C_CMDOK, buf)) {
(void)fprintf(stderr, "empire: no such country\n"); (void)fprintf(stderr, "empire: no such country\n");
@ -81,15 +81,18 @@ int kill_proc;
if (cpass == 0) { if (cpass == 0) {
#ifndef _WIN32 #ifndef _WIN32
cpass = (s_char *)getpass("Your name? "); cpass = (s_char *)getpass("Your name? ");
if (cpass == 0 || *cpass == 0)
return 0;
#else #else
printf("Note: This is echoed to the screen\n"); printf("Note: This is echoed to the screen\n");
printf("Your name? "); printf("Your name? ");
cpass = tmp; cpass = fgets(tmp, sizeof(tmp), stdin);
*cpass = 0;
fgets(cpass, 128, stdin);
#endif
if (cpass == 0 || *cpass == 0) if (cpass == 0 || *cpass == 0)
return 0; return 0;
len = strlen(cpass);
if (cname[len-1] == '\n')
cname[len-1] = 0;
#endif
} }
(void)printf("\n"); (void)printf("\n");
(void)sendcmd(s, PASS, cpass); (void)sendcmd(s, PASS, cpass);