From owner-freebsd-current@FreeBSD.ORG Sat Jul 23 01:49:39 2005 Return-Path: X-Original-To: freebsd-current@freebsd.org Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 285C216A41F for ; Sat, 23 Jul 2005 01:49:36 +0000 (GMT) (envelope-from minimarmot@gmail.com) Received: from wproxy.gmail.com (wproxy.gmail.com [64.233.184.205]) by mx1.FreeBSD.org (Postfix) with ESMTP id 59F9743D46 for ; Sat, 23 Jul 2005 01:49:35 +0000 (GMT) (envelope-from minimarmot@gmail.com) Received: by wproxy.gmail.com with SMTP id 55so556813wri for ; Fri, 22 Jul 2005 18:49:34 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:reply-to:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=aXNbvDL+iNWegHE61KmxoKwp3Zy/rrFGsCueeERK4OK4zinsgIgkeJuGk3178pomXJzc+RAzi3IwIa5/TVFU6l5eS3m8VaRNXaisP4Sh7hyZsvnA85FJi6dFRJgThMfwWQWG3IZF1yomgwgObSN3ZJ3LTvgDsgNlB+baM1yPqSM= Received: by 10.54.49.52 with SMTP id w52mr1510214wrw; Fri, 22 Jul 2005 18:49:34 -0700 (PDT) Received: by 10.54.44.33 with HTTP; Fri, 22 Jul 2005 18:49:34 -0700 (PDT) Message-ID: <47d0403c05072218491c78e2e9@mail.gmail.com> Date: Sat, 23 Jul 2005 01:49:34 +0000 From: Ben Kaduk To: Jung-uk Kim In-Reply-To: <47d0403c05072218091264a990@mail.gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline References: <200507220549.j6M5nfhO059858@repoman.freebsd.org> <47d0403c05072218091264a990@mail.gmail.com> Cc: freebsd-current@freebsd.org Subject: Re: cvs commit: src/usr.sbin/ndiscvt ndisgen.sh X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Ben Kaduk List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Jul 2005 01:49:39 -0000 On 7/23/05, Ben Kaduk wrote: > On 7/22/05, Jung-uk Kim wrote: > > jkim 2005-07-22 05:49:41 UTC > > > > FreeBSD src repository > > > > Modified files: > > usr.sbin/ndiscvt ndisgen.sh > > Log: > > Fix ndisgen(8) for amd64 > > > > - file(1) does not recognize UTF-16 encoded .INF file: > > > > netbc564.inf: MPEG ADTS, layer I, v1, 96 kBits, 32 kHz, Ster= eo > > > > Use egrep(1) to match two strings, i. e., `Signature' and `Class=3DNe= t'. > > > > - Fix linking failure. Generate a temporary Makefile to emluate > > official kernel module build process. > > > > - Some minor typo/style fixes. > > > > Reviewed by: obrien > > > > Revision Changes Path > > 1.2 +116 -72 src/usr.sbin/ndiscvt/ndisgen.sh > > _______________________________________________ > > cvs-src@freebsd.org mailing list > > http://lists.freebsd.org/mailman/listinfo/cvs-src > > To unsubscribe, send any mail to "cvs-src-unsubscribe@freebsd.org" > > >=20 > I think this commit broke ndisgen for my broadcom bcm4324 chipset > (dell truemobile 1400 mini-pci), since the only other commit since my > last > working version (6.0-Release Beta 1) claimed to be grammatical fixes. > ndisgen fails to recognize my .inf file, which the old version recognized= : >=20 > ---------begin ndisgen output ---------- >=20 > A .INF file is most often provided as an ASCII file, however > files with multilanguage support are provided in Unicode format. > Please type in the path to your .INF file now. >=20 > > /usr/src/sys/modules/if_ndis/bcmwl5a.inf >=20 > I don't recognize this file format. It may not be a valid .INF fi= le. >=20 > --------- end ndisgen output -------- > the driver files that worked are here: > https://netfiles.uiuc.edu/kaduk/www/bcmwl5a.inf > https://netfiles.uiuc.edu/kaduk/www/bcmwl5.sys >=20 > I tried removing the ^M's from the ends of lines, but this made no > difference. Any thoughts to explain this behaviour? >=20 > Thanks >=20 > Ben Kaduk >=20 I know it's bad form to reply to myself, but this patch seems to allow ndisgen to recognize my .inf file: prolepsis# diff -u /usr/sbin/ndisgen /root/ndisgen.old --- /usr/sbin/ndisgen Sat Jul 23 01:47:31 2005 +++ /root/ndisgen.old Sat Jul 23 01:39:50 2005 @@ -196,7 +196,7 @@ echo -n " > " read INFPATH if [ ${INFPATH} ] && [ -e ${INFPATH} ]; then - INFTYPE=3D`${EGREP} -i -c "Signature|^.S.i.g.n.a.t.u.r.e" ${INFPATH= }` + INFTYPE=3D`${EGREP} -i -c "^Signature|^.S.i.g.n.a.t.u.r.e" ${INFPAT= H}` if [ ${INFTYPE} -le 0 ]; then echo "" echo " I don't recognize this file format. It may not be a valid .INF file." @@ -207,7 +207,7 @@ return fi - INFTYPE=3D`${EGREP} -i -c "Class.*=3D.*Net" ${INFPATH}` + INFTYPE=3D`${EGREP} -i -c "^Class.*=3D.*Net" ${INFPATH}` if [ ${INFTYPE} -gt 0 ]; then echo "" echo " This .INF file appears to be ASCII." Apparently egrep isn't recognizing "^" as the beginning of a line. Hope this helps, Ben Kaduk