Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From code inspection, nvi had the undocumented and non-working functionality

Browse Source 
of ignoring alphanumerical and blank characters from the shellmeta option.
The former code was using a character pointed to by a pointer as a boolean
to check whether to enable this functionality, but in the meantime the pointer
was used for something else. Introduce a variable for this boolean so that
the functionality actually works.
This commit is contained in:
aymeric 2005-09-06 21:36:10 +00:00
parent 0eceae0438
commit 3065f3379c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.bin/vi/ex/ex_argv.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ex_argv.c,v 1.12 2005/02/12 12:53:22 aymeric Exp $ */
/* $NetBSD: ex_argv.c,v 1.13 2005/09/06 21:36:10 aymeric Exp $ */
/*-
* Copyright (c) 1993, 1994
@ -16,7 +16,7 @@
#if 0
static const char sccsid[] = "@(#)ex_argv.c 10.26 (Berkeley) 9/20/96";
#else
__RCSID("$NetBSD: ex_argv.c,v 1.12 2005/02/12 12:53:22 aymeric Exp $");
__RCSID("$NetBSD: ex_argv.c,v 1.13 2005/09/06 21:36:10 aymeric Exp $");
#endif
#endif /* not lint */
@ -151,6 +151,7 @@ argv_exp2(sp, excp, cmd, cmdlen)
size_t blen, len, n;
int rval;
char *bp, *mp, *p;
int shellmeta_ok;
GET_SPACE_RET(sp, bp, blen, 512);
@ -190,12 +191,16 @@ argv_exp2(sp, excp, cmd, cmdlen)
if (opts_empty(sp, O_SHELL, 1) || opts_empty(sp, O_SHELLMETA, 1))
n = 0;
else {
shellmeta_ok = 1;
for (p = mp = O_STR(sp, O_SHELLMETA); *p != '\0'; ++p)
if (isblank(*p) || isalnum((unsigned char)*p))
if (isblank(*p) || isalnum((unsigned char)*p)) {
shellmeta_ok = 0;
break;
}
p = bp + SHELLOFFSET;
n = len - SHELLOFFSET;
if (*p != '\0') {
if (shellmeta_ok) {
for (; n > 0; --n, ++p)
if (strchr(mp, *p) != NULL)
break;