diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2009-01-18 14:40:48 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2009-01-18 14:40:48 +0000 |
| commit | a15f8fc4a66420615d237313c6a01fcf532c52a2 (patch) | |
| tree | 751d858639e20ae413ec907f7cf3215c06e3820d /cmd-new-window.c | |
| parent | c4d5989a4ef03db0477446ee004ef431be268286 (diff) | |
Support command sequences separated by " ; ". Also clean up command printing.
Diffstat (limited to 'cmd-new-window.c')
| -rw-r--r-- | cmd-new-window.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/cmd-new-window.c b/cmd-new-window.c index 2dad77e8..25a1fb21 100644 --- a/cmd-new-window.c +++ b/cmd-new-window.c @@ -1,4 +1,4 @@ -/* $Id: cmd-new-window.c,v 1.27 2009-01-10 19:37:35 nicm Exp $ */ +/* $Id: cmd-new-window.c,v 1.28 2009-01-18 14:40:48 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -32,7 +32,7 @@ void cmd_new_window_send(struct cmd *, struct buffer *); void cmd_new_window_recv(struct cmd *, struct buffer *); void cmd_new_window_free(struct cmd *); void cmd_new_window_init(struct cmd *, int); -void cmd_new_window_print(struct cmd *, char *, size_t); +size_t cmd_new_window_print(struct cmd *, char *, size_t); struct cmd_new_window_data { char *target; @@ -194,7 +194,7 @@ cmd_new_window_free(struct cmd *self) xfree(data); } -void +size_t cmd_new_window_print(struct cmd *self, char *buf, size_t len) { struct cmd_new_window_data *data = self->data; @@ -202,13 +202,14 @@ cmd_new_window_print(struct cmd *self, char *buf, size_t len) off += xsnprintf(buf, len, "%s", self->entry->name); if (data == NULL) - return; + return (off); if (off < len && data->flag_detached) off += xsnprintf(buf + off, len - off, " -d"); if (off < len && data->target != NULL) - off += xsnprintf(buf + off, len - off, " -t %s", data->target); + off += cmd_prarg(buf + off, len - off, " -t ", data->target); if (off < len && data->name != NULL) - off += xsnprintf(buf + off, len - off, " -n %s", data->name); + off += cmd_prarg(buf + off, len - off, " -n ", data->name); if (off < len && data->cmd != NULL) - off += xsnprintf(buf + off, len - off, " %s", data->cmd); + off += cmd_prarg(buf + off, len - off, " ", data->cmd); + return (off); } |