dadada/netcalc
dadada/netcalc
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

client closes on emty line

Browse source
This commit is contained in:
Jan-Frederick Musiol 2018-10-29 11:28:37 +01:00
parent 4d7d96872a
commit d19ec0764e
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
netcalc.c
View file

@ -158,6 +158,8 @@ int parse(char *buf, size_t buflen, unsigned int *first, unsigned int *second, c
char *num2str = NULL; char *num2str = NULL;
char *opstr = NULL; char *opstr = NULL;
ssize_t num_items = sscanf(buf, "%m[x0-9A-Fb]%m[+-*/]%m[x0-9A-Fb]", &num1str, &opstr, &num2str); ssize_t num_items = sscanf(buf, "%m[x0-9A-Fb]%m[+-*/]%m[x0-9A-Fb]", &num1str, &opstr, &num2str);
int status = 0; int status = 0;
@ -272,6 +274,10 @@ int client() {
size_t nullsize = 0; size_t nullsize = 0;
char *line = NULL; char *line = NULL;
while (getline(&line, &nullsize, stdin) != -1) { while (getline(&line, &nullsize, stdin) != -1) {
if (strlen(line) <= 1) {
break;
}
unsigned int num1; unsigned int num1;
unsigned int num2; unsigned int num2;
char op; char op;
@ -290,7 +296,7 @@ int client() {
} }
if (send(SOCKFD, buf, strlen(buf)+1, 0) == -1) { if (send(SOCKFD, buf, strlen(buf)+1, 0) == -1) {
perror("send"); perror("error on send");
continue; continue;
} }
@ -300,11 +306,12 @@ int client() {
memset(buf, 0, BUFLEN); memset(buf, 0, BUFLEN);
ssize_t re_bytes_c = recv(SOCKFD, buf, sizeof buf, 0); ssize_t re_bytes_c = recv(SOCKFD, buf, sizeof buf, 0);
if (re_bytes_c == -1) { if (re_bytes_c == -1) {
perror("recv"); perror("error on receive");
continue; continue;
} }
printf("%s", buf); printf("%s", buf);
} }
return 0; return 0;
} }