From 86aa8c6429885ecde3c4cbbb9528fc82f024f40a Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sat, 24 Jan 2015 13:07:29 +0000 Subject: - add fdswap - version: 2.0.2.0 --- INSTALL | 2 +- doc/fdswap.html | 43 ++++++++++++++++++++++++++++++++++++++++++ doc/index.html | 5 +++-- doc/upgrade.html | 7 +++++++ package/deps.mak | 3 +++ package/info | 2 +- package/modes | 1 + package/targets.mak | 1 + src/execline/deps-exe/fdswap | 1 + src/execline/fdswap.c | 19 +++++++++++++++++++ src/execline/multisubstitute.c | 5 +---- 11 files changed, 81 insertions(+), 8 deletions(-) create mode 100644 doc/fdswap.html create mode 100644 src/execline/deps-exe/fdswap create mode 100644 src/execline/fdswap.c diff --git a/INSTALL b/INSTALL index 09a8be5..dda0e02 100644 --- a/INSTALL +++ b/INSTALL @@ -6,7 +6,7 @@ Build Instructions - A POSIX-compliant C development environment - GNU make version 4.0 or later - - skalibs version 2.2.0.0 or later: http://skarnet.org/software/skalibs/ + - skalibs version 2.2.1.0 or later: http://skarnet.org/software/skalibs/ This software will run on any operating system that implements POSIX.1-2008, available at: diff --git a/doc/fdswap.html b/doc/fdswap.html new file mode 100644 index 0000000..5f353dc --- /dev/null +++ b/doc/fdswap.html @@ -0,0 +1,43 @@ + + + + + execline: the fdswap program + + + + + + +

+execline
+Software
+skarnet.org +

+ +

The `fdswap` program

+ +

+fdswap swaps two file descriptors, then +executes a program. +

+ +

Interface

+ +

+     fdswap fd1 fd2 prog...
+

+ +

+fdswaps swaps file descriptors numbered fd1 and +fd2, then execs into prog with its arguments. +

+ +

Notes

+ +

fdswap has no portable shell equivalent.

+ + + diff --git a/doc/index.html b/doc/index.html index 462eeba..851a0c5 100644 --- a/doc/index.html +++ b/doc/index.html @@ -50,7 +50,7 @@ shell's syntax, and has no security issues.

A POSIX-compliant system with a standard C development environment

GNU make, version 4.0 or later

skalibs version -2.2.0.0 or later

+2.2.1.0 or later

Licensing

@@ -63,7 +63,7 @@ shell's syntax, and has no security issues.

Download

The current released version of execline is 2.0.1.1.
The current released version of execline is 2.0.2.0.
Alternatively, you can checkout a copy of the execline git repository:
```
 git clone git://git.skarnet.org/execline 
```

@@ -122,6 +122,7 @@ to your installation: the shebang lines for your system might be something like

The fdclose program

The fdblock program

The fdmove program

The fdswap program

The fdreserve program

The redirfd program

The piperw program

diff --git a/doc/upgrade.html b/doc/upgrade.html index eed4a6a..ed85109 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -17,6 +17,13 @@

What has changed in execline

in 2.0.2.0

+ +

skalibs dependency bumped to 2.2.1.0
New command: fdswap

in 2.0.1.1

+#include +#include +#include + +#define USAGE "fdswap fd1 fd2 prog..." + +int main (int argc, char const *const *argv, char const *const *envp) +{ + unsigned int fd1, fd2 ; + PROG = "fdswap" ; + if ((argc < 4) || !uint0_scan(argv[1], &fd1) || !uint0_scan(argv[2], &fd2)) + strerr_dieusage(100, USAGE) ; + if (fd_move2(fd1, fd2, fd2, fd1) < 0) strerr_diefu1sys(111, "swap fds") ; + pathexec_run(argv[3], argv+3, envp) ; + strerr_dieexec(111, argv[3]) ; +} diff --git a/src/execline/multisubstitute.c b/src/execline/multisubstitute.c index acee42f..d7fbb4e 100644 --- a/src/execline/multisubstitute.c +++ b/src/execline/multisubstitute.c @@ -18,7 +18,7 @@ static char const *const commands[8] = 0 } ; -static exlsnfunc_t *const functions[8] = +static exlsnfunc_t_ref const functions[8] = { &exlsn_define, &exlsn_importas, @@ -36,12 +36,10 @@ int main (int argc, char const **argv, char const *const *envp) PROG = "multisubstitute" ; if (!--argc) strerr_dieusage(100, USAGE) ; - /* Read a block containing directives */ argc1 = el_semicolon(++argv) ; if (argc1 >= argc) strerr_dief1x(100, "unterminated block") ; if (argc1 + 1 == argc) strerr_dieusage(100, USAGE) ; - /* Parse args and update the substitution info */ while (argc1) { int n ; @@ -59,6 +57,5 @@ int main (int argc, char const **argv, char const *const *envp) argv += n ; argc1 -= n ; argc -= n ; } - /* Perform the substitution and exec */ el_substandrun(argc-1, argv+1, envp, &info) ; } -- cgit v1.2.3

The fdswap program