New command, if-shell (alias if). Executes the tmux command in the second

argument if the shell command in the first succeeds, for example:

       if "[ -e ~/.tmux.conf.alt ]" "source .tmux.conf.alt"

Written by Tiago Cunha, many thanks.

5 files changed, 194 insertions, 6 deletions

diff --git a/usr.bin/tmux/Makefile b/usr.bin/tmux/Makefile
index 633341dcd02..88bff2ff7ec 100644
--- a/usr.bin/tmux/Makefile
+++ b/usr.bin/tmux/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2009/06/25 07:42:41 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2009/07/09 15:47:49 nicm Exp $
 
 PROG=	tmux
 SRCS=	arg.c attributes.c buffer-poll.c buffer.c cfg.c client-fn.c \
@@ -22,7 +22,7 @@ SRCS=	arg.c attributes.c buffer-poll.c buffer.c cfg.c client-fn.c \
 	cmd-send-prefix.c cmd-server-info.c cmd-set-buffer.c cmd-set-option.c \
 	cmd-set-password.c cmd-set-window-option.c cmd-show-buffer.c \
 	cmd-show-options.c cmd-show-window-options.c cmd-source-file.c \
-	cmd-split-window.c cmd-start-server.c cmd-string.c \
+	cmd-split-window.c cmd-start-server.c cmd-string.c cmd-if-shell.c \
 	cmd-suspend-client.c cmd-swap-pane.c cmd-swap-window.c \
 	cmd-switch-client.c cmd-unbind-key.c cmd-unlink-window.c \
 	cmd-up-pane.c cmd.c colour.c grid-view.c grid.c input-keys.c \
diff --git a/usr.bin/tmux/cmd-if-shell.c b/usr.bin/tmux/cmd-if-shell.c
new file mode 100644
index 00000000000..57a445d43d6
--- /dev/null
+++ b/usr.bin/tmux/cmd-if-shell.c
@@ -0,0 +1,176 @@
+/* $OpenBSD: cmd-if-shell.c,v 1.1 2009/07/09 15:47:49 nicm Exp $ */
+
+/*
+ * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "tmux.h"
+
+/*
+ * Executes a tmux command if a shell command returns true.
+ */
+
+int	cmd_if_shell_parse(struct cmd *, int, char **, char **);
+int	cmd_if_shell_exec(struct cmd *, struct cmd_ctx *);
+void	cmd_if_shell_send(struct cmd *, struct buffer *);
+void	cmd_if_shell_recv(struct cmd *, struct buffer *);
+void	cmd_if_shell_free(struct cmd *);
+void	cmd_if_shell_init(struct cmd *, int);
+size_t	cmd_if_shell_print(struct cmd *, char *, size_t);
+
+struct cmd_if_shell_data {
+	char *cmd;
+	char *sh_cmd;
+};
+
+const struct cmd_entry cmd_if_shell_entry = {
+	"if-shell", "if",
+	"shell-command command",
+	0,
+	cmd_if_shell_init,
+	cmd_if_shell_parse,
+	cmd_if_shell_exec,
+	cmd_if_shell_send,
+	cmd_if_shell_recv,
+	cmd_if_shell_free,
+	cmd_if_shell_print
+};
+
+void
+cmd_if_shell_init(struct cmd *self, unused int arg)
+{
+	struct cmd_if_shell_data	*data;
+
+	self->data = data = xmalloc(sizeof *data);
+	data->cmd = NULL;
+	data->sh_cmd = NULL;
+}
+
+int
+cmd_if_shell_parse(struct cmd *self, int argc, char **argv, char **cause)
+{
+	struct cmd_if_shell_data	*data;
+	int				 opt;
+
+	self->entry->init(self, 0);
+	data = self->data;
+
+	while ((opt = getopt(argc, argv, "")) != -1) {
+		switch (opt) {
+		default:
+			goto usage;
+		}
+	}
+	argc -= optind;
+	argv += optind;
+	if (argc != 2)
+		goto usage;
+
+	data->sh_cmd = xstrdup(argv[0]);
+	data->cmd = xstrdup(argv[1]);
+	return (0);
+
+usage:
+	xasprintf(cause, "usage: %s %s", self->entry->name, self->entry->usage);
+
+	self->entry->free(self);
+	return (-1);
+}
+
+int
+cmd_if_shell_exec(struct cmd *self, struct cmd_ctx *ctx)
+{
+	struct cmd_if_shell_data	*data = self->data;
+	struct cmd_list			*cmdlist;
+	char				*cause;
+	int				 ret;
+
+	if ((ret = system(data->sh_cmd)) < 0) {
+		ctx->error(ctx, "system error: %s", strerror(errno));
+		return (-1);
+	} else if (ret != 0)
+		return (0);
+
+	if (cmd_string_parse(data->cmd, &cmdlist, &cause) != 0) {
+		if (cause != NULL) {
+			ctx->error(ctx, "%s", cause);
+			xfree(cause);
+		}
+		return (-1);
+	}
+
+	if (cmd_list_exec(cmdlist, ctx) < 0) {
+		cmd_list_free(cmdlist);
+		return (-1);
+	}
+
+	cmd_list_free(cmdlist);
+	return (0);
+}
+
+void
+cmd_if_shell_send(struct cmd *self, struct buffer *b)
+{
+	struct cmd_if_shell_data	*data = self->data;
+
+	buffer_write(b, data, sizeof *data);
+	cmd_send_string(b, data->cmd);
+	cmd_send_string(b, data->sh_cmd);
+}
+
+void
+cmd_if_shell_recv(struct cmd *self, struct buffer *b)
+{
+	struct cmd_if_shell_data	*data;
+
+	self->data = data = xmalloc(sizeof *data);
+	buffer_read(b, data, sizeof *data);
+	data->cmd = cmd_recv_string(b);
+	data->sh_cmd = cmd_recv_string(b);
+}
+
+void
+cmd_if_shell_free(struct cmd *self)
+{
+	struct cmd_if_shell_data	*data = self->data;
+
+	if (data->cmd != NULL)
+		xfree(data->cmd);
+	if (data->sh_cmd != NULL)
+		xfree(data->sh_cmd);
+	xfree(data);
+}
+
+size_t
+cmd_if_shell_print(struct cmd *self, char *buf, size_t len)
+{
+	struct cmd_if_shell_data	*data = self->data;
+	size_t				off = 0;
+
+	off += xsnprintf(buf, len, "%s", self->entry->name);
+	if (data == NULL)
+		return (off);
+	if (off < len && data->sh_cmd != NULL)
+		off += cmd_prarg(buf + off, len - off, " ", data->sh_cmd);
+	if (off < len && data->cmd != NULL)
+		off += cmd_prarg(buf + off, len - off, " ", data->cmd);
+	return (off);
+}
diff --git a/usr.bin/tmux/cmd.c b/usr.bin/tmux/cmd.c
index 26c6770d38f..b4cdd0ec5d8 100644
--- a/usr.bin/tmux/cmd.c
+++ b/usr.bin/tmux/cmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd.c,v 1.3 2009/07/07 21:23:22 nicm Exp $ */
+/* $OpenBSD: cmd.c,v 1.4 2009/07/09 15:47:49 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -42,6 +42,7 @@ const struct cmd_entry *cmd_table[] = {
 	&cmd_down_pane_entry,
 	&cmd_find_window_entry,
 	&cmd_has_session_entry,
+	&cmd_if_shell_entry,
 	&cmd_kill_pane_entry,
 	&cmd_kill_server_entry,
 	&cmd_kill_session_entry,
diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1
index 74df1220ae9..ca074e281f2 100644
--- a/usr.bin/tmux/tmux.1
+++ b/usr.bin/tmux/tmux.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.19 2009/07/08 05:26:45 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.20 2009/07/09 15:47:49 nicm Exp $
 .\"
 .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
 .\"
@@ -14,7 +14,7 @@
 .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 8 2009 $
+.Dd $Mdocdate: July 9 2009 $
 .Dt TMUX 1
 .Os
 .Sh NAME
@@ -711,6 +711,16 @@ This command only works from inside
 .D1 (alias: Ic has )
 Report an error and exit with 1 if the specified session does not exist.
 If it does exist, exit with 0.
+.It Xo Ic if-shell
+.Ar shell-command
+.Ar command
+.Xc
+.D1 (alias: Ic if )
+Execute
+.Ar command
+if
+.Ar shell-command
+returns success.
 .It Xo Ic kill-pane
 .Op Fl p Ar pane-index
 .Op Fl t Ar target-window
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index e397b2ae4d0..2b58c031899 100644
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.18 2009/07/09 00:29:32 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.19 2009/07/09 15:47:49 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1101,6 +1101,7 @@ extern const struct cmd_entry cmd_detach_client_entry;
 extern const struct cmd_entry cmd_down_pane_entry;
 extern const struct cmd_entry cmd_find_window_entry;
 extern const struct cmd_entry cmd_has_session_entry;
+extern const struct cmd_entry cmd_if_shell_entry;
 extern const struct cmd_entry cmd_kill_pane_entry;
 extern const struct cmd_entry cmd_kill_server_entry;
 extern const struct cmd_entry cmd_kill_session_entry;