diff options
author | nicm <nicm> | 2014-01-09 14:05:55 +0000 |
---|---|---|
committer | nicm <nicm> | 2014-01-09 14:05:55 +0000 |
commit | adc1f21eaee899b8ecfdb6ef3676d9a25019e4fa (patch) | |
tree | 54d9a476292b7b41200ffa4cc5216c1b1e5aa28b | |
parent | 994cb872cfb5ef49a08a714d093d92bfee79b0e8 (diff) |
Three small changes from Tiago Cunha:
- Check for truncation when copying path.
- Don't need to use a temporary buffer in screen_set_title.
- Include strerror in output when connecting to server fails.
-rw-r--r-- | client.c | 3 | ||||
-rw-r--r-- | screen.c | 6 | ||||
-rw-r--r-- | tmux.c | 6 |
3 files changed, 8 insertions, 7 deletions
@@ -232,7 +232,8 @@ client_main(int argc, char **argv, int flags) /* Initialise the client socket and start the server. */ fd = client_connect(socket_path, cmdflags & CMD_STARTSERVER); if (fd == -1) { - fprintf(stderr, "failed to connect to server\n"); + fprintf(stderr, "failed to connect to server: %s\n", + strerror(errno)); return (1); } @@ -110,12 +110,8 @@ screen_set_cursor_colour(struct screen *s, const char *colour_string) void screen_set_title(struct screen *s, const char *title) { - char tmp[BUFSIZ]; - - strlcpy(tmp, title, sizeof tmp); - free(s->title); - s->title = xstrdup(tmp); + s->title = xstrdup(title); } /* Resize screen. */ @@ -361,7 +361,11 @@ main(int argc, char **argv) } } free(label); - strlcpy(socket_path, path, sizeof socket_path); + + if (strlcpy(socket_path, path, sizeof socket_path) >= sizeof socket_path) { + fprintf(stderr, "socket path too long: %s\n", path); + exit(1); + } free(path); /* Set process title. */ |