From owner-cvs-usrbin Sun Jun 30 02:41:02 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id CAA27075 for cvs-usrbin-outgoing; Sun, 30 Jun 1996 02:41:02 -0700 (PDT) Received: (from joerg@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id CAA27026; Sun, 30 Jun 1996 02:40:49 -0700 (PDT) Date: Sun, 30 Jun 1996 02:40:49 -0700 (PDT) From: Joerg Wunsch Message-Id: <199606300940.CAA27026@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrbin Subject: cvs commit: src/usr.bin/ktrace ktrace.c Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk joerg 96/06/30 02:40:46 Modified: usr.bin/ktrace ktrace.c Log: Do always create ktrace.out with mode 0600, to prevent it from accidentally compromising information confidential to the user running ktrace. Revision Changes Path 1.5 +4 -1 src/usr.bin/ktrace/ktrace.c From owner-cvs-usrbin Sun Jun 30 02:42:56 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id CAA27334 for cvs-usrbin-outgoing; Sun, 30 Jun 1996 02:42:56 -0700 (PDT) Received: (from joerg@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id CAA27295; Sun, 30 Jun 1996 02:42:45 -0700 (PDT) Date: Sun, 30 Jun 1996 02:42:45 -0700 (PDT) From: Joerg Wunsch Message-Id: <199606300942.CAA27295@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrbin Subject: cvs commit: src/usr.bin/ktrace ktrace.c Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk joerg 96/06/30 02:42:44 Branch: usr.bin/ktrace RELENG_2_1_0 Modified: usr.bin/ktrace ktrace.c Log: Merge rev 1.5: create ktrace.out with mode 0600. Revision Changes Path 1.3.4.2 +4 -1 src/usr.bin/ktrace/ktrace.c From owner-cvs-usrbin Sun Jun 30 04:58:32 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id EAA06656 for cvs-usrbin-outgoing; Sun, 30 Jun 1996 04:58:32 -0700 (PDT) Received: (from wosch@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id EAA06630; Sun, 30 Jun 1996 04:58:22 -0700 (PDT) Date: Sun, 30 Jun 1996 04:58:22 -0700 (PDT) From: Wolfram Schneider Message-Id: <199606301158.EAA06630@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrbin Subject: cvs commit: src/usr.bin/lastcomm lastcomm.1 lastcomm.c Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk wosch 96/06/30 04:58:21 Modified: usr.bin/lastcomm lastcomm.1 lastcomm.c Log: Add some options which makes lastcomm(1) a better debug tool. Revision Changes Path 1.2 +32 -2 src/usr.bin/lastcomm/lastcomm.1 1.4 +87 -11 src/usr.bin/lastcomm/lastcomm.c From owner-cvs-usrbin Sun Jun 30 08:15:22 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id IAA19348 for cvs-usrbin-outgoing; Sun, 30 Jun 1996 08:15:22 -0700 (PDT) Received: from GndRsh.aac.dev.com (GndRsh.aac.dev.com [198.145.92.241]) by freefall.freebsd.org (8.7.5/8.7.3) with SMTP id IAA19341; Sun, 30 Jun 1996 08:15:17 -0700 (PDT) Received: (from rgrimes@localhost) by GndRsh.aac.dev.com (8.6.12/8.6.12) id IAA19104; Sun, 30 Jun 1996 08:15:15 -0700 From: "Rodney W. Grimes" Message-Id: <199606301515.IAA19104@GndRsh.aac.dev.com> Subject: Re: cvs commit: src/usr.bin/ktrace ktrace.c To: joerg@freefall.freebsd.org (Joerg Wunsch) Date: Sun, 30 Jun 1996 08:15:15 -0700 (PDT) Cc: CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-usrbin@freefall.freebsd.org In-Reply-To: <199606300940.CAA27026@freefall.freebsd.org> from Joerg Wunsch at "Jun 30, 96 02:40:49 am" X-Mailer: ELM [version 2.4ME+ PL11 (25)] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk > joerg 96/06/30 02:40:46 > > Modified: usr.bin/ktrace ktrace.c > Log: > Do always create ktrace.out with mode 0600, to prevent it from > accidentally compromising information confidential to the user running > ktrace. > > Revision Changes Path > 1.5 +4 -1 src/usr.bin/ktrace/ktrace.c Ahh... there is already a command to protect the user from such foolishness, the statement above could be applied to _any_ command. umask 077 if you are working with sensitive data. -- Rod Grimes rgrimes@gndrsh.aac.dev.com Accurate Automation Company Reliable computers for FreeBSD From owner-cvs-usrbin Sun Jun 30 09:06:58 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id JAA23840 for cvs-usrbin-outgoing; Sun, 30 Jun 1996 09:06:58 -0700 (PDT) Received: (from wosch@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id JAA23744; Sun, 30 Jun 1996 09:06:46 -0700 (PDT) Date: Sun, 30 Jun 1996 09:06:46 -0700 (PDT) From: Wolfram Schneider Message-Id: <199606301606.JAA23744@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrbin Subject: cvs commit: src/usr.bin/what what.1 Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk wosch 96/06/30 09:06:46 Modified: usr.bin/what what.1 Log: Add a reference to ident(1). Revision Changes Path 1.2 +4 -0 src/usr.bin/what/what.1 From owner-cvs-usrbin Mon Jul 1 01:06:19 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id BAA08565 for cvs-usrbin-outgoing; Mon, 1 Jul 1996 01:06:19 -0700 (PDT) Received: from irz301.inf.tu-dresden.de (irz301.inf.tu-dresden.de [141.76.1.11]) by freefall.freebsd.org (8.7.5/8.7.3) with SMTP id AAA07123; Mon, 1 Jul 1996 00:53:17 -0700 (PDT) Received: from sax.sax.de by irz301.inf.tu-dresden.de (8.6.12/8.6.12-s1) with ESMTP id JAA17615; Mon, 1 Jul 1996 09:53:03 +0200 Received: (from uucp@localhost) by sax.sax.de (8.6.12/8.6.12-s1) with UUCP id JAA10858; Mon, 1 Jul 1996 09:53:02 +0200 Received: (from j@localhost) by uriah.heep.sax.de (8.7.5/8.6.9) id JAA09785; Mon, 1 Jul 1996 09:02:42 +0200 (MET DST) From: J Wunsch Message-Id: <199607010702.JAA09785@uriah.heep.sax.de> Subject: Re: cvs commit: src/usr.bin/ktrace ktrace.c To: rgrimes@gndrsh.aac.dev.com (Rodney W. Grimes) Date: Mon, 1 Jul 1996 09:02:42 +0200 (MET DST) Cc: joerg@freefall.freebsd.org, CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-usrbin@freefall.freebsd.org In-Reply-To: <199606301515.IAA19104@GndRsh.aac.dev.com> from "Rodney W. Grimes" at "Jun 30, 96 08:15:15 am" X-Phone: +49-351-2012 669 X-PGP-Fingerprint: DC 47 E6 E4 FF A6 E9 8F 93 21 E0 7D F9 12 D6 4E X-Mailer: ELM [version 2.4ME+ PL17 (25)] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk As Rodney W. Grimes wrote: > > Do always create ktrace.out with mode 0600, to prevent it from > > accidentally compromising information confidential to the user running > > ktrace. > > > > Revision Changes Path > > 1.5 +4 -1 src/usr.bin/ktrace/ktrace.c > > Ahh... there is already a command to protect the user from such foolishness, > the statement above could be applied to _any_ command. > > umask 077 if you are working with sensitive data. That's exactly what i'm doing. Anyway, there's no need that ktrace.out is readable by anyone else. It's about in the same category as core files, and those are also being created as 0600. -- cheers, J"org joerg_wunsch@uriah.heep.sax.de -- http://www.sax.de/~joerg/ -- NIC: JW11-RIPE Never trust an operating system you don't have sources for. ;-) From owner-cvs-usrbin Mon Jul 1 12:40:52 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id MAA28876 for cvs-usrbin-outgoing; Mon, 1 Jul 1996 12:40:52 -0700 (PDT) Received: (from guido@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id MAA28221; Mon, 1 Jul 1996 12:38:54 -0700 (PDT) Date: Mon, 1 Jul 1996 12:38:54 -0700 (PDT) From: Guido van Rooij Message-Id: <199607011938.MAA28221@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrbin, cvs-usrsbin Subject: cvs commit: src/usr.bin/chpass chpass.c src/usr.bin/passwd local_passwd.c src/usr.sbin/vipw pw_util.c pw_util.h vipw.c src/usr.sbin/pwd_mkdb pwd_mkdb.c src/usr.sbin/rpc.yppasswdd pw_util.c yppasswdd_extern.h yppasswdd_server.c Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk guido 96/07/01 12:38:54 Modified: usr.bin/chpass chpass.c usr.bin/passwd local_passwd.c usr.sbin/pwd_mkdb pwd_mkdb.c usr.sbin/rpc.yppasswdd pw_util.c yppasswdd_extern.h yppasswdd_server.c usr.sbin/vipw pw_util.c pw_util.h vipw.c Log: Implement incremental passwd database updates. This is done by ading a '-u' option to pwd_mkdb and adding this option to utilities invoking it. Further, the filling of both the secure and insecure databases has been merged into one loop giving also a performance improvemnet. Note that I did *not* change the adduser command. I don't read perl (it is a write only language anyway). The change will drastically improve performance for passwd and friends with large passwd files. Vipw's performance won't change. In order to do that some kind of diff should be made between the old and new master.passwd and depending the amount of changes, an incremental or complete update of the databases should be agreed upon. Revision Changes Path 1.9 +4 -2 src/usr.bin/chpass/chpass.c 1.9 +2 -2 src/usr.bin/passwd/local_passwd.c 1.11 +218 -133 src/usr.sbin/pwd_mkdb/pwd_mkdb.c 1.2 +8 -2 src/usr.sbin/rpc.yppasswdd/pw_util.c 1.5 +2 -2 src/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h 1.6 +4 -4 src/usr.sbin/rpc.yppasswdd/yppasswdd_server.c 1.5 +8 -2 src/usr.sbin/vipw/pw_util.c 1.2 +1 -1 src/usr.sbin/vipw/pw_util.h 1.3 +1 -1 src/usr.sbin/vipw/vipw.c From owner-cvs-usrbin Mon Jul 1 15:57:57 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id PAA25822 for cvs-usrbin-outgoing; Mon, 1 Jul 1996 15:57:57 -0700 (PDT) Received: (from jkh@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id PAA25538; Mon, 1 Jul 1996 15:56:02 -0700 (PDT) Date: Mon, 1 Jul 1996 15:56:02 -0700 (PDT) From: "Jordan K. Hubbard" Message-Id: <199607012256.PAA25538@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrbin Subject: cvs commit: src/usr.bin/make main.c Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk jkh 96/07/01 15:56:00 Modified: usr.bin/make main.c Log: Put back the $PWD override behavior of revision 1.4. The concensus *seems* to be that it was the right thing to do. Revision Changes Path 1.6 +6 -0 src/usr.bin/make/main.c From owner-cvs-usrbin Mon Jul 1 18:51:17 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id SAA09932 for cvs-usrbin-outgoing; Mon, 1 Jul 1996 18:51:17 -0700 (PDT) Received: (from jmz@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id SAA09845; Mon, 1 Jul 1996 18:49:49 -0700 (PDT) Date: Mon, 1 Jul 1996 18:49:49 -0700 (PDT) From: Jean-Marc Zucconi Message-Id: <199607020149.SAA09845@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrbin Subject: cvs commit: src/usr.bin/fetch main.c Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk jmz 96/07/01 18:49:49 Modified: usr.bin/fetch main.c Log: Use read(fileno(fp), ...) instead of fread(..., fp) to avoid buffered input. Revision Changes Path 1.7 +2 -2 src/usr.bin/fetch/main.c From owner-cvs-usrbin Mon Jul 1 19:03:28 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id TAA10685 for cvs-usrbin-outgoing; Mon, 1 Jul 1996 19:03:28 -0700 (PDT) Received: from spinner.DIALix.COM (root@spinner.DIALix.COM [192.203.228.67]) by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id TAA10671; Mon, 1 Jul 1996 19:03:17 -0700 (PDT) Received: from spinner.DIALix.COM (peter@localhost.DIALix.oz.au [127.0.0.1]) by spinner.DIALix.COM (8.7.5/8.7.3) with ESMTP id KAA21604; Tue, 2 Jul 1996 10:03:10 +0800 (WST) Message-Id: <199607020203.KAA21604@spinner.DIALix.COM> X-Mailer: exmh version 1.6.6 3/24/96 To: Jean-Marc Zucconi cc: CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-usrbin@freefall.freebsd.org Subject: Re: cvs commit: src/usr.bin/fetch main.c In-reply-to: Your message of "Mon, 01 Jul 1996 18:49:49 MST." <199607020149.SAA09845@freefall.freebsd.org> Date: Tue, 02 Jul 1996 10:03:09 +0800 From: Peter Wemm Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk >>>Jean-Marc Zucconi said: > jmz 96/07/01 18:49:49 > > Modified: usr.bin/fetch main.c > Log: > Use read(fileno(fp), ...) instead of fread(..., fp) to avoid buffered input THANKYOU!!!!!!!!!!! The fread() was *extremely* annoying as it took forever to do a status update on anything but a fast line. The intended 5-second status update was taking as long as a minute sometimes... :-( Cheers, -Peter From owner-cvs-usrbin Tue Jul 2 00:02:31 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id AAA04496 for cvs-usrbin-outgoing; Tue, 2 Jul 1996 00:02:31 -0700 (PDT) Received: from irz301.inf.tu-dresden.de (irz301.inf.tu-dresden.de [141.76.1.11]) by freefall.freebsd.org (8.7.5/8.7.3) with SMTP id XAA03401; Mon, 1 Jul 1996 23:53:21 -0700 (PDT) Received: from sax.sax.de by irz301.inf.tu-dresden.de (8.6.12/8.6.12-s1) with ESMTP id IAA04186; Tue, 2 Jul 1996 08:52:22 +0200 Received: (from uucp@localhost) by sax.sax.de (8.6.12/8.6.12-s1) with UUCP id IAA26314; Tue, 2 Jul 1996 08:52:22 +0200 Received: (from j@localhost) by uriah.heep.sax.de (8.7.5/8.6.9) id IAA10225; Tue, 2 Jul 1996 08:39:46 +0200 (MET DST) From: J Wunsch Message-Id: <199607020639.IAA10225@uriah.heep.sax.de> Subject: Re: cvs commit: src/usr.bin/fetch main.c To: jmz@freefall.freebsd.org (Jean-Marc Zucconi) Date: Tue, 2 Jul 1996 08:39:46 +0200 (MET DST) Cc: CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-usrbin@freefall.freebsd.org Reply-To: joerg_wunsch@uriah.heep.sax.de (Joerg Wunsch) In-Reply-To: <199607020149.SAA09845@freefall.freebsd.org> from Jean-Marc Zucconi at "Jul 1, 96 06:49:49 pm" X-Phone: +49-351-2012 669 X-PGP-Fingerprint: DC 47 E6 E4 FF A6 E9 8F 93 21 E0 7D F9 12 D6 4E X-Mailer: ELM [version 2.4ME+ PL17 (25)] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk As Jean-Marc Zucconi wrote: > jmz 96/07/01 18:49:49 > > Modified: usr.bin/fetch main.c > Log: > Use read(fileno(fp), ...) instead of fread(..., fp) to avoid buffered input. I'm still against it, and i consider it bad style that you're committing something that has caused opposition in the mailing lists. You haven't even marked your change with /* XXX bogus */ as would be the least sign of warning. If all your concern is avoiding input buffering, why have you never considered doing The Right Thing and using setvbuf(3)? -- cheers, J"org joerg_wunsch@uriah.heep.sax.de -- http://www.sax.de/~joerg/ -- NIC: JW11-RIPE Never trust an operating system you don't have sources for. ;-) From owner-cvs-usrbin Tue Jul 2 00:28:53 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id AAA05449 for cvs-usrbin-outgoing; Tue, 2 Jul 1996 00:28:53 -0700 (PDT) Received: from godzilla.zeta.org.au (godzilla.zeta.org.au [203.2.228.19]) by freefall.freebsd.org (8.7.5/8.7.3) with SMTP id AAA05437; Tue, 2 Jul 1996 00:28:43 -0700 (PDT) Received: (from bde@localhost) by godzilla.zeta.org.au (8.6.12/8.6.9) id RAA31605; Tue, 2 Jul 1996 17:26:22 +1000 Date: Tue, 2 Jul 1996 17:26:22 +1000 From: Bruce Evans Message-Id: <199607020726.RAA31605@godzilla.zeta.org.au> To: j@uriah.heep.sax.de, jmz@freefall.freebsd.org Subject: Re: cvs commit: src/usr.bin/fetch main.c Cc: CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-usrbin@freefall.freebsd.org Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk >If all your concern is avoiding input buffering, why have you never >considered doing The Right Thing and using setvbuf(3)? Perhaps because setvbuf() only applies to output buffering 8-). Bruce From owner-cvs-usrbin Tue Jul 2 01:21:25 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id BAA08419 for cvs-usrbin-outgoing; Tue, 2 Jul 1996 01:21:25 -0700 (PDT) Received: from spinner.DIALix.COM (root@spinner.DIALix.COM [192.203.228.67]) by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id BAA08394; Tue, 2 Jul 1996 01:21:03 -0700 (PDT) Received: from spinner.DIALix.COM (peter@localhost.DIALix.oz.au [127.0.0.1]) by spinner.DIALix.COM (8.7.5/8.7.3) with ESMTP id QAA08915; Tue, 2 Jul 1996 16:19:27 +0800 (WST) Message-Id: <199607020819.QAA08915@spinner.DIALix.COM> X-Mailer: exmh version 1.6.6 3/24/96 To: joerg_wunsch@uriah.heep.sax.de (Joerg Wunsch) cc: jmz@freefall.freebsd.org (Jean-Marc Zucconi), CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-usrbin@freefall.freebsd.org Subject: Re: cvs commit: src/usr.bin/fetch main.c In-reply-to: Your message of "Tue, 02 Jul 1996 08:39:46 +0200." <199607020639.IAA10225@uriah.heep.sax.de> Date: Tue, 02 Jul 1996 16:19:27 +0800 From: Peter Wemm Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk >>>J Wunsch said: > As Jean-Marc Zucconi wrote: > > jmz 96/07/01 18:49:49 > > > > Modified: usr.bin/fetch main.c > > Log: > > Use read(fileno(fp), ...) instead of fread(..., fp) to avoid buffered inp ut. > > I'm still against it, and i consider it bad style that you're > committing something that has caused opposition in the mailing lists. > > You haven't even marked your change with > > /* XXX bogus */ > > as would be the least sign of warning. > > If all your concern is avoiding input buffering, why have you never > considered doing The Right Thing and using setvbuf(3)? The problem isn't buffering, it's fread() itself. libftpio has broken one of the fundamental features of ftpget, being the up-to-date status reporting. read() returns as soon as a tcp push happens, and the loop checks to see if the next status report is due. If you use fread(), it waits until the entire 30K buffer has been read. setvbuf() doesn't seem to have any effect on this situation, as the only way out of the while loop in fread.c is to get an eof or error. ie: in filbuf.c: fp->_r = (*fp->_read)(fp->_cookie, (char *)fp->_p, fp->_bf._size); fp->_flags &= ~__SMOD; /* buffer contents are again pristine */ if (fp->_r <= 0) { if (fp->_r == 0) fp->_flags |= __SEOF; else { fp->_r = 0; fp->_flags |= __SERR; } return (EOF); } return (0); and in fread.c: while (resid > (r = fp->_r)) { (void)memcpy((void *)p, (void *)fp->_p, (size_t)r); fp->_p += r; /* fp->_r = 0 ... done in __srefill */ p += r; resid -= r; if (__srefill(fp)) { /* no more input: return partial result */ return ((total - resid) / size); } } There is no way for fread() to simply return the data that has been read so far on a tcp connection, which is what's needed here. The other thing that I've found that seems to work OK is to reduce the 32K fread() buffer down to 1K or lower still. -Peter From owner-cvs-usrbin Tue Jul 2 01:30:24 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id BAA08740 for cvs-usrbin-outgoing; Tue, 2 Jul 1996 01:30:24 -0700 (PDT) Received: from sovcom.kiae.su (sovcom.kiae.su [193.125.152.1]) by freefall.freebsd.org (8.7.5/8.7.3) with SMTP id BAA08663; Tue, 2 Jul 1996 01:30:00 -0700 (PDT) Received: by sovcom.kiae.su id AA03998 (5.65.kiae-1 ); Tue, 2 Jul 1996 11:27:32 +0300 Received: by sovcom.KIAE.su (UUMAIL/2.0); Tue, 2 Jul 96 11:27:32 +0300 Received: (from ache@localhost) by nagual.ru (8.7.5/8.7.3) id MAA00507; Tue, 2 Jul 1996 12:15:31 +0400 (MSD) Message-Id: <199607020815.MAA00507@nagual.ru> Subject: Re: cvs commit: src/usr.bin/fetch main.c To: bde@zeta.org.au (Bruce Evans) Date: Tue, 2 Jul 1996 12:15:31 +0400 (MSD) Cc: j@uriah.heep.sax.de, jmz@freefall.freebsd.org, CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-usrbin@freefall.freebsd.org In-Reply-To: <199607020726.RAA31605@godzilla.zeta.org.au> from "Bruce Evans" at "Jul 2, 96 05:26:22 pm" From: =?KOI8-R?Q?=E1=CE=C4=D2=C5=CA_=FE=C5=D2=CE=CF=D7?= (Andrey A. Chernov) X-Class: Fast X-Mailer: ELM [version 2.4ME+ PL22 (25)] Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk > >If all your concern is avoiding input buffering, why have you never > >considered doing The Right Thing and using setvbuf(3)? > > Perhaps because setvbuf() only applies to output buffering 8-). It work for input too, but somehow strange. If you call fread(100) and use setvbuf(8192), it attempts to read(8192) (for empty buffer) which can cause strange effect (input waiting on the net) even if you know read length exactly. -- Andrey A. Chernov http://www.nagual.ru/~ache/ From owner-cvs-usrbin Tue Jul 2 02:30:05 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id CAA16540 for cvs-usrbin-outgoing; Tue, 2 Jul 1996 02:30:05 -0700 (PDT) Received: from godzilla.zeta.org.au (godzilla.zeta.org.au [203.2.228.19]) by freefall.freebsd.org (8.7.5/8.7.3) with SMTP id CAA16473; Tue, 2 Jul 1996 02:29:50 -0700 (PDT) Received: (from bde@localhost) by godzilla.zeta.org.au (8.6.12/8.6.9) id TAA03124; Tue, 2 Jul 1996 19:24:20 +1000 Date: Tue, 2 Jul 1996 19:24:20 +1000 From: Bruce Evans Message-Id: <199607020924.TAA03124@godzilla.zeta.org.au> To: ache@nagual.ru, bde@zeta.org.au Subject: Re: cvs commit: src/usr.bin/fetch main.c Cc: CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-usrbin@freefall.freebsd.org, j@uriah.heep.sax.de, jmz@freefall.freebsd.org Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk >> Perhaps because setvbuf() only applies to output buffering 8-). >It work for input too, but somehow strange. Oops. >If you call fread(100) and use setvbuf(8192), >it attempts to read(8192) (for empty buffer) getc() works right. fread() is specified as reading all the items unless EOF or an error occurs. Bruce From owner-cvs-usrbin Tue Jul 2 09:59:03 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id JAA22300 for cvs-usrbin-outgoing; Tue, 2 Jul 1996 09:59:03 -0700 (PDT) Received: (from bde@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id JAA22259; Tue, 2 Jul 1996 09:58:44 -0700 (PDT) Date: Tue, 2 Jul 1996 09:58:44 -0700 (PDT) From: Bruce Evans Message-Id: <199607021658.JAA22259@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrbin Subject: cvs commit: src/usr.bin/mt mt.c Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk bde 96/07/02 09:58:43 Branch: usr.bin/mt RELENG_2_1_0 Modified: usr.bin/mt mt.c Log: Brought in change from rev.1.6: fix a null pointer bug in printreg(). Revision Changes Path 1.4.4.3 +2 -0 src/usr.bin/mt/mt.c From owner-cvs-usrbin Tue Jul 2 10:09:10 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id KAA23034 for cvs-usrbin-outgoing; Tue, 2 Jul 1996 10:09:10 -0700 (PDT) Received: (from bde@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id KAA23006; Tue, 2 Jul 1996 10:08:45 -0700 (PDT) Date: Tue, 2 Jul 1996 10:08:45 -0700 (PDT) From: Bruce Evans Message-Id: <199607021708.KAA23006@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrbin Subject: cvs commit: src/usr.bin/find function.c Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk bde 96/07/02 10:08:44 Branch: usr.bin/find RELENG_2_1_0 Modified: usr.bin/find function.c Log: Brought in fix from rev.1.7: use strtoq() instead of strtol() to avoid overflows. Revision Changes Path 1.3.4.3 +4 -4 src/usr.bin/find/function.c From owner-cvs-usrbin Tue Jul 2 10:22:40 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id KAA23800 for cvs-usrbin-outgoing; Tue, 2 Jul 1996 10:22:40 -0700 (PDT) Received: (from bde@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id KAA23776; Tue, 2 Jul 1996 10:22:21 -0700 (PDT) Date: Tue, 2 Jul 1996 10:22:21 -0700 (PDT) From: Bruce Evans Message-Id: <199607021722.KAA23776@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrbin Subject: cvs commit: src/usr.bin/wc wc.c Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk bde 96/07/02 10:22:20 Branch: usr.bin/wc RELENG_2_1_0 Modified: usr.bin/wc wc.c Log: Brought in changes from revs.1.3-1.4: don't exit before attempting to count all the files. Revision Changes Path 1.1.1.1.6.1 +50 -55 src/usr.bin/wc/wc.c From owner-cvs-usrbin Tue Jul 2 16:06:34 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id QAA09177 for cvs-usrbin-outgoing; Tue, 2 Jul 1996 16:06:34 -0700 (PDT) Received: (from wosch@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id QAA08845; Tue, 2 Jul 1996 16:04:54 -0700 (PDT) Date: Tue, 2 Jul 1996 16:04:54 -0700 (PDT) From: Wolfram Schneider Message-Id: <199607022304.QAA08845@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrbin, cvs-include Subject: cvs commit: src/include stdio.h src/usr.bin/compress Makefile Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk wosch 96/07/02 16:04:53 Modified: usr.bin/compress Makefile include stdio.h Log: remove zopen, zopen is not part of libc. Revision Changes Path 1.3 +3 -0 src/usr.bin/compress/Makefile 1.7 +0 -1 src/include/stdio.h From owner-cvs-usrbin Tue Jul 2 18:06:58 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id SAA19064 for cvs-usrbin-outgoing; Tue, 2 Jul 1996 18:06:58 -0700 (PDT) Received: (from mpp@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id SAA18880; Tue, 2 Jul 1996 18:05:21 -0700 (PDT) From: Mike Pritchard Message-Id: <199607030105.SAA18880@freefall.freebsd.org> Subject: Re: cvs commit: src/usr.bin/quota quota.c To: alex@freefall.freebsd.org (Alex Nash) Date: Tue, 2 Jul 1996 18:05:20 -0700 (PDT) Cc: CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-usrbin@freefall.freebsd.org In-Reply-To: <199606150101.SAA07937@freefall.freebsd.org> from "Alex Nash" at Jun 14, 96 06:01:04 pm X-Mailer: ELM [version 2.4 PL24] Content-Type: text Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk BSD 4.4-lite2 does some of this, did you consult those sources when making these changes? That would be a good idea for anyone doing code cleanups like this (I've noticed that there have been a lot of them this past month or so). Alex Nash wrote: > > alex 96/06/14 18:01:03 > > Modified: usr.bin/quota quota.c > Log: > Code clean up. Prototypes, casting, and parentheses around assignments > used as truth value. > > Revision Changes Path > 1.5 +48 -18 src/usr.bin/quota/quota.c > -- Mike Pritchard mpp@FreeBSD.org "Go that way. Really fast. If something gets in your way, turn" From owner-cvs-usrbin Tue Jul 2 18:20:18 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id SAA20918 for cvs-usrbin-outgoing; Tue, 2 Jul 1996 18:20:18 -0700 (PDT) Received: (from mpp@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id SAA20895; Tue, 2 Jul 1996 18:20:11 -0700 (PDT) Date: Tue, 2 Jul 1996 18:20:11 -0700 (PDT) From: Mike Pritchard Message-Id: <199607030120.SAA20895@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrbin Subject: cvs commit: src/usr.bin/login login.1 Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk mpp 96/07/02 18:20:10 Modified: usr.bin/login login.1 Log: Document login's use of /etc/login.access. Submitted by: David E. O'Brien Revision Changes Path 1.4 +11 -0 src/usr.bin/login/login.1 From owner-cvs-usrbin Tue Jul 2 19:27:54 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id TAA29519 for cvs-usrbin-outgoing; Tue, 2 Jul 1996 19:27:54 -0700 (PDT) Received: (from mpp@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id TAA29447; Tue, 2 Jul 1996 19:27:33 -0700 (PDT) Date: Tue, 2 Jul 1996 19:27:33 -0700 (PDT) From: Mike Pritchard Message-Id: <199607030227.TAA29447@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrbin Subject: cvs commit: src/usr.bin/chat chat.8 Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk mpp 96/07/02 19:27:32 Modified: usr.bin/chat chat.8 Log: Document how chat logis it information via syslog. Submitted by: Partially based on a patch by Mark Diekhans Revision Changes Path 1.4 +9 -3 src/usr.bin/chat/chat.8 From owner-cvs-usrbin Wed Jul 3 04:36:54 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id EAA02397 for cvs-usrbin-outgoing; Wed, 3 Jul 1996 04:36:54 -0700 (PDT) Received: from shogun.tdktca.com ([206.26.1.21]) by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id EAA02234; Wed, 3 Jul 1996 04:34:28 -0700 (PDT) Received: from shogun.tdktca.com (daemon@localhost) by shogun.tdktca.com (8.7.2/8.7.2) with ESMTP id GAA20619; Wed, 3 Jul 1996 06:35:37 -0500 (CDT) Received: from localhost.fa.tdktca.com ([163.49.131.130]) by shogun.tdktca.com (8.7.2/8.7.2) with ESMTP id GAA20615; Wed, 3 Jul 1996 06:35:37 -0500 (CDT) Received: (from alex@localhost) by localhost.fa.tdktca.com (8.7.4/8.6.9) id GAA00318; Wed, 3 Jul 1996 06:36:49 -0500 Date: Wed, 3 Jul 1996 06:36:49 -0500 Message-Id: <199607031136.GAA00318@localhost.fa.tdktca.com> From: RHS Linux User To: mpp@freefall.freebsd.org Cc: CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-usrbin@freefall.freebsd.org Subject: Re: cvs commit: src/usr.bin/quota quota.c Reply-to: alex@fa.tdktca.com Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk > BSD 4.4-lite2 does some of this, did you consult > those sources when making these changes? That would > be a good idea for anyone doing code cleanups like > this (I've noticed that there have been a lot > of them this past month or so). No, I must admit I did not consult lite2. Thanks for pointing that out. However, I don't see a quota.c tagged as bsd_44_lite_2 in our CVS tree. Even if there were no changes shouldn't rev 1.1.1.1 (tagged as bsd_44_lite) also be tagged with bsd_44_lite_2, or was only sys brought onto the vendor branch? Alex From owner-cvs-usrbin Wed Jul 3 10:53:53 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id KAA02244 for cvs-usrbin-outgoing; Wed, 3 Jul 1996 10:53:53 -0700 (PDT) Received: from who.cdrom.com (who.cdrom.com [204.216.27.3]) by freefall.freebsd.org (8.7.5/8.7.3) with SMTP id KAA01381; Wed, 3 Jul 1996 10:49:30 -0700 (PDT) Received: from palmer.demon.co.uk (palmer.demon.co.uk [158.152.50.150]) by who.cdrom.com (8.6.12/8.6.11) with ESMTP id KAA07595 ; Wed, 3 Jul 1996 10:49:23 -0700 Received: from palmer.demon.co.uk (localhost [127.0.0.1]) by palmer.demon.co.uk (sendmail/PALMER-2) with ESMTP id SAA10606; Wed, 3 Jul 1996 18:44:23 +0100 (BST) To: alex@fa.tdktca.com cc: mpp@freefall.freebsd.org, CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-usrbin@freefall.freebsd.org From: "Gary Palmer" Subject: Re: cvs commit: src/usr.bin/quota quota.c In-reply-to: Your message of "Wed, 03 Jul 1996 06:36:49 CDT." <199607031136.GAA00318@localhost.fa.tdktca.com> Date: Wed, 03 Jul 1996 18:44:22 +0100 Message-ID: <10604.836415862@palmer.demon.co.uk> Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk RHS Linux User wrote in message ID <199607031136.GAA00318@localhost.fa.tdktca.com>: > No, I must admit I did not consult lite2. Thanks for pointing that > out. However, I don't see a quota.c tagged as bsd_44_lite_2 in our > CVS tree. Even if there were no changes shouldn't rev 1.1.1.1 (tagged > as bsd_44_lite) also be tagged with bsd_44_lite_2, or was only sys > brought onto the vendor branch? So far only /sys and bin/sh have been imported from the lite-2 distribution as far as I remember. Looking in the commit logs would probably be easier (~ncvs/CVSROOT/commitlogs/sys) Gary -- Gary Palmer FreeBSD Core Team Member FreeBSD: Turning PC's into workstations. See http://www.FreeBSD.ORG/ for info From owner-cvs-usrbin Wed Jul 3 15:35:13 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id PAA03105 for cvs-usrbin-outgoing; Wed, 3 Jul 1996 15:35:13 -0700 (PDT) Received: (from mpp@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id PAA02548; Wed, 3 Jul 1996 15:29:25 -0700 (PDT) From: Mike Pritchard Message-Id: <199607032229.PAA02548@freefall.freebsd.org> Subject: Re: cvs commit: src/usr.bin/quota quota.c To: gpalmer@FreeBSD.ORG (Gary Palmer) Date: Wed, 3 Jul 1996 15:29:24 -0700 (PDT) Cc: alex@fa.tdktca.com, CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-usrbin@freefall.freebsd.org In-Reply-To: <10604.836415862@palmer.demon.co.uk> from "Gary Palmer" at Jul 3, 96 06:44:22 pm X-Mailer: ELM [version 2.4 PL24] Content-Type: text Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk Gary Palmer wrote: > > RHS Linux User wrote in message ID > <199607031136.GAA00318@localhost.fa.tdktca.com>: > > No, I must admit I did not consult lite2. Thanks for pointing that > > out. However, I don't see a quota.c tagged as bsd_44_lite_2 in our > > CVS tree. Even if there were no changes shouldn't rev 1.1.1.1 (tagged > > as bsd_44_lite) also be tagged with bsd_44_lite_2, or was only sys > > brought onto the vendor branch? > > So far only /sys and bin/sh have been imported from the lite-2 > distribution as far as I remember. Looking in the commit logs would > probably be easier (~ncvs/CVSROOT/commitlogs/sys) But also keep in mind that even though lite-2 has been imported into /sys, not all of it has been integrated back into the working sources yet. So be careful if you try and import lite-2 code into some utility. -- Mike Pritchard mpp@FreeBSD.org "Go that way. Really fast. If something gets in your way, turn" From owner-cvs-usrbin Wed Jul 3 17:07:34 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id RAA10163 for cvs-usrbin-outgoing; Wed, 3 Jul 1996 17:07:34 -0700 (PDT) Received: from relay-4.mail.demon.net (relay-4.mail.demon.net [158.152.1.108]) by freefall.freebsd.org (8.7.5/8.7.3) with SMTP id RAA09809; Wed, 3 Jul 1996 17:01:18 -0700 (PDT) Received: from post.demon.co.uk ([158.152.1.72]) by relay-4.mail.demon.net id ac05958; 4 Jul 96 0:00 GMT Received: from jraynard.demon.co.uk ([158.152.42.77]) by relay-3.mail.demon.net id aa00410; 4 Jul 96 0:59 +0100 Received: (from jraynard@localhost) by jraynard.demon.co.uk (8.6.12/8.6.12) id UAA01957; Wed, 3 Jul 1996 20:44:08 GMT Date: Wed, 3 Jul 1996 20:44:08 GMT Message-Id: <199607032044.UAA01957@jraynard.demon.co.uk> From: James Raynard To: gpalmer@freebsd.org CC: alex@fa.tdktca.com, mpp@freefall.freebsd.org, CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-usrbin@freefall.freebsd.org In-reply-to: <10604.836415862@palmer.demon.co.uk> (message from Gary Palmer on Wed, 03 Jul 1996 18:44:22 +0100) Subject: Re: cvs commit: src/usr.bin/quota quota.c Sender: owner-cvs-usrbin@freebsd.org X-Loop: FreeBSD.org Precedence: bulk >>>>> Gary Palmer writes: > > So far only /sys and bin/sh have been imported from the lite-2 > distribution as far as I remember. Looking in the commit logs would > probably be easier (~ncvs/CVSROOT/commitlogs/sys) What's the "approved" way to import Lite-2 code? (Sorry, I don't have a CVS tree to look at at the moment). -- James Raynard, Edinburgh, Scotland james@jraynard.demon.co.uk http://www.freebsd.org/~jraynard/ From owner-cvs-usrbin Wed Jul 3 18:38:32 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id SAA14931 for cvs-usrbin-outgoing; Wed, 3 Jul 1996 18:38:32 -0700 (PDT) Received: from spinner.DIALix.COM (root@spinner.DIALix.COM [192.203.228.67]) by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id SAA14919; Wed, 3 Jul 1996 18:38:25 -0700 (PDT) Received: from spinner.DIALix.COM (peter@localhost.DIALix.oz.au [127.0.0.1]) by spinner.DIALix.COM (8.7.5/8.7.3) with ESMTP id JAA14584; Thu, 4 Jul 1996 09:37:34 +0800 (WST) Message-Id: <199607040137.JAA14584@spinner.DIALix.COM> X-Mailer: exmh version 1.6.6 3/24/96 To: James Raynard cc: gpalmer@freebsd.org, alex@fa.tdktca.com, mpp@freefall.freebsd.org, CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-usrbin@freefall.freebsd.org Subject: Re: cvs commit: src/usr.bin/quota quota.c In-reply-to: Your message of "Wed, 03 Jul 1996 20:44:08 GMT." <199607032044.UAA01957@jraynard.demon.co.uk> Date: Thu, 04 Jul 1996 09:37:33 +0800 From: Peter Wemm Sender: owner-cvs-usrbin@freebsd.org X-Loop: FreeBSD.org Precedence: bulk >>>James Raynard said: > >>>>> Gary Palmer writes: > > > > So far only /sys and bin/sh have been imported from the lite-2 > > distribution as far as I remember. Looking in the commit logs would > > probably be easier (~ncvs/CVSROOT/commitlogs/sys) > > What's the "approved" way to import Lite-2 code? (Sorry, I don't have > a CVS tree to look at at the moment). There is actually a pretty good reason why we have not done a bulk import of the Lite-2 code to the userland areas. The main problem is that a good deal of the userland area has not been touched, so it's all on the vendor branch still. By that, I mean the files have never been committed to, so the checked out version implicitly comes from the 1.1.1 branch, as there is no 1.1, 1.2 etc deltas. What this means, is that when a Lite-2 version is imported, a new 1.1.1 branch entry (1.1.1.2) is created, so all the files that are still on the 1.1.1 vendor branch suddenly *change* to the lite-2 version, while those that have been committed to are left alone based on the Lite-1 version. The usual result is that the module then wont compile. If we imported Lite-2 into userland in bulk, up to 90% of the source modules would no longer compile. There are four options here.. 1: commit to all files in userland to get them onto a stable code line, so we can import Lite2 and nothing will happen until somebody manually merges it in at their leisure. Simply adding a $Id$ to *every single file* would do this. Once it's done, import the whole lot, and gradually pull in the new stuff as needed. 2: Set something up so that anybody can import Lite-2 from the cdrom and have a reasonable chance of succeeding... easy-import was meant to help this, but we still seem to have a lot of hassles with it, so I dont know what the answer is. Perhaps just a good set of instructions and a "how to import stuff" is what is needed. But then, as we've found with the ports tree guidelines, many people still dont read the docs. 3: Import the tree bulk, allowing userland to be broken, then set everybody loose merging it in to fix it. This would have the advantage of getting it over and done with, but it would cause chaos along the way for a week or two. 4: Do nothing - it's too hard, and do the imports piecemeal, like sys, lpr, sh etc so far... By default, we seem to have ended up with #4, at least until the kernel is updated to use the Lite-2 interfaces. If a couple of people with a lot of spare time also understand the Lite vs. Lite-2 changes in the kernel interface that have not been completed yet would be interested in doing a gradual update, module by module, resolving the conflicts as they go, then I guess I could instruct them in how to deal with importing the lite-2 code and we could let them loose. Do we want to do this? Going for a flag-fall day for importing the lot would certainly get it done quicker...... or should we wait for the Lite-2 parts of the kernel to arrive so that we dont have to keep parts of Lite-1 around? Cheers, -Peter From owner-cvs-usrbin Wed Jul 3 22:46:39 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id WAA02208 for cvs-usrbin-outgoing; Wed, 3 Jul 1996 22:46:39 -0700 (PDT) Received: from rocky.mt.sri.com ([206.127.76.100]) by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id WAA01857; Wed, 3 Jul 1996 22:40:35 -0700 (PDT) Received: (from nate@localhost) by rocky.mt.sri.com (8.7.5/8.7.3) id XAA07322; Wed, 3 Jul 1996 23:40:09 -0600 (MDT) Date: Wed, 3 Jul 1996 23:40:09 -0600 (MDT) Message-Id: <199607040540.XAA07322@rocky.mt.sri.com> From: Nate Williams To: Peter Wemm Cc: James Raynard , gpalmer@freebsd.org, alex@fa.tdktca.com, mpp@freefall.freebsd.org, CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-usrbin@freefall.freebsd.org Subject: Re: cvs commit: src/usr.bin/quota quota.c In-Reply-To: <199607040137.JAA14584@spinner.DIALix.COM> References: <199607032044.UAA01957@jraynard.demon.co.uk> <199607040137.JAA14584@spinner.DIALix.COM> Sender: owner-cvs-usrbin@freebsd.org X-Loop: FreeBSD.org Precedence: bulk > > What's the "approved" way to import Lite-2 code? (Sorry, I don't have > > a CVS tree to look at at the moment). > > There is actually a pretty good reason why we have not done a bulk import > of the Lite-2 code to the userland areas. [ Excellent explanation deleted ] > There are four options here.. > > 1: commit to all files in userland to get them onto a stable code line, so > we can import Lite2 and nothing will happen until somebody manually merges > it in at their leisure. Simply adding a $Id$ to *every single file* would > do this. Once it's done, import the whole lot, and gradually pull in the > new stuff as needed. > > 2: Set something up so that anybody can import Lite-2 from the cdrom and > have a reasonable chance of succeeding... easy-import was meant to help > this, but we still seem to have a lot of hassles with it, so I dont know > what the answer is. Perhaps just a good set of instructions and a "how to > import stuff" is what is needed. But then, as we've found with the ports > tree guidelines, many people still dont read the docs. > > 3: Import the tree bulk, allowing userland to be broken, then set > everybody loose merging it in to fix it. This would have the advantage of > getting it over and done with, but it would cause chaos along the way for > a week or two. > > 4: Do nothing - it's too hard, and do the imports piecemeal, like sys, > lpr, sh etc so far... > > By default, we seem to have ended up with #4, at least until the kernel is > updated to use the Lite-2 interfaces. If a couple of people with a lot of > spare time also understand the Lite vs. Lite-2 changes in the kernel > interface that have not been completed yet would be interested in doing a > gradual update, module by module, resolving the conflicts as they go, then > I guess I could instruct them in how to deal with importing the lite-2 > code and we could let them loose. > > Do we want to do this? Going for a flag-fall day for importing the lot > would certainly get it done quicker...... or should we wait for the > Lite-2 parts of the kernel to arrive so that we dont have to keep parts of > Lite-1 around? I'd like to see the current -current tree branched right before this happens, and then let people have at it. Make sure you give some folks plenty of time to understand what's going on, and then let the developers hack on the 'broken' tree until it works, at which point we can merge any changes people have made on the 'stable' branch back onto the now working development branch and life goes on. And, if things are going really slowly/badly or if you're nostalgic you can call the 'pre-Lite2' branch 'stable' and the 'post-Lite2' branch 'current' and cut the next release from the 'stable' branch. { Quickly donning his asbestos underwear } I know people hate CVS branching, but short-lived branches work exceedingly well *AS LONG AS* you understand the limitations of branching (which are a problem in all SCM tools). Nate [ Wishing he wasn't here to answer email, but my 95 Neon blew a head gasket 60 miles out of town, so now I'm back at home trying to figure out how to get outta town tomorrow. ] From owner-cvs-usrbin Thu Jul 4 17:07:00 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id RAA20809 for cvs-usrbin-outgoing; Thu, 4 Jul 1996 17:07:00 -0700 (PDT) Received: (from jmz@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id RAA20766; Thu, 4 Jul 1996 17:06:38 -0700 (PDT) Date: Thu, 4 Jul 1996 17:06:38 -0700 (PDT) From: Jean-Marc Zucconi Message-Id: <199607050006.RAA20766@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrbin Subject: cvs commit: src/usr.bin/fetch main.c Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk jmz 96/07/04 17:06:37 Modified: usr.bin/fetch main.c Log: Back out previous commit: do not use read(), but fread (). Change BUFFER_SIZE to 1K to avoid waiting too long between 2 progress reports in the case of a slow transfer. Move the signal()/setitimer() code just before the read loop because the ftpio library set and reset the timer internally. Revision Changes Path 1.8 +11 -11 src/usr.bin/fetch/main.c From owner-cvs-usrbin Thu Jul 4 17:25:43 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id RAA22961 for cvs-usrbin-outgoing; Thu, 4 Jul 1996 17:25:43 -0700 (PDT) Received: (from jmz@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id RAA22931; Thu, 4 Jul 1996 17:25:34 -0700 (PDT) Date: Thu, 4 Jul 1996 17:25:34 -0700 (PDT) From: Jean-Marc Zucconi Message-Id: <199607050025.RAA22931@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrbin Subject: cvs commit: src/usr.bin/fetch main.c Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk jmz 96/07/04 17:25:33 Branch: usr.bin/fetch RELENG_2_1_0 Modified: usr.bin/fetch main.c Log: Merge from HEAD Revision Changes Path 1.1.1.1.2.4 +10 -10 src/usr.bin/fetch/main.c From owner-cvs-usrbin Thu Jul 4 18:03:34 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id SAA26640 for cvs-usrbin-outgoing; Thu, 4 Jul 1996 18:03:34 -0700 (PDT) Received: (from jkh@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id SAA26608; Thu, 4 Jul 1996 18:03:22 -0700 (PDT) Date: Thu, 4 Jul 1996 18:03:22 -0700 (PDT) From: "Jordan K. Hubbard" Message-Id: <199607050103.SAA26608@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrbin Subject: cvs commit: src/usr.bin/fetch fetch.1 Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk jkh 96/07/04 18:03:22 Modified: usr.bin/fetch fetch.1 Log: New man page for fetch(1). Submitted by: jmz (with some small tweaks) Revision Changes Path 1.2 +106 -1 src/usr.bin/fetch/fetch.1 From owner-cvs-usrbin Thu Jul 4 18:04:20 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id SAA26797 for cvs-usrbin-outgoing; Thu, 4 Jul 1996 18:04:20 -0700 (PDT) Received: (from jkh@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id SAA26772; Thu, 4 Jul 1996 18:04:12 -0700 (PDT) Date: Thu, 4 Jul 1996 18:04:12 -0700 (PDT) From: "Jordan K. Hubbard" Message-Id: <199607050104.SAA26772@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrbin Subject: cvs commit: src/usr.bin/fetch fetch.1 Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk jkh 96/07/04 18:04:11 Branch: usr.bin/fetch RELENG_2_1_0 Modified: usr.bin/fetch fetch.1 Log: Merge. Revision Changes Path 1.1.1.1.2.1 +106 -1 src/usr.bin/fetch/fetch.1 From owner-cvs-usrbin Fri Jul 5 12:28:29 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id MAA01617 for cvs-usrbin-outgoing; Fri, 5 Jul 1996 12:28:29 -0700 (PDT) Received: (from jkh@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id MAA01304; Fri, 5 Jul 1996 12:26:59 -0700 (PDT) Date: Fri, 5 Jul 1996 12:26:59 -0700 (PDT) From: "Jordan K. Hubbard" Message-Id: <199607051926.MAA01304@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrbin Subject: cvs commit: src/usr.bin/file/Magdir freebsd Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk jkh 96/07/05 12:26:58 Modified: usr.bin/file/Magdir freebsd Log: New magic file with more politically correct identification of objects and execs. Submitted-By: Brent Nordquist Revision Changes Path 1.5 +77 -11 src/usr.bin/file/Magdir/freebsd