diff options
| author |   nicm <nicm@openbsd.org> | 2009-09-02 20:15:49 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2009-09-02 20:15:49 +0000 |
| commit | b818fc224a9e1a231dada8007a8e9c67e4037ffd (patch) | |
| tree | 2d40baa85cf3e7ef7c322d038e71c2b1f8fa8f88 | |
| parent | Set exittype for error exit as well as the error string. (diff) | |
| download | wireguard-openbsd-b818fc224a9e1a231dada8007a8e9c67e4037ffd.tar.xz wireguard-openbsd-b818fc224a9e1a231dada8007a8e9c67e4037ffd.zip | |
That was the wrong fix. MSG_ERROR should set the error and the client should
use the error and exit on MSG_EXIT (it was being handled in the default
case). Undo the last change, move the errstr check into the MSG_EXIT case, and
add a comment.
| -rw-r--r-- | usr.bin/tmux/client.c | 13 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.h | 5 |
2 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/tmux/client.c b/usr.bin/tmux/client.c index adc86d45775..3f64e200067 100644 --- a/usr.bin/tmux/client.c +++ b/usr.bin/tmux/client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: client.c,v 1.15 2009/09/02 20:00:10 nicm Exp $ */ +/* $OpenBSD: client.c,v 1.16 2009/09/02 20:15:49 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -214,16 +214,17 @@ client_main(struct client_ctx *cctx) printf("[server exited]\n"); return (0); case CCTX_EXIT: + if (cctx->errstr != NULL) { + printf("[error: %s]\n", cctx->errstr); + return (1); + } printf("[exited]\n"); return (0); case CCTX_DETACH: printf("[detached]\n"); return (0); - case CCTX_ERROR: - printf("[error: %s]\n", cctx->errstr); - return (1); default: - printf("[error: unknown error]\n"); + printf("[unknown error]\n"); return (1); } } @@ -277,8 +278,8 @@ client_msg_dispatch(struct client_ctx *cctx) memcpy(&printdata, imsg.data, sizeof printdata); printdata.msg[(sizeof printdata.msg) - 1] = '\0'; + /* Error string used after exit message from server. */ cctx->errstr = xstrdup(printdata.msg); - cctx->exittype = CCTX_ERROR; imsg_free(&imsg); return (-1); case MSG_EXIT: diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index 7d36f59a03d..69013fb3fed 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.97 2009/09/02 20:00:10 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.98 2009/09/02 20:15:49 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -973,8 +973,7 @@ struct client_ctx { CCTX_DETACH, CCTX_EXIT, CCTX_DIED, - CCTX_SHUTDOWN, - CCTX_ERROR + CCTX_SHUTDOWN } exittype; const char *errstr; }; |