summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--server-client.c6
-rw-r--r--tmux.h2
-rw-r--r--tty.c14
3 files changed, 11 insertions, 11 deletions
diff --git a/server-client.c b/server-client.c
index 4c03de91..09348b05 100644
--- a/server-client.c
+++ b/server-client.c
@@ -96,8 +96,8 @@ server_client_create(int fd)
environ_init(&c->environ);
- c->cwd = -1;
-
+ c->cwd = -1;
+
c->cmdq = cmdq_new(c);
c->cmdq->client_exit = 1;
@@ -1255,7 +1255,7 @@ server_client_msg_identify(struct client *c, struct imsg *imsg)
if (c->fd == -1)
return;
- if (tty_init(&c->tty, c, c->fd, c->term) != 0) {
+ if (tty_init(&c->tty, c, c->fd, c->term) != 0) {
close(c->fd);
c->fd = -1;
return;
diff --git a/tmux.h b/tmux.h
index e082aeab..3aceff9d 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1600,7 +1600,7 @@ void tty_putcode_ptr2(struct tty *, enum tty_code_code, const void *,
void tty_puts(struct tty *, const char *);
void tty_putc(struct tty *, u_char);
void tty_putn(struct tty *, const void *, size_t, u_int);
-int tty_init(struct tty *, struct client *, int, char *);
+int tty_init(struct tty *, struct client *, int, char *);
int tty_resize(struct tty *);
int tty_set_size(struct tty *, u_int, u_int);
void tty_set_class(struct tty *, u_int);
diff --git a/tty.c b/tty.c
index ffb36cb1..374fb8c6 100644
--- a/tty.c
+++ b/tty.c
@@ -59,14 +59,14 @@ void tty_default_colours(struct grid_cell *, const struct window_pane *);
#define tty_pane_full_width(tty, ctx) \
((ctx)->xoff == 0 && screen_size_x((ctx)->wp->screen) >= (tty)->sx)
-int
+int
tty_init(struct tty *tty, struct client *c, int fd, char *term)
{
char *path;
- if (!isatty(fd))
- return (-1);
-
+ if (!isatty(fd))
+ return (-1);
+
memset(tty, 0, sizeof *tty);
tty->log_fd = -1;
@@ -78,15 +78,15 @@ tty_init(struct tty *tty, struct client *c, int fd, char *term)
tty->client = c;
if ((path = ttyname(fd)) == NULL)
- return (-1);
+ return (-1);
tty->path = xstrdup(path);
tty->cstyle = 0;
tty->ccolour = xstrdup("");
tty->flags = 0;
tty->term_flags = 0;
-
- return (0);
+
+ return (0);
}
int