diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | src/execline/backtick.c | 2 | ||||
| -rw-r--r-- | src/execline/withstdinas.c | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -14,6 +14,7 @@ Contributors: Eugen Wissner <belka@caraus.de> Paul Sopka <psopka@sopka.ch> Lennart Jablonka <humm@ljabl.com> + Josiah Frentsos <jfrent@tilde.team> Thanks to: Dan J. Bernstein <djb@cr.yp.to> diff --git a/src/execline/backtick.c b/src/execline/backtick.c index 429e720..a954323 100644 --- a/src/execline/backtick.c +++ b/src/execline/backtick.c @@ -84,7 +84,7 @@ int main (int argc, char const **argv, char const *const *envp) else value.len = strlen(value.s) + 1 ; } else allgood = 1 ; - if ((!insist || allgood) && chomp && (value.len > 1) && (value.s[value.len - 2] == '\n')) + if ((!insist || allgood) && chomp && value.len > 1 && value.s[value.len - 2] == '\n') value.s[--value.len - 1] = 0 ; val1[uint_fmt(val1, wait_status(fdwstat))] = 0 ; el_modifs_and_exec(argv + argc1 + 1, var, val, insist < 2 ? 2 : 1, doimport) ; diff --git a/src/execline/withstdinas.c b/src/execline/withstdinas.c index 065f719..c516095 100644 --- a/src/execline/withstdinas.c +++ b/src/execline/withstdinas.c @@ -53,7 +53,7 @@ int main (int argc, char const *const *argv) strerr_warnw2x("stdin contained a null character", " - using default instead") ; } } - else if (chomp && (value.len > 1) && (value.s[value.len - 2] == '\n')) + else if (chomp && value.len > 1 && value.s[value.len - 2] == '\n') value.s[--value.len - 1] = 0 ; el_modif_and_exec(argv + 1, argv[0], val, doimport) ; } |