d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some weirdnesses in the NetBSD IFS code,

Browse Source 
in particular "$@"$ifschar if the final positional parameter is empty.
With the NetBSD code, adding the $ifschar removes a parameter.

PR:		standards/79067
Approved by:	ed (mentor) (implicit)
This commit is contained in:
Jilles Tjoelker 2009-06-25 17:14:06 +00:00
parent af88b2c276
commit f19a2f6c57
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=194977
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/sh/expand.c
View File

@ -994,12 +994,12 @@ ifsbreakup(char *string, struct arglist *arglist)
for (ifsp = &ifsfirst; ifsp != NULL; ifsp = ifsp->next) {
p = string + ifsp->begoff;
while (p < string + ifsp->endoff) {
had_param_ch = 1;
q = p;
if (*p == CTLESC)
p++;
if (ifsp->inquotes) {
/* Only NULs (should be from "$@") end args */
had_param_ch = 1;
if (*p != 0) {
p++;
continue;
@ -1007,10 +1007,10 @@ ifsbreakup(char *string, struct arglist *arglist)
ifsspc = NULL;
} else {
if (!strchr(ifs, *p)) {
had_param_ch = 1;
p++;
continue;
}
had_param_ch = 0;
ifsspc = strchr(" \t\n", *p);
/* Ignore IFS whitespace at start */
@ -1019,6 +1019,7 @@ ifsbreakup(char *string, struct arglist *arglist)
start = p;
continue;
}
had_param_ch = 0;
}
/* Save this argument... */