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

(parseid): New, factored out of recvline() and recv_output().

Browse source 
(recvline, recv_output): Use it.
This commit is contained in:
Markus Armbruster 2007-12-14 07:44:12 +00:00
parent c9c9305c2f
commit 225f0f5132
3 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/client/expect.c
View file

@ -58,10 +58,9 @@ int
recvline(int s, char *buf) recvline(int s, char *buf)
{ {
int sz = 1024; int sz = 1024;
char *bp, *end; char *bp;
char ch; char ch;
ssize_t n; ssize_t n;
long id;
bp = buf; bp = buf;
for (;;) { for (;;) {
@ -84,10 +83,18 @@ recvline(int s, char *buf)
*bp++ = ch; *bp++ = ch;
*bp = 0; *bp = 0;
return parseid(buf);
}
id = strtol(buf, &end, 16); int
if (end == buf || *end != ' ') { parseid(char *line)
fprintf(stderr, "Malformed id in line %s", buf); {
char *end;
long id;
id = strtol(line, &end, 16);
if (end == line || *end != ' ') {
fprintf(stderr, "Malformed id in line %s", line);
id = -1; id = -1;
} }
if (id > C_LAST) if (id > C_LAST)

1
src/client/misc.h
View file

@ -57,6 +57,7 @@ void putso(void);
void putse(void); void putse(void);
#endif #endif
int recvline(int s, char *buf); int recvline(int s, char *buf);
int parseid(char *);
int expect(int s, int match, char *buf); int expect(int s, int match, char *buf);
int tcp_connect(char *, char *); int tcp_connect(char *, char *);
int login(int s, char *uname, char *cname, char *cpass, int kill_proc, int); int login(int s, char *uname, char *cname, char *cpass, int kill_proc, int);

11
src/client/play.c
View file

@ -322,7 +322,7 @@ recv_output(int sock)
char buf[4096]; char buf[4096];
ssize_t n; ssize_t n;
int i, ch, len; int i, ch, len;
char *line, *end; char *line;
n = read(sock, buf, sizeof(buf)); n = read(sock, buf, sizeof(buf));
if (n < 0) if (n < 0)
@ -337,16 +337,11 @@ recv_output(int sock)
lbuf_init(&lbuf); lbuf_init(&lbuf);
break; break;
} }
if (ch != ' ') {
lbuf_putc(&lbuf, ch); lbuf_putc(&lbuf, ch);
if (ch != ' ')
break; break;
}
line = lbuf_line(&lbuf); line = lbuf_line(&lbuf);
id = strtol(line, &end, 16); id = parseid(line);
if (end == line || *end) {
/* FIXME gripe bad id */
id = -1;
}
lbuf_init(&lbuf); lbuf_init(&lbuf);
switch (id) { switch (id) {