From owner-p4-projects  Sat May 18 22:22:12 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1173A37B401; Sat, 18 May 2002 22:19:56 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 3D15937B40D
	for <perforce@freebsd.org>; Sat, 18 May 2002 22:19:54 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g4J5Jrj40369
	for perforce@freebsd.org; Sat, 18 May 2002 22:19:53 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Sat, 18 May 2002 22:19:53 -0700 (PDT)
Message-Id: <200205190519.g4J5Jrj40369@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
Subject: PERFORCE change 11516 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11516

Change 11516 by peter@peter_daintree on 2002/05/18 22:18:56

	IFC @11514

Affected files ...

... //depot/projects/ia64/MAINTAINERS#6 integrate
... //depot/projects/ia64/Makefile.inc1#26 integrate
... //depot/projects/ia64/bin/cp/cp.c#5 integrate
... //depot/projects/ia64/bin/df/df.c#6 integrate
... //depot/projects/ia64/bin/ls/extern.h#3 integrate
... //depot/projects/ia64/bin/ls/ls.1#8 integrate
... //depot/projects/ia64/bin/ls/ls.c#5 integrate
... //depot/projects/ia64/bin/ls/ls.h#4 integrate
... //depot/projects/ia64/bin/ls/print.c#5 integrate
... //depot/projects/ia64/bin/mv/mv.c#4 integrate
... //depot/projects/ia64/bin/mv/pathnames.h#2 integrate
... //depot/projects/ia64/bin/pwd/pwd.1#5 integrate
... //depot/projects/ia64/bin/pwd/pwd.c#3 integrate
... //depot/projects/ia64/contrib/gcc/cp/cfns.h#2 integrate
... //depot/projects/ia64/etc/periodic/daily/450.status-security#4 integrate
... //depot/projects/ia64/etc/periodic/monthly/200.accounting#4 integrate
... //depot/projects/ia64/etc/periodic/security/100.chksetuid#3 integrate
... //depot/projects/ia64/etc/periodic/security/200.chkmounts#3 integrate
... //depot/projects/ia64/etc/periodic/security/500.ipfwdenied#2 integrate
... //depot/projects/ia64/etc/periodic/security/550.ipfwlimit#3 integrate
... //depot/projects/ia64/etc/periodic/security/600.ip6fwdenied#2 integrate
... //depot/projects/ia64/etc/periodic/security/650.ip6fwlimit#3 integrate
... //depot/projects/ia64/etc/periodic/security/700.kernelmsg#2 integrate
... //depot/projects/ia64/include/paths.h#5 integrate
... //depot/projects/ia64/lib/libc/sys/quotactl.2#3 integrate
... //depot/projects/ia64/release/Makefile.inc.docports#3 integrate
... //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#27 integrate
... //depot/projects/ia64/sbin/dump/pathnames.h#2 integrate
... //depot/projects/ia64/sbin/shutdown/pathnames.h#2 integrate
... //depot/projects/ia64/sys/boot/efi/include/efi.h#4 integrate
... //depot/projects/ia64/sys/boot/efi/include/efi_nii.h#2 integrate
... //depot/projects/ia64/sys/boot/efi/include/efiapi.h#6 integrate
... //depot/projects/ia64/sys/boot/efi/include/eficon.h#2 integrate
... //depot/projects/ia64/sys/boot/efi/include/efidebug.h#2 integrate
... //depot/projects/ia64/sys/boot/efi/include/efidef.h#2 integrate
... //depot/projects/ia64/sys/boot/efi/include/efidevp.h#2 integrate
... //depot/projects/ia64/sys/boot/efi/include/efifpswa.h#5 integrate
... //depot/projects/ia64/sys/boot/efi/include/efifs.h#2 integrate
... //depot/projects/ia64/sys/boot/efi/include/efinet.h#2 integrate
... //depot/projects/ia64/sys/boot/efi/include/efipart.h#2 integrate
... //depot/projects/ia64/sys/boot/efi/include/efiprot.h#3 integrate
... //depot/projects/ia64/sys/boot/efi/include/efipxebc.h#2 integrate
... //depot/projects/ia64/sys/boot/efi/include/efiser.h#2 integrate
... //depot/projects/ia64/sys/boot/efi/include/i386/efibind.h#2 integrate
... //depot/projects/ia64/sys/boot/efi/include/ia64/efibind.h#3 integrate
... //depot/projects/ia64/sys/boot/efi/libefi/copy.c#2 integrate
... //depot/projects/ia64/sys/boot/efi/libefi/elf_freebsd.c#4 integrate
... //depot/projects/ia64/sys/boot/i386/libi386/biospnp.c#2 integrate
... //depot/projects/ia64/sys/boot/ia64/libski/copy.c#2 integrate
... //depot/projects/ia64/sys/boot/ia64/libski/elf_freebsd.c#5 integrate
... //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#8 integrate
... //depot/projects/ia64/sys/compat/linux/linux_ipc.c#2 integrate
... //depot/projects/ia64/sys/conf/Makefile.ia64#12 integrate
... //depot/projects/ia64/sys/conf/NOTES#10 integrate
... //depot/projects/ia64/sys/conf/files#22 integrate
... //depot/projects/ia64/sys/conf/files.i386#10 integrate
... //depot/projects/ia64/sys/conf/options#14 integrate
... //depot/projects/ia64/sys/fs/procfs/procfs.c#3 integrate
... //depot/projects/ia64/sys/fs/procfs/procfs_ctl.c#6 integrate
... //depot/projects/ia64/sys/fs/procfs/procfs_dbregs.c#5 integrate
... //depot/projects/ia64/sys/fs/procfs/procfs_fpregs.c#5 integrate
... //depot/projects/ia64/sys/fs/procfs/procfs_mem.c#5 integrate
... //depot/projects/ia64/sys/fs/procfs/procfs_regs.c#5 integrate
... //depot/projects/ia64/sys/fs/procfs/procfs_status.c#7 integrate
... //depot/projects/ia64/sys/fs/pseudofs/pseudofs_vnops.c#8 integrate
... //depot/projects/ia64/sys/fs/specfs/spec_vnops.c#5 integrate
... //depot/projects/ia64/sys/gnu/ext2fs/ext2_alloc.c#6 integrate
... //depot/projects/ia64/sys/gnu/ext2fs/ext2_balloc.c#3 integrate
... //depot/projects/ia64/sys/gnu/ext2fs/ext2_bmap.c#2 integrate
... //depot/projects/ia64/sys/gnu/ext2fs/ext2_extern.h#5 integrate
... //depot/projects/ia64/sys/gnu/ext2fs/ext2_ihash.c#2 integrate
... //depot/projects/ia64/sys/gnu/ext2fs/ext2_inode.c#5 integrate
... //depot/projects/ia64/sys/gnu/ext2fs/ext2_subr.c#6 integrate
... //depot/projects/ia64/sys/gnu/ext2fs/ext2_vfsops.c#10 integrate
... //depot/projects/ia64/sys/gnu/ext2fs/ext2_vnops.c#7 integrate
... //depot/projects/ia64/sys/gnu/ext2fs/inode.h#2 integrate
... //depot/projects/ia64/sys/i386/linux/linux_dummy.c#2 integrate
... //depot/projects/ia64/sys/i386/linux/linux_proto.h#3 integrate
... //depot/projects/ia64/sys/i386/linux/linux_ptrace.c#1 branch
... //depot/projects/ia64/sys/i386/linux/linux_syscall.h#3 integrate
... //depot/projects/ia64/sys/i386/linux/linux_sysent.c#3 integrate
... //depot/projects/ia64/sys/i386/linux/syscalls.master#2 integrate
... //depot/projects/ia64/sys/ia64/acpica/madt.c#8 integrate
... //depot/projects/ia64/sys/ia64/conf/GENERIC#11 integrate
... //depot/projects/ia64/sys/ia64/ia64/dump_machdep.c#2 integrate
... //depot/projects/ia64/sys/ia64/ia64/interrupt.c#9 integrate
... //depot/projects/ia64/sys/ia64/ia64/machdep.c#37 integrate
... //depot/projects/ia64/sys/ia64/ia64/mem.c#3 integrate
... //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#14 integrate
... //depot/projects/ia64/sys/ia64/ia64/trap.c#26 integrate
... //depot/projects/ia64/sys/ia64/ia64/unwind.c#4 integrate
... //depot/projects/ia64/sys/ia64/include/cpu.h#6 integrate
... //depot/projects/ia64/sys/ia64/include/cpufunc.h#6 integrate
... //depot/projects/ia64/sys/ia64/include/db_machdep.h#5 integrate
... //depot/projects/ia64/sys/ia64/include/ia64_cpu.h#5 integrate
... //depot/projects/ia64/sys/ia64/include/param.h#4 integrate
... //depot/projects/ia64/sys/ia64/include/pcb.h#5 integrate
... //depot/projects/ia64/sys/ia64/include/vmparam.h#4 integrate
... //depot/projects/ia64/sys/kern/kern_event.c#5 integrate
... //depot/projects/ia64/sys/kern/kern_ktrace.c#8 integrate
... //depot/projects/ia64/sys/kern/kern_physio.c#2 integrate
... //depot/projects/ia64/sys/kern/kern_proc.c#16 integrate
... //depot/projects/ia64/sys/kern/kern_prot.c#15 integrate
... //depot/projects/ia64/sys/kern/kern_resource.c#9 integrate
... //depot/projects/ia64/sys/kern/kern_sig.c#16 integrate
... //depot/projects/ia64/sys/kern/subr_blist.c#2 integrate
... //depot/projects/ia64/sys/kern/sys_process.c#10 integrate
... //depot/projects/ia64/sys/modules/Makefile#13 integrate
... //depot/projects/ia64/sys/modules/linux/Makefile#4 integrate
... //depot/projects/ia64/sys/nfsclient/bootp_subr.c#5 integrate
... //depot/projects/ia64/sys/posix4/p1003_1b.c#3 integrate
... //depot/projects/ia64/sys/powerpc/include/psl.h#2 integrate
... //depot/projects/ia64/sys/powerpc/powerpc/trap.c#11 integrate
... //depot/projects/ia64/sys/security/lomac/kernel_lkm.c#3 integrate
... //depot/projects/ia64/sys/sys/blist.h#3 integrate
... //depot/projects/ia64/sys/sys/proc.h#17 integrate
... //depot/projects/ia64/sys/sys/types.h#11 integrate
... //depot/projects/ia64/sys/ufs/ffs/ffs_softdep.c#9 integrate
... //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#13 integrate
... //depot/projects/ia64/sys/ufs/ifs/README#2 delete
... //depot/projects/ia64/sys/ufs/ifs/ifs_extern.h#2 delete
... //depot/projects/ia64/sys/ufs/ifs/ifs_lookup.c#3 delete
... //depot/projects/ia64/sys/ufs/ifs/ifs_subr.c#3 delete
... //depot/projects/ia64/sys/ufs/ifs/ifs_vfsops.c#5 delete
... //depot/projects/ia64/sys/ufs/ifs/ifs_vnops.c#6 delete
... //depot/projects/ia64/sys/ufs/ufs/inode.h#2 integrate
... //depot/projects/ia64/sys/ufs/ufs/ufs_bmap.c#4 integrate
... //depot/projects/ia64/sys/ufs/ufs/ufs_dirhash.c#6 integrate
... //depot/projects/ia64/sys/ufs/ufs/ufs_readwrite.c#7 integrate
... //depot/projects/ia64/sys/ufs/ufs/ufs_vfsops.c#6 integrate
... //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#11 integrate
... //depot/projects/ia64/sys/ufs/ufs/ufsmount.h#4 integrate
... //depot/projects/ia64/sys/vm/vm_map.c#18 integrate
... //depot/projects/ia64/sys/vm/vm_mmap.c#7 integrate
... //depot/projects/ia64/sys/vm/vm_object.c#12 integrate
... //depot/projects/ia64/tools/regression/usr.bin/uuencode/regress.base64.out#2 integrate
... //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#13 integrate
... //depot/projects/ia64/usr.bin/elf2aout/elf2aout.c#4 integrate
... //depot/projects/ia64/usr.bin/ldd/ldd.c#6 integrate
... //depot/projects/ia64/usr.bin/tee/tee.c#5 integrate
... //depot/projects/ia64/usr.bin/uuencode/uuencode.c#5 integrate
... //depot/projects/ia64/usr.sbin/sysinstall/index.c#4 integrate

Differences ...

==== //depot/projects/ia64/MAINTAINERS#6 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.29 2002/05/12 13:41:28 ru Exp $
+$FreeBSD: src/MAINTAINERS,v 1.30 2002/05/18 07:59:51 markm Exp $
 
 subsystem	login	notes
 -----------------------------
@@ -11,8 +11,6 @@
 NEWCARD		imp	Pre-commit review requested.
 OLDCARD		imp	Pre-commit review requested.
 wi		imp	Pre-commit review requested.
-perl5		markm	This is about to be deleted.
-			HARD LOCK! No commits at all!
 telnet		markm	commits _must_ be made to src/crypto/telnet
 			first, only then to "base" telnet via "make
 			unifdef"

==== //depot/projects/ia64/Makefile.inc1#26 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.278 2002/05/16 08:55:59 markm Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.281 2002/05/18 18:23:04 obrien Exp $
 #
 # Make command line options:
 #	-DMAKE_KERBEROS4 to build KerberosIV
@@ -572,7 +572,7 @@
 .if exists(${.CURDIR}/games) && !defined(NOGAMES)
 _strfile=	games/fortune/strfile
 .endif
-.if ${CXX} != "c++"
+.if ${CXX:T} != "c++"
 _cxx_consumers=	gnu/usr.bin/gperf gnu/usr.bin/groff
 .endif
 

==== //depot/projects/ia64/bin/cp/cp.c#5 (text+ko) ====

@@ -45,7 +45,7 @@
 static char sccsid[] = "@(#)cp.c	8.2 (Berkeley) 4/1/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD: src/bin/cp/cp.c,v 1.33 2002/05/11 00:21:00 alfred Exp $";
+  "$FreeBSD: src/bin/cp/cp.c,v 1.35 2002/05/17 12:24:19 ache Exp $";
 #endif /* not lint */
 
 /*
@@ -99,7 +99,7 @@
 {
 	struct stat to_stat, tmp_stat;
 	enum op type;
-	int Hflag, Lflag, Pflag, ch, fts_options, r;
+	int Hflag, Lflag, Pflag, ch, fts_options, r, have_trailing_slash;
 	char *target;
 
 	Hflag = Lflag = Pflag = 0;
@@ -179,7 +179,9 @@
 		*to.p_end++ = '.';
 		*to.p_end = 0;
 	}
-        STRIP_TRAILING_SLASH(to);
+	have_trailing_slash = (to.p_end[-1] == '/');
+	if (have_trailing_slash)
+		STRIP_TRAILING_SLASH(to);
 	to.target_end = to.p_end;
 
 	/* Set end of argument list for fts(3). */
@@ -229,6 +231,14 @@
 				type = FILE_TO_FILE;
 		} else
 			type = FILE_TO_FILE;
+
+		if (have_trailing_slash && type == FILE_TO_FILE) {
+			if (r == -1)
+				errx(1, "directory %s does not exist",
+				     to.p_path);
+			else
+				errx(1, "%s is not a directory", to.p_path);
+		}
 	} else
 		/*
 		 * Case (2).  Target is a directory.

==== //depot/projects/ia64/bin/df/df.c#6 (text+ko) ====

@@ -47,7 +47,7 @@
 static char sccsid[] = "@(#)df.c	8.9 (Berkeley) 5/8/95";
 #else
 static const char rcsid[] =
-  "$FreeBSD: src/bin/df/df.c,v 1.38 2002/05/12 19:24:09 phk Exp $";
+  "$FreeBSD: src/bin/df/df.c,v 1.39 2002/05/18 21:10:40 iedowse Exp $";
 #endif
 #endif /* not lint */
 
@@ -203,11 +203,9 @@
 	rv = 0;
 	if (!*argv) {
 		mntsize = regetmntinfo(&mntbuf, mntsize, vfslist);
-		if (vfslist != NULL) {
-			bzero(&maxwidths, sizeof(maxwidths));
-			for (i = 0; i < mntsize; i++)
-				update_maxwidths(&maxwidths, &mntbuf[i]);
-		}
+		bzero(&maxwidths, sizeof(maxwidths));
+		for (i = 0; i < mntsize; i++)
+			update_maxwidths(&maxwidths, &mntbuf[i]);
 		for (i = 0; i < mntsize; i++) {
 			if (aflag || (mntbuf[i].f_flags & MNT_IGNORE) == 0)
 				prtstat(&mntbuf[i], &maxwidths);

==== //depot/projects/ia64/bin/ls/extern.h#3 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD: src/bin/ls/extern.h,v 1.18 2002/02/03 19:11:32 markm Exp $
+ * $FreeBSD: src/bin/ls/extern.h,v 1.19 2002/05/19 02:51:36 tjr Exp $
  */
 
 int	 acccmp(const FTSENT *, const FTSENT *);
@@ -46,6 +46,7 @@
 void	 printcol(DISPLAY *);
 void	 printlong(DISPLAY *);
 void	 printscol(DISPLAY *);
+void	 printstream(DISPLAY *);
 void	 usage(void);
 size_t	 len_octal(const char *, int);
 int	 prn_octal(const char *);

==== //depot/projects/ia64/bin/ls/ls.1#8 (text+ko) ====

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
-.\" $FreeBSD: src/bin/ls/ls.1,v 1.65 2002/05/16 01:57:08 trhodes Exp $
+.\" $FreeBSD: src/bin/ls/ls.1,v 1.66 2002/05/19 02:51:36 tjr Exp $
 .\"
 .Dd December 29, 2002
 .Dt LS 1
@@ -43,7 +43,7 @@
 .Nd list directory contents
 .Sh SYNOPSIS
 .Nm
-.Op Fl ABCFGHLPRTWZabcdfghiklnoqrstuw1
+.Op Fl ABCFGHLPRTWZabcdfghiklmnopqrstuwx1
 .Op Ar
 .Sh DESCRIPTION
 For each operand that names a
@@ -192,6 +192,8 @@
 (See below.)
 If the output is to a terminal, a total sum for all the file
 sizes is output on a line before the long listing.
+.It Fl m
+Stream output format; list files across the page, separated by commas.
 .It Fl n
 Display user and group IDs numerically rather than converting to a user
 or group name in a long
@@ -201,6 +203,10 @@
 Include the file flags in a long
 .Pq Fl l
 output.
+.It Fl p
+Write a slash
+.Pq Ql /
+after each filename if that file is a directory.
 .It Fl q
 Force printing of non-graphic characters in file names as
 the character
@@ -232,6 +238,11 @@
 Force raw printing of non-printable characters.
 This is the default
 when output is not to a terminal.
+.It Fl x
+The same as
+.Fl C ,
+except that the multi-column output is produced with entries sorted
+across, rather than down, the columns.
 .It Fl 1
 (The numeric digit
 .Dq one . )
@@ -242,7 +253,7 @@
 .El
 .Pp
 The
-.Fl 1 , C ,
+.Fl 1 , C , x ,
 and
 .Fl l
 options all override each other; the last one specified determines
@@ -274,7 +285,9 @@
 lists one entry per line to standard
 output; the exceptions are to terminals or when the
 .Fl C
-option is specified.
+or
+.Fl x
+options are specified.
 .Pp
 File information is displayed with one or more
 .Ao blank Ac Ns s
@@ -481,7 +494,8 @@
 many pathname text columns to display
 based on the width provided.
 (See
-.Fl C . )
+.Fl C and 
+.Fl x . )
 .It Ev LANG
 The locale to use when determining the order of day and month in the long
 .Fl l
@@ -619,17 +633,16 @@
 .Xr termcap 5 ,
 .Xr symlink 7 ,
 .Xr sticky 8
+.Sh STANDARDS
+The
+.Nm
+utility conforms to
+.St -p1003.1-2001 .
 .Sh HISTORY
 An
 .Nm
 command appeared in
 .At v1 .
-.Sh STANDARDS
-The
-.Nm
-utility is expected to be a superset of the
-.St -p1003.2
-specification.
 .Sh BUGS
 To maintain backward compatibility, the relationships between the many
 options are quite complex.

==== //depot/projects/ia64/bin/ls/ls.c#5 (text+ko) ====

@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.59 2002/05/15 18:53:56 billf Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.60 2002/05/19 02:51:36 tjr Exp $");
 
 #ifndef lint
 static const char copyright[] =
@@ -113,7 +113,10 @@
        int f_sectime;		/* print the real time for all files */
 static int f_singlecol;		/* use single column output */
        int f_size;		/* list size in short listing */
+       int f_slash;		/* similar to f_type, but only for dirs */
+       int f_sortacross;	/* sort across rows, not down columns */ 
        int f_statustime;	/* use time of last mode change */
+       int f_stream;		/* stream the output, seperate with commas */
 static int f_timesort;		/* sort by time vice name */
        int f_type;		/* add type character for non-regular files */
 static int f_whiteout;		/* show whiteout entries */
@@ -167,15 +170,17 @@
 		f_listdot = 1;
 
 	fts_options = FTS_PHYSICAL;
- 	while ((ch = getopt(argc, argv, "1ABCFGHLPRTWZabcdfghiklnoqrstuw")) != -1) {
+ 	while ((ch = getopt(argc, argv, "1ABCFGHLPRTWZabcdfghiklmnopqrstuwx")) 
+	    != -1) {
 		switch (ch) {
 		/*
-		 * The -1, -C and -l options all override each other so shell
-		 * aliasing works right.
+		 * The -1, -C, -x and -l options all override each other so
+		 * shell aliasing works right.
 		 */
 		case '1':
 			f_singlecol = 1;
 			f_longform = 0;
+			f_stream = 0;
 			break;
 		case 'B':
 			f_nonprint = 0;
@@ -183,12 +188,18 @@
 			f_octal_escape = 0;
 			break;
 		case 'C':
-			f_longform = f_singlecol = 0;
+			f_sortacross = f_longform = f_singlecol = 0;
 			break;
 		case 'l':
 			f_longform = 1;
 			f_singlecol = 0;
+			f_stream = 0;
 			break;
+		case 'x':
+			f_sortacross = 1;
+			f_longform = 0;
+			f_singlecol = 0;
+			break;
 		/* The -c and -u options override each other. */
 		case 'c':
 			f_statustime = 1;
@@ -200,6 +211,7 @@
 			break;
 		case 'F':
 			f_type = 1;
+			f_slash = 0;
 			break;
 		case 'H':
 			fts_options |= FTS_COMFOLLOW;
@@ -244,12 +256,21 @@
 		case 'k':
 			f_kblocks = 1;
 			break;
+		case 'm':
+			f_stream = 1;
+			f_singlecol = 0;
+			f_longform = 0;
+			break;
 		case 'n':
 			f_numericonly = 1;
 			break;
 		case 'o':
 			f_flags = 1;
 			break;
+		case 'p':
+			f_slash = 1;
+			f_type = 1;
+			break;
 		case 'q':
 			f_nonprint = 1;
 			f_octal = 0;
@@ -390,6 +411,8 @@
 		printfcn = printscol;
 	else if (f_longform)
 		printfcn = printlong;
+	else if (f_stream)
+		printfcn = printstream;
 	else
 		printfcn = printcol;
 

==== //depot/projects/ia64/bin/ls/ls.h#4 (text+ko) ====

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ls.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD: src/bin/ls/ls.h,v 1.17 2002/02/03 19:11:32 markm Exp $
+ * $FreeBSD: src/bin/ls/ls.h,v 1.18 2002/05/19 02:51:36 tjr Exp $
  */
 
 #define NO_PRINT	1
@@ -53,6 +53,8 @@
 extern int f_nonprint;		/* show unprintables as ? */
 extern int f_sectime;		/* print the real time for all files */
 extern int f_size;		/* list size in short listing */
+extern int f_slash;		/* append a '/' if the file is a directory */
+extern int f_sortacross;	/* sort across rows, not down columns */ 
 extern int f_statustime;	/* use time of last mode change */
 extern int f_notabs;		/* don't use tab-separated multi-col output */
 extern int f_type;		/* add type character for non-regular files */

==== //depot/projects/ia64/bin/ls/print.c#5 (text+ko) ====

@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.54 2002/05/15 18:53:56 billf Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.55 2002/05/19 02:51:36 tjr Exp $");
 
 #if 0
 #ifndef lint
@@ -223,6 +223,31 @@
 }
 
 void
+printstream(DISPLAY *dp)
+{
+	FTSENT *p;
+	extern int termwidth;
+	int chcnt;
+
+	for (p = dp->list, chcnt = 0; p; p = p->fts_link) {
+		if (p->fts_number == NO_PRINT)
+			continue;
+		if (strlen(p->fts_name) + chcnt +
+		    (p->fts_link ? 2 : 0) >= (unsigned)termwidth) {
+			putchar('\n');
+			chcnt = 0;
+		}
+		chcnt += printaname(p, dp->s_inode, dp->s_block);
+		if (p->fts_link) {
+			printf(", ");
+			chcnt += 2;
+		}
+	}
+	if (chcnt)
+		putchar('\n');
+}
+		
+void
 printcol(DISPLAY *dp)
 {
 	extern int termwidth;
@@ -282,15 +307,26 @@
 
 	if (dp->list->fts_level != FTS_ROOTLEVEL && (f_longform || f_size))
 		(void)printf("total %lu\n", howmany(dp->btotal, blocksize));
+
+	if (f_sortacross)
+		base = 0;
 	for (row = 0; row < numrows; ++row) {
 		endcol = colwidth;
-		for (base = row, chcnt = col = 0; col < numcols; ++col) {
+		if (!f_sortacross)
+			base = row;
+		for (col = 0, chcnt = 0; col < numcols; ++col) {
 			chcnt += printaname(array[base], dp->s_inode,
 			    dp->s_block);
-			if ((base += numrows) >= num)
+			if (f_sortacross)
+				base++;
+			else
+				base += numrows;
+			if (base >= num)
 				break;
 			while ((cnt = ((chcnt + tabwidth) & ~(tabwidth - 1)))
 			    <= endcol) {
+				if (f_sortacross && col + 1 >= numcols)
+					break;
 				(void)putchar(f_notabs ? ' ' : '\t');
 				chcnt = cnt;
 			}
@@ -364,6 +400,15 @@
 static int
 printtype(u_int mode)
 {
+
+	if (f_slash) {
+		if ((mode & S_IFMT) == S_IFDIR) {
+			(void)putchar('/');
+			return (1);
+		}
+		return (0);
+	}
+
 	switch (mode & S_IFMT) {
 	case S_IFDIR:
 		(void)putchar('/');

==== //depot/projects/ia64/bin/mv/mv.c#4 (text+ko) ====

@@ -46,7 +46,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.36 2002/03/22 19:52:59 obrien Exp $");
+__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.37 2002/05/17 11:38:48 jmallett Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
@@ -59,6 +59,7 @@
 #include <fcntl.h>
 #include <grp.h>
 #include <limits.h>
+#include <paths.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>

==== //depot/projects/ia64/bin/mv/pathnames.h#2 (text+ko) ====

@@ -31,8 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD: src/bin/mv/pathnames.h,v 1.5 1999/08/27 23:14:37 peter Exp $
+ * $FreeBSD: src/bin/mv/pathnames.h,v 1.6 2002/05/17 11:38:48 jmallett Exp $
  */
 
 #define	_PATH_RM	"/bin/rm"
-#define	_PATH_CP	"/bin/cp"

==== //depot/projects/ia64/bin/pwd/pwd.1#5 (text+ko) ====

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pwd.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD: src/bin/pwd/pwd.1,v 1.18 2002/04/16 20:06:27 charnier Exp $
+.\" $FreeBSD: src/bin/pwd/pwd.1,v 1.20 2002/05/18 13:52:07 tjr Exp $
 .\"
 .Dd February 4, 2002
 .Dt PWD 1
@@ -43,7 +43,7 @@
 .Nd return working directory name
 .Sh SYNOPSIS
 .Nm
-.Op Fl L | P
+.Op Fl LP
 .Sh DESCRIPTION
 The
 .Nm

==== //depot/projects/ia64/bin/pwd/pwd.c#3 (text+ko) ====

@@ -42,7 +42,7 @@
 static char sccsid[] = "@(#)pwd.c	8.3 (Berkeley) 4/1/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD: src/bin/pwd/pwd.c,v 1.17 2002/02/11 18:38:54 mike Exp $";
+  "$FreeBSD: src/bin/pwd/pwd.c,v 1.19 2002/05/18 13:52:07 tjr Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -61,18 +61,18 @@
 int
 main(int argc, char *argv[])
 {
-	int Lflag, Pflag;
+	int physical;
 	int ch;
 	char *p;
 
-	Lflag = Pflag = 0;
+	physical = 1;
 	while ((ch = getopt(argc, argv, "LP")) != -1)
 		switch (ch) {
 		case 'L':
-			Lflag = 1;
+			physical = 0;
 			break;
 		case 'P':
-			Pflag = 1;
+			physical = 1;
 			break;
 		case '?':
 		default:
@@ -81,13 +81,18 @@
 	argc -= optind;
 	argv += optind;
 
-	if (argc != 0 || (Lflag && Pflag))
+	if (argc != 0)
 		usage();
 
-	p = Lflag ? getcwd_logical() : getcwd(NULL, 0);
-	if (p == NULL)
+	/*
+	 * If we're trying to find the logical current directory and that
+	 * fails, behave as if -P was specified.
+	 */
+	if ((!physical && (p = getcwd_logical()) != NULL) ||
+	    (p = getcwd(NULL, 0)) != NULL)
+		printf("%s\n", p);
+	else
 		err(1, ".");
-	(void)printf("%s\n", p);
 
 	exit(0);
 }
@@ -96,7 +101,7 @@
 usage(void)
 {
 
-	(void)fprintf(stderr, "usage: pwd [-L | -P]\n");
+	(void)fprintf(stderr, "usage: pwd [-LP]\n");
   	exit(1);
 }
 

==== //depot/projects/ia64/contrib/gcc/cp/cfns.h#2 (text+ko) ====

@@ -1,5 +1,6 @@
-/* C code produced by gperf version 2.7 */
-/* Command-line: gperf -o -C -E -k 1-6,$ -j1 -D -N libc_name_p ../../../egcs-CVS20000404/gcc/cp/cfns.gperf  */
+/* C code produced by gperf version 2.7.2 */
+/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p /FBSD/src/gnu/usr.bin/cc/cc1plus/../../../../contrib/gcc/cp/cfns.gperf  */
+/* $FreeBSD: src/contrib/gcc/cp/cfns.h,v 1.2 2002/05/17 19:22:31 obrien Exp $ */
 #ifdef __GNUC__
 __inline
 #endif
@@ -12,6 +13,10 @@
 
 #ifdef __GNUC__
 __inline
+#else
+#ifdef __cplusplus
+inline
+#endif
 #endif
 static unsigned int
 hash (str, len)

==== //depot/projects/ia64/etc/periodic/daily/450.status-security#4 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/periodic/daily/450.status-security,v 1.9 2001/12/07 23:57:38 cjc Exp $
+# $FreeBSD: src/etc/periodic/daily/450.status-security,v 1.10 2002/05/17 11:31:45 brian Exp $
 #
 
 # If there is a global system configuration file, suck it in.
@@ -32,7 +32,7 @@
 	esac
 
 	periodic security
-	rc=$?;;
+	rc=3;;
 
     *)  rc=0;;
 esac

==== //depot/projects/ia64/etc/periodic/monthly/200.accounting#4 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD: src/etc/periodic/monthly/200.accounting,v 1.8 2002/04/30 17:07:32 brian Exp $
+# $FreeBSD: src/etc/periodic/monthly/200.accounting,v 1.9 2002/05/17 14:05:08 brian Exp $
 #
 
 # If there is a global system configuration file, suck it in.
@@ -11,6 +11,8 @@
     source_periodic_confs
 fi
 
+oldmask=$(umask)
+umask 066
 case "$monthly_accounting_enable" in
     [Yy][Ee][Ss])
 	W=/var/log/wtmp
@@ -45,4 +47,5 @@
     *)  rc=0;;
 esac
 
+umask $oldmask
 exit $rc

==== //depot/projects/ia64/etc/periodic/security/100.chksetuid#3 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.2 2002/05/05 00:59:37 cjc Exp $
+# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.3 2002/05/17 11:34:12 brian Exp $
 #
 
 # If there is a global system configuration file, suck it in.
@@ -35,7 +35,7 @@
     source_periodic_confs
 fi
 
-TMP=/var/run/_secure.$$
+TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX`
 LOG="${daily_status_security_logdir}"
 rc=0
 

==== //depot/projects/ia64/etc/periodic/security/200.chkmounts#3 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.2 2001/12/14 22:25:04 cjc Exp $
+# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.3 2002/05/17 11:34:12 brian Exp $
 #
 
 # Show changes in the way filesystems are mounted
@@ -38,7 +38,7 @@
     source_periodic_confs
 fi
 
-TMP=/var/run/_secure.$$
+TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX`
 LOG="${daily_status_security_logdir}"
 ignore="${daily_status_security_chkmounts_ignore}"
 rc=0

==== //depot/projects/ia64/etc/periodic/security/500.ipfwdenied#2 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/periodic/security/500.ipfwdenied,v 1.1 2001/12/07 23:57:38 cjc Exp $
+# $FreeBSD: src/etc/periodic/security/500.ipfwdenied,v 1.2 2002/05/17 11:34:12 brian Exp $
 #
 
 # Show denied packets
@@ -39,7 +39,7 @@
     source_periodic_confs
 fi
 
-TMP=/var/run/_secure.$$
+TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX`
 LOG="${daily_status_security_logdir}"
 rc=0
 

==== //depot/projects/ia64/etc/periodic/security/550.ipfwlimit#3 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/periodic/security/550.ipfwlimit,v 1.2 2001/12/14 08:58:21 ru Exp $
+# $FreeBSD: src/etc/periodic/security/550.ipfwlimit,v 1.3 2002/05/17 11:34:12 brian Exp $
 #
 
 # Show ipfw rules which have reached the log limit
@@ -38,7 +38,7 @@
     source_periodic_confs
 fi
 
-TMP=/var/run/_secure.$$
+TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX`
 rc=0
 
 case "$daily_status_security_ipfwlimit_enable" in

==== //depot/projects/ia64/etc/periodic/security/600.ip6fwdenied#2 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/periodic/security/600.ip6fwdenied,v 1.1 2001/12/07 23:57:38 cjc Exp $
+# $FreeBSD: src/etc/periodic/security/600.ip6fwdenied,v 1.2 2002/05/17 11:34:12 brian Exp $
 #
 
 # Show IPv6 denied packets
@@ -38,7 +38,7 @@
     source_periodic_confs
 fi
 
-TMP=/var/run/_secure.$$
+TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX`
 LOG="${daily_status_security_logdir}"
 rc=0
 

==== //depot/projects/ia64/etc/periodic/security/650.ip6fwlimit#3 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/periodic/security/650.ip6fwlimit,v 1.2 2001/12/14 08:58:21 ru Exp $
+# $FreeBSD: src/etc/periodic/security/650.ip6fwlimit,v 1.3 2002/05/17 11:34:12 brian Exp $
 #
 
 # Show ip6fw rules which have reached the log limit
@@ -38,7 +38,7 @@
     source_periodic_confs
 fi
 
-TMP=/var/run/_secure.$$
+TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX`
 rc=0
 
 case "$daily_status_security_ip6fwlimit_enable" in

==== //depot/projects/ia64/etc/periodic/security/700.kernelmsg#2 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/periodic/security/700.kernelmsg,v 1.1 2001/12/07 23:57:38 cjc Exp $
+# $FreeBSD: src/etc/periodic/security/700.kernelmsg,v 1.3 2002/05/17 13:38:36 brian Exp $
 #
 
 # Show kernel log messages
@@ -38,13 +38,13 @@
     source_periodic_confs
 fi
 
-TMP=/var/run/_secure.$$
+TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX`
 LOG="${daily_status_security_logdir}"
 rc=0
 
 case "$daily_status_security_kernelmsg_enable" in
     [Yy][Ee][Ss])
-	if dmesg -a 2>/dev/null > ${TMP}; then
+	if dmesg 2>/dev/null > ${TMP}; then
 	    if [ ! -f ${LOG}/dmesg.today ]; then
 		rc=1
 		echo ""

==== //depot/projects/ia64/include/paths.h#5 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)paths.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/include/paths.h,v 1.15 2002/05/08 00:37:50 des Exp $
+ * $FreeBSD: src/include/paths.h,v 1.16 2002/05/17 11:47:09 jmallett Exp $
  */
 
 #ifndef _PATHS_H_
@@ -73,6 +73,7 @@
 #define	_PATH_TTY	"/dev/tty"
 #define	_PATH_UNIX	"don't use _PATH_UNIX"
 #define	_PATH_VI	"/usr/bin/vi"
+#define	_PATH_WALL	"/usr/bin/wall"
 
 /* Provide trailing slash, since mostly used for building pathnames. */
 #define	_PATH_DEV	"/dev/"

==== //depot/projects/ia64/lib/libc/sys/quotactl.2#3 (text+ko) ====

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)quotactl.2	8.2 (Berkeley) 3/10/95
-.\" $FreeBSD: src/lib/libc/sys/quotactl.2,v 1.18 2002/05/14 07:27:20 roam Exp $
+.\" $FreeBSD: src/lib/libc/sys/quotactl.2,v 1.19 2002/05/17 16:39:21 roam Exp $
 .\"
 .Dd March 5, 1999
 .Dt QUOTACTL 2
@@ -166,10 +166,11 @@
 .It Bq Er EINVAL
 .Fa Cmd
 or the command type is invalid.
+In
 .Dv Q_GETQUOTA
-returns
-.Er EINVAL
-if quotas are not currently enabled for this filesystem.
+and
+.Dv Q_SETQUOTA ,
+quotas are not currently enabled for this filesystem.
 .It Bq Er EACCES
 In
 .Dv Q_QUOTAON ,

==== //depot/projects/ia64/release/Makefile.inc.docports#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile.inc.docports,v 1.9 2002/03/17 15:40:01 jhay Exp $
+# $FreeBSD: src/release/Makefile.inc.docports,v 1.10 2002/05/17 19:01:21 bmah Exp $
 #
 # List of (dependent) ports that are minimally required to be
 # checked out from CVS in order to get ${DOCPORTS} built and

>>> TRUNCATED FOR MAIL (1000 lines) <<<

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message