From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: Re: [PATCH 11/12] hush: only remove backslashes introduced from glob
Date: Mon, 29 Mar 2010 12:00:58 +0200 [thread overview]
Message-ID: <20100329100058.GG2241@pengutronix.de> (raw)
In-Reply-To: <1269855383-22716-12-git-send-email-s.hauer@pengutronix.de>
On Mon, Mar 29, 2010 at 11:36:22AM +0200, Sascha Hauer wrote:
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
> common/hush.c | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/common/hush.c b/common/hush.c
> index 6a8b56b..afa67d1 100644
> --- a/common/hush.c
> +++ b/common/hush.c
> @@ -779,8 +779,9 @@ static int globhack(const char *src, int flags, glob_t *pglob)
> int cnt=0, pathc;
> const char *s;
> char *dest;
> +
> for (cnt=1, s=src; s && *s; s++) {
> - if (*s == '\\') s++;
> + if (*s == '\\' && strchr("*[?", *(s + 1))) s++;
> cnt++;
> }
> dest = xmalloc(cnt);
> @@ -794,7 +795,7 @@ static int globhack(const char *src, int flags, glob_t *pglob)
> pglob->gl_pathv[pathc-1] = dest;
> pglob->gl_pathv[pathc] = NULL;
> for (s=src; s && *s; s++, dest++) {
> - if (*s == '\\') s++;
> + if (*s == '\\' && strchr("*[?", *(s + 1))) s++;
> *dest = *s;
> }
> *dest='\0';
This patch also fixes a quoting workaround found in many
/env/bin/_update scripts:
if [ \! -e "$part" ]; then
echo "Partition $part does not exist"
exit 1
fi
The backslash is not needed anymore (and in fact now breaks the script)
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2010-03-29 10:01 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-29 9:36 Patches for next merge window Sascha Hauer
2010-03-29 9:36 ` [PATCH 01/12] ARM zImage: do memmap if possible Sascha Hauer
2010-03-29 18:47 ` Peter Korsgaard
2010-03-30 9:20 ` Sascha Hauer
2010-03-30 10:01 ` Peter Korsgaard
2010-03-30 12:18 ` Sascha Hauer
2010-03-29 9:36 ` [PATCH 02/12] nand_imx: use optimized memcpy Sascha Hauer
2010-03-29 9:36 ` [PATCH 03/12] nand_imx: Speed up sequential read Sascha Hauer
2010-03-29 9:36 ` [PATCH 04/12] imx_nand: use memcpy for copying from/to buffer Sascha Hauer
2010-03-29 10:42 ` Ivo Clarysse
2010-03-29 9:36 ` [PATCH 05/12] add unaligned access support Sascha Hauer
2010-03-29 9:36 ` [PATCH 06/12] add unlzo support Sascha Hauer
2010-03-30 11:04 ` Sascha Hauer
2010-03-29 9:36 ` [PATCH 07/12] add snprintf function Sascha Hauer
2010-03-29 9:36 ` [PATCH 08/12] echo: add -e option support Sascha Hauer
2010-03-30 11:45 ` Peter Korsgaard
2010-03-30 12:17 ` Sascha Hauer
2010-03-29 9:36 ` [PATCH 09/12] add process_escape_sequence function Sascha Hauer
2010-03-29 9:36 ` [PATCH 10/12] echo command: Add -e option Sascha Hauer
2010-03-29 9:36 ` [PATCH 11/12] hush: only remove backslashes introduced from glob Sascha Hauer
2010-03-29 10:00 ` Sascha Hauer [this message]
2010-03-29 9:36 ` [PATCH 12/12] hush: allow fancy prompts Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100329100058.GG2241@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox