circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-04 06:56:58 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 166:

Browse Source 
Pass a set of flags into client_init rather than just a start_server
variable. Only one flag now but more to come later.
This commit is contained in:
Tiago Cunha
2009-07-23 13:15:41 +00:00
parent 6708ad19c5
commit 7174c76bf0
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tmux.c
View File

@ -1,4 +1,4 @@
/* $Id: tmux.c,v 1.148 2009-07-22 16:53:30 tcunha Exp $ */
/* $Id: tmux.c,v 1.149 2009-07-23 13:15:41 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -222,7 +222,7 @@ main(int argc, char **argv)
struct passwd *pw;
char *s, *path, *label, *cause, *home, *pass = NULL;
char cwd[MAXPATHLEN];
int retcode, opt, flags, unlock, start_server;
int retcode, opt, flags, unlock, cmdflags = 0;
unlock = flags = 0;
label = path = NULL;
@ -399,7 +399,7 @@ main(int argc, char **argv)
cmdlist = NULL;
if ((pass = getpass("Password: ")) == NULL)
exit(1);
start_server = 0;
cmdflags &= ~CMD_STARTSERVER;
} else {
if (argc == 0) {
cmd = xmalloc(sizeof *cmd);
@ -416,17 +416,16 @@ main(int argc, char **argv)
exit(1);
}
}
start_server = 0;
TAILQ_FOREACH(cmd, cmdlist, qentry) {
if (cmd->entry->flags & CMD_STARTSERVER) {
start_server = 1;
cmdflags |= CMD_STARTSERVER;
break;
}
}
}
memset(&cctx, 0, sizeof cctx);
if (client_init(path, &cctx, start_server, flags) != 0)
if (client_init(path, &cctx, cmdflags, flags) != 0)
exit(1);
xfree(path);