OpenBSD CVS

CVS log for src/usr.bin/tmux/cmd-source-file.c


[BACK] Up to [local] / src / usr.bin / tmux

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.54 / (download) - annotate - [select for diffs], Fri Sep 15 06:31:49 2023 UTC (8 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, OPENBSD_7_4_BASE, OPENBSD_7_4, HEAD
Changes since 1.53: +7 -4 lines
Diff to previous 1.53 (colored)

Add -t to source-file, GitHub issue 3473.

Revision 1.53 / (download) - annotate - [select for diffs], Mon Aug 23 11:04:21 2021 UTC (2 years, 8 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_7_3_BASE, OPENBSD_7_3, OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1, OPENBSD_7_0_BASE, OPENBSD_7_0
Changes since 1.52: +6 -1 lines
Diff to previous 1.52 (colored)

Fix a few memory leaks.

Revision 1.52 / (download) - annotate - [select for diffs], Sun Aug 22 13:48:29 2021 UTC (2 years, 8 months ago) by nicm
Branch: MAIN
Changes since 1.51: +2 -2 lines
Diff to previous 1.51 (colored)

Do not double free expanded path in source-file, also remove some
unnecessary assignments.

Revision 1.51 / (download) - annotate - [select for diffs], Sat Aug 21 10:22:39 2021 UTC (2 years, 8 months ago) by nicm
Branch: MAIN
Changes since 1.50: +2 -2 lines
Diff to previous 1.50 (colored)

Add args parsing callback for some future work, currently unused.

Revision 1.50 / (download) - annotate - [select for diffs], Fri Aug 20 19:50:17 2021 UTC (2 years, 8 months ago) by nicm
Branch: MAIN
Changes since 1.49: +11 -11 lines
Diff to previous 1.49 (colored)

Hide struct args behind a couple of accessor functions.

Revision 1.49 / (download) - annotate - [select for diffs], Thu Jun 10 07:53:19 2021 UTC (2 years, 11 months ago) by nicm
Branch: MAIN
Changes since 1.48: +4 -2 lines
Diff to previous 1.48 (colored)

Do not use NULL client when source-file finishes, GitHub issue 2707.

Revision 1.48 / (download) - annotate - [select for diffs], Tue Sep 1 09:19:01 2020 UTC (3 years, 8 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_9_BASE, OPENBSD_6_9, OPENBSD_6_8_BASE, OPENBSD_6_8
Changes since 1.47: +11 -5 lines
Diff to previous 1.47 (colored)

Add -F to set-environment and source-file; GitHub issue 2359.

Revision 1.47 / (download) - annotate - [select for diffs], Mon Apr 13 10:59:58 2020 UTC (4 years, 1 month ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_7_BASE, OPENBSD_6_7
Changes since 1.46: +2 -2 lines
Diff to previous 1.46 (colored)

Also move cmdq_item and cmdq_list into cmd-queue.c (this is to make its
use more clearly defined and preparation for some future work).

Revision 1.46 / (download) - annotate - [select for diffs], Mon Apr 13 08:26:27 2020 UTC (4 years, 1 month ago) by nicm
Branch: MAIN
Changes since 1.45: +2 -2 lines
Diff to previous 1.45 (colored)

Make struct cmd local to cmd.c and move it out of tmux.h.

Revision 1.45 / (download) - annotate - [select for diffs], Sat Dec 21 17:30:48 2019 UTC (4 years, 4 months ago) by tim
Branch: MAIN
Changes since 1.44: +2 -3 lines
Diff to previous 1.44 (colored)

Restore source-file -q behaviour, broken in r1.42; OK nicm@

Revision 1.44 / (download) - annotate - [select for diffs], Thu Dec 19 09:22:33 2019 UTC (4 years, 5 months ago) by nicm
Branch: MAIN
Changes since 1.43: +2 -1 lines
Diff to previous 1.43 (colored)

When adding a list with multiple commands to the queue, the next item to
insert after needs to be the last one added, not the first. Reported by
Jason Kim in GitHub issue 2023.

Revision 1.43 / (download) - annotate - [select for diffs], Wed Dec 18 07:48:56 2019 UTC (4 years, 5 months ago) by nicm
Branch: MAIN
Changes since 1.42: +11 -5 lines
Diff to previous 1.42 (colored)

Do not rely on errno after glob(3) fails.

Revision 1.42 / (download) - annotate - [select for diffs], Thu Dec 12 12:49:36 2019 UTC (4 years, 5 months ago) by nicm
Branch: MAIN
Changes since 1.41: +110 -39 lines
Diff to previous 1.41 (colored)

Change source-file to use new file code which allows it to read from
stdin.

Revision 1.41 / (download) - annotate - [select for diffs], Wed Jun 5 20:00:53 2019 UTC (4 years, 11 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_6_BASE, OPENBSD_6_6
Changes since 1.40: +5 -3 lines
Diff to previous 1.40 (colored)

Add a -v flag to source-file to show the commands and line numbers.

Revision 1.40 / (download) - annotate - [select for diffs], Tue May 28 12:20:28 2019 UTC (4 years, 11 months ago) by nicm
Branch: MAIN
Changes since 1.39: +3 -1 lines
Diff to previous 1.39 (colored)

Exit 1 correctly if source-file fails.

Revision 1.39 / (download) - annotate - [select for diffs], Tue May 28 11:46:30 2019 UTC (4 years, 11 months ago) by nicm
Branch: MAIN
Changes since 1.38: +34 -29 lines
Diff to previous 1.38 (colored)

Allow source-file to take multiple arguments.

Revision 1.38 / (download) - annotate - [select for diffs], Thu May 23 11:13:30 2019 UTC (4 years, 11 months ago) by nicm
Branch: MAIN
Changes since 1.37: +7 -5 lines
Diff to previous 1.37 (colored)

Replace the split parser code (cfg.c and cmd-string.c) with a single
parser using yacc(1). This is a major change but is clearer and simpler
and allows some edge cases to be made more consistent, as well as
tidying up how aliases are handled. It will also allow some further
improvements later.

Entirely the same parser is now used for parsing the configuration file
and for string commands. This means that constructs previously only
available in .tmux.conf, such as %if, can now be used in string commands
(for example, those given to if-shell - not commands invoked from the
shell, they are still parsed by the shell itself).

The only syntax change I am aware of is that #{} outside quotes or a
comment is now considered a format and not a comment, so #{ is now a
syntax error (notably, if it is at the start of a line).

This also adds two new sections to the man page documenting the syntax
and outlining how parsing and command execution works.

Thanks to everyone who sent me test configs (they still all parse
without errors - but this doesn't mean they still work as intended!).

Thanks to Avi Halachmi for testing and man page improvements, also to
jmc@ for reviewing the man page changes.

Revision 1.37 / (download) - annotate - [select for diffs], Mon May 20 13:23:32 2019 UTC (5 years ago) by nicm
Branch: MAIN
Changes since 1.36: +11 -5 lines
Diff to previous 1.36 (colored)

Fix ordering of source-file with multiple files and add flags to load_cfg.

Revision 1.36 / (download) - annotate - [select for diffs], Thu May 24 09:42:49 2018 UTC (5 years, 11 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_5_BASE, OPENBSD_6_5, OPENBSD_6_4_BASE, OPENBSD_6_4
Changes since 1.35: +2 -2 lines
Diff to previous 1.35 (colored)

Make server_client_get_cwd used (almost) everywhere we need to work out
the cwd, and do not fall back to "." as it is pretty useless. GitHub
issue 1331.

Revision 1.35 / (download) - annotate - [select for diffs], Wed Apr 19 16:59:54 2017 UTC (7 years, 1 month ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_3_BASE, OPENBSD_6_3, OPENBSD_6_2_BASE, OPENBSD_6_2
Changes since 1.34: +2 -2 lines
Diff to previous 1.34 (colored)

load_cfg returns < 0 on error, not != 0. Problem reported by Kaushal Modi.

Revision 1.34 / (download) - annotate - [select for diffs], Tue Feb 14 18:13:05 2017 UTC (7 years, 3 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_1_BASE, OPENBSD_6_1
Changes since 1.33: +22 -8 lines
Diff to previous 1.33 (colored)

Make source-file look for files relative to the client working directory
(like load-buffer and save-buffer), from Chris Pickel. Also break the
where-is-this-file code out into its own function for loadb and saveb.

Revision 1.33 / (download) - annotate - [select for diffs], Sun Jan 29 22:10:55 2017 UTC (7 years, 3 months ago) by nicm
Branch: MAIN
Changes since 1.32: +3 -3 lines
Diff to previous 1.32 (colored)

Add -n to break-pane.

Revision 1.32 / (download) - annotate - [select for diffs], Mon Jan 9 19:29:12 2017 UTC (7 years, 4 months ago) by nicm
Branch: MAIN
Changes since 1.31: +4 -2 lines
Diff to previous 1.31 (colored)

source-file -q needs to apply to glob(3) too.

Revision 1.31 / (download) - annotate - [select for diffs], Mon Jan 9 19:27:00 2017 UTC (7 years, 4 months ago) by nicm
Branch: MAIN
Changes since 1.30: +19 -11 lines
Diff to previous 1.30 (colored)

Run the source-file pattern through glob(3).

Revision 1.30 / (download) - annotate - [select for diffs], Sun Oct 16 19:04:05 2016 UTC (7 years, 7 months ago) by nicm
Branch: MAIN
Changes since 1.29: +15 -15 lines
Diff to previous 1.29 (colored)

Mass rename struct cmd_q to struct cmdq_item and related.

Revision 1.29 / (download) - annotate - [select for diffs], Sun Oct 16 17:55:14 2016 UTC (7 years, 7 months ago) by nicm
Branch: MAIN
Changes since 1.28: +17 -39 lines
Diff to previous 1.28 (colored)

Rewrite command queue handling. Each client still has a command queue,
but there is also now a global command queue. Instead of command queues
being dispatched on demand from wherever the command happens to be
added, they are now all dispatched from the top level server
loop. Command queues may now also include callbacks as well as commands,
and items may be inserted after the current command as well as at the end.

This all makes command queues significantly more predictable and easier
to use, and avoids the complex multiple nested command queues used by
source-file, if-shell and friends.

A mass rename of struct cmdq to a better name (cmdq_item probably) is
coming.

Revision 1.28 / (download) - annotate - [select for diffs], Fri Oct 14 18:41:53 2016 UTC (7 years, 7 months ago) by nicm
Branch: MAIN
Changes since 1.27: +5 -4 lines
Diff to previous 1.27 (colored)

source-file and some other commands can recurse back into cmdq_continue,
which could potentially free the currently running command, so we need
to take a reference to it in cmdq_continue_one.

Fixes problem reported by Theo Buehler.

Revision 1.27 / (download) - annotate - [select for diffs], Thu Oct 13 22:48:51 2016 UTC (7 years, 7 months ago) by nicm
Branch: MAIN
Changes since 1.26: +1 -2 lines
Diff to previous 1.26 (colored)

Trying to do hooks generically is way too complicated and unreliable and
confusing, particularly trying to automatically figure out what target
hooks should be using. So simplify it:

- drop before hooks entirely, they don't seem to be very useful;

- commands with special requirements now fire their own after hook (for
  example, if they change session or window, or if they have -t and -s
  and need to choose which one the hook uses as current target);

- commands with no special requirements can have the CMD_AFTERHOOK flag
  added and they will use the -t state.

At the moment new-session, new-window, split-window fire their own hook,
and display-message uses the flag. The remaining commands still need to
be looked at.

Revision 1.26 / (download) - annotate - [select for diffs], Mon Oct 10 21:51:39 2016 UTC (7 years, 7 months ago) by nicm
Branch: MAIN
Changes since 1.25: +5 -5 lines
Diff to previous 1.25 (colored)

Add static in cmd-* and fix a few other nits.

Revision 1.25 / (download) - annotate - [select for diffs], Thu May 12 16:05:33 2016 UTC (8 years ago) by tim
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE, OPENBSD_6_0
Changes since 1.24: +10 -12 lines
Diff to previous 1.24 (colored)

- Rework load_cfg() error handling a little.
- Add -q to source-file to suppress errors about nonexistent files.

Input and OK nicm@

Revision 1.24 / (download) - annotate - [select for diffs], Fri Apr 29 14:05:24 2016 UTC (8 years ago) by nicm
Branch: MAIN
Changes since 1.23: +2 -1 lines
Diff to previous 1.23 (colored)

Final parts of command hooks, add before- and after- hooks to each command.

Revision 1.23 / (download) - annotate - [select for diffs], Sun Dec 13 21:53:57 2015 UTC (8 years, 5 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.22: +9 -6 lines
Diff to previous 1.22 (colored)

Use member names in cmd_entry definitions so I stop getting confused
about the order.

Revision 1.22 / (download) - annotate - [select for diffs], Sun Dec 13 14:32:38 2015 UTC (8 years, 5 months ago) by nicm
Branch: MAIN
Changes since 1.21: +2 -3 lines
Diff to previous 1.21 (colored)

Instead of every command resolving the target (-t or -s) itself, prepare
the state (client, session, winlink, pane) for it it before entering the
command. Each command provides some flags that tell the prepare step
what it is expecting.

This is a requirement for having hooks on commands (for example, if you
hook "select-window -t1:2", the hook command should to operate on window
1:2 not whatever it thinks is the current window), and should allow some
other target improvements.

The old cmd_find_* functions remain for the moment but that layer will
be dropped later.

Joint work with Thomas Adam.

Revision 1.21 / (download) - annotate - [select for diffs], Mon Oct 27 22:23:47 2014 UTC (9 years, 6 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8, OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.20: +5 -19 lines
Diff to previous 1.20 (colored)

Move cfg_causes local into cfg.c and remove struct causelist.

Revision 1.20 / (download) - annotate - [select for diffs], Mon Oct 20 22:29:25 2014 UTC (9 years, 7 months ago) by nicm
Branch: MAIN
Changes since 1.19: +1 -2 lines
Diff to previous 1.19 (colored)

Instead of setting up the default keys by building the key struct
directly with a helper function in the cmd_entry, include a table of
bind-key commands and pass them through the command parser and a
temporary cmd_q.

As well as being smaller, this will allow default bindings to be command
sequences which will probably be needed soon.

Revision 1.19 / (download) - annotate - [select for diffs], Thu Oct 10 12:04:38 2013 UTC (10 years, 7 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6, OPENBSD_5_5_BASE, OPENBSD_5_5
Changes since 1.18: +4 -1 lines
Diff to previous 1.18 (colored)

Make cmdq->client_exit a tristate (-1 means "not set") so that if
explicitly set it can be copied from child to parent cmdq by if-shell
and source-file. This fixes using attach or new. From Chris Johnsen.

Revision 1.18 / (download) - annotate - [select for diffs], Thu Oct 10 12:00:23 2013 UTC (10 years, 7 months ago) by nicm
Branch: MAIN
Changes since 1.17: +1 -2 lines
Diff to previous 1.17 (colored)

Remove the barely-used and unnecessary command check() function.

Revision 1.17 / (download) - annotate - [select for diffs], Fri Apr 12 12:44:31 2013 UTC (11 years, 1 month ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE, OPENBSD_5_4
Changes since 1.16: +2 -1 lines
Diff to previous 1.16 (colored)

Copy the client into the new cmdq in source-file so commands that work
on it (such as new-session) can work. Fixes issue reported by oss-adv at
users dot sf dot net.

Revision 1.16 / (download) - annotate - [select for diffs], Mon Mar 25 10:05:58 2013 UTC (11 years, 1 month ago) by nicm
Branch: MAIN
Changes since 1.15: +5 -4 lines
Diff to previous 1.15 (colored)

Continue the parent cmdq after sourcing a file.

Revision 1.15 / (download) - annotate - [select for diffs], Sun Mar 24 09:54:10 2013 UTC (11 years, 1 month ago) by nicm
Branch: MAIN
Changes since 1.14: +60 -26 lines
Diff to previous 1.14 (colored)

Add a command queue to standardize and simplify commands that call other
commands and allow a command to block execution of subsequent
commands. This allows run-shell and if-shell to be synchronous which has
been much requested.

Each client has a default command queue and commands are consumed one at
a time from it. A command may suspend execution from the queue by
returning CMD_RETURN_WAIT and then resume it by calling cmd_continue() -
for example run-shell does this from the callback that is fired after
the job is freed.

When the command queue becomes empty, command clients are automatically
exited (unless attaching). A callback is also fired - this is used for
nested commands in, for example, if-shell which can block execution of
the client's cmdq until a new cmdq becomes empty.

Also merge all the old error/info/print functions together and lose the
old curclient/cmdclient distinction - a cmdq is bound to one client (or
none if in the configuration file), this is a command client if
c->session is NULL otherwise an attached client.

Revision 1.14 / (download) - annotate - [select for diffs], Tue Nov 27 16:12:29 2012 UTC (11 years, 5 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_3_BASE, OPENBSD_5_3
Changes since 1.13: +20 -23 lines
Diff to previous 1.13 (colored)

Correctly aggregate together errors from nested config files (with
source-file). Fix by Thomas Adam, reported by Sam Livingstone-Gray

Revision 1.13 / (download) - annotate - [select for diffs], Wed Jul 11 07:10:15 2012 UTC (11 years, 10 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_2_BASE, OPENBSD_5_2
Changes since 1.12: +3 -3 lines
Diff to previous 1.12 (colored)

Make command exec functions return an enum rather than -1/0/1 values and
add a new value to mean "leave client running but don't attach" to fix
problems with using some commands in a command sequence. Most of the
work by Thomas Adam, problem reported by "jspenguin" on SF bug 3535531.

Revision 1.12 / (download) - annotate - [select for diffs], Tue Jul 10 11:53:01 2012 UTC (11 years, 10 months ago) by nicm
Branch: MAIN
Changes since 1.11: +5 -3 lines
Diff to previous 1.11 (colored)

xfree is not particularly helpful, remove it. From Thomas Adam.

Revision 1.11 / (download) - annotate - [select for diffs], Tue Jan 4 00:42:47 2011 UTC (13 years, 4 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_1_BASE, OPENBSD_5_1, OPENBSD_5_0_BASE, OPENBSD_5_0, OPENBSD_4_9_BASE, OPENBSD_4_9
Changes since 1.10: +13 -86 lines
Diff to previous 1.10 (colored)

Clean up and simplify tmux command argument parsing.

Originally, tmux commands were parsed in the client process into a
struct with the command data which was then serialised and sent to the
server to be executed. The parsing was later moved into the server (an
argv was sent from the client), but the parse step and intermediate
struct was kept.

This change removes that struct and the separate parse step. Argument
parsing and printing is now common to all commands (in arguments.c) with
each command left with just an optional check function (to validate the
arguments at parse time), the exec function and a function to set up any
key bindings (renamed from the old init function).

This is overall more simple and consistent.

There should be no changes to any commands behaviour or syntax although
as this touches every command please watch for any unexpected changes.

Revision 1.10 / (download) - annotate - [select for diffs], Wed Dec 29 21:28:32 2010 UTC (13 years, 4 months ago) by nicm
Branch: MAIN
Changes since 1.9: +20 -4 lines
Diff to previous 1.9 (colored)

Allow the config file parser and source-file to return "don't exit" to
the client to let attach work from configuration files.

Revision 1.9 / (download) - annotate - [select for diffs], Sat Feb 6 23:22:27 2010 UTC (14 years, 3 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_4_8_BASE, OPENBSD_4_8, OPENBSD_4_7_BASE, OPENBSD_4_7
Changes since 1.8: +12 -12 lines
Diff to previous 1.8 (colored)

Use the array.h code for the causes list.

Revision 1.8 / (download) - annotate - [select for diffs], Sat Feb 6 17:15:33 2010 UTC (14 years, 3 months ago) by nicm
Branch: MAIN
Changes since 1.7: +12 -6 lines
Diff to previous 1.7 (colored)

Instead of bailing out on the first configuration file error, carry on,
collecting all the errors, then start with the active window in more mode
displaying them.

Revision 1.7 / (download) - annotate - [select for diffs], Thu Nov 26 21:37:13 2009 UTC (14 years, 5 months ago) by nicm
Branch: MAIN
Changes since 1.6: +2 -1 lines
Diff to previous 1.6 (colored)

Remove a couple of unused arguments where possible, and add /* ARGSUSED */ to
the rest to reduce lint output.

Revision 1.6 / (download) - annotate - [select for diffs], Fri Nov 13 19:53:29 2009 UTC (14 years, 6 months ago) by nicm
Branch: MAIN
Changes since 1.5: +2 -2 lines
Diff to previous 1.5 (colored)

Get rid of the ugly CMD_CHFLAG macro and use a const string (eg "dDU") in the
command entry structs and a couple of functions to check/set the flags.

Revision 1.5 / (download) - annotate - [select for diffs], Mon Sep 21 15:32:06 2009 UTC (14 years, 8 months ago) by nicm
Branch: MAIN
Changes since 1.4: +2 -2 lines
Diff to previous 1.4 (colored)

Use KEYC_NONE constant instead of 0 on init.

Revision 1.4 / (download) - annotate - [select for diffs], Sun Aug 23 17:29:51 2009 UTC (14 years, 8 months ago) by nicm
Branch: MAIN
Changes since 1.3: +2 -2 lines
Diff to previous 1.3 (colored)

When using source-file, run the commands in the context of the source-file
command rather than with no context. This makes things like attach work from a
file.

Revision 1.3 / (download) - annotate - [select for diffs], Sun Jul 26 12:58:44 2009 UTC (14 years, 9 months ago) by nicm
Branch: MAIN
Changes since 1.2: +1 -24 lines
Diff to previous 1.2 (colored)

Make all messages sent between the client and server fixed size.

This is the first of two changes to make the protocol more resilient and less
sensitive to other changes in the code, particularly with commands. The client
now packs argv into a buffer and sends it to the server for parsing, rather
than doing it itself and sending the parsed command data.

As a side-effect this also removes a lot of now-unused command marshalling
code.

Mixing a server without this change and a client with or vice versa will cause
tmux to hang or crash, please ensure that tmux is entirely killed before
upgrading.

Revision 1.2 / (download) - annotate - [select for diffs], Mon Jul 13 23:11:35 2009 UTC (14 years, 10 months ago) by nicm
Branch: MAIN
Changes since 1.1: +2 -2 lines
Diff to previous 1.1 (colored)

Having fixed flags for single-character getopt options is a bit hard to
maintain and is only going to get worse as more are used. So instead, add a new
uint64_t member to cmd_entry which is a bitmask of upper and lowercase options
accepted by the command.

This means new single character options can be used without the need to add it
explicitly to the list.

Revision 1.1 / (download) - annotate - [select for diffs], Mon Jun 1 22:58:49 2009 UTC (14 years, 11 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE, OPENBSD_4_6

Import tmux, a terminal multiplexor allowing (among other things) a single
terminal to be switched between several different windows and programs
displayed on one terminal be detached from one terminal and moved to another.

ok deraadt pirofti

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.