From owner-freebsd-stable  Fri Sep 21  3:51:47 2001
Delivered-To: freebsd-stable@freebsd.org
Received: from smtp.www-service.de (smtp.www-service.de [212.77.161.16])
	by hub.freebsd.org (Postfix) with SMTP id 5B4DE37B425
	for <stable@freebsd.org>; Fri, 21 Sep 2001 03:51:41 -0700 (PDT)
Received: (qmail 8382 invoked from network); 21 Sep 2001 10:51:33 -0000
Received: from pd900657d.dip.t-dialin.net (HELO fw.tue.le) (217.0.101.125)
  by smtp.www-service.de with SMTP; 21 Sep 2001 10:51:33 -0000
Received: from mezcal.tue.le (mezcal.tue.le [192.168.201.20])
	by fw.tue.le (8.8.8/8.8.8) with ESMTP id MAA24472;
	Fri, 21 Sep 2001 12:50:59 +0200 (CEST)
	(envelope-from thz@mezcal.tue.le)
Received: (from thz@localhost)
	by mezcal.tue.le (8.11.6/8.11.6) id f8LAoxO26171;
	Fri, 21 Sep 2001 12:50:59 +0200 (CEST)
	(envelope-from thz)
Date: Fri, 21 Sep 2001 12:50:59 +0200
From: Thomas Zenker <thz@Lennartz-electronic.de>
To: Antony T Curtis <antony@dp.abacus.co.uk>
Cc: stable@freebsd.org
Subject: Re: mergemaster goes postal / MAKEDEV problems
Message-ID: <20010921125059.A19142@mezcal.tue.le>
Mail-Followup-To: Thomas Zenker <thz@mezcal.tue.le>,
	Antony T Curtis <antony@dp.abacus.co.uk>, stable@freebsd.org
References: <E15jveS-0008Uc-00@rip.psg.com> <3BAA3B47.6000308@gmx.net> <3BAA0757.BF52C720@dp.abacus.co.uk>
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
User-Agent: Mutt/1.2.5i
In-Reply-To: <3BAA0757.BF52C720@dp.abacus.co.uk>; from antony@dp.abacus.co.uk on Thu, Sep 20, 2001 at 04:12:23PM +0100
Sender: owner-freebsd-stable@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-stable.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-stable>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-stable>
X-Loop: FreeBSD.ORG

On Thu, Sep 20, 2001 at 04:12:23PM +0100, Antony T Curtis wrote:
> Michael Nottebrock wrote:
> > 
> > Randy Bush wrote:
> >  > happened on three separate systems cvsupped this afternoon
> >  >
> >  > [...]
> >  >
> >  > MAKEDEV: arith: syntax error: à [...]
> >  >
> >  > [...]
> > 
> > Looks to me as if this is a really old bug surfacing here. Reference
> > 
> > http://www.freebsd.org/cgi/query-pr.cgi?pr=30637
> > 
> > and
> > 
> > http://www.freebsd.org/cgi/query-pr.cgi?pr=24443
> 
> Is the above PR a reasonable fix and is it safe for people to apply this
> change to /usr/src/bin/sh/expand.c ?
> 
> If it is a good fix - any chance it would be committed?

yes, that's it:

Index: expand.c
===================================================================
RCS file: /usr/cvs/FreeBSD/src/bin/sh/expand.c,v
retrieving revision 1.31.2.1
diff -u -r1.31.2.1 expand.c
--- expand.c	2000/06/14 13:42:25	1.31.2.1
+++ expand.c	2001/09/21 10:49:11
@@ -397,7 +397,7 @@
 	CHECKSTRSPACE(12 - 2, expdest);
 	USTPUTC('\0', expdest);
 	start = stackblock();
-	p = expdest;
+	p = expdest - 1;
 	while (*p != CTLARI && p >= start)
 		--p;
 	if (*p != CTLARI)


-- Thomas Zenker
   c/o Lennartz electronic GmbH
   Bismarckstrasse 136, D-72072 Tuebingen, Germany
   Phone:  +49-(0)7071-93550
   Email:  thz@lennartz-electronic.de

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message