summaryrefslogtreecommitdiff
path: root/usr.bin/tmux/tmux.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2009-12-03 22:50:11 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2009-12-03 22:50:11 +0000
commitba1906c0f6cde1edffbb454483a9ecebb8942c71 (patch)
tree27dbb1919efa0b7aff52529186b13715775f2eea /usr.bin/tmux/tmux.c
parent01c66e11a4a92cc38c58979c53c9f0b385d4f2c4 (diff)
Massive spaces->tabs and trailing whitespace cleanup, hopefully for the last
time now I've configured emacs to make them displayed in really annoying colours...
Diffstat (limited to 'usr.bin/tmux/tmux.c')
-rw-r--r--usr.bin/tmux/tmux.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c
index 43288117c00..15ad3379382 100644
--- a/usr.bin/tmux/tmux.c
+++ b/usr.bin/tmux/tmux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.61 2009/11/26 21:37:13 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.62 2009/12/03 22:50:10 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -219,7 +219,7 @@ int
main(int argc, char **argv)
{
struct cmd_list *cmdlist;
- struct cmd *cmd;
+ struct cmd *cmd;
enum msgtype msg;
struct passwd *pw;
struct options *so, *wo;
@@ -311,7 +311,7 @@ main(int argc, char **argv)
}
environ_init(&global_environ);
- for (var = environ; *var != NULL; var++)
+ for (var = environ; *var != NULL; var++)
environ_put(&global_environ, *var);
options_init(&global_s_options, NULL);
@@ -394,10 +394,10 @@ main(int argc, char **argv)
options_set_string(wo, "window-status-format", "#I:#W#F");
options_set_string(wo, "window-status-current-format", "#I:#W#F");
options_set_number(wo, "xterm-keys", 0);
- options_set_number(wo, "remain-on-exit", 0);
+ options_set_number(wo, "remain-on-exit", 0);
options_set_number(wo, "synchronize-panes", 0);
- if (flags & IDENTIFY_UTF8) {
+ if (flags & IDENTIFY_UTF8) {
options_set_number(so, "status-utf8", 1);
options_set_number(wo, "utf8", 1);
} else {
@@ -432,7 +432,7 @@ main(int argc, char **argv)
exit(1);
}
}
-
+
if (label == NULL)
label = xstrdup("default");
if (path == NULL && (path = makesockpath(label)) == NULL) {
@@ -447,14 +447,14 @@ main(int argc, char **argv)
len = 0;
} else {
fill_session(&cmddata);
-
+
cmddata.argc = argc;
if (cmd_pack_argv(
argc, argv, cmddata.argv, sizeof cmddata.argv) != 0) {
log_warnx("command too long");
exit(1);
}
-
+
msg = MSG_COMMAND;
buf = &cmddata;
len = sizeof cmddata;
@@ -490,7 +490,7 @@ main(int argc, char **argv)
event_init();
- imsg_compose(main_ibuf, msg, PROTOCOL_VERSION, -1, -1, buf, len);
+ imsg_compose(main_ibuf, msg, PROTOCOL_VERSION, -1, -1, buf, len);
main_set_signals();
@@ -526,7 +526,7 @@ main_set_signals(void)
fatal("sigaction failed");
if (sigaction(SIGTSTP, &sigact, NULL) != 0)
fatal("sigaction failed");
-
+
signal_set(&main_ev_sigterm, SIGTERM, main_signal, NULL);
signal_add(&main_ev_sigterm, NULL);
}
@@ -550,7 +550,7 @@ main_clear_signals(void)
fatal("sigaction failed");
if (sigaction(SIGTSTP, &sigact, NULL) != 0)
fatal("sigaction failed");
-
+
event_del(&main_ev_sigterm);
}
@@ -572,7 +572,7 @@ main_callback(unused int fd, short events, void *data)
if (events & EV_READ)
main_dispatch(shellcmd);
-
+
if (events & EV_WRITE) {
if (msgbuf_write(&main_ibuf->w) < 0)
fatalx("msgbuf_write failed");