diff options
author | Nicholas Marriott <nicm@openbsd.org> | 2009-07-22 21:58:56 +0000 |
---|---|---|
committer | Nicholas Marriott <nicm@openbsd.org> | 2009-07-22 21:58:56 +0000 |
commit | bb14c36a27d308281af32dfa2e2f9b25d9755537 (patch) | |
tree | 4c6e4406a5919fcbc8c8af9c7c22fe9fd456655c /client.c | |
parent | 5ee84436c8bd77800fc2c04a8c5b20442078cde0 (diff) | |
download | rtmux-bb14c36a27d308281af32dfa2e2f9b25d9755537.tar.gz rtmux-bb14c36a27d308281af32dfa2e2f9b25d9755537.tar.bz2 rtmux-bb14c36a27d308281af32dfa2e2f9b25d9755537.zip |
Pass a set of flags into client_init rather than just a start_server
variable. Only one flag now but more to come later.
Diffstat (limited to 'client.c')
-rw-r--r-- | client.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -36,7 +36,7 @@ void client_handle_winch(struct client_ctx *); int -client_init(char *path, struct client_ctx *cctx, int start_server, int flags) +client_init(char *path, struct client_ctx *cctx, int cmdflags, int flags) { struct sockaddr_un sa; struct stat sb; @@ -53,7 +53,7 @@ client_init(char *path, struct client_ctx *cctx, int start_server, int flags) setproctitle("client (%s)", rpathbuf); if (lstat(path, &sb) != 0) { - if (start_server && errno == ENOENT) { + if (cmdflags & CMD_STARTSERVER && errno == ENOENT) { if ((cctx->srv_fd = server_start(path)) == -1) goto start_failed; goto server_started; @@ -79,7 +79,7 @@ client_init(char *path, struct client_ctx *cctx, int start_server, int flags) if (connect( cctx->srv_fd, (struct sockaddr *) &sa, SUN_LEN(&sa)) == -1) { if (errno == ECONNREFUSED) { - if (unlink(path) != 0 || !start_server) + if (unlink(path) != 0 || !(cmdflags & CMD_STARTSERVER)) goto not_found; if ((cctx->srv_fd = server_start(path)) == -1) goto start_failed; |