From d19ec0764e0b8d97207f8129cb7ebc26c280f250 Mon Sep 17 00:00:00 2001
From: Jan-Frederick Musiol <j.musiol@tu-bs.de>
Date: Mon, 29 Oct 2018 11:28:37 +0100
Subject: [PATCH] client closes on emty line
---
netcalc.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/netcalc.c b/netcalc.c
index 59847e6..b9db506 100644
--- a/netcalc.c
+++ b/netcalc.c
@@ -158,6 +158,8 @@ int parse(char *buf, size_t buflen, unsigned int *first, unsigned int *second, c
char *num2str = NULL;
char *opstr = NULL;
+
+
ssize_t num_items = sscanf(buf, "%m[x0-9A-Fb]%m[+-*/]%m[x0-9A-Fb]", &num1str, &opstr, &num2str);
int status = 0;
@@ -272,6 +274,10 @@ int client() {
size_t nullsize = 0;
char *line = NULL;
while (getline(&line, &nullsize, stdin) != -1) {
+ if (strlen(line) <= 1) {
+ break;
+ }
+
unsigned int num1;
unsigned int num2;
char op;
@@ -290,7 +296,7 @@ int client() {
}
if (send(SOCKFD, buf, strlen(buf)+1, 0) == -1) {
- perror("send");
+ perror("error on send");
continue;
}
@@ -300,11 +306,12 @@ int client() {
memset(buf, 0, BUFLEN);
ssize_t re_bytes_c = recv(SOCKFD, buf, sizeof buf, 0);
if (re_bytes_c == -1) {
- perror("recv");
+ perror("error on receive");
continue;
}
printf("%s", buf);
}
+
return 0;
}