=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty.c,v retrieving revision 1.184 retrieving revision 1.185 diff -c -r1.184 -r1.185 *** src/usr.bin/tmux/tty.c 2015/07/13 15:49:31 1.184 --- src/usr.bin/tmux/tty.c 2015/07/13 15:51:31 1.185 *************** *** 1,4 **** ! /* $OpenBSD: tty.c,v 1.184 2015/07/13 15:49:31 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott --- 1,4 ---- ! /* $OpenBSD: tty.c,v 1.185 2015/07/13 15:51:31 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott *************** *** 59,72 **** #define tty_pane_full_width(tty, ctx) \ ((ctx)->xoff == 0 && screen_size_x((ctx)->wp->screen) >= (tty)->sx) ! int tty_init(struct tty *tty, struct client *c, int fd, char *term) { char *path; ! if (!isatty(fd)) ! return (-1); ! memset(tty, 0, sizeof *tty); tty->log_fd = -1; --- 59,72 ---- #define tty_pane_full_width(tty, ctx) \ ((ctx)->xoff == 0 && screen_size_x((ctx)->wp->screen) >= (tty)->sx) ! int tty_init(struct tty *tty, struct client *c, int fd, char *term) { char *path; ! if (!isatty(fd)) ! return (-1); ! memset(tty, 0, sizeof *tty); tty->log_fd = -1; *************** *** 78,92 **** tty->client = c; if ((path = ttyname(fd)) == NULL) ! return (-1); tty->path = xstrdup(path); tty->cstyle = 0; tty->ccolour = xstrdup(""); tty->flags = 0; tty->term_flags = 0; ! ! return (0); } int --- 78,92 ---- tty->client = c; if ((path = ttyname(fd)) == NULL) ! return (-1); tty->path = xstrdup(path); tty->cstyle = 0; tty->ccolour = xstrdup(""); tty->flags = 0; tty->term_flags = 0; ! ! return (0); } int