From a9e2410d469049f35715a4732e1cb6ccfc4bf507 Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Thu, 28 Nov 2019 01:01:35 -0500 Subject: nserve: Add ncmd.h * nserver/src/nserve.c (sanitize, check_cmd): Move functions ... * nserver/src/ncmd.c (sanitize, check_cmd): ... here. * nserver/src/nserve.h (CMD_MIN_SIZE, CMD_MAX_SIZE): Move constants... * nserver/src/ncmd.h (CMD_MIN_SIZE, CMD_MAX_SIZE): ... here. (sanitize, check_cmd): New function declarations. --- nserver/src/nserve.c | 42 ------------------------------------------ 1 file changed, 42 deletions(-) (limited to 'nserver/src/nserve.c') diff --git a/nserver/src/nserve.c b/nserver/src/nserve.c index 316fdd1..8008562 100644 --- a/nserver/src/nserve.c +++ b/nserver/src/nserve.c @@ -25,48 +25,6 @@ int barfsock(char *buf, size_t buf_sz, int sock) return -1; } -int sanitize(char *cmd) -{ - check(cmd != NULL, "cmd is NULL"); - - size_t len = strlen(cmd); - check(len > 0, "cmd empty"); - - // strip newline character at the end. - cmd[len - 1] = '\0'; - - return 0; - error: - return -1; -} - -char *check_cmd(char *cmd) -{ - char *err = NULL; - - check(cmd != NULL, "cmd is NULL"); - - int rc = sanitize(cmd); - check(rc != -1, "sanitize failed"); - - size_t len = strlen(cmd); - if (len >= CMD_MIN_SIZE && len <= CMD_MAX_SIZE) { - return NULL; - } - - if (len == 0) { - err = "closing connection\n"; - } else { - err = "command size invalid\n"; - } - - return err; - error: - err = "internal error\n"; - return err; -} - - void nserve(int sock) { size_t cmd_sz = 200; -- cgit v1.2.3