From 08e6360f23284c9e2e521cb466002bdd9350a63d Mon Sep 17 00:00:00 2001 From: nicm Date: Sat, 21 Aug 2021 10:22:38 +0000 Subject: [PATCH] Add args parsing callback for some future work, currently unused. --- cmd-attach-session.c | 2 +- cmd-bind-key.c | 2 +- cmd-break-pane.c | 2 +- cmd-capture-pane.c | 4 ++-- cmd-choose-tree.c | 8 ++++---- cmd-command-prompt.c | 2 +- cmd-confirm-before.c | 2 +- cmd-copy-mode.c | 4 ++-- cmd-detach-client.c | 4 ++-- cmd-display-menu.c | 4 ++-- cmd-display-message.c | 2 +- cmd-display-panes.c | 2 +- cmd-find-window.c | 2 +- cmd-if-shell.c | 2 +- cmd-join-pane.c | 4 ++-- cmd-kill-pane.c | 2 +- cmd-kill-server.c | 4 ++-- cmd-kill-session.c | 2 +- cmd-kill-window.c | 4 ++-- cmd-list-buffers.c | 2 +- cmd-list-clients.c | 2 +- cmd-list-keys.c | 4 ++-- cmd-list-panes.c | 2 +- cmd-list-sessions.c | 2 +- cmd-list-windows.c | 2 +- cmd-load-buffer.c | 2 +- cmd-lock-server.c | 6 +++--- cmd-move-window.c | 4 ++-- cmd-new-session.c | 4 ++-- cmd-new-window.c | 2 +- cmd-paste-buffer.c | 2 +- cmd-pipe-pane.c | 2 +- cmd-refresh-client.c | 2 +- cmd-rename-session.c | 2 +- cmd-rename-window.c | 2 +- cmd-resize-pane.c | 2 +- cmd-resize-window.c | 2 +- cmd-respawn-pane.c | 2 +- cmd-respawn-window.c | 2 +- cmd-rotate-window.c | 2 +- cmd-run-shell.c | 2 +- cmd-save-buffer.c | 4 ++-- cmd-select-layout.c | 6 +++--- cmd-select-pane.c | 4 ++-- cmd-select-window.c | 8 ++++---- cmd-send-keys.c | 4 ++-- cmd-set-buffer.c | 4 ++-- cmd-set-environment.c | 2 +- cmd-set-option.c | 6 +++--- cmd-show-environment.c | 2 +- cmd-show-messages.c | 2 +- cmd-show-options.c | 6 +++--- cmd-show-prompt-history.c | 4 ++-- cmd-source-file.c | 2 +- cmd-split-window.c | 2 +- cmd-swap-pane.c | 2 +- cmd-swap-window.c | 2 +- cmd-switch-client.c | 2 +- cmd-unbind-key.c | 2 +- cmd-wait-for.c | 2 +- tmux.h | 2 ++ 61 files changed, 91 insertions(+), 89 deletions(-) diff --git a/cmd-attach-session.c b/cmd-attach-session.c index c2074f4fc1..cc795b222b 100644 --- a/cmd-attach-session.c +++ b/cmd-attach-session.c @@ -37,7 +37,7 @@ const struct cmd_entry cmd_attach_session_entry = { .name = "attach-session", .alias = "attach", - .args = { "c:dEf:rt:x", 0, 0 }, + .args = { "c:dEf:rt:x", 0, 0, NULL }, .usage = "[-dErx] [-c working-directory] [-f flags] " CMD_TARGET_SESSION_USAGE, diff --git a/cmd-bind-key.c b/cmd-bind-key.c index 87dd3cf7cd..a16d054eba 100644 --- a/cmd-bind-key.c +++ b/cmd-bind-key.c @@ -33,7 +33,7 @@ const struct cmd_entry cmd_bind_key_entry = { .name = "bind-key", .alias = "bind", - .args = { "nrN:T:", 1, -1 }, + .args = { "nrN:T:", 1, -1, NULL }, .usage = "[-nr] [-T key-table] [-N note] key " "[command [arguments]]", diff --git a/cmd-break-pane.c b/cmd-break-pane.c index 4c436405e1..4f38d4bd9c 100644 --- a/cmd-break-pane.c +++ b/cmd-break-pane.c @@ -34,7 +34,7 @@ const struct cmd_entry cmd_break_pane_entry = { .name = "break-pane", .alias = "breakp", - .args = { "abdPF:n:s:t:", 0, 0 }, + .args = { "abdPF:n:s:t:", 0, 0, NULL }, .usage = "[-abdP] [-F format] [-n window-name] [-s src-pane] " "[-t dst-window]", diff --git a/cmd-capture-pane.c b/cmd-capture-pane.c index 6f37bc8fa1..964f831e34 100644 --- a/cmd-capture-pane.c +++ b/cmd-capture-pane.c @@ -39,7 +39,7 @@ const struct cmd_entry cmd_capture_pane_entry = { .name = "capture-pane", .alias = "capturep", - .args = { "ab:CeE:JNpPqS:t:", 0, 0 }, + .args = { "ab:CeE:JNpPqS:t:", 0, 0, NULL }, .usage = "[-aCeJNpPq] " CMD_BUFFER_USAGE " [-E end-line] " "[-S start-line] " CMD_TARGET_PANE_USAGE, @@ -53,7 +53,7 @@ const struct cmd_entry cmd_clear_history_entry = { .name = "clear-history", .alias = "clearhist", - .args = { "t:", 0, 0 }, + .args = { "t:", 0, 0, NULL }, .usage = CMD_TARGET_PANE_USAGE, .target = { 't', CMD_FIND_PANE, 0 }, diff --git a/cmd-choose-tree.c b/cmd-choose-tree.c index 81209ee395..9258f36685 100644 --- a/cmd-choose-tree.c +++ b/cmd-choose-tree.c @@ -30,7 +30,7 @@ const struct cmd_entry cmd_choose_tree_entry = { .name = "choose-tree", .alias = NULL, - .args = { "F:f:GK:NO:rst:wZ", 0, 1 }, + .args = { "F:f:GK:NO:rst:wZ", 0, 1, NULL }, .usage = "[-GNrswZ] [-F format] [-f filter] [-K key-format] " "[-O sort-order] " CMD_TARGET_PANE_USAGE " [template]", @@ -44,7 +44,7 @@ const struct cmd_entry cmd_choose_client_entry = { .name = "choose-client", .alias = NULL, - .args = { "F:f:K:NO:rt:Z", 0, 1 }, + .args = { "F:f:K:NO:rt:Z", 0, 1, NULL }, .usage = "[-NrZ] [-F format] [-f filter] [-K key-format] " "[-O sort-order] " CMD_TARGET_PANE_USAGE " [template]", @@ -58,7 +58,7 @@ const struct cmd_entry cmd_choose_buffer_entry = { .name = "choose-buffer", .alias = NULL, - .args = { "F:f:K:NO:rt:Z", 0, 1 }, + .args = { "F:f:K:NO:rt:Z", 0, 1, NULL }, .usage = "[-NrZ] [-F format] [-f filter] [-K key-format] " "[-O sort-order] " CMD_TARGET_PANE_USAGE " [template]", @@ -72,7 +72,7 @@ const struct cmd_entry cmd_customize_mode_entry = { .name = "customize-mode", .alias = NULL, - .args = { "F:f:Nt:Z", 0, 0 }, + .args = { "F:f:Nt:Z", 0, 0, NULL }, .usage = "[-NZ] [-F format] [-f filter] " CMD_TARGET_PANE_USAGE, .target = { 't', CMD_FIND_PANE, 0 }, diff --git a/cmd-command-prompt.c b/cmd-command-prompt.c index 25ec68174d..f80760ce20 100644 --- a/cmd-command-prompt.c +++ b/cmd-command-prompt.c @@ -40,7 +40,7 @@ const struct cmd_entry cmd_command_prompt_entry = { .name = "command-prompt", .alias = NULL, - .args = { "1bFkiI:Np:t:T:", 0, 1 }, + .args = { "1bFkiI:Np:t:T:", 0, 1, NULL }, .usage = "[-1bFkiN] [-I inputs] [-p prompts] " CMD_TARGET_CLIENT_USAGE " [-T type] [template]", diff --git a/cmd-confirm-before.c b/cmd-confirm-before.c index 9f179aaf4b..580c379a36 100644 --- a/cmd-confirm-before.c +++ b/cmd-confirm-before.c @@ -39,7 +39,7 @@ const struct cmd_entry cmd_confirm_before_entry = { .name = "confirm-before", .alias = "confirm", - .args = { "bp:t:", 1, 1 }, + .args = { "bp:t:", 1, 1, NULL }, .usage = "[-b] [-p prompt] " CMD_TARGET_CLIENT_USAGE " command", .flags = CMD_CLIENT_TFLAG, diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c index d8b4fd3efa..8f698ce846 100644 --- a/cmd-copy-mode.c +++ b/cmd-copy-mode.c @@ -30,7 +30,7 @@ const struct cmd_entry cmd_copy_mode_entry = { .name = "copy-mode", .alias = NULL, - .args = { "eHMs:t:uq", 0, 0 }, + .args = { "eHMs:t:uq", 0, 0, NULL }, .usage = "[-eHMuq] [-s src-pane] " CMD_TARGET_PANE_USAGE, .source = { 's', CMD_FIND_PANE, 0 }, @@ -44,7 +44,7 @@ const struct cmd_entry cmd_clock_mode_entry = { .name = "clock-mode", .alias = NULL, - .args = { "t:", 0, 0 }, + .args = { "t:", 0, 0, NULL }, .usage = CMD_TARGET_PANE_USAGE, .target = { 't', CMD_FIND_PANE, 0 }, diff --git a/cmd-detach-client.c b/cmd-detach-client.c index 02a43f4e46..661293aead 100644 --- a/cmd-detach-client.c +++ b/cmd-detach-client.c @@ -33,7 +33,7 @@ const struct cmd_entry cmd_detach_client_entry = { .name = "detach-client", .alias = "detach", - .args = { "aE:s:t:P", 0, 0 }, + .args = { "aE:s:t:P", 0, 0, NULL }, .usage = "[-aP] [-E shell-command] " "[-s target-session] " CMD_TARGET_CLIENT_USAGE, @@ -47,7 +47,7 @@ const struct cmd_entry cmd_suspend_client_entry = { .name = "suspend-client", .alias = "suspendc", - .args = { "t:", 0, 0 }, + .args = { "t:", 0, 0, NULL }, .usage = CMD_TARGET_CLIENT_USAGE, .flags = CMD_CLIENT_TFLAG, diff --git a/cmd-display-menu.c b/cmd-display-menu.c index a8eda0d2d8..b80f8d46f1 100644 --- a/cmd-display-menu.c +++ b/cmd-display-menu.c @@ -37,7 +37,7 @@ const struct cmd_entry cmd_display_menu_entry = { .name = "display-menu", .alias = "menu", - .args = { "c:t:OT:x:y:", 1, -1 }, + .args = { "c:t:OT:x:y:", 1, -1, NULL }, .usage = "[-O] [-c target-client] " CMD_TARGET_PANE_USAGE " [-T title] " "[-x position] [-y position] name key command ...", @@ -51,7 +51,7 @@ const struct cmd_entry cmd_display_popup_entry = { .name = "display-popup", .alias = "popup", - .args = { "BCc:d:Eh:t:w:x:y:", 0, -1 }, + .args = { "BCc:d:Eh:t:w:x:y:", 0, -1, NULL }, .usage = "[-BCE] [-c target-client] [-d start-directory] [-h height] " CMD_TARGET_PANE_USAGE " [-w width] " "[-x position] [-y position] [command]", diff --git a/cmd-display-message.c b/cmd-display-message.c index f4d41e6cfc..596f0b5c13 100644 --- a/cmd-display-message.c +++ b/cmd-display-message.c @@ -39,7 +39,7 @@ const struct cmd_entry cmd_display_message_entry = { .name = "display-message", .alias = "display", - .args = { "ac:d:INpt:F:v", 0, 1 }, + .args = { "ac:d:INpt:F:v", 0, 1, NULL }, .usage = "[-aINpv] [-c target-client] [-d delay] [-F format] " CMD_TARGET_PANE_USAGE " [message]", diff --git a/cmd-display-panes.c b/cmd-display-panes.c index 59484872b9..bc17163839 100644 --- a/cmd-display-panes.c +++ b/cmd-display-panes.c @@ -34,7 +34,7 @@ const struct cmd_entry cmd_display_panes_entry = { .name = "display-panes", .alias = "displayp", - .args = { "bd:Nt:", 0, 1 }, + .args = { "bd:Nt:", 0, 1, NULL }, .usage = "[-bN] [-d duration] " CMD_TARGET_CLIENT_USAGE " [template]", .flags = CMD_AFTERHOOK|CMD_CLIENT_TFLAG, diff --git a/cmd-find-window.c b/cmd-find-window.c index 691baf859c..804e8fe44b 100644 --- a/cmd-find-window.c +++ b/cmd-find-window.c @@ -32,7 +32,7 @@ const struct cmd_entry cmd_find_window_entry = { .name = "find-window", .alias = "findw", - .args = { "CiNrt:TZ", 1, 1 }, + .args = { "CiNrt:TZ", 1, 1, NULL }, .usage = "[-CiNrTZ] " CMD_TARGET_PANE_USAGE " match-string", .target = { 't', CMD_FIND_PANE, 0 }, diff --git a/cmd-if-shell.c b/cmd-if-shell.c index df06a0b6f6..28e9b5d1e1 100644 --- a/cmd-if-shell.c +++ b/cmd-if-shell.c @@ -38,7 +38,7 @@ const struct cmd_entry cmd_if_shell_entry = { .name = "if-shell", .alias = "if", - .args = { "bFt:", 2, 3 }, + .args = { "bFt:", 2, 3, NULL }, .usage = "[-bF] " CMD_TARGET_PANE_USAGE " shell-command command " "[command]", diff --git a/cmd-join-pane.c b/cmd-join-pane.c index 3d3f0ac856..f7f16a4e19 100644 --- a/cmd-join-pane.c +++ b/cmd-join-pane.c @@ -36,7 +36,7 @@ const struct cmd_entry cmd_join_pane_entry = { .name = "join-pane", .alias = "joinp", - .args = { "bdfhvp:l:s:t:", 0, 0 }, + .args = { "bdfhvp:l:s:t:", 0, 0, NULL }, .usage = "[-bdfhv] [-l size] " CMD_SRCDST_PANE_USAGE, .source = { 's', CMD_FIND_PANE, CMD_FIND_DEFAULT_MARKED }, @@ -50,7 +50,7 @@ const struct cmd_entry cmd_move_pane_entry = { .name = "move-pane", .alias = "movep", - .args = { "bdfhvp:l:s:t:", 0, 0 }, + .args = { "bdfhvp:l:s:t:", 0, 0, NULL }, .usage = "[-bdfhv] [-l size] " CMD_SRCDST_PANE_USAGE, .source = { 's', CMD_FIND_PANE, CMD_FIND_DEFAULT_MARKED }, diff --git a/cmd-kill-pane.c b/cmd-kill-pane.c index 3bf6e26e24..e1134a1ee2 100644 --- a/cmd-kill-pane.c +++ b/cmd-kill-pane.c @@ -32,7 +32,7 @@ const struct cmd_entry cmd_kill_pane_entry = { .name = "kill-pane", .alias = "killp", - .args = { "at:", 0, 0 }, + .args = { "at:", 0, 0, NULL }, .usage = "[-a] " CMD_TARGET_PANE_USAGE, .target = { 't', CMD_FIND_PANE, 0 }, diff --git a/cmd-kill-server.c b/cmd-kill-server.c index 76bcf267e6..7bb79e3d4f 100644 --- a/cmd-kill-server.c +++ b/cmd-kill-server.c @@ -33,7 +33,7 @@ const struct cmd_entry cmd_kill_server_entry = { .name = "kill-server", .alias = NULL, - .args = { "", 0, 0 }, + .args = { "", 0, 0, NULL }, .usage = "", .flags = 0, @@ -44,7 +44,7 @@ const struct cmd_entry cmd_start_server_entry = { .name = "start-server", .alias = "start", - .args = { "", 0, 0 }, + .args = { "", 0, 0, NULL }, .usage = "", .flags = CMD_STARTSERVER, diff --git a/cmd-kill-session.c b/cmd-kill-session.c index c10efba613..19a8d49524 100644 --- a/cmd-kill-session.c +++ b/cmd-kill-session.c @@ -33,7 +33,7 @@ const struct cmd_entry cmd_kill_session_entry = { .name = "kill-session", .alias = NULL, - .args = { "aCt:", 0, 0 }, + .args = { "aCt:", 0, 0, NULL }, .usage = "[-aC] " CMD_TARGET_SESSION_USAGE, .target = { 't', CMD_FIND_SESSION, 0 }, diff --git a/cmd-kill-window.c b/cmd-kill-window.c index 430f667e2c..f5ff05f84a 100644 --- a/cmd-kill-window.c +++ b/cmd-kill-window.c @@ -30,7 +30,7 @@ const struct cmd_entry cmd_kill_window_entry = { .name = "kill-window", .alias = "killw", - .args = { "at:", 0, 0 }, + .args = { "at:", 0, 0, NULL }, .usage = "[-a] " CMD_TARGET_WINDOW_USAGE, .target = { 't', CMD_FIND_WINDOW, 0 }, @@ -43,7 +43,7 @@ const struct cmd_entry cmd_unlink_window_entry = { .name = "unlink-window", .alias = "unlinkw", - .args = { "kt:", 0, 0 }, + .args = { "kt:", 0, 0, NULL }, .usage = "[-k] " CMD_TARGET_WINDOW_USAGE, .target = { 't', CMD_FIND_WINDOW, 0 }, diff --git a/cmd-list-buffers.c b/cmd-list-buffers.c index 45d5a4ee12..8b12f0b376 100644 --- a/cmd-list-buffers.c +++ b/cmd-list-buffers.c @@ -36,7 +36,7 @@ const struct cmd_entry cmd_list_buffers_entry = { .name = "list-buffers", .alias = "lsb", - .args = { "F:f:", 0, 0 }, + .args = { "F:f:", 0, 0, NULL }, .usage = "[-F format] [-f filter]", .flags = CMD_AFTERHOOK, diff --git a/cmd-list-clients.c b/cmd-list-clients.c index d450f017a9..a5b7d1475f 100644 --- a/cmd-list-clients.c +++ b/cmd-list-clients.c @@ -39,7 +39,7 @@ const struct cmd_entry cmd_list_clients_entry = { .name = "list-clients", .alias = "lsc", - .args = { "F:t:", 0, 0 }, + .args = { "F:t:", 0, 0, NULL }, .usage = "[-F format] " CMD_TARGET_SESSION_USAGE, .target = { 't', CMD_FIND_SESSION, 0 }, diff --git a/cmd-list-keys.c b/cmd-list-keys.c index 1484af6d28..ae9f995c1b 100644 --- a/cmd-list-keys.c +++ b/cmd-list-keys.c @@ -36,7 +36,7 @@ const struct cmd_entry cmd_list_keys_entry = { .name = "list-keys", .alias = "lsk", - .args = { "1aNP:T:", 0, 1 }, + .args = { "1aNP:T:", 0, 1, NULL }, .usage = "[-1aN] [-P prefix-string] [-T key-table] [key]", .flags = CMD_STARTSERVER|CMD_AFTERHOOK, @@ -47,7 +47,7 @@ const struct cmd_entry cmd_list_commands_entry = { .name = "list-commands", .alias = "lscm", - .args = { "F:", 0, 1 }, + .args = { "F:", 0, 1, NULL }, .usage = "[-F format] [command]", .flags = CMD_STARTSERVER|CMD_AFTERHOOK, diff --git a/cmd-list-panes.c b/cmd-list-panes.c index c6dcff2337..a29a40328e 100644 --- a/cmd-list-panes.c +++ b/cmd-list-panes.c @@ -38,7 +38,7 @@ const struct cmd_entry cmd_list_panes_entry = { .name = "list-panes", .alias = "lsp", - .args = { "asF:f:t:", 0, 0 }, + .args = { "asF:f:t:", 0, 0, NULL }, .usage = "[-as] [-F format] [-f filter] " CMD_TARGET_WINDOW_USAGE, .target = { 't', CMD_FIND_WINDOW, 0 }, diff --git a/cmd-list-sessions.c b/cmd-list-sessions.c index fbc3db1d10..e448524e53 100644 --- a/cmd-list-sessions.c +++ b/cmd-list-sessions.c @@ -42,7 +42,7 @@ const struct cmd_entry cmd_list_sessions_entry = { .name = "list-sessions", .alias = "ls", - .args = { "F:f:", 0, 0 }, + .args = { "F:f:", 0, 0, NULL }, .usage = "[-F format] [-f filter]", .flags = CMD_AFTERHOOK, diff --git a/cmd-list-windows.c b/cmd-list-windows.c index d6cc0b7acd..035471d48c 100644 --- a/cmd-list-windows.c +++ b/cmd-list-windows.c @@ -49,7 +49,7 @@ const struct cmd_entry cmd_list_windows_entry = { .name = "list-windows", .alias = "lsw", - .args = { "F:f:at:", 0, 0 }, + .args = { "F:f:at:", 0, 0, NULL }, .usage = "[-a] [-F format] [-f filter] " CMD_TARGET_SESSION_USAGE, .target = { 't', CMD_FIND_SESSION, 0 }, diff --git a/cmd-load-buffer.c b/cmd-load-buffer.c index 318a7467af..59810dea24 100644 --- a/cmd-load-buffer.c +++ b/cmd-load-buffer.c @@ -37,7 +37,7 @@ const struct cmd_entry cmd_load_buffer_entry = { .name = "load-buffer", .alias = "loadb", - .args = { "b:t:w", 1, 1 }, + .args = { "b:t:w", 1, 1, NULL }, .usage = CMD_BUFFER_USAGE " " CMD_TARGET_CLIENT_USAGE " path", .flags = CMD_AFTERHOOK|CMD_CLIENT_TFLAG|CMD_CLIENT_CANFAIL, diff --git a/cmd-lock-server.c b/cmd-lock-server.c index a0df95b031..bd61dcffd0 100644 --- a/cmd-lock-server.c +++ b/cmd-lock-server.c @@ -30,7 +30,7 @@ const struct cmd_entry cmd_lock_server_entry = { .name = "lock-server", .alias = "lock", - .args = { "", 0, 0 }, + .args = { "", 0, 0, NULL }, .usage = "", .flags = CMD_AFTERHOOK, @@ -41,7 +41,7 @@ const struct cmd_entry cmd_lock_session_entry = { .name = "lock-session", .alias = "locks", - .args = { "t:", 0, 0 }, + .args = { "t:", 0, 0, NULL }, .usage = CMD_TARGET_SESSION_USAGE, .target = { 't', CMD_FIND_SESSION, 0 }, @@ -54,7 +54,7 @@ const struct cmd_entry cmd_lock_client_entry = { .name = "lock-client", .alias = "lockc", - .args = { "t:", 0, 0 }, + .args = { "t:", 0, 0, NULL }, .usage = CMD_TARGET_CLIENT_USAGE, .flags = CMD_AFTERHOOK|CMD_CLIENT_TFLAG, diff --git a/cmd-move-window.c b/cmd-move-window.c index 61128771bb..4b90e70f86 100644 --- a/cmd-move-window.c +++ b/cmd-move-window.c @@ -32,7 +32,7 @@ const struct cmd_entry cmd_move_window_entry = { .name = "move-window", .alias = "movew", - .args = { "abdkrs:t:", 0, 0 }, + .args = { "abdkrs:t:", 0, 0, NULL }, .usage = "[-abdkr] " CMD_SRCDST_WINDOW_USAGE, .source = { 's', CMD_FIND_WINDOW, 0 }, @@ -46,7 +46,7 @@ const struct cmd_entry cmd_link_window_entry = { .name = "link-window", .alias = "linkw", - .args = { "abdks:t:", 0, 0 }, + .args = { "abdks:t:", 0, 0, NULL }, .usage = "[-abdk] " CMD_SRCDST_WINDOW_USAGE, .source = { 's', CMD_FIND_WINDOW, 0 }, diff --git a/cmd-new-session.c b/cmd-new-session.c index 0cc6b9da02..83e3f2998c 100644 --- a/cmd-new-session.c +++ b/cmd-new-session.c @@ -39,7 +39,7 @@ const struct cmd_entry cmd_new_session_entry = { .name = "new-session", .alias = "new", - .args = { "Ac:dDe:EF:f:n:Ps:t:x:Xy:", 0, -1 }, + .args = { "Ac:dDe:EF:f:n:Ps:t:x:Xy:", 0, -1, NULL }, .usage = "[-AdDEPX] [-c start-directory] [-e environment] [-F format] " "[-f flags] [-n window-name] [-s session-name] " CMD_TARGET_SESSION_USAGE " [-x width] [-y height] [command]", @@ -54,7 +54,7 @@ const struct cmd_entry cmd_has_session_entry = { .name = "has-session", .alias = "has", - .args = { "t:", 0, 0 }, + .args = { "t:", 0, 0, NULL }, .usage = CMD_TARGET_SESSION_USAGE, .target = { 't', CMD_FIND_SESSION, 0 }, diff --git a/cmd-new-window.c b/cmd-new-window.c index f24de8e98c..208cd88036 100644 --- a/cmd-new-window.c +++ b/cmd-new-window.c @@ -38,7 +38,7 @@ const struct cmd_entry cmd_new_window_entry = { .name = "new-window", .alias = "neww", - .args = { "abc:de:F:kn:PSt:", 0, -1 }, + .args = { "abc:de:F:kn:PSt:", 0, -1, NULL }, .usage = "[-abdkPS] [-c start-directory] [-e environment] [-F format] " "[-n window-name] " CMD_TARGET_WINDOW_USAGE " [command]", diff --git a/cmd-paste-buffer.c b/cmd-paste-buffer.c index 22fa8bd51f..28d4a8cccb 100644 --- a/cmd-paste-buffer.c +++ b/cmd-paste-buffer.c @@ -34,7 +34,7 @@ const struct cmd_entry cmd_paste_buffer_entry = { .name = "paste-buffer", .alias = "pasteb", - .args = { "db:prs:t:", 0, 0 }, + .args = { "db:prs:t:", 0, 0, NULL }, .usage = "[-dpr] [-s separator] " CMD_BUFFER_USAGE " " CMD_TARGET_PANE_USAGE, diff --git a/cmd-pipe-pane.c b/cmd-pipe-pane.c index d1917bc63b..ed08e61888 100644 --- a/cmd-pipe-pane.c +++ b/cmd-pipe-pane.c @@ -44,7 +44,7 @@ const struct cmd_entry cmd_pipe_pane_entry = { .name = "pipe-pane", .alias = "pipep", - .args = { "IOot:", 0, 1 }, + .args = { "IOot:", 0, 1, NULL }, .usage = "[-IOo] " CMD_TARGET_PANE_USAGE " [shell-command]", .target = { 't', CMD_FIND_PANE, 0 }, diff --git a/cmd-refresh-client.c b/cmd-refresh-client.c index 938450249f..026bee029f 100644 --- a/cmd-refresh-client.c +++ b/cmd-refresh-client.c @@ -34,7 +34,7 @@ const struct cmd_entry cmd_refresh_client_entry = { .name = "refresh-client", .alias = "refresh", - .args = { "A:B:cC:Df:F:lLRSt:U", 0, 1 }, + .args = { "A:B:cC:Df:F:lLRSt:U", 0, 1, NULL }, .usage = "[-cDlLRSU] [-A pane:state] [-B name:what:format] " "[-C XxY] [-f flags] " CMD_TARGET_CLIENT_USAGE " [adjustment]", diff --git a/cmd-rename-session.c b/cmd-rename-session.c index 8ec070bf0a..694f3c97fa 100644 --- a/cmd-rename-session.c +++ b/cmd-rename-session.c @@ -34,7 +34,7 @@ const struct cmd_entry cmd_rename_session_entry = { .name = "rename-session", .alias = "rename", - .args = { "t:", 1, 1 }, + .args = { "t:", 1, 1, NULL }, .usage = CMD_TARGET_SESSION_USAGE " new-name", .target = { 't', CMD_FIND_SESSION, 0 }, diff --git a/cmd-rename-window.c b/cmd-rename-window.c index 66c119f25f..472b571ba1 100644 --- a/cmd-rename-window.c +++ b/cmd-rename-window.c @@ -33,7 +33,7 @@ const struct cmd_entry cmd_rename_window_entry = { .name = "rename-window", .alias = "renamew", - .args = { "t:", 1, 1 }, + .args = { "t:", 1, 1, NULL }, .usage = CMD_TARGET_WINDOW_USAGE " new-name", .target = { 't', CMD_FIND_WINDOW, 0 }, diff --git a/cmd-resize-pane.c b/cmd-resize-pane.c index 98d500db6a..9395b379cd 100644 --- a/cmd-resize-pane.c +++ b/cmd-resize-pane.c @@ -36,7 +36,7 @@ const struct cmd_entry cmd_resize_pane_entry = { .name = "resize-pane", .alias = "resizep", - .args = { "DLMRTt:Ux:y:Z", 0, 1 }, + .args = { "DLMRTt:Ux:y:Z", 0, 1, NULL }, .usage = "[-DLMRTUZ] [-x width] [-y height] " CMD_TARGET_PANE_USAGE " " "[adjustment]", diff --git a/cmd-resize-window.c b/cmd-resize-window.c index 3e33f77189..8389230b6e 100644 --- a/cmd-resize-window.c +++ b/cmd-resize-window.c @@ -33,7 +33,7 @@ const struct cmd_entry cmd_resize_window_entry = { .name = "resize-window", .alias = "resizew", - .args = { "aADLRt:Ux:y:", 0, 1 }, + .args = { "aADLRt:Ux:y:", 0, 1, NULL }, .usage = "[-aADLRU] [-x width] [-y height] " CMD_TARGET_WINDOW_USAGE " " "[adjustment]", diff --git a/cmd-respawn-pane.c b/cmd-respawn-pane.c index 14f9abf2a3..3d8d1c034a 100644 --- a/cmd-respawn-pane.c +++ b/cmd-respawn-pane.c @@ -34,7 +34,7 @@ const struct cmd_entry cmd_respawn_pane_entry = { .name = "respawn-pane", .alias = "respawnp", - .args = { "c:e:kt:", 0, -1 }, + .args = { "c:e:kt:", 0, -1, NULL }, .usage = "[-k] [-c start-directory] [-e environment] " CMD_TARGET_PANE_USAGE " [command]", diff --git a/cmd-respawn-window.c b/cmd-respawn-window.c index 25288bade9..51ef209e62 100644 --- a/cmd-respawn-window.c +++ b/cmd-respawn-window.c @@ -34,7 +34,7 @@ const struct cmd_entry cmd_respawn_window_entry = { .name = "respawn-window", .alias = "respawnw", - .args = { "c:e:kt:", 0, -1 }, + .args = { "c:e:kt:", 0, -1, NULL }, .usage = "[-k] [-c start-directory] [-e environment] " CMD_TARGET_WINDOW_USAGE " [command]", diff --git a/cmd-rotate-window.c b/cmd-rotate-window.c index 450ffc17ad..0e2ed852de 100644 --- a/cmd-rotate-window.c +++ b/cmd-rotate-window.c @@ -31,7 +31,7 @@ const struct cmd_entry cmd_rotate_window_entry = { .name = "rotate-window", .alias = "rotatew", - .args = { "Dt:UZ", 0, 0 }, + .args = { "Dt:UZ", 0, 0, NULL }, .usage = "[-DUZ] " CMD_TARGET_WINDOW_USAGE, .target = { 't', CMD_FIND_WINDOW, 0 }, diff --git a/cmd-run-shell.c b/cmd-run-shell.c index a0115f0ada..207e47103a 100644 --- a/cmd-run-shell.c +++ b/cmd-run-shell.c @@ -41,7 +41,7 @@ const struct cmd_entry cmd_run_shell_entry = { .name = "run-shell", .alias = "run", - .args = { "bd:Ct:", 0, 1 }, + .args = { "bd:Ct:", 0, 1, NULL }, .usage = "[-bC] [-d delay] " CMD_TARGET_PANE_USAGE " [shell-command]", .target = { 't', CMD_FIND_PANE, CMD_FIND_CANFAIL }, diff --git a/cmd-save-buffer.c b/cmd-save-buffer.c index f897af24c8..513181e101 100644 --- a/cmd-save-buffer.c +++ b/cmd-save-buffer.c @@ -38,7 +38,7 @@ const struct cmd_entry cmd_save_buffer_entry = { .name = "save-buffer", .alias = "saveb", - .args = { "ab:", 1, 1 }, + .args = { "ab:", 1, 1, NULL }, .usage = "[-a] " CMD_BUFFER_USAGE " path", .flags = CMD_AFTERHOOK, @@ -49,7 +49,7 @@ const struct cmd_entry cmd_show_buffer_entry = { .name = "show-buffer", .alias = "showb", - .args = { "b:", 0, 0 }, + .args = { "b:", 0, 0, NULL }, .usage = CMD_BUFFER_USAGE, .flags = CMD_AFTERHOOK, diff --git a/cmd-select-layout.c b/cmd-select-layout.c index f9a2904704..c857a0e1c3 100644 --- a/cmd-select-layout.c +++ b/cmd-select-layout.c @@ -33,7 +33,7 @@ const struct cmd_entry cmd_select_layout_entry = { .name = "select-layout", .alias = "selectl", - .args = { "Enopt:", 0, 1 }, + .args = { "Enopt:", 0, 1, NULL }, .usage = "[-Enop] " CMD_TARGET_PANE_USAGE " [layout-name]", .target = { 't', CMD_FIND_PANE, 0 }, @@ -46,7 +46,7 @@ const struct cmd_entry cmd_next_layout_entry = { .name = "next-layout", .alias = "nextl", - .args = { "t:", 0, 0 }, + .args = { "t:", 0, 0, NULL }, .usage = CMD_TARGET_WINDOW_USAGE, .target = { 't', CMD_FIND_WINDOW, 0 }, @@ -59,7 +59,7 @@ const struct cmd_entry cmd_previous_layout_entry = { .name = "previous-layout", .alias = "prevl", - .args = { "t:", 0, 0 }, + .args = { "t:", 0, 0, NULL }, .usage = CMD_TARGET_WINDOW_USAGE, .target = { 't', CMD_FIND_WINDOW, 0 }, diff --git a/cmd-select-pane.c b/cmd-select-pane.c index c5b4ee1355..ae21d4ce6c 100644 --- a/cmd-select-pane.c +++ b/cmd-select-pane.c @@ -33,7 +33,7 @@ const struct cmd_entry cmd_select_pane_entry = { .name = "select-pane", .alias = "selectp", - .args = { "DdegLlMmP:RT:t:UZ", 0, 0 }, /* -P and -g deprecated */ + .args = { "DdegLlMmP:RT:t:UZ", 0, 0, NULL }, /* -P and -g deprecated */ .usage = "[-DdeLlMmRUZ] [-T title] " CMD_TARGET_PANE_USAGE, .target = { 't', CMD_FIND_PANE, 0 }, @@ -46,7 +46,7 @@ const struct cmd_entry cmd_last_pane_entry = { .name = "last-pane", .alias = "lastp", - .args = { "det:Z", 0, 0 }, + .args = { "det:Z", 0, 0, NULL }, .usage = "[-deZ] " CMD_TARGET_WINDOW_USAGE, .target = { 't', CMD_FIND_WINDOW, 0 }, diff --git a/cmd-select-window.c b/cmd-select-window.c index 8dd358b078..4aca3e60e5 100644 --- a/cmd-select-window.c +++ b/cmd-select-window.c @@ -33,7 +33,7 @@ const struct cmd_entry cmd_select_window_entry = { .name = "select-window", .alias = "selectw", - .args = { "lnpTt:", 0, 0 }, + .args = { "lnpTt:", 0, 0, NULL }, .usage = "[-lnpT] " CMD_TARGET_WINDOW_USAGE, .target = { 't', CMD_FIND_WINDOW, 0 }, @@ -46,7 +46,7 @@ const struct cmd_entry cmd_next_window_entry = { .name = "next-window", .alias = "next", - .args = { "at:", 0, 0 }, + .args = { "at:", 0, 0, NULL }, .usage = "[-a] " CMD_TARGET_SESSION_USAGE, .target = { 't', CMD_FIND_SESSION, 0 }, @@ -59,7 +59,7 @@ const struct cmd_entry cmd_previous_window_entry = { .name = "previous-window", .alias = "prev", - .args = { "at:", 0, 0 }, + .args = { "at:", 0, 0, NULL }, .usage = "[-a] " CMD_TARGET_SESSION_USAGE, .target = { 't', CMD_FIND_SESSION, 0 }, @@ -72,7 +72,7 @@ const struct cmd_entry cmd_last_window_entry = { .name = "last-window", .alias = "last", - .args = { "t:", 0, 0 }, + .args = { "t:", 0, 0, NULL }, .usage = CMD_TARGET_SESSION_USAGE, .target = { 't', CMD_FIND_SESSION, 0 }, diff --git a/cmd-send-keys.c b/cmd-send-keys.c index 351bd9191e..44b796ba97 100644 --- a/cmd-send-keys.c +++ b/cmd-send-keys.c @@ -33,7 +33,7 @@ const struct cmd_entry cmd_send_keys_entry = { .name = "send-keys", .alias = "send", - .args = { "FHlMN:Rt:X", 0, -1 }, + .args = { "FHlMN:Rt:X", 0, -1, NULL }, .usage = "[-FHlMRX] [-N repeat-count] " CMD_TARGET_PANE_USAGE " key ...", @@ -47,7 +47,7 @@ const struct cmd_entry cmd_send_prefix_entry = { .name = "send-prefix", .alias = NULL, - .args = { "2t:", 0, 0 }, + .args = { "2t:", 0, 0, NULL }, .usage = "[-2] " CMD_TARGET_PANE_USAGE, .target = { 't', CMD_FIND_PANE, 0 }, diff --git a/cmd-set-buffer.c b/cmd-set-buffer.c index 3005e62d40..9112683fc0 100644 --- a/cmd-set-buffer.c +++ b/cmd-set-buffer.c @@ -33,7 +33,7 @@ const struct cmd_entry cmd_set_buffer_entry = { .name = "set-buffer", .alias = "setb", - .args = { "ab:t:n:w", 0, 1 }, + .args = { "ab:t:n:w", 0, 1, NULL }, .usage = "[-aw] " CMD_BUFFER_USAGE " [-n new-buffer-name] " CMD_TARGET_CLIENT_USAGE " data", @@ -45,7 +45,7 @@ const struct cmd_entry cmd_delete_buffer_entry = { .name = "delete-buffer", .alias = "deleteb", - .args = { "b:", 0, 0 }, + .args = { "b:", 0, 0, NULL }, .usage = CMD_BUFFER_USAGE, .flags = CMD_AFTERHOOK, diff --git a/cmd-set-environment.c b/cmd-set-environment.c index e60240a867..cec1f3e3cb 100644 --- a/cmd-set-environment.c +++ b/cmd-set-environment.c @@ -34,7 +34,7 @@ const struct cmd_entry cmd_set_environment_entry = { .name = "set-environment", .alias = "setenv", - .args = { "Fhgrt:u", 1, 2 }, + .args = { "Fhgrt:u", 1, 2, NULL }, .usage = "[-Fhgru] " CMD_TARGET_SESSION_USAGE " name [value]", .target = { 't', CMD_FIND_SESSION, CMD_FIND_CANFAIL }, diff --git a/cmd-set-option.c b/cmd-set-option.c index 48e04eedda..8839dc0d09 100644 --- a/cmd-set-option.c +++ b/cmd-set-option.c @@ -33,7 +33,7 @@ const struct cmd_entry cmd_set_option_entry = { .name = "set-option", .alias = "set", - .args = { "aFgopqst:uUw", 1, 2 }, + .args = { "aFgopqst:uUw", 1, 2, NULL }, .usage = "[-aFgopqsuUw] " CMD_TARGET_PANE_USAGE " option [value]", .target = { 't', CMD_FIND_PANE, CMD_FIND_CANFAIL }, @@ -46,7 +46,7 @@ const struct cmd_entry cmd_set_window_option_entry = { .name = "set-window-option", .alias = "setw", - .args = { "aFgoqt:u", 1, 2 }, + .args = { "aFgoqt:u", 1, 2, NULL }, .usage = "[-aFgoqu] " CMD_TARGET_WINDOW_USAGE " option [value]", .target = { 't', CMD_FIND_WINDOW, CMD_FIND_CANFAIL }, @@ -59,7 +59,7 @@ const struct cmd_entry cmd_set_hook_entry = { .name = "set-hook", .alias = NULL, - .args = { "agpRt:uw", 1, 2 }, + .args = { "agpRt:uw", 1, 2, NULL }, .usage = "[-agpRuw] " CMD_TARGET_PANE_USAGE " hook [command]", .target = { 't', CMD_FIND_PANE, CMD_FIND_CANFAIL }, diff --git a/cmd-show-environment.c b/cmd-show-environment.c index 7ea1aeec4f..b52db3668d 100644 --- a/cmd-show-environment.c +++ b/cmd-show-environment.c @@ -38,7 +38,7 @@ const struct cmd_entry cmd_show_environment_entry = { .name = "show-environment", .alias = "showenv", - .args = { "hgst:", 0, 1 }, + .args = { "hgst:", 0, 1, NULL }, .usage = "[-hgs] " CMD_TARGET_SESSION_USAGE " [name]", .target = { 't', CMD_FIND_SESSION, CMD_FIND_CANFAIL }, diff --git a/cmd-show-messages.c b/cmd-show-messages.c index ef5acf441b..64a4670e6a 100644 --- a/cmd-show-messages.c +++ b/cmd-show-messages.c @@ -40,7 +40,7 @@ const struct cmd_entry cmd_show_messages_entry = { .name = "show-messages", .alias = "showmsgs", - .args = { "JTt:", 0, 0 }, + .args = { "JTt:", 0, 0, NULL }, .usage = "[-JT] " CMD_TARGET_CLIENT_USAGE, .flags = CMD_AFTERHOOK|CMD_CLIENT_TFLAG, diff --git a/cmd-show-options.c b/cmd-show-options.c index 4d0acb42da..bdcd3e78b5 100644 --- a/cmd-show-options.c +++ b/cmd-show-options.c @@ -39,7 +39,7 @@ const struct cmd_entry cmd_show_options_entry = { .name = "show-options", .alias = "show", - .args = { "AgHpqst:vw", 0, 1 }, + .args = { "AgHpqst:vw", 0, 1, NULL }, .usage = "[-AgHpqsvw] " CMD_TARGET_PANE_USAGE " [option]", .target = { 't', CMD_FIND_PANE, CMD_FIND_CANFAIL }, @@ -52,7 +52,7 @@ const struct cmd_entry cmd_show_window_options_entry = { .name = "show-window-options", .alias = "showw", - .args = { "gvt:", 0, 1 }, + .args = { "gvt:", 0, 1, NULL }, .usage = "[-gv] " CMD_TARGET_WINDOW_USAGE " [option]", .target = { 't', CMD_FIND_WINDOW, CMD_FIND_CANFAIL }, @@ -65,7 +65,7 @@ const struct cmd_entry cmd_show_hooks_entry = { .name = "show-hooks", .alias = NULL, - .args = { "gpt:w", 0, 1 }, + .args = { "gpt:w", 0, 1, NULL }, .usage = "[-gpw] " CMD_TARGET_PANE_USAGE, .target = { 't', CMD_FIND_PANE, CMD_FIND_CANFAIL }, diff --git a/cmd-show-prompt-history.c b/cmd-show-prompt-history.c index 2091ac9d54..c85950b0a4 100644 --- a/cmd-show-prompt-history.c +++ b/cmd-show-prompt-history.c @@ -31,7 +31,7 @@ const struct cmd_entry cmd_show_prompt_history_entry = { .name = "show-prompt-history", .alias = "showphist", - .args = { "T:", 0, 0 }, + .args = { "T:", 0, 0, NULL }, .usage = "[-T type]", .flags = CMD_AFTERHOOK, @@ -42,7 +42,7 @@ const struct cmd_entry cmd_clear_prompt_history_entry = { .name = "clear-prompt-history", .alias = "clearphist", - .args = { "T:", 0, 0 }, + .args = { "T:", 0, 0, NULL }, .usage = "[-T type]", .flags = CMD_AFTERHOOK, diff --git a/cmd-source-file.c b/cmd-source-file.c index edc66c3fc5..63e1b28c4c 100644 --- a/cmd-source-file.c +++ b/cmd-source-file.c @@ -36,7 +36,7 @@ const struct cmd_entry cmd_source_file_entry = { .name = "source-file", .alias = "source", - .args = { "Fnqv", 1, -1 }, + .args = { "Fnqv", 1, -1, NULL }, .usage = "[-Fnqv] path ...", .flags = 0, diff --git a/cmd-split-window.c b/cmd-split-window.c index baf753276b..30a361dfce 100644 --- a/cmd-split-window.c +++ b/cmd-split-window.c @@ -40,7 +40,7 @@ const struct cmd_entry cmd_split_window_entry = { .name = "split-window", .alias = "splitw", - .args = { "bc:de:fF:hIl:p:Pt:vZ", 0, -1 }, + .args = { "bc:de:fF:hIl:p:Pt:vZ", 0, -1, NULL }, .usage = "[-bdefhIPvZ] [-c start-directory] [-e environment] " "[-F format] [-l size] " CMD_TARGET_PANE_USAGE " [command]", diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c index 12bc20b45b..7d47773975 100644 --- a/cmd-swap-pane.c +++ b/cmd-swap-pane.c @@ -32,7 +32,7 @@ const struct cmd_entry cmd_swap_pane_entry = { .name = "swap-pane", .alias = "swapp", - .args = { "dDs:t:UZ", 0, 0 }, + .args = { "dDs:t:UZ", 0, 0, NULL }, .usage = "[-dDUZ] " CMD_SRCDST_PANE_USAGE, .source = { 's', CMD_FIND_PANE, CMD_FIND_DEFAULT_MARKED }, diff --git a/cmd-swap-window.c b/cmd-swap-window.c index 651a44dae3..b765112b57 100644 --- a/cmd-swap-window.c +++ b/cmd-swap-window.c @@ -32,7 +32,7 @@ const struct cmd_entry cmd_swap_window_entry = { .name = "swap-window", .alias = "swapw", - .args = { "ds:t:", 0, 0 }, + .args = { "ds:t:", 0, 0, NULL }, .usage = "[-d] " CMD_SRCDST_WINDOW_USAGE, .source = { 's', CMD_FIND_WINDOW, CMD_FIND_DEFAULT_MARKED }, diff --git a/cmd-switch-client.c b/cmd-switch-client.c index bc6baa6adb..dc1b621a80 100644 --- a/cmd-switch-client.c +++ b/cmd-switch-client.c @@ -34,7 +34,7 @@ const struct cmd_entry cmd_switch_client_entry = { .name = "switch-client", .alias = "switchc", - .args = { "lc:EFnpt:rT:Z", 0, 0 }, + .args = { "lc:EFnpt:rT:Z", 0, 0, NULL }, .usage = "[-ElnprZ] [-c target-client] [-t target-session] " "[-T key-table]", diff --git a/cmd-unbind-key.c b/cmd-unbind-key.c index 202a07f43e..6d91d7cca1 100644 --- a/cmd-unbind-key.c +++ b/cmd-unbind-key.c @@ -32,7 +32,7 @@ const struct cmd_entry cmd_unbind_key_entry = { .name = "unbind-key", .alias = "unbind", - .args = { "anqT:", 0, 1 }, + .args = { "anqT:", 0, 1, NULL }, .usage = "[-anq] [-T key-table] key", .flags = CMD_AFTERHOOK, diff --git a/cmd-wait-for.c b/cmd-wait-for.c index 027700b491..8a6aa259e6 100644 --- a/cmd-wait-for.c +++ b/cmd-wait-for.c @@ -34,7 +34,7 @@ const struct cmd_entry cmd_wait_for_entry = { .name = "wait-for", .alias = "wait", - .args = { "LSU", 1, 1 }, + .args = { "LSU", 1, 1, NULL }, .usage = "[-L|-S|-U] channel", .flags = 0, diff --git a/tmux.h b/tmux.h index 43881c1d44..af3e3a84da 100644 --- a/tmux.h +++ b/tmux.h @@ -1366,10 +1366,12 @@ struct args_entry; RB_HEAD(args_tree, args_entry); /* Arguments parsing state. */ +typedef enum args_type (*args_parse_cb)(struct args *, u_int); struct args_parse { const char *template; int lower; int upper; + args_parse_cb cb; }; /* Command find structures. */