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

Fix bug introduced by EXP_RECORD, where in case there was a variable expansion

Browse Source 
involved in the `for' list, the list was recorded twice, leading to incorrect
argument expansion.
Introduce ifsfree() function that free's the IFS region list, GC'ing duplicated
code.
This commit is contained in:
christos 1998-02-05 08:32:00 +00:00
parent 1a8c7604f4
commit f7c8df6d68
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
bin/sh/expand.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: expand.c,v 1.34 1998/01/31 12:45:07 christos Exp $ */ /* $NetBSD: expand.c,v 1.35 1998/02/05 08:32:00 christos Exp $ */
/*- /*-
* Copyright (c) 1991, 1993 * Copyright (c) 1991, 1993
@ -41,7 +41,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)expand.c 8.5 (Berkeley) 5/15/95"; static char sccsid[] = "@(#)expand.c 8.5 (Berkeley) 5/15/95";
#else #else
__RCSID("$NetBSD: expand.c,v 1.34 1998/01/31 12:45:07 christos Exp $"); __RCSID("$NetBSD: expand.c,v 1.35 1998/02/05 08:32:00 christos Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -105,6 +105,7 @@ STATIC int varisset __P((char *, int));
STATIC void varvalue __P((char *, int, int)); STATIC void varvalue __P((char *, int, int));
STATIC void recordregion __P((int, int, int)); STATIC void recordregion __P((int, int, int));
STATIC void ifsbreakup __P((char *, struct arglist *)); STATIC void ifsbreakup __P((char *, struct arglist *));
STATIC void ifsfree __P((void));
STATIC void expandmeta __P((struct strlist *, int)); STATIC void expandmeta __P((struct strlist *, int));
STATIC void expmeta __P((char *, char *)); STATIC void expmeta __P((char *, char *));
STATIC void addfname __P((char *)); STATIC void addfname __P((char *));
@ -160,8 +161,10 @@ expandarg(arg, arglist, flag)
* TODO - EXP_REDIR * TODO - EXP_REDIR
*/ */
if (flag & EXP_FULL) { if (flag & EXP_FULL) {
if (!recorded && (flag & EXP_RECORD)) if (!recorded && (flag & EXP_RECORD)) {
ifsfree();
recordregion(0, expdest - p - 1, 0); recordregion(0, expdest - p - 1, 0);
}
ifsbreakup(p, &exparg); ifsbreakup(p, &exparg);
*exparg.lastp = NULL; *exparg.lastp = NULL;
exparg.lastp = &exparg.list; exparg.lastp = &exparg.list;
@ -174,14 +177,7 @@ expandarg(arg, arglist, flag)
*exparg.lastp = sp; *exparg.lastp = sp;
exparg.lastp = &sp->next; exparg.lastp = &sp->next;
} }
while (ifsfirst.next != NULL) { ifsfree();
struct ifsregion *ifsp;
INTOFF;
ifsp = ifsfirst.next->next;
ckfree(ifsfirst.next);
ifsfirst.next = ifsp;
INTON;
}
*exparg.lastp = NULL; *exparg.lastp = NULL;
if (exparg.list) { if (exparg.list) {
*arglist->lastp = exparg.list; *arglist->lastp = exparg.list;
@ -317,15 +313,7 @@ expari(flag)
int result; int result;
int quotes = flag & (EXP_FULL | EXP_CASE); int quotes = flag & (EXP_FULL | EXP_CASE);
while (ifsfirst.next != NULL) { ifsfree();
struct ifsregion *ifsp;
INTOFF;
ifsp = ifsfirst.next->next;
ckfree(ifsfirst.next);
ifsfirst.next = ifsp;
INTON;
}
ifslastp = NULL;
/* /*
* This routine is slightly over-complicated for * This routine is slightly over-complicated for
@ -938,6 +926,21 @@ ifsbreakup(string, arglist)
} }
} }
STATIC void
ifsfree()
{
while (ifsfirst.next != NULL) {
struct ifsregion *ifsp;
INTOFF;
ifsp = ifsfirst.next->next;
ckfree(ifsfirst.next);
ifsfirst.next = ifsp;
INTON;
}
ifslastp = NULL;
ifsfirst.next = NULL;
}
/* /*