From owner-cvs-bin Sun Jun 29 01:53:57 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id BAA24282 for cvs-bin-outgoing; Sun, 29 Jun 1997 01:53:57 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id BAA24171; Sun, 29 Jun 1997 01:50:29 -0700 (PDT) From: Julian Elischer Received: (from julian@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id BAA27222; Sun, 29 Jun 1997 01:48:52 -0700 (PDT) Date: Sun, 29 Jun 1997 01:48:52 -0700 (PDT) Message-Id: <199706290848.BAA27222@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-bin@FreeBSD.ORG, cvs-lib@FreeBSD.ORG, cvs-sys@FreeBSD.ORG, cvs-usrbin@FreeBSD.ORG Subject: cvs commit: src/bin/ls stat_flags.c src/lib/libc/sys chflags.2 src/sys/sys stat.h src/sys/ufs/ufs ufs_vnops.c src/usr.bin/chflags chflags.1 Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk julian 1997/06/29 01:48:52 PDT Modified files: (Branch: RELENG_2_2) bin/ls stat_flags.c lib/libc/sys chflags.2 sys/sys stat.h sys/ufs/ufs ufs_vnops.c usr.bin/chflags chflags.1 Log: YAMFC a flag that is not quite as draconian as IMMUTABLE. if you never use this, you'll never see it. Submitted by: Whistle Communications Revision Changes Path 1.2.8.1 +9 -1 src/bin/ls/stat_flags.c 1.3.2.3 +10 -2 src/lib/libc/sys/chflags.2 1.8.2.2 +4 -1 src/sys/sys/stat.h 1.41.2.3 +11 -7 src/sys/ufs/ufs/ufs_vnops.c 1.2.6.3 +5 -2 src/usr.bin/chflags/chflags.1 From owner-cvs-bin Sun Jun 29 05:29:31 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id FAA00462 for cvs-bin-outgoing; Sun, 29 Jun 1997 05:29:31 -0700 (PDT) Received: from godzilla.zeta.org.au (godzilla.zeta.org.au [203.2.228.19]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id FAA00382; Sun, 29 Jun 1997 05:27:27 -0700 (PDT) Received: (from bde@localhost) by godzilla.zeta.org.au (8.8.5/8.6.9) id WAA00513; Sun, 29 Jun 1997 22:26:15 +1000 Date: Sun, 29 Jun 1997 22:26:15 +1000 From: Bruce Evans Message-Id: <199706291226.WAA00513@godzilla.zeta.org.au> To: cvs-all@FreeBSD.ORG, cvs-bin@FreeBSD.ORG, cvs-committers@FreeBSD.ORG, cvs-lib@FreeBSD.ORG, cvs-sys@FreeBSD.ORG, cvs-usrbin@FreeBSD.ORG, julian@FreeBSD.ORG Subject: Re: cvs commit: src/bin/ls stat_flags.c src/lib/libc/sys chflags.2 src/sys/sys stat.h src/sys/ufs/ufs ufs_vnops.c src/usr.bin/chflags chflags.1 Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk >julian 1997/06/29 01:48:52 PDT > > Modified files: (Branch: RELENG_2_2) > bin/ls stat_flags.c > lib/libc/sys chflags.2 > sys/sys stat.h > sys/ufs/ufs ufs_vnops.c > usr.bin/chflags chflags.1 > Log: > YAMFC > a flag that is not quite as draconian as IMMUTABLE. > if you never use this, you'll never see it. You'll see it if you are root and someone else used it. Even rm -f as root does not remove uunlink-able files, although rm -f as root silently removes uchg'able files and rm as root removes uchg'able files if you answer `y' to the prompt. Similarly for `find -delete' run as root. `find' doesn't know about the new flags, so it can only remove draconianly immutable files :-). Bruce From owner-cvs-bin Sun Jun 29 14:29:49 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id OAA18164 for cvs-bin-outgoing; Sun, 29 Jun 1997 14:29:49 -0700 (PDT) Received: from nagual.pp.ru (ache.relcom.ru [194.58.229.133]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id OAA18135; Sun, 29 Jun 1997 14:29:24 -0700 (PDT) Received: (from ache@localhost) by nagual.pp.ru (8.8.6/8.8.5) id BAA01011; Mon, 30 Jun 1997 01:29:18 +0400 (MSD) Date: Mon, 30 Jun 1997 01:29:16 +0400 (MSD) From: =?KOI8-R?B?4c7E0sXKIP7F0s7P1w==?= To: Julian Elischer cc: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-bin@FreeBSD.ORG, cvs-lib@FreeBSD.ORG, cvs-sys@FreeBSD.ORG, cvs-usrbin@FreeBSD.ORG Subject: Re: cvs commit: src/bin/ls stat_flags.c src/lib/libc/sys chflags.2 src/sys/sys stat.h src/sys/ufs/ufs ufs_vnops.c src/usr.bin/chflags chflags.1 In-Reply-To: <199706290848.BAA27222@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk On Sun, 29 Jun 1997, Julian Elischer wrote: > a flag that is not quite as draconian as IMMUTABLE. > if you never use this, you'll never see it. How's about removing/finding such files from root, does this flag implies silent removing? If not, it must be fixed (in kernel or in affected utilities). -- Andrey A. Chernov http://www.nagual.pp.ru/~ache/ From owner-cvs-bin Sun Jun 29 18:22:07 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id SAA25934 for cvs-bin-outgoing; Sun, 29 Jun 1997 18:22:07 -0700 (PDT) Received: from alpo.whistle.com (alpo.whistle.com [207.76.204.38]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id SAA25788; Sun, 29 Jun 1997 18:19:54 -0700 (PDT) Received: (from daemon@localhost) by alpo.whistle.com (8.8.5/8.8.5) id SAA27768; Sun, 29 Jun 1997 18:15:29 -0700 (PDT) Received: from current1.whistle.com(207.76.205.22) via SMTP by alpo.whistle.com, id smtpd027763; Mon Jun 30 01:15:22 1997 Message-ID: <33B7083D.31D2DE92@whistle.com> Date: Sun, 29 Jun 1997 18:13:33 -0700 From: Julian Elischer Organization: Whistle Communications X-Mailer: Mozilla 3.0Gold (X11; I; FreeBSD 2.2-CURRENT i386) MIME-Version: 1.0 To: Bruce Evans CC: cvs-all@FreeBSD.ORG, cvs-bin@FreeBSD.ORG, cvs-committers@FreeBSD.ORG, cvs-lib@FreeBSD.ORG, cvs-sys@FreeBSD.ORG, cvs-usrbin@FreeBSD.ORG, julian@FreeBSD.ORG Subject: Re: cvs commit: src/bin/ls stat_flags.c src/lib/libc/sys chflags.2 src/sys/sys stat.h src/sys/ufs/ufs ufs_vnops.c src/usr.bin/chflags chflags.1 References: <199706291226.WAA00513@godzilla.zeta.org.au> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk Bruce Evans wrote: > > >julian 1997/06/29 01:48:52 PDT > > > > Modified files: (Branch: RELENG_2_2) > > bin/ls stat_flags.c > > lib/libc/sys chflags.2 > > sys/sys stat.h > > sys/ufs/ufs ufs_vnops.c > > usr.bin/chflags chflags.1 > > Log: > > YAMFC > > a flag that is not quite as draconian as IMMUTABLE. > > if you never use this, you'll never see it. > > You'll see it if you are root and someone else used it. Even rm > -f as root does not remove uunlink-able files, although rm -f > as root silently removes uchg'able files and rm as root removes > uchg'able files if you answer `y' to the prompt. Similarly for > `find -delete' run as root. `find' doesn't know about the new > flags, so it can only remove draconianly immutable files :-). > > Bruce Thanks for pointing this out. actually there are some changes we will add to make this less noticable. julian From owner-cvs-bin Mon Jun 30 04:08:18 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id EAA18201 for cvs-bin-outgoing; Mon, 30 Jun 1997 04:08:18 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id EAA18019; Mon, 30 Jun 1997 04:05:18 -0700 (PDT) From: Philippe Charnier Received: (from charnier@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id EAA15541; Mon, 30 Jun 1997 04:03:32 -0700 (PDT) Date: Mon, 30 Jun 1997 04:03:32 -0700 (PDT) Message-Id: <199706301103.EAA15541@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-bin@FreeBSD.ORG Subject: cvs commit: src/bin/rmail rmail.c Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk charnier 1997/06/30 04:03:32 PDT Modified files: bin/rmail rmail.c Log: Remove lines inside #ifdef 0/#endif. Revision Changes Path 1.12 +1 -34 src/bin/rmail/rmail.c From owner-cvs-bin Tue Jul 1 14:38:19 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id OAA23204 for cvs-bin-outgoing; Tue, 1 Jul 1997 14:38:19 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id OAA23060; Tue, 1 Jul 1997 14:36:27 -0700 (PDT) From: Bruce Evans Received: (from bde@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id OAA00439; Tue, 1 Jul 1997 14:34:30 -0700 (PDT) Date: Tue, 1 Jul 1997 14:34:30 -0700 (PDT) Message-Id: <199707012134.OAA00439@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-bin@FreeBSD.ORG Subject: cvs commit: src/bin/rcp - Imported sources Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk bde 1997/07/01 14:34:30 PDT src/bin/rcp - Imported sources Update of /home/ncvs/src/bin/rcp In directory freefall.freebsd.org:/c/bde/src/rcp Log Message: Import this unwanted file from Lite-original so that it doesn't get imported with Lite2 (there was only one missing file in src/bin, other than tags files and obj links). Status: Vendor Tag: CSRG Release Tags: bsd_44_lite N src/bin/rcp/Makefile.krb No conflicts created by this import From owner-cvs-bin Tue Jul 1 14:42:36 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id OAA23475 for cvs-bin-outgoing; Tue, 1 Jul 1997 14:42:36 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id OAA23377; Tue, 1 Jul 1997 14:40:46 -0700 (PDT) From: Bruce Evans Received: (from bde@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id OAA00894; Tue, 1 Jul 1997 14:38:49 -0700 (PDT) Date: Tue, 1 Jul 1997 14:38:49 -0700 (PDT) Message-Id: <199707012138.OAA00894@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-bin@FreeBSD.ORG Subject: cvs commit: src/bin/rcp Makefile.krb Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk bde 1997/07/01 14:38:49 PDT Removed files: bin/rcp Makefile.krb Log: Bury this properly. From owner-cvs-bin Tue Jul 1 15:19:18 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id PAA25802 for cvs-bin-outgoing; Tue, 1 Jul 1997 15:19:18 -0700 (PDT) Received: from godzilla.zeta.org.au (godzilla.zeta.org.au [203.2.228.19]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id PAA25765; Tue, 1 Jul 1997 15:18:47 -0700 (PDT) Received: (from bde@localhost) by godzilla.zeta.org.au (8.8.5/8.6.9) id IAA05271; Wed, 2 Jul 1997 08:14:08 +1000 Date: Wed, 2 Jul 1997 08:14:08 +1000 From: Bruce Evans Message-Id: <199707012214.IAA05271@godzilla.zeta.org.au> To: bde@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-bin@FreeBSD.ORG, cvs-committers@FreeBSD.ORG Subject: Re: cvs commit: src/bin/rcp - Imported sources Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk >bde 1997/07/01 14:34:30 PDT > > src/bin/rcp - Imported sources > Update of /home/ncvs/src/bin/rcp > In directory freefall.freebsd.org:/c/bde/src/rcp > > Log Message: > Import this unwanted file from Lite-original so that it doesn't > get imported with Lite2 (there was only one missing file in src/bin, > other than tags files and obj links). This file has strange availabilities. It is on archive sites in it's normal place (usr/src/bin/rcp) in Lite-original, but we don't seem to have ever had it. It is on my "Export" Lite2 cdrom from WC in its normal place, but it is not there in on archive sites or in freefall:/f/peter/ 4.4BSD-Lite2 - it is only in Foreign/src/rcp there. Apparently, less is more for the Export cdrom (it seems to have the Foreign section merged), and most archive sites have the non-export version. Bruce From owner-cvs-bin Tue Jul 1 15:38:55 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id PAA27034 for cvs-bin-outgoing; Tue, 1 Jul 1997 15:38:55 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id PAA26912; Tue, 1 Jul 1997 15:36:07 -0700 (PDT) From: Bruce Evans Received: (from bde@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id PAA01974; Tue, 1 Jul 1997 15:34:10 -0700 (PDT) Date: Tue, 1 Jul 1997 15:34:10 -0700 (PDT) Message-Id: <199707012234.PAA01974@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-bin@FreeBSD.ORG Subject: cvs commit: src/bin - Imported sources Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk bde 1997/07/01 15:34:10 PDT src/bin - Imported sources Update of /home/ncvs/src/bin In directory freefall.freebsd.org:/f/peter/4.4BSD-Lite2/usr/src/bin Log Message: Import Lite2's src/bin. All files in src/bin are off the vendor branch, so this doesn't change the active versions. Status: Vendor Tag: CSRG Release Tags: bsd_44_lite_2 U src/bin/Makefile U src/bin/Makefile.inc U src/bin/pax/Makefile U src/bin/pax/ar_io.c U src/bin/pax/ar_subs.c U src/bin/pax/buf_subs.c U src/bin/pax/cache.c U src/bin/pax/cpio.h U src/bin/pax/cpio.c U src/bin/pax/extern.h U src/bin/pax/ftree.c U src/bin/pax/file_subs.c U src/bin/pax/options.c U src/bin/pax/options.h U src/bin/pax/pat_rep.c U src/bin/pax/pax.1 U src/bin/pax/pax.c U src/bin/pax/tables.c U src/bin/pax/pax.h U src/bin/pax/cache.h U src/bin/pax/tar.c U src/bin/pax/tar.h U src/bin/pax/ftree.h U src/bin/pax/sel_subs.h U src/bin/pax/pat_rep.h U src/bin/pax/tty_subs.c U src/bin/pax/tables.h U src/bin/pax/gen_subs.c U src/bin/pax/sel_subs.c U src/bin/test/test.c U src/bin/test/Makefile U src/bin/test/operators.c U src/bin/test/TEST.csh U src/bin/test/test.1 U src/bin/test/operators.h U src/bin/sh/TOUR U src/bin/sh/alias.c U src/bin/sh/alias.h U src/bin/sh/arith.h U src/bin/sh/cd.c U src/bin/sh/error.c U src/bin/sh/error.h U src/bin/sh/main.c U src/bin/sh/eval.h U src/bin/sh/exec.c U src/bin/sh/exec.h U src/bin/sh/expand.c U src/bin/sh/expand.h U src/bin/sh/histedit.c U src/bin/sh/nodetypes U src/bin/sh/arith_lex.l U src/bin/sh/init.h U src/bin/sh/input.c U src/bin/sh/mktokens U src/bin/sh/Makefile U src/bin/sh/input.h U src/bin/sh/jobs.c U src/bin/sh/jobs.h U src/bin/sh/sh.1 U src/bin/sh/machdep.h U src/bin/sh/parser.c U src/bin/sh/mail.c U src/bin/sh/mail.h U src/bin/sh/eval.c U src/bin/sh/main.h U src/bin/sh/memalloc.c U src/bin/sh/memalloc.h U src/bin/sh/miscbltin.c U src/bin/sh/mkinit.c U src/bin/sh/mknodes.c U src/bin/sh/mksyntax.c U src/bin/sh/myhistedit.h U src/bin/sh/mystring.c U src/bin/sh/mystring.h U src/bin/sh/options.c U src/bin/sh/options.h U src/bin/sh/output.c U src/bin/sh/builtins.def U src/bin/sh/redir.c U src/bin/sh/output.h U src/bin/sh/mkbuiltins U src/bin/sh/nodes.c.pat U src/bin/sh/parser.h U src/bin/sh/redir.h U src/bin/sh/shell.h U src/bin/sh/show.c U src/bin/sh/show.h U src/bin/sh/trap.c U src/bin/sh/trap.h U src/bin/sh/var.c U src/bin/sh/var.h U src/bin/sh/arith.y U src/bin/sh/bltin/bltin.h U src/bin/sh/bltin/echo.1 U src/bin/sh/bltin/echo.c U src/bin/sh/funcs/cmv U src/bin/sh/funcs/dirs U src/bin/sh/funcs/kill U src/bin/sh/funcs/login U src/bin/sh/funcs/newgrp U src/bin/sh/funcs/popd U src/bin/sh/funcs/pushd U src/bin/sh/funcs/suspend C src/bin/csh/Makefile U src/bin/csh/alloc.c U src/bin/csh/char.c U src/bin/csh/char.h U src/bin/csh/const.c C src/bin/csh/csh.1 C src/bin/csh/set.c C src/bin/csh/lex.c C src/bin/csh/dol.c U src/bin/csh/dir.h C src/bin/csh/csh.c C src/bin/csh/csh.h U src/bin/csh/err.c C src/bin/csh/proc.c U src/bin/csh/exp.c U src/bin/csh/extern.h C src/bin/csh/dir.c C src/bin/csh/exec.c U src/bin/csh/glob.c C src/bin/csh/file.c U src/bin/csh/init.c U src/bin/csh/misc.c U src/bin/csh/parse.c U src/bin/csh/pathnames.h C src/bin/csh/func.c U src/bin/csh/proc.h C src/bin/csh/hist.c C src/bin/csh/sem.c U src/bin/csh/str.c U src/bin/csh/time.c U src/bin/csh/USD.doc/Makefile C src/bin/csh/USD.doc/csh.1 C src/bin/csh/USD.doc/csh.2 C src/bin/csh/USD.doc/csh.3 C src/bin/csh/USD.doc/csh.4 I src/bin/csh/USD.doc/csh.a U src/bin/csh/USD.doc/csh.g U src/bin/csh/USD.doc/tabs U src/bin/sleep/sleep.1 U src/bin/sleep/sleep.c U src/bin/sleep/Makefile C src/bin/hostname/hostname.1 C src/bin/hostname/hostname.c U src/bin/hostname/Makefile U src/bin/mv/mv.1 U src/bin/mv/Makefile U src/bin/mv/mv.c U src/bin/mv/pathnames.h U src/bin/echo/echo.c U src/bin/echo/echo.1 U src/bin/echo/Makefile U src/bin/rmail/rmail.8 C src/bin/rmail/rmail.c U src/bin/rmail/Makefile U src/bin/mkdir/mkdir.1 U src/bin/mkdir/mkdir.c U src/bin/mkdir/Makefile U src/bin/df/Makefile U src/bin/df/df.1 U src/bin/df/df.c U src/bin/rmdir/rmdir.c U src/bin/rmdir/rmdir.1 U src/bin/rmdir/Makefile C src/bin/ls/util.c C src/bin/ls/print.c C src/bin/ls/ls.1 U src/bin/ls/extern.h U src/bin/ls/cmp.c C src/bin/ls/ls.c U src/bin/ls/ls.h C src/bin/ls/stat_flags.c U src/bin/ls/Makefile U src/bin/pwd/pwd.c U src/bin/pwd/Makefile C src/bin/pwd/pwd.1 C src/bin/rm/rm.c U src/bin/rm/Makefile C src/bin/rm/rm.1 U src/bin/cp/cp.1 C src/bin/cp/cp.c U src/bin/cp/utils.c U src/bin/cp/Makefile U src/bin/cp/extern.h C src/bin/stty/stty.1 U src/bin/stty/Makefile U src/bin/stty/stty.c U src/bin/stty/extern.h C src/bin/stty/key.c U src/bin/stty/cchar.c U src/bin/stty/gfmt.c U src/bin/stty/modes.c U src/bin/stty/stty.h U src/bin/stty/print.c U src/bin/stty/util.c U src/bin/sync/sync.8 U src/bin/sync/sync.c U src/bin/sync/Makefile U src/bin/ps/nlist.c U src/bin/ps/ps.c U src/bin/ps/Makefile U src/bin/ps/keyword.c U src/bin/ps/print.c C src/bin/ps/fmt.c U src/bin/ps/extern.h U src/bin/ps/ps.1 U src/bin/ps/ps.h U src/bin/dd/dd.c U src/bin/dd/Makefile U src/bin/dd/dd.1 U src/bin/dd/args.c U src/bin/dd/conv_tab.c U src/bin/dd/conv.c U src/bin/dd/dd.h U src/bin/dd/misc.c U src/bin/dd/extern.h U src/bin/dd/position.c C src/bin/cat/cat.c U src/bin/cat/Makefile C src/bin/cat/cat.1 U src/bin/rcp/rcp.1 U src/bin/rcp/rcp.c U src/bin/rcp/Makefile U src/bin/rcp/pathnames.h U src/bin/rcp/util.c U src/bin/rcp/extern.h U src/bin/chmod/chmod.1 U src/bin/chmod/chmod.c U src/bin/chmod/Makefile C src/bin/date/date.c C src/bin/date/date.1 C src/bin/date/netdate.c U src/bin/date/Makefile U src/bin/date/extern.h C src/bin/kill/kill.1 C src/bin/kill/kill.c U src/bin/kill/Makefile U src/bin/ln/Makefile U src/bin/ln/ln.c U src/bin/ln/ln.1 U src/bin/ln/symlink.7 40 conflicts created by this import. Use the following command to help the merge: cvs checkout -jCSRG:yesterday -jCSRG src/bin