From owner-cvs-gnu Sun Oct 29 01:36:05 1995 Return-Path: owner-cvs-gnu Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id BAA05903 for cvs-gnu-outgoing; Sun, 29 Oct 1995 01:36:05 -0700 Received: (from peter@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id BAA05888 ; Sun, 29 Oct 1995 01:35:54 -0700 Date: Sun, 29 Oct 1995 01:35:54 -0700 From: Peter Wemm Message-Id: <199510290835.BAA05888@freefall.freebsd.org> To: CVS-commiters, cvs-gnu Subject: cvs commit: src/gnu/usr.bin/rcs/lib conf.h Sender: owner-cvs-gnu@FreeBSD.org Precedence: bulk peter 95/10/29 01:35:52 Modified: gnu/usr.bin/rcs/lib conf.h Log: AARGH!!!! Fix the hard-coded pathname to /usr/local/bin/co and /usr/local/bin/merge that I missed... From owner-cvs-gnu Sun Oct 29 01:42:10 1995 Return-Path: owner-cvs-gnu Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id BAA06222 for cvs-gnu-outgoing; Sun, 29 Oct 1995 01:42:10 -0700 Received: from jhome.DIALix.COM (root@jhome.DIALix.COM [192.203.228.69]) by freefall.freebsd.org (8.6.12/8.6.6) with ESMTP id BAA06195 ; Sun, 29 Oct 1995 01:41:54 -0700 Received: (from peter@localhost) by jhome.DIALix.COM (8.6.12/8.6.9) id QAA10096; Sun, 29 Oct 1995 16:41:41 +0800 Date: Sun, 29 Oct 1995 16:41:41 +0800 (WST) From: Peter Wemm To: CVS-commiters@freefall.freebsd.org, cvs-gnu@freefall.freebsd.org Subject: Re: cvs commit: src/gnu/usr.bin/rcs/lib conf.h In-Reply-To: <199510290835.BAA05888@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-cvs-gnu@FreeBSD.org Precedence: bulk On Sun, 29 Oct 1995, Peter Wemm wrote: > peter 95/10/29 01:35:52 > > Modified: gnu/usr.bin/rcs/lib conf.h > Log: > AARGH!!!! > > Fix the hard-coded pathname to /usr/local/bin/co and /usr/local/bin/merge > that I missed... Pointed out by: bde (sorry, forgot this in the commit message) Somebody please pass the conical hat! If you're running via ctm-cvs-cur and have just got the most recent deltas, I'd suggest applying this patch to your checked out copy of rcs/lib/conf.h so that you dont get dung out to dry if you compile/install it. The upcoming cvs-src-cur probably will be OK. -Peter RCS file: /home/ncvs/src/gnu/usr.bin/rcs/lib/conf.h,v retrieving revision 1.4 diff -c -r1.4 conf.h *** 1.4 1995/10/28 21:49:25 --- conf.h 1995/10/29 08:32:09 *************** *** 210,216 **** /* Do struct stat s and t describe the same file? Answer d if unknown. */ #define same_file(s,t,d) ((s).st_ino==(t).st_ino && (s).st_dev==(t).st_dev) #define has_utimbuf 1 /* Does struct utimbuf work? */ ! #define CO "/usr/local/bin/co" /* name of 'co' program */ #define COMPAT2 0 /* Are version 2 files supported? */ #define DIFF "/usr/bin/diff" /* name of 'diff' program */ #define DIFF3 "/usr/bin/diff3" /* name of 'diff3' program */ --- 210,216 ---- /* Do struct stat s and t describe the same file? Answer d if unknown. */ #define same_file(s,t,d) ((s).st_ino==(t).st_ino && (s).st_dev==(t).st_dev) #define has_utimbuf 1 /* Does struct utimbuf work? */ ! #define CO "/usr/bin/co" /* name of 'co' program */ #define COMPAT2 0 /* Are version 2 files supported? */ #define DIFF "/usr/bin/diff" /* name of 'diff' program */ #define DIFF3 "/usr/bin/diff3" /* name of 'diff3' program */ *************** *** 221,227 **** #define DIFF_FAILURE 1 /* DIFF status if differences are found */ #define DIFF_TROUBLE 2 /* DIFF status if trouble */ #define ED "/bin/ed" /* name of 'ed' program (used only if !DIFF3_BIN) */ ! #define MERGE "/usr/local/bin/merge" /* name of 'merge' program */ #define TMPDIR "/tmp" /* default directory for temporary files */ #define SLASH '/' /* principal filename separator */ #define SLASHes '/' /* `case SLASHes:' labels all filename separators */ --- 221,227 ---- #define DIFF_FAILURE 1 /* DIFF status if differences are found */ #define DIFF_TROUBLE 2 /* DIFF status if trouble */ #define ED "/bin/ed" /* name of 'ed' program (used only if !DIFF3_BIN) */ ! #define MERGE "/usr/bin/merge" /* name of 'merge' program */ #define TMPDIR "/tmp" /* default directory for temporary files */ #define SLASH '/' /* principal filename separator */ #define SLASHes '/' /* `case SLASHes:' labels all filename separators */ From owner-cvs-gnu Sun Oct 29 01:52:44 1995 Return-Path: owner-cvs-gnu Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id BAA06669 for cvs-gnu-outgoing; Sun, 29 Oct 1995 01:52:44 -0700 Received: (from peter@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id BAA06654 ; Sun, 29 Oct 1995 01:52:30 -0700 Date: Sun, 29 Oct 1995 01:52:30 -0700 From: Peter Wemm Message-Id: <199510290852.BAA06654@freefall.freebsd.org> To: CVS-commiters, cvs-gnu Subject: cvs commit: src/gnu/usr.bin/diff - Imported sources Sender: owner-cvs-gnu@FreeBSD.org Precedence: bulk peter 95/10/29 01:52:28 Branch: gnu/usr.bin/diff 1.1.1 Log: Import diff-2.7's diff.texi which I left out last time. Suggested by: bde Status: Vendor Tag: GNU Release Tags: diff_2_7 N src/gnu/usr.bin/diff/diff.texi No conflicts created by this import From owner-cvs-gnu Sun Oct 29 01:02:47 1995 Return-Path: owner-cvs-gnu Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id BAA07168 for cvs-gnu-outgoing; Sun, 29 Oct 1995 01:02:47 -0800 Received: (from peter@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id BAA07140 ; Sun, 29 Oct 1995 01:02:32 -0800 Date: Sun, 29 Oct 1995 01:02:32 -0800 From: Peter Wemm Message-Id: <199510290902.BAA07140@freefall.freebsd.org> To: CVS-commiters, cvs-gnu Subject: cvs commit: src/gnu/usr.bin/diff/doc - New directory Sender: owner-cvs-gnu@FreeBSD.org Precedence: bulk peter 95/10/29 01:02:31 src/gnu/usr.bin/diff/doc - New directory From owner-cvs-gnu Sun Oct 29 01:08:47 1995 Return-Path: owner-cvs-gnu Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id BAA07676 for cvs-gnu-outgoing; Sun, 29 Oct 1995 01:08:47 -0800 Received: (from peter@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id BAA07665 ; Sun, 29 Oct 1995 01:08:38 -0800 Date: Sun, 29 Oct 1995 01:08:38 -0800 From: Peter Wemm Message-Id: <199510290908.BAA07665@freefall.freebsd.org> To: CVS-commiters, cvs-gnu Subject: cvs commit: src/gnu/usr.bin/diff/doc Makefile Sender: owner-cvs-gnu@FreeBSD.org Precedence: bulk hsu 95/10/29 01:08:37 Modified: gnu/usr.bin/diff Makefile Added: gnu/usr.bin/diff/doc Makefile Log: Build and install diff.info.. As Bruce said, this is a little bogus, it'd be nice if bsd.prog.mk knew about .texi in the same way as it does man pages.. Submitted by: bde From owner-cvs-gnu Sun Oct 29 09:56:38 1995 Return-Path: owner-cvs-gnu Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id JAA09207 for cvs-gnu-outgoing; Sun, 29 Oct 1995 09:56:38 -0800 Received: (from peter@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id JAA09187 ; Sun, 29 Oct 1995 09:56:30 -0800 Date: Sun, 29 Oct 1995 09:56:30 -0800 From: Peter Wemm Message-Id: <199510291756.JAA09187@freefall.freebsd.org> To: CVS-commiters, cvs-gnu Subject: cvs commit: src/gnu/usr.bin/rcs/rlog rlog.c Sender: owner-cvs-gnu@FreeBSD.org Precedence: bulk peter 95/10/29 09:56:30 Modified: gnu/usr.bin/rcs/rlog rlog.c Log: Restore nate's change from rev 1.2; improve readability of the rlog output (adds a short row of dashes in a place that CVS and RCS dont mind) From owner-cvs-gnu Sun Oct 29 10:07:13 1995 Return-Path: owner-cvs-gnu Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id KAA10456 for cvs-gnu-outgoing; Sun, 29 Oct 1995 10:07:13 -0800 Received: (from peter@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id KAA10443 ; Sun, 29 Oct 1995 10:07:06 -0800 Date: Sun, 29 Oct 1995 10:07:06 -0800 From: Peter Wemm Message-Id: <199510291807.KAA10443@freefall.freebsd.org> To: CVS-commiters, cvs-gnu Subject: cvs commit: src/gnu/usr.bin/rcs/rlog rlog.c Sender: owner-cvs-gnu@FreeBSD.org Precedence: bulk peter 95/10/29 10:07:06 Modified: gnu/usr.bin/rcs/rlog rlog.c Log: Restore phk's changes from 1.3 - 1.5.. Adds a -v switch to rlog to get it to print the current version of the RCS files. From owner-cvs-gnu Sun Oct 29 11:31:16 1995 Return-Path: owner-cvs-gnu Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id LAA13964 for cvs-gnu-outgoing; Sun, 29 Oct 1995 11:31:16 -0800 Received: (from peter@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id LAA13955 ; Sun, 29 Oct 1995 11:31:13 -0800 Date: Sun, 29 Oct 1995 11:31:13 -0800 From: Peter Wemm Message-Id: <199510291931.LAA13955@freefall.freebsd.org> To: CVS-commiters, cvs-gnu Subject: cvs commit: src/gnu/usr.bin/rcs/lib rcsbase.h rcsedit.c rcskeys.c Sender: owner-cvs-gnu@FreeBSD.org Precedence: bulk peter 95/10/29 11:31:12 Modified: gnu/usr.bin/rcs/co co.c gnu/usr.bin/rcs/lib rcsbase.h rcsedit.c rcskeys.c Log: Recover the -K option to co, for handling selective keyword expansion. From owner-cvs-gnu Sun Oct 29 14:07:08 1995 Return-Path: owner-cvs-gnu Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id OAA20975 for cvs-gnu-outgoing; Sun, 29 Oct 1995 14:07:08 -0800 Received: (from peter@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id OAA20962 ; Sun, 29 Oct 1995 14:06:52 -0800 Date: Sun, 29 Oct 1995 14:06:52 -0800 From: Peter Wemm Message-Id: <199510292206.OAA20962@freefall.freebsd.org> To: CVS-commiters, cvs-gnu Subject: cvs commit: src/gnu/usr.bin/rcs/rlog rlog.c Sender: owner-cvs-gnu@FreeBSD.org Precedence: bulk peter 95/10/29 14:06:50 Modified: gnu/usr.bin/rcs/ci ci.c gnu/usr.bin/rcs/co co.c gnu/usr.bin/rcs/ident ident.c gnu/usr.bin/rcs/lib rcsbase.h rcsedit.c rcsfcmp.c rcsfnms.c rcsgen.c rcskeep.c rcskeys.c rcslex.c rcsrev.c rcssyn.c rcsutil.c gnu/usr.bin/rcs/rcs rcs.c gnu/usr.bin/rcs/rcsdiff rcsdiff.c gnu/usr.bin/rcs/rcsmerge rcsmerge.c gnu/usr.bin/rcs/rlog rlog.c Log: Remove the $ Log: ... $ lines from the comments in the files that had them. Good greif! This was causing an unimaginable amount of brain-damage! The mere fact that I griped about $ Log $ in a previous commit (misspelled deliberately here) meant that the blasted thing was being expanded from the middle of the log entry as well as the beginning, and using " * All these" as the comment leader.. AARGH!!!! We *really* need to prevent these from being expanded! (or remove the magic identifier from the source). From owner-cvs-gnu Sun Oct 29 15:16:53 1995 Return-Path: owner-cvs-gnu Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id PAA23954 for cvs-gnu-outgoing; Sun, 29 Oct 1995 15:16:53 -0800 Received: from Root.COM (implode.Root.COM [198.145.90.17]) by freefall.freebsd.org (8.6.12/8.6.6) with ESMTP id PAA23949 ; Sun, 29 Oct 1995 15:16:46 -0800 Received: from corbin.Root.COM (corbin [198.145.90.50]) by Root.COM (8.6.12/8.6.5) with ESMTP id PAA01349; Sun, 29 Oct 1995 15:16:45 -0800 Received: from localhost (localhost [127.0.0.1]) by corbin.Root.COM (8.6.12/8.6.5) with SMTP id PAA12164; Sun, 29 Oct 1995 15:14:18 -0800 Message-Id: <199510292314.PAA12164@corbin.Root.COM> To: Peter Wemm cc: CVS-commiters@freefall.freebsd.org, cvs-gnu@freefall.freebsd.org Subject: Re: cvs commit: src/gnu/usr.bin/rcs/rlog rlog.c In-reply-to: Your message of "Sun, 29 Oct 95 14:06:52 PST." <199510292206.OAA20962@freefall.freebsd.org> From: David Greenman Reply-To: davidg@Root.COM Date: Sun, 29 Oct 1995 15:14:18 -0800 Sender: owner-cvs-gnu@FreeBSD.org Precedence: bulk >peter 95/10/29 14:06:50 > > Modified: gnu/usr.bin/rcs/ci ci.c > gnu/usr.bin/rcs/co co.c > gnu/usr.bin/rcs/ident ident.c > gnu/usr.bin/rcs/lib rcsbase.h rcsedit.c rcsfcmp.c rcsfnms.c > rcsgen.c rcskeep.c rcskeys.c rcslex.c rcsrev.c > rcssyn.c rcsutil.c > gnu/usr.bin/rcs/rcs rcs.c > gnu/usr.bin/rcs/rcsdiff rcsdiff.c > gnu/usr.bin/rcs/rcsmerge rcsmerge.c > gnu/usr.bin/rcs/rlog rlog.c > Log: > Remove the $ Log: ... $ lines from the comments in the files that had > them. Good greif! This was causing an unimaginable amount of brain-damage! > The mere fact that I griped about $ Log $ in a previous commit (misspelled > deliberately here) meant that the blasted thing was being expanded from the > middle of the log entry as well as the beginning, and using " * All these" > as the comment leader.. AARGH!!!! We *really* need to prevent these from > being expanded! (or remove the magic identifier from the source). Is it just me, or does everyone think this is poetic justice? :-) Yeah, $Log$ is evil. -DG From owner-cvs-gnu Sun Oct 29 15:23:45 1995 Return-Path: owner-cvs-gnu Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id PAA24120 for cvs-gnu-outgoing; Sun, 29 Oct 1995 15:23:45 -0800 Received: from precipice.shockwave.com (precipice.shockwave.com [171.69.108.33]) by freefall.freebsd.org (8.6.12/8.6.6) with ESMTP id PAA24115 ; Sun, 29 Oct 1995 15:23:42 -0800 Received: from localhost (localhost [127.0.0.1]) by precipice.shockwave.com (8.6.12/8.6.12) with SMTP id PAA02647; Sun, 29 Oct 1995 15:22:37 -0800 Message-Id: <199510292322.PAA02647@precipice.shockwave.com> To: davidg@Root.COM cc: Peter Wemm , CVS-commiters@freefall.freebsd.org, cvs-gnu@freefall.freebsd.org Subject: Re: cvs commit: src/gnu/usr.bin/rcs/rlog rlog.c In-reply-to: Your message of "Sun, 29 Oct 1995 15:14:18 PST." <199510292314.PAA12164@corbin.Root.COM> Date: Sun, 29 Oct 1995 15:22:36 -0800 From: Paul Traina Sender: owner-cvs-gnu@FreeBSD.org Precedence: bulk Some of us don't think so...in fact, I wish all files had $Log$'s kept inline and trimmed to show all changes in period of time. It's easier than digging through cvs log. Actually, I will agree with you, $Log$ is evil. I hate it, but it's handy. Is it just me, or does everyone think this is poetic justice? :-) Yeah, $Log$ is evil. -DG From owner-cvs-gnu Sun Oct 29 16:37:44 1995 Return-Path: owner-cvs-gnu Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id QAA15780 for cvs-gnu-outgoing; Sun, 29 Oct 1995 16:37:44 -0800 Received: from rocky.sri.MT.net (sri.MT.net [204.94.231.129]) by freefall.freebsd.org (8.6.12/8.6.6) with ESMTP id QAA15694 ; Sun, 29 Oct 1995 16:37:33 -0800 Received: (from nate@localhost) by rocky.sri.MT.net (8.6.12/8.6.12) id RAA09168; Sun, 29 Oct 1995 17:39:55 -0700 Date: Sun, 29 Oct 1995 17:39:55 -0700 From: Nate Williams Message-Id: <199510300039.RAA09168@rocky.sri.MT.net> To: Peter Wemm Cc: CVS-commiters@freefall.freebsd.org, cvs-gnu@freefall.freebsd.org Subject: Re: cvs commit: src/gnu/usr.bin/rcs/rlog rlog.1 rlog.c In-Reply-To: <199510282151.OAA01822@freefall.freebsd.org> References: <199510282151.OAA01822@freefall.freebsd.org> Sender: owner-cvs-gnu@FreeBSD.org Precedence: bulk [ RCS commit ] > Some of the FreeBSD specific features are not working > in this commit yet (mainly rlog stuff and $FreeBSD$ support) Note, $FreeBSD$ support *never* worked quite right, although that might have been a CVS problem and not an RCS problem. Nate From owner-cvs-gnu Sun Oct 29 19:37:48 1995 Return-Path: owner-cvs-gnu Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id TAA27892 for cvs-gnu-outgoing; Sun, 29 Oct 1995 19:37:48 -0800 Received: from GndRsh.aac.dev.com (GndRsh.aac.dev.com [198.145.92.241]) by freefall.freebsd.org (8.6.12/8.6.6) with ESMTP id TAA27886 ; Sun, 29 Oct 1995 19:37:25 -0800 Received: (from rgrimes@localhost) by GndRsh.aac.dev.com (8.6.12/8.6.12) id TAA07247; Sun, 29 Oct 1995 19:37:13 -0800 From: "Rodney W. Grimes" Message-Id: <199510300337.TAA07247@GndRsh.aac.dev.com> Subject: Re: cvs commit: src/gnu/usr.bin/rcs/rlog rlog.1 rlog.c To: nate@rocky.sri.MT.net (Nate Williams) Date: Sun, 29 Oct 1995 19:37:13 -0800 (PST) Cc: peter@freefall.freebsd.org, CVS-commiters@freefall.freebsd.org, cvs-gnu@freefall.freebsd.org In-Reply-To: <199510300039.RAA09168@rocky.sri.MT.net> from "Nate Williams" at Oct 29, 95 05:39:55 pm X-Mailer: ELM [version 2.4 PL24] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Length: 622 Sender: owner-cvs-gnu@FreeBSD.org Precedence: bulk > > [ RCS commit ] > > > Some of the FreeBSD specific features are not working > > in this commit yet (mainly rlog stuff and $FreeBSD$ support) > > Note, $FreeBSD$ support *never* worked quite right, although that might > have been a CVS problem and not an RCS problem. It is a (was since you removed that support from cvs) cvs problem, the RCS part of the patches works just fine. The only cvs problem was I missed one place for cvs diff to work correctly. -- Rod Grimes rgrimes@gndrsh.aac.dev.com Accurate Automation Company Reliable computers for FreeBSD From owner-cvs-gnu Sun Oct 29 20:17:25 1995 Return-Path: owner-cvs-gnu Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id UAA29890 for cvs-gnu-outgoing; Sun, 29 Oct 1995 20:17:25 -0800 Received: from jhome.DIALix.COM (root@jhome.DIALix.COM [192.203.228.69]) by freefall.freebsd.org (8.6.12/8.6.6) with ESMTP id UAA29865 ; Sun, 29 Oct 1995 20:16:49 -0800 Received: (from peter@localhost) by jhome.DIALix.COM (8.6.12/8.6.9) id MAA17470; Mon, 30 Oct 1995 12:15:20 +0800 Date: Mon, 30 Oct 1995 12:15:19 +0800 (WST) From: Peter Wemm To: Nate Williams cc: CVS-commiters@freefall.freebsd.org, cvs-gnu@freefall.freebsd.org Subject: Re: cvs commit: src/gnu/usr.bin/rcs/rlog rlog.1 rlog.c In-Reply-To: <199510300039.RAA09168@rocky.sri.MT.net> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-cvs-gnu@FreeBSD.org Precedence: bulk On Sun, 29 Oct 1995, Nate Williams wrote: > [ RCS commit ] > > > Some of the FreeBSD specific features are not working > > in this commit yet (mainly rlog stuff and $FreeBSD$ support) > > Note, $FreeBSD$ support *never* worked quite right, although that might > have been a CVS problem and not an RCS problem. >From what I understood, it was a CVS problem that was confined to cvs diff. Even though it's not in the current mainline code, it's still in the cvs history. David Dawes had also given me a copy of his current version that they use for XFree86, built on top of the FreeBSD version of cvs/rcs. Now is probably not the time to bring up the issue of $Id$, $FreeBSD$ and keyword expansion (we've got a release to do)... -Peter > Nate > From owner-cvs-gnu Sun Oct 29 23:07:18 1995 Return-Path: owner-cvs-gnu Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id XAA08040 for cvs-gnu-outgoing; Sun, 29 Oct 1995 23:07:18 -0800 Received: from godzilla.zeta.org.au (godzilla.zeta.org.au [203.2.228.19]) by freefall.freebsd.org (8.6.12/8.6.6) with ESMTP id XAA08016 ; Sun, 29 Oct 1995 23:07:07 -0800 Received: (from bde@localhost) by godzilla.zeta.org.au (8.6.9/8.6.9) id SAA10648; Mon, 30 Oct 1995 18:04:53 +1100 Date: Mon, 30 Oct 1995 18:04:53 +1100 From: Bruce Evans Message-Id: <199510300704.SAA10648@godzilla.zeta.org.au> To: nate@rocky.sri.MT.net, peter@jhome.dialix.com Subject: Re: cvs commit: src/gnu/usr.bin/rcs/rlog rlog.1 rlog.c Cc: CVS-commiters@freefall.freebsd.org, cvs-gnu@freefall.freebsd.org Sender: owner-cvs-gnu@FreeBSD.org Precedence: bulk >Now is probably not the time to bring up the issue of $Id$, $FreeBSD$ and >keyword expansion (we've got a release to do)... Yes it is :-). $Id$ is treated differently by `cvs export', so in the release, all files with $Id$ have gratuitous differences from the checked out versions. Bruce From owner-cvs-gnu Mon Oct 30 00:39:11 1995 Return-Path: owner-cvs-gnu Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id AAA12234 for cvs-gnu-outgoing; Mon, 30 Oct 1995 00:39:11 -0800 Received: from jhome.DIALix.COM (root@jhome.DIALix.COM [192.203.228.69]) by freefall.freebsd.org (8.6.12/8.6.6) with ESMTP id AAA12160 ; Mon, 30 Oct 1995 00:37:04 -0800 Received: (from peter@localhost) by jhome.DIALix.COM (8.6.12/8.6.9) id QAA18082; Mon, 30 Oct 1995 16:35:28 +0800 Date: Mon, 30 Oct 1995 16:35:28 +0800 (WST) From: Peter Wemm To: Bruce Evans cc: nate@rocky.sri.MT.net, CVS-commiters@freefall.freebsd.org, cvs-gnu@freefall.freebsd.org Subject: Re: cvs commit: src/gnu/usr.bin/rcs/rlog rlog.1 rlog.c In-Reply-To: <199510300704.SAA10648@godzilla.zeta.org.au> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-cvs-gnu@FreeBSD.org Precedence: bulk On Mon, 30 Oct 1995, Bruce Evans wrote: > >Now is probably not the time to bring up the issue of $Id$, $FreeBSD$ and > >keyword expansion (we've got a release to do)... > > Yes it is :-). $Id$ is treated differently by `cvs export', so in the > release, all files with $Id$ have gratuitous differences from the checked > out versions. > > Bruce Perhaps somebody could explain the logic behind this to me, as I certainly do not understand why we do this.. Part of 'make release' does a 'cvs co' of the source tree, and builds it. OK, fair enough.. So, where does this 'cvs export' code come from? It looks very much like we supply source code that does not match the binaries.. That's not real comforting for people who want to modify a part of the system, but decide to compile that section first to discover that the new binaries dont match what's on the system. Does somebody manually 'cvs export' the code, tar.gz it and split it? If we are worried about somebody cvs importing the source into their own tree and loosing our $Id$ lines, IMHO that's not the way to do it - $FreeBSD$ would be much better and just ship either the source tree that was used in the 'make release' or use proper 'cvs co'.. Well Bruce, you started it.. :-) Cheers, -Peter From owner-cvs-gnu Mon Oct 30 01:10:31 1995 Return-Path: owner-cvs-gnu Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id BAA13533 for cvs-gnu-outgoing; Mon, 30 Oct 1995 01:10:31 -0800 Received: from godzilla.zeta.org.au (godzilla.zeta.org.au [203.2.228.19]) by freefall.freebsd.org (8.6.12/8.6.6) with ESMTP id BAA13512 ; Mon, 30 Oct 1995 01:10:09 -0800 Received: (from bde@localhost) by godzilla.zeta.org.au (8.6.9/8.6.9) id UAA15212; Mon, 30 Oct 1995 20:04:39 +1100 Date: Mon, 30 Oct 1995 20:04:39 +1100 From: Bruce Evans Message-Id: <199510300904.UAA15212@godzilla.zeta.org.au> To: bde@zeta.org.au, peter@jhome.dialix.com Subject: Re: cvs commit: src/gnu/usr.bin/rcs/rlog rlog.1 rlog.c Cc: CVS-commiters@freefall.freebsd.org, cvs-gnu@freefall.freebsd.org, nate@rocky.sri.MT.net Sender: owner-cvs-gnu@FreeBSD.org Precedence: bulk >> Yes it is :-). $Id$ is treated differently by `cvs export', so in the >> release, all files with $Id$ have gratuitous differences from the checked >> out versions. >Perhaps somebody could explain the logic behind this to me, as I >certainly do not understand why we do this.. I thought it was to preserve our Ids from other users' revision control systems. It's annoying when foreign revision control polices such as $Log$ in rcs get imported. Even for things like $Id$ that we want, we really want our Ids separate from the originals. >So, where does this 'cvs export' code come from? It looks very much like Don't know. >If we are worried about somebody cvs importing the source into their own >tree and loosing our $Id$ lines, IMHO that's not the way to do it - >$FreeBSD$ would be much better and just ship either the source tree that >was used in the 'make release' or use proper 'cvs co'.. Perhaps that should be $FreeBSD-Id$. What does $FreeBSD$ do exactly. I'd like one that is applied automatically to all files that we've changed from the vendor branch. Bruce From owner-cvs-gnu Mon Oct 30 02:04:30 1995 Return-Path: owner-cvs-gnu Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id CAA16006 for cvs-gnu-outgoing; Mon, 30 Oct 1995 02:04:30 -0800 Received: from tfs.com (tfs.com [140.145.250.1]) by freefall.freebsd.org (8.6.12/8.6.6) with SMTP id CAA15989 ; Mon, 30 Oct 1995 02:04:13 -0800 Received: from critter.tfs.com by tfs.com (smail3.1.28.1) with SMTP id m0t9qRb-0003vsC; Mon, 30 Oct 95 01:23 PST Received: from localhost (localhost [127.0.0.1]) by critter.tfs.com (8.6.11/8.6.9) with SMTP id KAA02056; Mon, 30 Oct 1995 10:18:39 +0100 X-Authentication-Warning: critter.tfs.com: Host localhost didn't use HELO protocol To: Peter Wemm cc: CVS-commiters@freefall.freebsd.org, cvs-gnu@freefall.freebsd.org Subject: Re: cvs commit: src/gnu/usr.bin/rcs/rlog rlog.1 rlog.c In-reply-to: Your message of "Mon, 30 Oct 1995 16:35:28 +0800." Date: Mon, 30 Oct 1995 10:18:36 +0100 Message-ID: <2054.815044716@critter.tfs.com> From: Poul-Henning Kamp Sender: owner-cvs-gnu@FreeBSD.org Precedence: bulk > So, where does this 'cvs export' code come from? It looks very much like src/release/Makefile. I don't think we should use "export" any more, and it should be simple for Jordan to change it to a "co", though he may have to add a line or two to avoid putting the CVS/ into the src dists. -- Poul-Henning Kamp | phk@FreeBSD.ORG FreeBSD Core-team. http://www.freebsd.org/~phk | phk@login.dknet.dk Private mailbox. whois: [PHK] | phk@ref.tfs.com TRW Financial Systems, Inc. Future will arrive by its own means, progress not so. From owner-cvs-gnu Mon Oct 30 03:03:14 1995 Return-Path: owner-cvs-gnu Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id DAA17977 for cvs-gnu-outgoing; Mon, 30 Oct 1995 03:03:14 -0800 Received: from godzilla.zeta.org.au (godzilla.zeta.org.au [203.2.228.19]) by freefall.freebsd.org (8.6.12/8.6.6) with ESMTP id DAA17960 ; Mon, 30 Oct 1995 03:02:57 -0800 Received: (from bde@localhost) by godzilla.zeta.org.au (8.6.9/8.6.9) id VAA19597; Mon, 30 Oct 1995 21:57:34 +1100 Date: Mon, 30 Oct 1995 21:57:34 +1100 From: Bruce Evans Message-Id: <199510301057.VAA19597@godzilla.zeta.org.au> To: peter@jhome.dialix.com, phk@critter.tfs.com Subject: Re: cvs commit: src/gnu/usr.bin/rcs/rlog rlog.1 rlog.c Cc: CVS-commiters@freefall.freebsd.org, cvs-gnu@freefall.freebsd.org Sender: owner-cvs-gnu@FreeBSD.org Precedence: bulk >> So, where does this 'cvs export' code come from? It looks very much like >src/release/Makefile. >I don't think we should use "export" any more, and it should be simple for >Jordan to change it to a "co", though he may have to add a line or two >to avoid putting the CVS/ into the src dists. Nevermind. This is already implemented. Bruce From owner-cvs-gnu Mon Oct 30 10:16:04 1995 Return-Path: owner-cvs-gnu Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id KAA06697 for cvs-gnu-outgoing; Mon, 30 Oct 1995 10:16:04 -0800 Received: from time.cdrom.com (time.cdrom.com [192.216.222.226]) by freefall.freebsd.org (8.6.12/8.6.6) with ESMTP id KAA06685 ; Mon, 30 Oct 1995 10:15:58 -0800 Received: from localhost (localhost [127.0.0.1]) by time.cdrom.com (8.6.12/8.6.9) with SMTP id KAA20497; Mon, 30 Oct 1995 10:15:35 -0800 To: Poul-Henning Kamp cc: Peter Wemm , CVS-commiters@freefall.freebsd.org, cvs-gnu@freefall.freebsd.org Subject: Re: cvs commit: src/gnu/usr.bin/rcs/rlog rlog.1 rlog.c In-reply-to: Your message of "Mon, 30 Oct 1995 10:18:36 +0100." <2054.815044716@critter.tfs.com> Date: Mon, 30 Oct 1995 10:15:35 -0800 Message-ID: <20491.815076935@time.cdrom.com> From: "Jordan K. Hubbard" Sender: owner-cvs-gnu@FreeBSD.org Precedence: bulk > I don't think we should use "export" any more, and it should be simple for > Jordan to change it to a "co", though he may have to add a line or two > to avoid putting the CVS/ into the src dists. Actually, I'm half tempted to change it to a "copy" with some filtering since I'm just about tired of fielding requests from people who wish to build their own customized floppies but don't (understandably) have the CVS repository lying around.. It'd also save a LOT of time in my builds! I know that I can ensure the sanity of my /usr/src, and if other folks want to build floppies then I daresay they can to. The CVS checkout strikes me as an unecessary safety belt. Jordan From owner-cvs-gnu Mon Oct 30 10:20:33 1995 Return-Path: owner-cvs-gnu Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id KAA06861 for cvs-gnu-outgoing; Mon, 30 Oct 1995 10:20:33 -0800 Received: from halloran-eldar.lcs.mit.edu (halloran-eldar.lcs.mit.edu [18.26.0.159]) by freefall.freebsd.org (8.6.12/8.6.6) with SMTP id KAA06856 ; Mon, 30 Oct 1995 10:20:26 -0800 Received: by halloran-eldar.lcs.mit.edu; (5.65/1.1.8.2/19Aug95-0530PM) id AA28005; Mon, 30 Oct 1995 13:20:05 -0500 Date: Mon, 30 Oct 1995 13:20:05 -0500 From: "Garrett A. Wollman" Message-Id: <9510301820.AA28005@halloran-eldar.lcs.mit.edu> To: "Jordan K. Hubbard" Cc: Poul-Henning Kamp , Peter Wemm , CVS-commiters@freefall.freebsd.org, cvs-gnu@freefall.freebsd.org Subject: Re: cvs commit: src/gnu/usr.bin/rcs/rlog rlog.1 rlog.c In-Reply-To: <20491.815076935@time.cdrom.com> References: <2054.815044716@critter.tfs.com> <20491.815076935@time.cdrom.com> Sender: owner-cvs-gnu@FreeBSD.org Precedence: bulk < said: > (understandably) have the CVS repository lying around.. It'd also > save a LOT of time in my builds! I know that I can ensure the sanity > of my /usr/src, and if other folks want to build floppies then I > daresay they can to. The CVS checkout strikes me as an unecessary > safety belt. In our environment I have found the separate source areas to be extremely useful in keeping the length of time required for a rebuild down to a minimum. (Of course, I never do a `make release' from the top since it wastes far too much time doing things that should already be done anyway.) If you really want to speed up `make release', get rid of the `make world' in there... -GAWollman -- Garrett A. Wollman | Shashish is simple, it's discreet, it's brief. ... wollman@lcs.mit.edu | Shashish is the bonding of hearts in spite of distance. Opinions not those of| It is a bond more powerful than absence. We like people MIT, LCS, ANA, or NSA| who like Shashish. - Claude McKenzie + Florent Vollant From owner-cvs-gnu Mon Oct 30 10:34:58 1995 Return-Path: owner-cvs-gnu Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id KAA07336 for cvs-gnu-outgoing; Mon, 30 Oct 1995 10:34:58 -0800 Received: from kryten.atinc.com (kryten.Atinc.COM [198.138.38.7]) by freefall.freebsd.org (8.6.12/8.6.6) with ESMTP id KAA07304 ; Mon, 30 Oct 1995 10:33:45 -0800 Received: (jmb@localhost) by kryten.atinc.com (8.6.9/8.3) id NAA08529; Mon, 30 Oct 1995 13:21:31 -0500 Date: Mon, 30 Oct 1995 13:21:30 -0500 (EST) From: "Jonathan M. Bresler" Subject: Re: cvs commit: src/gnu/usr.bin/rcs/rlog rlog.1 rlog.c To: "Jordan K. Hubbard" cc: Poul-Henning Kamp , Peter Wemm , CVS-commiters@freefall.freebsd.org, cvs-gnu@freefall.freebsd.org In-Reply-To: <20491.815076935@time.cdrom.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-cvs-gnu@FreeBSD.org Precedence: bulk On Mon, 30 Oct 1995, Jordan K. Hubbard wrote: > Actually, I'm half tempted to change it to a "copy" with some > filtering since I'm just about tired of fielding requests from people > who wish to build their own customized floppies but don't > (understandably) have the CVS repository lying around.. It'd also > save a LOT of time in my builds! I know that I can ensure the sanity > of my /usr/src, and if other folks want to build floppies then I > daresay they can to. The CVS checkout strikes me as an unecessary > safety belt. JUST DO IT! > > Jordan > Jonathan M. Bresler jmb@kryten.atinc.com | Analysis & Technology, Inc. FreeBSD Postmaster jmb@FreeBSD.Org | 2341 Jeff Davis Hwy play go. | Arlington, VA 22202 ride bike. hack FreeBSD.--ah the good life | 703-418-2800 x346 From owner-cvs-gnu Tue Oct 31 00:44:31 1995 Return-Path: owner-cvs-gnu Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id AAA03316 for cvs-gnu-outgoing; Tue, 31 Oct 1995 00:44:31 -0800 Received: (from ache@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id AAA03307 ; Tue, 31 Oct 1995 00:44:25 -0800 Date: Tue, 31 Oct 1995 00:44:25 -0800 From: "Andrey A. Chernov" Message-Id: <199510310844.AAA03307@freefall.freebsd.org> To: CVS-commiters, cvs-gnu Subject: cvs commit: src/gnu/usr.bin/diff diff.c Sender: owner-cvs-gnu@FreeBSD.org Precedence: bulk ache 95/10/31 00:44:24 Modified: gnu/usr.bin/diff diff.c Log: Add setlocale LC_CTYPE From owner-cvs-gnu Thu Nov 2 10:48:39 1995 Return-Path: owner-cvs-gnu Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id KAA11292 for cvs-gnu-outgoing; Thu, 2 Nov 1995 10:48:39 -0800 Received: (from nate@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id KAA11239 ; Thu, 2 Nov 1995 10:48:20 -0800 Date: Thu, 2 Nov 1995 10:48:20 -0800 From: Nate Williams Message-Id: <199511021848.KAA11239@freefall.freebsd.org> To: CVS-commiters, cvs-gnu Subject: cvs commit: src/gnu/usr.bin/ld/rtld rtld.c Sender: owner-cvs-gnu@FreeBSD.org Precedence: bulk nate 95/11/02 10:48:17 Modified: gnu/usr.bin/ld/i386 md-static-funcs.c gnu/usr.bin/ld/rtld rtld.c Log: Changed the terminology for what used to be called the "memorizing" vector. Now it is called the "symbol caching" vector. This was made possible and unconfusing by other changes that allowed me to localize everything having to do with the caching vector in the function reloc_map(). Switched to alloca() for allocating the caching vector, and eliminated the special mmap-based allocation routines. Although this was motivated by performance reasons, it led to significant simplification of the code, and made it possible to confine the symbol caching code to the single function reloc_map(). Got rid of the unnecessary and inefficient division loop at the beginning of rtld(). Reduced the number of calls to getenv("LD_LIBRARY_PATH") to just 1, on suggestion from . Added breaks out of the relocation loops when the relocation address is found to be 0. A relocation address of 0 is caused by an unused relocation entry. Unused relocation entries are caused by linking a shared object with the "-Bsymbolic" switch. The runtime linker itself is linked that way, and the last 40% of its relocation entries are unused. Thus, breaking out of the loop on the first such entry is a performance win when ld.so relocates itself. As a side benefit, it permits removing a test from md_relocate_simple() in ../i386/md-static-funcs.c. Unused relocation entries in other shared objects (linked with "-Bsymbolic") caused even bigger problems in previous versions of the runtime linker. The runtime linker interpreted the unused entries as if they were valid. That caused it to perform repeated relocations of the first byte of the shared object. In order to do that, it had to remap the text segment writable. Breaking out of the loop on the first unused relocation entry solves that. Submitted by: John Polstra