From 5c0d68e2e50d86ff09363a994898175a06508c50 Mon Sep 17 00:00:00 2001
From: project-repo <cagebreak_signing_key_2@cagebreak>
Date: Fri, 22 May 2020 09:05:41 +0200
Subject: [PATCH] Ameliorate ipc

---
 ipc_server.c | 10 +++++-----
 ipc_server.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ipc_server.c b/ipc_server.c
index 2c415c1..f0b1e08 100644
--- a/ipc_server.c
+++ b/ipc_server.c
@@ -172,7 +172,7 @@ int ipc_client_handle_readable(int client_fd, uint32_t mask, void *data) {
 	}
 
 	int read_available;
-	if (ioctl(client_fd, FIONREAD, &read_available) == -1) {
+	if (ioctl(client_fd, FIONREAD, &read_available) < 0) {
 		wlr_log(WLR_ERROR, "Unable to read IPC socket buffer size");
 		ipc_client_disconnect(client);
 		return 0;
@@ -219,7 +219,7 @@ void ipc_client_handle_command(struct cg_ipc_client *client) {
 	}
 	client->read_buffer[client->read_buf_len]='\0';
 	char *nl_pos;
-	int offset=0;
+	uint32_t offset=0;
 	while((nl_pos = strchr(client->read_buffer+offset,'\n')) != NULL){
 		if(client->read_discard) {
 			client->read_discard = 0;
@@ -233,11 +233,11 @@ void ipc_client_handle_command(struct cg_ipc_client *client) {
 				}
 			}
 		}
-		offset+=(nl_pos-client->read_buffer)+1;
+		offset=(nl_pos-client->read_buffer)+1;
 	}
-	if(client->read_buf_len-offset == MAX_LINE_SIZE+1) {
+	if(offset == 0) {
 		wlr_log(WLR_ERROR, "Line received was longer that %d, discarding it",MAX_LINE_SIZE);
-		client->read_buf_len =0;
+		client->read_buf_len = 0;
 		client->read_discard = 1;
 		return;
 	}
diff --git a/ipc_server.h b/ipc_server.h
index 0e5aadd..91d09b2 100644
--- a/ipc_server.h
+++ b/ipc_server.h
@@ -20,7 +20,7 @@ struct cg_ipc_client {
 	size_t write_buffer_size;
 	char *write_buffer;
 	// The following is for storing data between event_loop calls
-	uint8_t read_buf_len;
+	uint16_t read_buf_len;
 	uint8_t read_discard;// 1 if the current line is to be discarded
 	char *read_buffer;
 };