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

Fix sending \0 in client mode.

Browse source
This commit is contained in:
tim.schubert@tu-bs.de 2016-10-28 18:58:46 +02:00
parent f57b204029
commit c06aad7cdc
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
netcalc.c
View file

@ -246,25 +246,23 @@ int client()
unsigned int num2; unsigned int num2;
char op; char op;
int status = parse(line, sizeof buf, &num1, &num2, &op);
memset(buf, 0, BUFLEN); memset(buf, 0, BUFLEN);
int status = parse(line, strlen(line)+1, &num1, &num2, &op);
if (status == -1) { if (status == -1) {
report_error(buf, BUFLEN, "parse: failed to parse"); report_error(buf, BUFLEN, "parse: failed to parse");
continue;
} else if (status == -2) { } else if (status == -2) {
op = '+'; sprintf(buf, "%u%c%u", num1, '+', "0");
num2 = 0; } else {
sprintf(buf, "%u%c%u", num1, op, num2);
} }
sprintf(buf, "%u%c%u", num1, op, num2); if (send(SOCKFD, buf, strlen(buf)+1, 0) == -1) {
if (send(SOCKFD, buf, strlen(buf), 0) == -1) {
perror("recv"); perror("recv");
continue; continue;
} }
free(line); free(line);
line = NULL; // so getline allocates a buffer for us line = NULL; // so getline allocates a buffer for us