diff options
| author |   nicm <nicm@openbsd.org> | 2012-05-25 08:28:10 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2012-05-25 08:28:10 +0000 |
| commit | 36fa31729f10eccba67112ecba28e5a0418a2a09 (patch) | |
| tree | efbdbe1d6a5ce86e908aa6ca98583765a60241dd /usr.bin/tmux/client.c | |
| parent | defaultdomain now read by rc, not netstart; from Chad Gross (diff) | |
| download | wireguard-openbsd-36fa31729f10eccba67112ecba28e5a0418a2a09.tar.xz wireguard-openbsd-36fa31729f10eccba67112ecba28e5a0418a2a09.zip | |
Simplify logging and just fprintf(stderr, ...) for early errors.
Diffstat (limited to 'usr.bin/tmux/client.c')
| -rw-r--r-- | usr.bin/tmux/client.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/tmux/client.c b/usr.bin/tmux/client.c index ffbf4e2b481..1e6338d560e 100644 --- a/usr.bin/tmux/client.c +++ b/usr.bin/tmux/client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: client.c,v 1.54 2012/05/21 18:27:42 nicm Exp $ */ +/* $OpenBSD: client.c,v 1.55 2012/05/25 08:28:10 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -209,15 +209,15 @@ client_main(int argc, char **argv, int flags) if (shell_cmd == NULL && environ_path != NULL && (cmdflags & CMD_CANTNEST) && strcmp(socket_path, environ_path) == 0) { - log_warnx("sessions should be nested with care. " - "unset $TMUX to force."); + fprintf(stderr, "sessions should be nested with care, " + "unset $TMUX to force\n"); return (1); } /* Initialise the client socket and start the server. */ fd = client_connect(socket_path, cmdflags & CMD_STARTSERVER); if (fd == -1) { - log_warn("failed to connect to server"); + fprintf(stderr, "failed to connect to server\n"); return (1); } @@ -252,7 +252,7 @@ client_main(int argc, char **argv, int flags) cmddata.argc = argc; if (cmd_pack_argv( argc, argv, cmddata.argv, sizeof cmddata.argv) != 0) { - log_warnx("command too long"); + fprintf(stderr, "command too long\n"); return (1); } @@ -538,7 +538,7 @@ client_dispatch_attached(void) return (0); datalen = imsg.hdr.len - IMSG_HEADER_SIZE; - log_debug("client got %d", imsg.hdr.type); + log_debug("got %d from server", imsg.hdr.type); switch (imsg.hdr.type) { case MSG_DETACHKILL: case MSG_DETACH: |