github
/
abduco
mirror of https://github.com/martanne/abduco
1
0
Fork 1
Code Issues Releases Wiki Activity

Use more appropriate types

This commit is contained in:
Marc André Tanner 2014-02-25 22:03:55 +01:00
parent 42bcd723bd
commit fcaf5368fa
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
abduco.c
View File

@ -80,7 +80,7 @@ typedef struct {
/* packet sent from server to all clients */ /* packet sent from server to all clients */
typedef struct { typedef struct {
char buf[BUFSIZ]; char buf[BUFSIZ];
ssize_t len; size_t len;
} ServerPacket; } ServerPacket;
typedef struct { typedef struct {
@ -116,9 +116,9 @@ typedef struct {
ServerPacket pty_output; ServerPacket pty_output;
ClientPacketState pty_input; ClientPacketState pty_input;
ClientPacket queue[10]; ClientPacket queue[10];
int queue_count; unsigned int queue_count;
int queue_insert; unsigned int queue_insert;
int queue_remove; unsigned int queue_remove;
int pty; int pty;
int exit_status; int exit_status;
struct termios term; struct termios term;
@ -184,7 +184,7 @@ static int create_socket_dir() {
if (!dir) if (!dir)
dir = "/tmp"; dir = "/tmp";
int len = snprintf(sockaddr.sun_path, maxlen, "%s/.%s/", dir, server.name); int len = snprintf(sockaddr.sun_path, maxlen, "%s/.%s/", dir, server.name);
if (len >= maxlen) if (len < 0 || (size_t)len >= maxlen)
return -1; return -1;
if (mkdir(sockaddr.sun_path, 0750) == -1 && errno != EEXIST) if (mkdir(sockaddr.sun_path, 0750) == -1 && errno != EEXIST)
return -1; return -1;

8
client.c
View File

@ -7,7 +7,7 @@ static void client_sigwinch_handler(int sig) {
static ssize_t write_all(int fd, const char *buf, size_t len) { static ssize_t write_all(int fd, const char *buf, size_t len) {
ssize_t ret = len; ssize_t ret = len;
while (len > 0) { while (len > 0) {
int res = write(fd, buf, len); ssize_t res = write(fd, buf, len);
if (res < 0) { if (res < 0) {
if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR)
continue; continue;
@ -24,7 +24,7 @@ static ssize_t write_all(int fd, const char *buf, size_t len) {
static ssize_t read_all(int fd, char *buf, size_t len) { static ssize_t read_all(int fd, char *buf, size_t len) {
ssize_t ret = len; ssize_t ret = len;
while (len > 0) { while (len > 0) {
int res = read(fd, buf, len); ssize_t res = read(fd, buf, len);
if (res < 0) { if (res < 0) {
if (errno == EWOULDBLOCK) if (errno == EWOULDBLOCK)
return ret - len; return ret - len;
@ -51,9 +51,9 @@ static bool client_send_packet(ClientPacket *pkt) {
} }
static bool client_recv_packet(ServerPacket *pkt) { static bool client_recv_packet(ServerPacket *pkt) {
pkt->len = read_all(server.socket, pkt->buf, sizeof(pkt->buf)); ssize_t len = pkt->len = read_all(server.socket, pkt->buf, sizeof(pkt->buf));
print_server_packet("client-recv:", pkt); print_server_packet("client-recv:", pkt);
if (pkt->len <= 0) { if (len <= 0) {
debug("FAILED\n"); debug("FAILED\n");
server.running = false; server.running = false;
return false; return false;

2
debug.c
View File

@ -35,7 +35,7 @@ static void print_client_packet(const char *prefix, ClientPacket *pkt) {
if (pkt->type == MSG_CONTENT) { if (pkt->type == MSG_CONTENT) {
fprintf(stderr, "%s %s len: %d content: ", prefix, s, pkt->len); fprintf(stderr, "%s %s len: %d content: ", prefix, s, pkt->len);
for (int i = 0; i < pkt->len && i < sizeof(pkt->u.msg); i++) for (size_t i = 0; i < pkt->len && i < sizeof(pkt->u.msg); i++)
fprintf(stderr, "%c", pkt->u.msg[i]); fprintf(stderr, "%c", pkt->u.msg[i]);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} else { } else {

4
server.c
View File

@ -74,7 +74,7 @@ static bool server_recv_packet(Client *c) {
ClientPacketState *pkt = &c->input; ClientPacketState *pkt = &c->input;
if (is_client_packet_complete(pkt)) if (is_client_packet_complete(pkt))
return true; return true;
int count = sizeof(ClientPacket) - pkt->off; size_t count = sizeof(ClientPacket) - pkt->off;
ssize_t len = recv(c->socket, ((char *)&pkt->pkt) + pkt->off, count, 0); ssize_t len = recv(c->socket, ((char *)&pkt->pkt) + pkt->off, count, 0);
switch (len) { switch (len) {
case -1: case -1:
@ -95,7 +95,7 @@ static bool server_send_packet(Client *c) {
ServerPacketState *pkt = &c->output; ServerPacketState *pkt = &c->output;
if (is_server_packet_complete(pkt)) if (is_server_packet_complete(pkt))
return true; return true;
int count = pkt->pkt->len - pkt->off; size_t count = pkt->pkt->len - pkt->off;
ssize_t len = send(c->socket, pkt->pkt->buf + pkt->off, count, 0); ssize_t len = send(c->socket, pkt->pkt->buf + pkt->off, count, 0);
switch (len) { switch (len) {
case -1: case -1: