diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2018-05-08 13:33:59 +0200 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2018-05-08 13:33:59 +0200 |
commit | 3fc79e80f4844cd86efe37912340e8e127e24cae (patch) | |
tree | 153192f9edb44c91f64ecb7ccd7a555a44689901 /app-shells/dash/files | |
parent | app-shells/dash: Bump to version 0.5.10 (diff) | |
download | gentoo-3fc79e80f4844cd86efe37912340e8e127e24cae.tar.gz gentoo-3fc79e80f4844cd86efe37912340e8e127e24cae.tar.bz2 gentoo-3fc79e80f4844cd86efe37912340e8e127e24cae.zip |
app-shells/dash: Removed old.
Package-Manager: Portage-2.3.36, Repoman-2.3.9
Diffstat (limited to 'app-shells/dash/files')
-rw-r--r-- | app-shells/dash/files/dash-0.5.8.1-dumb-echo.patch | 105 | ||||
-rw-r--r-- | app-shells/dash/files/dash-0.5.8.1-eval-warnx.patch | 12 |
2 files changed, 0 insertions, 117 deletions
diff --git a/app-shells/dash/files/dash-0.5.8.1-dumb-echo.patch b/app-shells/dash/files/dash-0.5.8.1-dumb-echo.patch deleted file mode 100644 index 4059a80e3301..000000000000 --- a/app-shells/dash/files/dash-0.5.8.1-dumb-echo.patch +++ /dev/null @@ -1,105 +0,0 @@ -http://bugs.gentoo.org/337329 -http://bugs.gentoo.org/527848 - -there's no requirement for `echo` to support escape sequences. bash, by default, -does not, while dash always does. POSIX permits either behavior: -http://pubs.opengroup.org/onlinepubs/9699919799/utilities/echo.html - -however, since the behavior is not portable, no one should be relying on echo -having any specific behavior. they should use `printf` when they want an escape -sequence. it also makes dash smaller & faster to disable this logic entirely. - ---- a/src/bltin/printf.c -+++ b/src/bltin/printf.c -@@ -439,34 +444,12 @@ - int - echocmd(int argc, char **argv) - { -- int nonl = 0; -- struct output *outs = out1; -- -- if (!*++argv) -- goto end; -- if (equal(*argv, "-n")) { -- nonl = ~nonl; -- if (!*++argv) -- goto end; -+ int i; -+ for (i = 1; i < argc; ++i) { -+ outstr(argv[i], out1); -+ if (i < argc - 1) -+ outc(' ', out1); - } -- -- do { -- int c; -- -- nonl += conv_escape_str(*argv); -- outstr(stackblock(), outs); -- if (nonl > 0) -- break; -- -- c = ' '; -- if (!*++argv) { --end: -- if (nonl) { -- break; -- } -- c = '\n'; -- } -- outc(c, outs); -- } while (*argv); -+ outc('\n', out1); - return 0; - } ---- a/src/dash.1 -+++ b/src/dash.1 -@@ -1180,43 +1180,15 @@ - option turns off the effect of any preceding - .Fl P - options. --.It Xo echo Op Fl n -+.It Xo echo - .Ar args... - .Xc - Print the arguments on the standard output, separated by spaces. --Unless the --.Fl n --option is present, a newline is output following the arguments. --.Pp --If any of the following sequences of characters is encountered during --output, the sequence is not output. Instead, the specified action is --performed: --.Bl -tag -width indent --.It Li \eb --A backspace character is output. --.It Li \ec --Subsequent output is suppressed. This is normally used at the end of the --last argument to suppress the trailing newline that --.Ic echo --would otherwise output. --.It Li \ef --Output a form feed. --.It Li \en --Output a newline character. --.It Li \er --Output a carriage return. --.It Li \et --Output a (horizontal) tab character. --.It Li \ev --Output a vertical tab. --.It Li \e0 Ns Ar digits --Output the character whose value is given by zero to three octal digits. --If there are zero digits, a nul character is output. --.It Li \e\e --Output a backslash. --.El - .Pp --All other backslash sequences elicit undefined behaviour. -+No arguments or backslash sequences are supported as they are not portable. -+They will be printed out exactly as passed in. -+.Pp -+You can replace `echo -n ...` with the portable `printf %s ...` construct. - .It eval Ar string ... - Concatenate all the arguments with spaces. - Then re-parse and execute the command. diff --git a/app-shells/dash/files/dash-0.5.8.1-eval-warnx.patch b/app-shells/dash/files/dash-0.5.8.1-eval-warnx.patch deleted file mode 100644 index 51530bfdaf53..000000000000 --- a/app-shells/dash/files/dash-0.5.8.1-eval-warnx.patch +++ /dev/null @@ -1,12 +0,0 @@ -fix one of the Debian patches -- it uses warnx but doesn't include err.h. - ---- a/src/eval.c -+++ b/src/eval.c -@@ -36,6 +36,7 @@ - #include <signal.h> - #include <unistd.h> - #include <sys/types.h> -+#include <err.h> - - /* - * Evaluate a command. |