From owner-cvs-all Mon Apr 8 22:55: 9 2002 Delivered-To: cvs-all@freebsd.org Received: from rover.village.org (rover.bsdimp.com [204.144.255.66]) by hub.freebsd.org (Postfix) with ESMTP id 7032737B405; Mon, 8 Apr 2002 22:55:00 -0700 (PDT) Received: from harmony.village.org (harmony.village.org [10.0.0.6]) by rover.village.org (8.11.3/8.11.3) with ESMTP id g395sxi95131; Mon, 8 Apr 2002 23:54:59 -0600 (MDT) (envelope-from imp@village.org) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.11.6/8.11.6) with ESMTP id g395swc27060; Mon, 8 Apr 2002 23:54:58 -0600 (MDT) (envelope-from imp@village.org) Date: Mon, 08 Apr 2002 23:54:59 -0600 (MDT) Message-Id: <20020408.235459.112894298.imp@village.org> To: obrien@FreeBSD.org Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/sys ioccom.h From: "M. Warner Losh" In-Reply-To: <200204090517.g395Hi385293@freefall.freebsd.org> References: <200204090517.g395Hi385293@freefall.freebsd.org> X-Mailer: Mew version 2.1 on Emacs 21.1 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG In message: <200204090517.g395Hi385293@freefall.freebsd.org> "David E. O'Brien" writes: : Back out rev 1.11. People want a FUBARed prototype that breaks many : things. The reason that vim broke is because it includes a bunch of system headers and tries to find the following pattern for each prototype: sed < $srcdir/osdef1.h.in -n -e '/^extern/s@.*[)* ][)* ]*\([a-zA-Z_][a-zA-Z0-9_]*\) __ARGS.*@/[)*, ]\1[ (]/i\\\ \\/\\[^a-zA-Z_\\]\1 __ARGS\\/d@p' > osdef11.sed followed by: cat osdef0.ccc | sed -n -f osdef11.sed >> osdef2.sed sed -f osdef2.sed < $srcdir/osdef1.h.in > auto/osdef.h which is failing to find the prototype.... Not the best thing for a configuration utility to assume. That's why 1.11 broke things for vim, and hylafax. when it failed to find a prototype with the above regular expression, it defined a prototype. I think that maybe the following will fix it: sed < $srcdir/osdef1.h.in -n -e '/^extern/s@.*[)* ][)* ]*\([a-zA-Z_][a-zA-Z0-9_]*\) __ARGS.*@/[)*, ][(]*\1[)]*[ (]/i\\\ \\/\\[^a-zA-Z_\\]\1 __ARGS\\/d@p' > osdef11.sed Since it allows the new prototypes to match. Likewise for osdef2.h.in elsewhere in the file. Or take the low road and just remove ioctl from the osdef1.h.in file... Of course if X were easier to compile/recompile, I'd take a shot at fixing it too, but the new meta ports make that hard :-(. Warner To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message