diff options
Diffstat (limited to 'src/socket.c')
| -rw-r--r-- | src/socket.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/socket.c b/src/socket.c index 8cb8680..48c0d00 100644 --- a/src/socket.c +++ b/src/socket.c @@ -40,13 +40,13 @@ static int runes_socket_open(RunesSocket *sock) struct sockaddr_un server; if (strlen(sock->name) + 1 > MAX_SOCKET_PATH_LEN) { - runes_die("socket path %s is too long\n", sock->name); + runes_die("socket path %s is too long", sock->name); } dir = strdup(sock->name); slash = strrchr(dir, '/'); if (slash == NULL) { - runes_die("socket path %s must be an absolute path\n", sock->name); + runes_die("socket path %s must be an absolute path", sock->name); } *slash = '\0'; runes_mkdir_p(dir); @@ -56,23 +56,23 @@ static int runes_socket_open(RunesSocket *sock) s = socket(AF_UNIX, SOCK_STREAM, 0); if (s < 0) { - runes_die("couldn't create socket: %s\n", strerror(errno)); + runes_die("couldn't create socket: %s", strerror(errno)); } server.sun_family = AF_UNIX; strcpy(server.sun_path, sock->name); if (bind(s, (struct sockaddr*)(&server), sizeof(struct sockaddr_un))) { - runes_die("couldn't bind to socket %s: %s\n", sock->name, + runes_die("couldn't bind to socket %s: %s", sock->name, strerror(errno)); } if (chmod(sock->name, S_IRUSR|S_IWUSR)) { - runes_die("couldn't chmod socket %s: %s\n", sock->name, + runes_die("couldn't chmod socket %s: %s", sock->name, strerror(errno)); } if (listen(s, 5)) { - runes_die("couldn't listen on socket %s: %s\n", sock->name, + runes_die("couldn't listen on socket %s: %s", sock->name, strerror(errno)); } @@ -107,7 +107,7 @@ static int runes_socket_handle_request(RunesTerm *t) bytes = recv(sock->client_sock, (void*)(&argc), sizeof(argc), 0); if (bytes < (int)sizeof(argc)) { - runes_warn("invalid message received: got %d bytes, expected 4\n", + runes_warn("invalid message received: got %d bytes, expected 4", bytes); close(sock->client_sock); return 1; @@ -115,7 +115,7 @@ static int runes_socket_handle_request(RunesTerm *t) argc = ntohl(argc); if (argc > 1024) { - runes_warn("invalid message received: argc = %d, must be < 1024\n", + runes_warn("invalid message received: argc = %d, must be < 1024", argc); close(sock->client_sock); return 1; @@ -124,7 +124,7 @@ static int runes_socket_handle_request(RunesTerm *t) bytes = recv(sock->client_sock, (void*)(&argv_len), sizeof(argv_len), 0); if (bytes < (int)sizeof(argc)) { - runes_warn("invalid message received: got %d bytes, expected 4\n", + runes_warn("invalid message received: got %d bytes, expected 4", bytes); close(sock->client_sock); free(argv); @@ -133,7 +133,7 @@ static int runes_socket_handle_request(RunesTerm *t) argv_len = ntohl(argv_len); if (argv_len > 131072) { - runes_warn("invalid message received: argv_len = %d, must be < %d\n", + runes_warn("invalid message received: argv_len = %d, must be < %d", argv_len, 131072); close(sock->client_sock); free(argv); @@ -143,7 +143,7 @@ static int runes_socket_handle_request(RunesTerm *t) bytes = recv(sock->client_sock, argv_buf, argv_len, 0); if (bytes < argv_len) { - runes_warn("invalid message received: got %d bytes, expected %d\n", + runes_warn("invalid message received: got %d bytes, expected %d", bytes, argv_len); close(sock->client_sock); free(argv); @@ -162,12 +162,12 @@ static int runes_socket_handle_request(RunesTerm *t) char *next_null; if (offset >= argv_len) { - runes_die("args in argv_buf don't match argc of %d\n", argc); + runes_die("args in argv_buf don't match argc of %d", argc); } argv[i] = argv_buf + offset; next_null = memchr(argv_buf + offset, '\0', argv_len - offset); if (!next_null) { - runes_die("args in argv_buf don't match argc of %d\n", argc); + runes_die("args in argv_buf don't match argc of %d", argc); } offset = next_null - argv_buf + 1; } |