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

Fix a problem caused by finger failure on my part. The builtin

Browse Source 
getopts should now work as expected.  This fix was in the NetBSD
code that I was merging from but missed getting into FreeBSD's
version because of 'drain bamage' on my part.

Submitted by:	NetBSD, joerg
This commit is contained in:
Steve Price 1996-12-21 13:21:57 +00:00
parent deb4f83f3c
commit 93d0e5ef14
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=20742
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/sh/options.c
View File

@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: options.c,v 1.8 1996/10/29 03:12:48 steve Exp $
* $Id: options.c,v 1.9 1996/12/14 06:19:24 steve Exp $
*/
#ifndef lint
@ -110,9 +110,11 @@ procargs(argc, argv)
setinputfile(commandname, 0);
}
/* POSIX 1003.2: first arg after -c cmd is $0, remainder $1... */
if (*argptr && minusc)
if (argptr && minusc)
arg0 = *argptr++;
shellparam.p = argptr;
shellparam.reset = 1;
/* assert(shellparam.malloc == 0 && shellparam.nparam == 0); */
while (*argptr) {
shellparam.nparam++;
@ -284,6 +286,7 @@ setparam(argv)
shellparam.nparam = nparam;
shellparam.p = newparam;
shellparam.optnext = NULL;
shellparam.reset = 1;
}
@ -423,8 +426,9 @@ getopts(optstr, optvar, optfirst, optnext, optptr)
p = **optnext;
if (p == NULL || *p != '-' || *++p == '\0') {
atend:
*optnext = NULL;
ind = *optnext - optfirst + 1;
*optnext = NULL;
p = NULL;
done = 1;
goto out;
}