Index: head/bin/sh/alias.c
===================================================================
--- head/bin/sh/alias.c	(revision 317038)
+++ head/bin/sh/alias.c	(revision 317039)
@@ -1,265 +1,256 @@
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Kenneth Almquist.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)alias.c	8.3 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <stdlib.h>
 #include "shell.h"
 #include "output.h"
 #include "error.h"
 #include "memalloc.h"
 #include "mystring.h"
 #include "alias.h"
 #include "options.h"
 #include "builtins.h"
 
 #define ATABSIZE 39
 
 static struct alias *atab[ATABSIZE];
 static int aliases;
 
 static void setalias(const char *, const char *);
 static int unalias(const char *);
 static struct alias **hashalias(const char *);
 
 static
 void
 setalias(const char *name, const char *val)
 {
 	struct alias *ap, **app;
 
+	unalias(name);
 	app = hashalias(name);
-	for (ap = *app; ap; ap = ap->next) {
-		if (equal(name, ap->name)) {
-			INTOFF;
-			ckfree(ap->val);
-			ap->val	= savestr(val);
-			INTON;
-			return;
-		}
-	}
-	/* not found */
 	INTOFF;
 	ap = ckmalloc(sizeof (struct alias));
 	ap->name = savestr(name);
 	ap->val = savestr(val);
 	ap->flag = 0;
 	ap->next = *app;
 	*app = ap;
 	aliases++;
 	INTON;
 }
 
 static void
 freealias(struct alias *ap)
 {
 	ckfree(ap->name);
 	ckfree(ap->val);
 	ckfree(ap);
 }
 
 static int
 unalias(const char *name)
 {
 	struct alias *ap, **app;
 
 	app = hashalias(name);
 
 	for (ap = *app; ap; app = &(ap->next), ap = ap->next) {
 		if (equal(name, ap->name)) {
 			/*
 			 * if the alias is currently in use (i.e. its
 			 * buffer is being used by the input routine) we
 			 * just null out the name instead of freeing it.
 			 * We could clear it out later, but this situation
 			 * is so rare that it hardly seems worth it.
 			 */
 			if (ap->flag & ALIASINUSE)
 				*ap->name = '\0';
 			else {
 				INTOFF;
 				*app = ap->next;
 				freealias(ap);
 				INTON;
 			}
 			aliases--;
 			return (0);
 		}
 	}
 
 	return (1);
 }
 
 static void
 rmaliases(void)
 {
 	struct alias *ap, **app;
 	int i;
 
 	INTOFF;
 	for (i = 0; i < ATABSIZE; i++) {
 		app = &atab[i];
 		while (*app) {
 			ap = *app;
 			if (ap->flag & ALIASINUSE) {
 				*ap->name = '\0';
 				app = &(*app)->next;
 			} else {
 				*app = ap->next;
 				freealias(ap);
 			}
 		}
 	}
 	aliases = 0;
 	INTON;
 }
 
 struct alias *
 lookupalias(const char *name, int check)
 {
 	struct alias *ap;
 
 	if (aliases == 0)
 		return (NULL);
 	for (ap = *hashalias(name); ap; ap = ap->next) {
 		if (equal(name, ap->name)) {
 			if (check && (ap->flag & ALIASINUSE))
 				return (NULL);
 			return (ap);
 		}
 	}
 
 	return (NULL);
 }
 
 static int
 comparealiases(const void *p1, const void *p2)
 {
 	const struct alias *const *a1 = p1;
 	const struct alias *const *a2 = p2;
 
 	return strcmp((*a1)->name, (*a2)->name);
 }
 
 static void
 printalias(const struct alias *a)
 {
 	out1fmt("%s=", a->name);
 	out1qstr(a->val);
 	out1c('\n');
 }
 
 static void
 printaliases(void)
 {
 	int i, j;
 	struct alias **sorted, *ap;
 
 	INTOFF;
 	sorted = ckmalloc(aliases * sizeof(*sorted));
 	j = 0;
 	for (i = 0; i < ATABSIZE; i++)
 		for (ap = atab[i]; ap; ap = ap->next)
 			if (*ap->name != '\0')
 				sorted[j++] = ap;
 	qsort(sorted, aliases, sizeof(*sorted), comparealiases);
 	for (i = 0; i < aliases; i++) {
 		printalias(sorted[i]);
 		if (int_pending())
 			break;
 	}
 	ckfree(sorted);
 	INTON;
 }
 
 int
 aliascmd(int argc __unused, char **argv __unused)
 {
 	char *n, *v;
 	int ret = 0;
 	struct alias *ap;
 
 	nextopt("");
 
 	if (*argptr == NULL) {
 		printaliases();
 		return (0);
 	}
 	while ((n = *argptr++) != NULL) {
 		if ((v = strchr(n+1, '=')) == NULL) /* n+1: funny ksh stuff */
 			if ((ap = lookupalias(n, 0)) == NULL) {
 				warning("%s: not found", n);
 				ret = 1;
 			} else
 				printalias(ap);
 		else {
 			*v++ = '\0';
 			setalias(n, v);
 		}
 	}
 
 	return (ret);
 }
 
 int
 unaliascmd(int argc __unused, char **argv __unused)
 {
 	int i;
 
 	while ((i = nextopt("a")) != '\0') {
 		if (i == 'a') {
 			rmaliases();
 			return (0);
 		}
 	}
 	for (i = 0; *argptr; argptr++)
 		i |= unalias(*argptr);
 
 	return (i);
 }
 
 static struct alias **
 hashalias(const char *p)
 {
 	unsigned int hashval;
 
 	hashval = (unsigned char)*p << 4;
 	while (*p)
 		hashval+= *p++;
 	return &atab[hashval % ATABSIZE];
 }
Index: head/bin/sh/tests/parser/Makefile
===================================================================
--- head/bin/sh/tests/parser/Makefile	(revision 317038)
+++ head/bin/sh/tests/parser/Makefile	(revision 317039)
@@ -1,87 +1,88 @@
 # $FreeBSD$
 
 PACKAGE=	tests
 
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}
 ATF_TESTS_SH=	functional_test
 
 ${PACKAGE}FILES+=	alias1.0
 ${PACKAGE}FILES+=	alias2.0
 ${PACKAGE}FILES+=	alias3.0
 ${PACKAGE}FILES+=	alias4.0
 ${PACKAGE}FILES+=	alias5.0
 ${PACKAGE}FILES+=	alias6.0
 ${PACKAGE}FILES+=	alias7.0
 ${PACKAGE}FILES+=	alias8.0
 ${PACKAGE}FILES+=	alias9.0
 ${PACKAGE}FILES+=	alias10.0
 ${PACKAGE}FILES+=	alias11.0
 ${PACKAGE}FILES+=	alias12.0
 ${PACKAGE}FILES+=	alias13.0
 ${PACKAGE}FILES+=	alias14.0
 ${PACKAGE}FILES+=	alias15.0 alias15.0.stdout
 ${PACKAGE}FILES+=	alias16.0
 ${PACKAGE}FILES+=	alias17.0
+${PACKAGE}FILES+=	alias18.0
 ${PACKAGE}FILES+=	and-pipe-not.0
 ${PACKAGE}FILES+=	case1.0
 ${PACKAGE}FILES+=	case2.0
 ${PACKAGE}FILES+=	comment1.0
 ${PACKAGE}FILES+=	comment2.42
 ${PACKAGE}FILES+=	dollar-quote1.0
 ${PACKAGE}FILES+=	dollar-quote2.0
 ${PACKAGE}FILES+=	dollar-quote3.0
 ${PACKAGE}FILES+=	dollar-quote4.0
 ${PACKAGE}FILES+=	dollar-quote5.0
 ${PACKAGE}FILES+=	dollar-quote6.0
 ${PACKAGE}FILES+=	dollar-quote7.0
 ${PACKAGE}FILES+=	dollar-quote8.0
 ${PACKAGE}FILES+=	dollar-quote9.0
 ${PACKAGE}FILES+=	dollar-quote10.0
 ${PACKAGE}FILES+=	dollar-quote11.0
 ${PACKAGE}FILES+=	dollar-quote12.0
 ${PACKAGE}FILES+=	dollar-quote13.0
 ${PACKAGE}FILES+=	empty-braces1.0
 ${PACKAGE}FILES+=	empty-cmd1.0
 ${PACKAGE}FILES+=	for1.0
 ${PACKAGE}FILES+=	for2.0
 ${PACKAGE}FILES+=	func1.0
 ${PACKAGE}FILES+=	func2.0
 ${PACKAGE}FILES+=	func3.0
 ${PACKAGE}FILES+=	heredoc1.0
 ${PACKAGE}FILES+=	heredoc2.0
 ${PACKAGE}FILES+=	heredoc3.0
 ${PACKAGE}FILES+=	heredoc4.0
 ${PACKAGE}FILES+=	heredoc5.0
 ${PACKAGE}FILES+=	heredoc6.0
 ${PACKAGE}FILES+=	heredoc7.0
 ${PACKAGE}FILES+=	heredoc8.0
 ${PACKAGE}FILES+=	heredoc9.0
 ${PACKAGE}FILES+=	heredoc10.0
 ${PACKAGE}FILES+=	heredoc11.0
 ${PACKAGE}FILES+=	heredoc12.0
 ${PACKAGE}FILES+=	heredoc13.0
 ${PACKAGE}FILES+=	line-cont1.0
 ${PACKAGE}FILES+=	line-cont2.0
 ${PACKAGE}FILES+=	line-cont3.0
 ${PACKAGE}FILES+=	line-cont4.0
 ${PACKAGE}FILES+=	line-cont5.0
 ${PACKAGE}FILES+=	line-cont6.0
 ${PACKAGE}FILES+=	line-cont7.0
 ${PACKAGE}FILES+=	line-cont8.0
 ${PACKAGE}FILES+=	line-cont9.0
 ${PACKAGE}FILES+=	line-cont10.0
 ${PACKAGE}FILES+=	line-cont11.0
 ${PACKAGE}FILES+=	no-space1.0
 ${PACKAGE}FILES+=	no-space2.0
 ${PACKAGE}FILES+=	nul1.0
 ${PACKAGE}FILES+=	only-redir1.0
 ${PACKAGE}FILES+=	only-redir2.0
 ${PACKAGE}FILES+=	only-redir3.0
 ${PACKAGE}FILES+=	only-redir4.0
 ${PACKAGE}FILES+=	pipe-not1.0
 ${PACKAGE}FILES+=	set-v1.0 set-v1.0.stderr
 ${PACKAGE}FILES+=	var-assign1.0
 
 .include <bsd.test.mk>
Index: head/bin/sh/tests/parser/alias18.0
===================================================================
--- head/bin/sh/tests/parser/alias18.0	(nonexistent)
+++ head/bin/sh/tests/parser/alias18.0	(revision 317039)
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+v=1
+alias a='alias a=v=2
+v=3
+a'
+eval a
+[ "$v" = 2 ]

Property changes on: head/bin/sh/tests/parser/alias18.0
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property