From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-12652-mason-zsh=primenet.com.au@sunsite.auc.dk>
Received: (qmail 11012 invoked from network); 15 Aug 2000 16:47:23 -0000
Received: from sunsite.auc.dk (130.225.51.30)
  by ns1.primenet.com.au with SMTP; 15 Aug 2000 16:47:23 -0000
Received: (qmail 10926 invoked by alias); 15 Aug 2000 16:47:11 -0000
Mailing-List: contact zsh-workers-help@sunsite.auc.dk; run by ezmlm
Precedence: bulk
X-No-Archive: yes
X-Seq: 12652
Received: (qmail 10887 invoked from network); 15 Aug 2000 16:47:08 -0000
From: "Bart Schaefer" <schaefer@candle.brasslantern.com>
Message-Id: <1000815164659.ZM19734@candle.brasslantern.com>
Date: Tue, 15 Aug 2000 16:46:59 +0000
In-Reply-To: <20000815175602.A25814@picard.franken.de>
Comments: =?iso-8859-1?Q?_In_reply_to_Thomas_K=F6hler_=3Cjean-luc=40picard?=
 =?iso-8859-1?Q?=2Efranken=2Ede=3E?=
 =?iso-8859-1?Q?________=22Re=3A_Seg_fault_with_zmodload_-u=22_=28Aug_15?=
 =?iso-8859-1?Q?=2C__5=3A56pm=29?=
References: <200008151518.QAA42116@cm01.ess> 
	<20000815174053.B5810@picard.franken.de> 
	<20000815174856.A20116@picard.franken.de> 
	<20000815175602.A25814@picard.franken.de>
X-Mailer: Z-Mail (5.0.0 30July97)
To: Zsh workers <zsh-workers@sunsite.auc.dk>
Subject: PATCH: Re: Seg fault with zmodload -u
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii

Unintentional re-use of a local variable name.

And stuff in some horizontal whitespace, as long as I'm here.

Index: Src/module.c
===================================================================
RCS file: /extra/cvsroot/zsh/zsh-3.1/Src/module.c,v
retrieving revision 1.36
diff -u -r1.36 module.c
--- module.c	2000/08/08 15:24:41	1.36
+++ module.c	2000/08/15 16:45:44
@@ -1142,23 +1142,24 @@
 {
     LinkNode node;
     Module m;
-    if(ops['u']) {
+    if (ops['u']) {
 	/* remove dependencies, which can't pertain to aliases */
 	const char *tnam = *args++;
 	node = find_module(tnam, 1, &tnam);
 	if (!node)
 	    return 0;
 	m = (Module) getdata(node);
-	if(*args && m->deps) {
+	if (*args && m->deps) {
 	    do {
-		for(node = firstnode(m->deps); node; incnode(node))
-		    if(!strcmp(*args, getdata(node))) {
-			zsfree(getdata(node));
-			remnode(m->deps, node);
+		LinkNode dnode;
+		for (dnode = firstnode(m->deps); dnode; incnode(dnode))
+		    if (!strcmp(*args, getdata(dnode))) {
+			zsfree(getdata(dnode));
+			remnode(m->deps, dnode);
 			break;
 		    }
 	    } while(*++args);
-	    if(empty(m->deps)) {
+	    if (empty(m->deps)) {
 		freelinklist(m->deps, freestr);
 		m->deps = NULL;
 	    }
@@ -1171,13 +1172,13 @@
 	if (!m->deps && !m->u.handle)
 	    delete_module(node);
 	return 0;
-    } else if(!args[0] || !args[1]) {
+    } else if (!args[0] || !args[1]) {
 	/* list dependencies */
 	for (node = firstnode(modules); node; incnode(node)) {
 	    m = (Module) getdata(node);
 	    if (m->deps && (!args[0] || !strcmp(args[0], m->nam))) {
 		LinkNode n;
-		if(ops['L']) {
+		if (ops['L']) {
 		    printf("zmodload -d ");
 		    if(m->nam[0] == '-')
 			fputs("-- ", stdout);
@@ -1202,7 +1203,7 @@
 	int ret = 0;
 	char *tnam = *args++;
 
-	for(; *args; args++)
+	for (; *args; args++)
 	    add_dep(tnam, *args);
 	return ret;
     }

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com

Zsh: http://www.zsh.org | PHPerl Project: http://phperl.sourceforge.net