Import of gdb 7.3.1

Change-Id: I504ac949581b96a04cb1d4b7677a93ee3d0e2ec9

.gitreview

@@ -11,7 +11,7 @@
 [gerrit]
 # The git-minix host is to be configured in your .ssh/config
 #
-host=gerrit.minix3.org
+host=git-minix
 port=2222
 project=minix
 defaultbranch=master

Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.303 2013/07/16 09:52:21 joerg Exp $
+#	$NetBSD: Makefile,v 1.299 2012/08/17 16:22:27 joerg Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -87,11 +87,11 @@
 #   do-top-obj:      creates the top level object directory.
 #   do-tools-obj:    creates object directories for the host toolchain.
 #   do-tools:        builds host toolchain.
-#   params:          record the values of variables that might affect the
-#                    build.
 #   obj:             creates object directories.
 #   do-distrib-dirs: creates the distribution directories.
 #   includes:        installs include files.
+#   do-tools-compat: builds the "libnbcompat" library; needed for some
+#                    random host tool programs in the source tree.
 #   do-lib:          builds and installs prerequisites from lib
 #                    if ${MKCOMPAT} != "no".
 #   do-compat-lib:   builds and installs prerequisites from compat/lib
@@ -137,14 +137,15 @@ _SRC_TOP_OBJ_=
 # _SUBDIR is used to set SUBDIR, after removing directories that have
 # BUILD_${dir}=no, or that have no ${dir}/Makefile.
 #
-_SUBDIR=	tools lib include gnu external crypto/external bin games
+_SUBDIR=	tools lib .WAIT include gnu external crypto/external bin games
 _SUBDIR+=	libexec sbin usr.bin
-_SUBDIR+=	usr.sbin share sys etc tests compat
-_SUBDIR+=	.WAIT rescue .WAIT distrib regress
+_SUBDIR+=	commands man
+_SUBDIR+=	common drivers kernel servers
+_SUBDIR+=	usr.sbin share rescue sys etc test compat .WAIT distrib regress
+
 .if defined(__MINIX)
-# the minix subdir depends on some other things (e.g. lib/) 
-_SUBDIR+=	.WAIT minix
-.endif # defined(__MINIX)
+_SUBDIR+=	benchmarks
+.endif
 
 .for dir in ${_SUBDIR}
 .if "${dir}" == ".WAIT" \
@@ -168,7 +169,7 @@ afterinstall: .PHONY .MAKE
 .if !defined(__MINIX)
 	${MAKEDIRTARGET} share/man makedb
 .else
-	${MAKEDIRTARGET} minix/man makedb
+	${MAKEDIRTARGET} man makedb
 .endif # !defined(__MINIX)
 .endif
 .if (${MKUNPRIVED} != "no" && ${MKINFO} != "no")
@@ -231,7 +232,6 @@ BUILDTARGETS+=	do-tools-obj
 .endif
 BUILDTARGETS+=	do-tools
 .endif # USETOOLS		# }
-BUILDTARGETS+=	params
 .if ${MKOBJDIRS} != "no"
 BUILDTARGETS+=	obj
 .endif
@@ -254,11 +254,6 @@ BUILDTARGETS+=	do-x11
 .if ${MKEXTSRC} != "no"
 BUILDTARGETS+=	do-extsrc
 .endif
-
-.if defined(__MINIX) && ${MKSRC} == "yes"
-BUILDTARGETS+=	do-installsrc
-.endif # defined(__MINIX)
-
 BUILDTARGETS+=	do-obsolete
 
 #
@@ -269,32 +264,6 @@ BUILDTARGETS+=	do-obsolete
 includes-lib:	.PHONY includes-include includes-sys
 includes-gnu:	.PHONY includes-lib
 
-#
-# Record the values of variables that might affect the build.
-# If no values have changed, avoid updating the timestamp
-# of the params file.
-#
-# This is referenced by _NETBSD_VERSION_DEPENDS in <bsd.own.mk>.
-#
-.include "${NETBSDSRCDIR}/etc/Makefile.params"
-CLEANDIRFILES+= params
-params: .EXEC
-	${_MKMSG_CREATE} params
-	@${PRINT_PARAMS} >${.TARGET}.new
-	@if cmp -s ${.TARGET}.new ${.TARGET} > /dev/null 2>&1; then \
-		: "params is unchanged" ; \
-		rm ${.TARGET}.new ; \
-	else \
-		: "params has changed or is new" ; \
-		mv ${.TARGET}.new ${.TARGET} ; \
-	fi
-
-#
-# Display current make(1) parameters
-#
-show-params: .PHONY .MAKE
-	@${PRINT_PARAMS}
-
 #
 # Build the system and install into DESTDIR.
 #
@@ -346,7 +315,7 @@ distribution buildworld: .PHONY .MAKE
 .endif
 	${MAKEDIRTARGET} . build NOPOSTINSTALL=1
 	${MAKEDIRTARGET} etc distribution INSTALL_DONE=1
-.if defined(DESTDIR) && ${DESTDIR} != "" && ${DESTDIR} != "/"
+.if defined(DESTDIR) && ${DESTDIR} != "" && ${DESTDIR} != "/"  && ${CHECKFLIST:Uyes} == "yes"
 	${MAKEDIRTARGET} . postinstall-fix-obsolete
 	${MAKEDIRTARGET} distrib/sets checkflist
 .endif
@@ -373,7 +342,7 @@ installworld: .PHONY .MAKE
 .endif
 .if !defined(INSTALLWORLDDIR) || \
     ${INSTALLWORLDDIR} == "" || ${INSTALLWORLDDIR} == "/"
-.if (${HOST_UNAME_S} != "NetBSD") && (${HOST_UNAME_S} != "Minix")
+.if (${HOST_UNAME_S} != "Minix")
 	@echo "Won't cross-make ${.TARGET} from ${HOST_UNAME_S} to Minix with INSTALLWORLDDIR=/"
 	@false
 .endif
@@ -499,8 +468,12 @@ do-${targ}: .PHONY ${targ}
 	@true
 .endfor
 
-do-tools: .PHONY .MAKE
-	${MAKEDIRTARGET} tools build_install
+.for dir in tools tools/compat
+do-${dir:S/\//-/g}: .PHONY .MAKE
+.for targ in dependall install
+	${MAKEDIRTARGET} ${dir} ${targ}
+.endfor
+.endfor
 
 do-lib: .PHONY .MAKE
 	${MAKEDIRTARGET} lib build_install
@@ -556,13 +529,6 @@ install-${dir}: .PHONY
 	@true
 .endfor
 
-.if defined(__MINIX)
-SRCTAR=src.tar.gz
-do-installsrc:
-	cd ${.CURDIR} && git ls-tree -r HEAD --name-only | tar czf ${.OBJDIR}/$(SRCTAR) -T -
-	${INSTALL_FILE} ${.OBJDIR}/$(SRCTAR) ${DESTDIR}/usr/src/
-.endif # defined(__MINIX)
-
 #
 # XXX this needs to change when distrib Makefiles are recursion compliant
 # XXX many distrib subdirs need "cd etc && make snap_pre snap_kern" first...
@@ -574,3 +540,9 @@ dependall-distrib depend-distrib all-distrib: .PHONY
 .include <bsd.obj.mk>
 .include <bsd.kernobj.mk>
 .include <bsd.subdir.mk>
+
+#
+# Display current make(1) parameters
+#
+params: .PHONY .MAKE
+	${MAKEDIRTARGET} etc params

Makefile.inc

@@ -1,16 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.4 2002/04/10 14:53:43 lukem Exp $
-
-.ifndef ABSTOP
-ABSTOP!= cd ${.PARSEDIR}; pwd
-
-.if (${.PARSEDIR} == ${.CURDIR})
-RELTOP:= .
-.else
-RELTOP:= ${.PARSEDIR:S,^${.CURDIR},,}
-.endif
-
-# you can set BSD{SRC,OBJ}DIR in Makefile.local.inc
-.if exists(${ABSTOP}/Makefile.local.inc)
-.include "${ABSTOP}/Makefile.local.inc"
-.endif
-.endif

benchmarks/unixbench-5.1.2/Makefile

@@ -0,0 +1,5 @@
+SCRIPTS=Run
+SUBDIR=pgms testdir run.sh
+.include "Makefile.inc"
+.include <bsd.prog.mk>
+.include <bsd.subdir.mk>

benchmarks/unixbench-5.1.2/Makefile.inc

@@ -0,0 +1 @@
+BINDIR=/usr/benchmarks/unixbench

benchmarks/unixbench-5.1.2/run.sh/Makefile

@@ -0,0 +1,3 @@
+SCRIPTS=run.sh
+SCRIPTSNAME=run.sh
+.include <bsd.prog.mk>

benchmarks/unixbench-5.1.2/src/syscall.c

@@ -0,0 +1,107 @@
+/*******************************************************************************
+ *  The BYTE UNIX Benchmarks - Release 3
+ *          Module: syscall.c   SID: 3.3 5/15/91 19:30:21
+ *
+ *******************************************************************************
+ * Bug reports, patches, comments, suggestions should be sent to:
+ *
+ *	Ben Smith, Rick Grehan or Tom Yager at BYTE Magazine
+ *	ben@bytepb.byte.com   rick_g@bytepb.byte.com   tyager@bytepb.byte.com
+ *
+ *******************************************************************************
+ *  Modification Log:
+ *  $Header: syscall.c,v 3.4 87/06/22 14:32:54 kjmcdonell Beta $
+ *  August 29, 1990 - Modified timing routines
+ *  October 22, 1997 - code cleanup to remove ANSI C compiler warnings
+ *                     Andy Kahn <kahn@zk3.dec.com>
+ *
+ ******************************************************************************/
+/*
+ *  syscall  -- sit in a loop calling the system
+ *
+ */
+char SCCSid[] = "@(#) @(#)syscall.c:3.3 -- 5/15/91 19:30:21";
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include "timeit.c"
+
+unsigned long iter;
+
+void report(int sig)
+{
+	fprintf(stderr,"COUNT|%ld|1|lps\n", iter);
+	exit(0);
+}
+
+int main(int argc, char *argv[])
+{
+        char   *test;
+	int	duration;
+
+	if (argc < 2) {
+		fprintf(stderr,"Usage: %s duration [ test ]\n", argv[0]);
+                fprintf(stderr,"test is one of:\n");
+                fprintf(stderr,"  \"mix\" (default), \"close\", \"getpid\", \"exec\"\n");
+		exit(1);
+	}
+        if (argc > 2)
+            test = argv[2];
+        else
+            test = "mix";
+
+	duration = atoi(argv[1]);
+
+	iter = 0;
+	wake_me(duration, report);
+
+        switch (test[0]) {
+        case 'm':
+	   while (1) {
+		close(dup(0));
+		getpid();
+		getuid();
+		umask(022);
+		iter++;
+	   }
+	   /* NOTREACHED */
+        case 'c':
+           while (1) {
+                close(dup(0));
+                iter++;
+           }
+           /* NOTREACHED */
+        case 'g':
+           while (1) {
+                getpid();
+                iter++;
+           }
+           /* NOTREACHED */
+        case 'e':
+           while (1) {
+                pid_t pid = fork();
+                if (pid < 0) {
+                    fprintf(stderr,"%s: fork failed\n", argv[0]);
+                    exit(1);
+                } else if (pid == 0) {
+                    execl("/bin/true", (char *) 0);
+                    fprintf(stderr,"%s: exec /bin/true failed\n", argv[0]);
+                    exit(1);
+                } else {
+                    if (waitpid(pid, NULL, 0) < 0) {
+                        fprintf(stderr,"%s: waitpid failed\n", argv[0]);
+                        exit(1);
+                    }
+                }
+                iter++;
+           }
+           /* NOTREACHED */
+        }
+
+        exit(9);
+}
+

bin/Makefile

@@ -1,8 +1,7 @@
 #	$NetBSD: Makefile,v 1.22 2007/12/31 15:31:24 ad Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
-SUBDIR=	cat chmod cp date df echo ed expr hostname \
-	kill ksh ln ls mkdir mv pax pwd rm rmdir sh \
-	sleep stty sync test
+SUBDIR=	cat date echo ed expr kill ksh ln ls \
+	mkdir pax pwd rm rmdir sync test
 
 .include <bsd.subdir.mk>

bin/cat/cat.1

@@ -1,4 +1,4 @@
-.\"	$NetBSD: cat.1,v 1.36 2012/11/10 18:41:10 wiz Exp $
+.\"	$NetBSD: cat.1,v 1.32 2006/09/23 11:24:44 wiz Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"     @(#)cat.1	8.3 (Berkeley) 5/2/95
 .\"
-.Dd November 10, 2012
+.Dd September 23, 2006
 .Dt CAT 1
 .Os
 .Sh NAME
@@ -41,7 +41,6 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl beflnstuv
-.Op Fl B Ar bsize
 .Op Fl
 .Op Ar
 .Sh DESCRIPTION
@@ -55,9 +54,6 @@ A single dash represents the standard input,
 and may appear multiple times in the
 .Ar file
 list.
-If no
-.Ar file
-operands are given, standard input is read.
 .Pp
 The word
 .Dq concatenate
@@ -66,15 +62,10 @@ is just a verbose synonym for
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
-.It Fl B Ar bsize
-Read with a buffer size of
-.Ar bsize
-bytes, instead of the default buffer size which is the blocksize of the
-output file.
 .It Fl b
 Implies the
 .Fl n
-option, but doesn't number blank lines.
+option but doesn't number blank lines.
 .It Fl e
 Implies the
 .Fl v
@@ -148,7 +139,7 @@ to the file
 truncating
 .Ar file3
 if it already exists.
-See the manual page for your shell (e.g.,
+See the manual page for your shell (i.e.,
 .Xr sh 1 )
 for more information on redirection.
 .Pp

bin/cat/cat.c

@@ -1,4 +1,4 @@
-/* $NetBSD: cat.c,v 1.52 2012/11/19 19:41:31 christos Exp $	*/
+/* $NetBSD: cat.c,v 1.47 2008/07/20 00:52:39 lukem Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -44,7 +44,7 @@ __COPYRIGHT(
 #if 0
 static char sccsid[] = "@(#)cat.c	8.2 (Berkeley) 4/27/95";
 #else
-__RCSID("$NetBSD: cat.c,v 1.52 2012/11/19 19:41:31 christos Exp $");
+__RCSID("$NetBSD: cat.c,v 1.47 2008/07/20 00:52:39 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -61,11 +61,11 @@ __RCSID("$NetBSD: cat.c,v 1.52 2012/11/19 19:41:31 christos Exp $");
 #include <string.h>
 #include <unistd.h>
 
-static int bflag, eflag, fflag, lflag, nflag, sflag, tflag, vflag;
-static size_t bsize;
-static int rval;
-static const char *filename;
+int bflag, eflag, fflag, lflag, nflag, sflag, tflag, vflag;
+int rval;
+const char *filename;
 
+int main(int, char *[]);
 void cook_args(char *argv[]);
 void cook_buf(FILE *);
 void raw_args(char *argv[]);
@@ -80,11 +80,8 @@ main(int argc, char *argv[])
 	setprogname(argv[0]);
 	(void)setlocale(LC_ALL, "");
 
-	while ((ch = getopt(argc, argv, "B:beflnstuv")) != -1)
+	while ((ch = getopt(argc, argv, "beflnstuv")) != -1)
 		switch (ch) {
-		case 'B':
-			bsize = (size_t)strtol(optarg, NULL, 0);
-			break;
 		case 'b':
 			bflag = nflag = 1;	/* -b implies -n */
 			break;
@@ -115,9 +112,9 @@ main(int argc, char *argv[])
 		default:
 		case '?':
 			(void)fprintf(stderr,
-			    "Usage: %s [-beflnstuv] [-B bsize] [-] "
-			    "[file ...]\n", getprogname());
-			return EXIT_FAILURE;
+			    "usage: cat [-beflnstuv] [-] [file ...]\n");
+			exit(EXIT_FAILURE);
+			/* NOTREACHED */
 		}
 	argv += optind;
 
@@ -136,7 +133,7 @@ main(int argc, char *argv[])
 		raw_args(argv);
 	if (fclose(stdout))
 		err(EXIT_FAILURE, "stdout");
-	return rval;
+	return (rval);
 }
 
 void
@@ -289,6 +286,7 @@ raw_cat(int rfd)
 {
 	static char *buf;
 	static char fb_buf[BUFSIZ];
+	static size_t bsize;
 
 	ssize_t nr, nw, off;
 	int wfd;
@@ -297,15 +295,10 @@ raw_cat(int rfd)
 	if (buf == NULL) {
 		struct stat sbuf;
 
-		if (bsize == 0) {
-			if (fstat(wfd, &sbuf) == 0 && sbuf.st_blksize > 0 &&
-			    (size_t)sbuf.st_blksize > sizeof(fb_buf))
-				bsize = sbuf.st_blksize;
-		}
-		if (bsize > sizeof(fb_buf)) {
+		if (fstat(wfd, &sbuf) == 0 &&
+		    sbuf.st_blksize > sizeof(fb_buf)) {
+			bsize = sbuf.st_blksize;
 			buf = malloc(bsize);
-			if (buf == NULL)
-				warnx("malloc, using %zu buffer", bsize);
 		}
 		if (buf == NULL) {
 			bsize = sizeof(fb_buf);

bin/chmod/Makefile

@@ -1,6 +0,0 @@
-#	$NetBSD: Makefile,v 1.8 1997/07/20 22:36:34 christos Exp $
-#	@(#)Makefile	8.1 (Berkeley) 5/31/93
-
-PROG=	chmod
-
-.include <bsd.prog.mk>

bin/chmod/chmod.1

@@ -1,307 +0,0 @@
-.\"	$NetBSD: chmod.1,v 1.24 2012/10/22 17:47:06 christos Exp $
-.\"
-.\" Copyright (c) 1989, 1990, 1993, 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the Institute of Electrical and Electronics Engineers, Inc.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
-.\"
-.Dd October 22, 2012
-.Dt CHMOD 1
-.Os
-.Sh NAME
-.Nm chmod
-.Nd change file modes
-.Sh SYNOPSIS
-.Nm
-.Oo
-.Fl R
-.Op Fl H | Fl L | Fl P
-.Oc
-.Op Fl fh
-.Ar mode
-.Ar
-.Nm
-.Oo
-.Fl R
-.Op Fl H | Fl L | Fl P
-.Oc
-.Op Fl fh
-.Fl Fl reference=rfile
-.Ar
-.Sh DESCRIPTION
-The
-.Nm
-utility modifies the file mode bits of the listed files
-as specified by the
-.Ar mode
-operand, or
-copied from a reference
-.Ar rfile ,
-as specified with the
-.Fl Fl reference
-argument.
-.Pp
-The options are as follows:
-.Bl -tag -width Ds
-.It Fl H
-If the
-.Fl R
-option is specified, symbolic links on the command line are followed.
-(Symbolic links encountered in the tree traversal are not followed.)
-.It Fl L
-If the
-.Fl R
-option is specified, all symbolic links are followed.
-.It Fl P
-If the
-.Fl R
-option is specified, no symbolic links are followed.
-.It Fl R
-Change the modes of the file hierarchies rooted in the files
-instead of just the files themselves.
-.It Fl f
-Do not display a diagnostic message or modify the exit status if
-.Nm
-fails to change the mode of a file.
-.It Fl h
-If
-.Ar file
-is symbolic link, the mode of the link is changed.
-.El
-.Pp
-The
-.Fl H ,
-.Fl L
-and
-.Fl P
-options are ignored unless the
-.Fl R
-option is specified.
-In addition, these options override each other and the
-command's actions are determined by the last one specified.
-.Pp
-Only the owner of a file or the super-user is permitted to change
-the mode of a file.
-.Sh EXIT STATUS
-The
-.Nm
-utility exits 0 on success, and \*[Gt]0 if an error occurs.
-.Sh MODES
-Modes may be absolute or symbolic.
-An absolute mode is an octal number constructed by
-.Em or Ap ing
-the following values:
-.Pp
-.Bl -tag -width 6n -compact -offset indent
-.It Li 4000
-set-user-ID-on-execution
-.It Li 2000
-set-group-ID-on-execution
-.It Li 1000
-sticky bit, see
-.Xr chmod 2
-.It Li 0400
-read by owner
-.It Li 0200
-write by owner
-.It Li 0100
-execute (or search for directories) by owner
-.It Li 0070
-read, write, execute/search by group
-.It Li 0007
-read, write, execute/search by others
-.El
-.Pp
-The read, write, and execute/search values for group and others
-are encoded as described for owner.
-.Pp
-The symbolic mode is described by the following grammar:
-.Bd -literal -offset indent
-mode         ::= clause [, clause ...]
-clause       ::= [who ...] [action ...] last_action
-action       ::= op [perm ...]
-last_action  ::= op [perm ...]
-who          ::= a | u | g | o
-op           ::= + | \- | =
-perm         ::= r | s | t | w | x | X | u | g | o
-.Ed
-.Pp
-The
-.Ar who
-symbols ``u'', ``g'', and ``o'' specify the user, group, and other parts
-of the mode bits, respectively.
-The
-.Ar who
-symbol ``a'' is equivalent to ``ugo''.
-.Pp
-The
-.Ar perm
-symbols represent the portions of the mode bits as follows:
-.Pp
-.Bl -tag -width Ds -compact -offset indent
-.It r
-The read bits.
-.It s
-The set-user-ID-on-execution and set-group-ID-on-execution bits.
-.It t
-The sticky bit.
-.It w
-The write bits.
-.It x
-The execute/search bits.
-.It X
-The execute/search bits if the file is a directory or any of the
-execute/search bits are set in the original (unmodified) mode.
-Operations with the
-.Ar perm
-symbol ``X'' are only meaningful in conjunction with the
-.Ar op
-symbol ``+'', and are ignored in all other cases.
-.It u
-The user permission bits in the mode of the original file.
-.It g
-The group permission bits in the mode of the original file.
-.It o
-The other permission bits in the mode of the original file.
-.El
-.Pp
-The
-.Ar op
-symbols represent the operation performed, as follows:
-.Bl -tag -width 4n
-.It +
-If no value is supplied for
-.Ar perm ,
-the ``+'' operation has no effect.
-If no value is supplied for
-.Ar who ,
-each permission bit specified in
-.Ar perm ,
-for which the corresponding bit in the file mode creation mask
-is clear, is set.
-Otherwise, the mode bits represented by the specified
-.Ar who
-and
-.Ar perm
-values are set.
-.It \&\-
-If no value is supplied for
-.Ar perm ,
-the ``\-'' operation has no effect.
-If no value is supplied for
-.Ar who ,
-each permission bit specified in
-.Ar perm ,
-for which the corresponding bit in the file mode creation mask
-is clear, is cleared.
-Otherwise, the mode bits represented by the specified
-.Ar who
-and
-.Ar perm
-values are cleared.
-.It =
-The mode bits specified by the
-.Ar who
-value are cleared, or, if no who value is specified, the owner, group
-and other mode bits are cleared.
-Then, if no value is supplied for
-.Ar who ,
-each permission bit specified in
-.Ar perm ,
-for which the corresponding bit in the file mode creation mask
-is clear, is set.
-Otherwise, the mode bits represented by the specified
-.Ar who
-and
-.Ar perm
-values are set.
-.El
-.Pp
-Each
-.Ar clause
-specifies one or more operations to be performed on the mode
-bits, and each operation is applied to the mode bits in the
-order specified.
-.Pp
-Operations upon the other permissions only (specified by the symbol
-``o'' by itself), in combination with the
-.Ar perm
-symbols ``s'' or ``t'', are ignored.
-.Sh EXAMPLES
-.Bl -tag -width "u=rwx,go=u-w" -compact
-.It Li 644
-make a file readable by anyone and writable by the owner only.
-.Pp
-.It Li go-w
-deny write permission to group and others.
-.Pp
-.It Li =rw,+X
-set the read and write permissions to the usual defaults, but
-retain any execute permissions that are currently set.
-.Pp
-.It Li +X
-make a directory or file searchable/executable by everyone if it is
-already searchable/executable by anyone.
-.Pp
-.It Li 755
-.It Li u=rwx,go=rx
-.It Li u=rwx,go=u-w
-make a file readable/executable by everyone and writable by the owner only.
-.Pp
-.It Li go=
-clear all mode bits for group and others.
-.Pp
-.It Li g=u-w
-set the group bits equal to the user bits, but clear the group write bit.
-.El
-.Sh SEE ALSO
-.Xr chflags 1 ,
-.Xr install 1 ,
-.Xr chmod 2 ,
-.Xr stat 2 ,
-.Xr umask 2 ,
-.Xr fts 3 ,
-.Xr setmode 3 ,
-.Xr symlink 7 ,
-.Xr chown 8
-.Sh STANDARDS
-The
-.Nm
-utility is expected to be
-.St -p1003.2-92
-compatible with the exception of the
-.Ar perm
-symbol
-.Dq t
-which is not included in that standard.
-.Sh BUGS
-There's no
-.Ar perm
-option for the naughty bits.

bin/chmod/chmod.c

@@ -1,239 +0,0 @@
-/* $NetBSD: chmod.c,v 1.38 2012/10/22 18:00:46 christos Exp $ */
-
-/*
- * Copyright (c) 1989, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__COPYRIGHT(
-"@(#) Copyright (c) 1989, 1993, 1994\
- The Regents of the University of California.  All rights reserved.");
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)chmod.c	8.8 (Berkeley) 4/1/94";
-#else
-__RCSID("$NetBSD: chmod.c,v 1.38 2012/10/22 18:00:46 christos Exp $");
-#endif
-#endif /* not lint */
-
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include <err.h>
-#include <errno.h>
-#include <fts.h>
-#include <limits.h>
-#include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <getopt.h>
-
-__dead static void	usage(void);
-
-struct option chmod_longopts[] = {
-	{ "reference",		required_argument,	0,
-						1 },
-	{ NULL,			0,			0,
-						0 },
-};
-
-int
-main(int argc, char *argv[])
-{
-	FTS *ftsp;
-	FTSENT *p;
-	void *set;
-	mode_t mval;
-	int Hflag, Lflag, Rflag, ch, fflag, fts_options, hflag, rval;
-	char *mode, *reference;
-	int (*change_mode)(const char *, mode_t);
-
-	setprogname(argv[0]);
-	(void)setlocale(LC_ALL, "");
-
-	Hflag = Lflag = Rflag = fflag = hflag = 0;
-	reference = NULL;
-	while ((ch = getopt_long(argc, argv, "HLPRXfghorstuwx",
-	    chmod_longopts, NULL)) != -1)
-		switch (ch) {
-		case 1:
-			reference = optarg;
-			break;
-		case 'H':
-			Hflag = 1;
-			Lflag = 0;
-			break;
-		case 'L':
-			Lflag = 1;
-			Hflag = 0;
-			break;
-		case 'P':
-			Hflag = Lflag = 0;
-			break;
-		case 'R':
-			Rflag = 1;
-			break;
-		case 'f':
-			fflag = 1;
-			break;
-		case 'h':
-			/*
-			 * In System V the -h option causes chmod to
-			 * change the mode of the symbolic link.
-			 * 4.4BSD's symbolic links didn't have modes,
-			 * so it was an undocumented noop.  In NetBSD
-			 * 1.3, lchmod(2) is introduced and this
-			 * option does real work.
-			 */
-			hflag = 1;
-			break;
-		/*
-		 * XXX
-		 * "-[rwx]" are valid mode commands.  If they are the entire
-		 * argument, getopt has moved past them, so decrement optind.
-		 * Regardless, we're done argument processing.
-		 */
-		case 'g': case 'o': case 'r': case 's':
-		case 't': case 'u': case 'w': case 'X': case 'x':
-			if (argv[optind - 1][0] == '-' &&
-			    argv[optind - 1][1] == ch &&
-			    argv[optind - 1][2] == '\0')
-				--optind;
-			goto done;
-		case '?':
-		default:
-			usage();
-		}
-done:	argv += optind;
-	argc -= optind;
-
-	if (argc == 0 || (argc == 1 && reference == NULL))
-		usage();
-
-	fts_options = FTS_PHYSICAL;
-	if (Rflag) {
-		if (hflag) {
-			errx(EXIT_FAILURE,
-		"the -R and -h options may not be specified together.");
-			/* NOTREACHED */
-		}
-		if (Hflag)
-			fts_options |= FTS_COMFOLLOW;
-		if (Lflag) {
-			fts_options &= ~FTS_PHYSICAL;
-			fts_options |= FTS_LOGICAL;
-		}
-	} else if (!hflag)
-		fts_options |= FTS_COMFOLLOW;
-	if (hflag)
-		change_mode = lchmod;
-	else
-		change_mode = chmod;
-
-	if (reference == NULL) {
-		mode = *argv++;
-		if ((set = setmode(mode)) == NULL) {
-			err(EXIT_FAILURE, "Cannot set file mode `%s'", mode);
-			/* NOTREACHED */
-		}
-		mval = 0;
-	} else {
-		struct stat st;
-
-		if (stat(reference, &st) == -1)
-			err(EXIT_FAILURE, "Cannot stat `%s'", reference);
-		mval = st.st_mode;
-		set = NULL;
-	}
-
-	if ((ftsp = fts_open(argv, fts_options, 0)) == NULL) {
-		err(EXIT_FAILURE, "fts_open");
-		/* NOTREACHED */
-	}
-	for (rval = 0; (p = fts_read(ftsp)) != NULL;) {
-		switch (p->fts_info) {
-		case FTS_D:
-			if (!Rflag)
-				(void)fts_set(ftsp, p, FTS_SKIP);
-			break;
-		case FTS_DNR:			/* Warn, chmod, continue. */
-			warnx("%s: %s", p->fts_path, strerror(p->fts_errno));
-			rval = 1;
-			break;
-		case FTS_DP:			/* Already changed at FTS_D. */
-			continue;
-		case FTS_ERR:			/* Warn, continue. */
-		case FTS_NS:
-			warnx("%s: %s", p->fts_path, strerror(p->fts_errno));
-			rval = 1;
-			continue;
-		case FTS_SL:			/* Ignore. */
-		case FTS_SLNONE:
-			/*
-			 * The only symlinks that end up here are ones that
-			 * don't point to anything and ones that we found
-			 * doing a physical walk.
-			 */
-			if (!hflag)
-				continue;
-			/* else */
-			/* FALLTHROUGH */
-		default:
-			break;
-		}
-		if ((*change_mode)(p->fts_accpath,
-		    set ? getmode(set, p->fts_statp->st_mode) : mval)
-		    && !fflag) {
-			warn("%s", p->fts_path);
-			rval = 1;
-		}
-	}
-	if (errno) {
-		err(EXIT_FAILURE, "fts_read");
-		/* NOTREACHED */
-	}
-	exit(rval);
-	/* NOTREACHED */
-}
-
-static void
-usage(void)
-{
-	(void)fprintf(stderr,
-	    "Usage: %s [-R [-H | -L | -P]] [-fh] mode file ...\n"
-	    "\t%s [-R [-H | -L | -P]] [-fh] --reference=rfile file ...\n",
-	    getprogname(), getprogname());
-	exit(1);
-	/* NOTREACHED */
-}

bin/cp/Makefile

@@ -1,7 +0,0 @@
-#	$NetBSD: Makefile,v 1.9 1997/07/20 22:36:37 christos Exp $
-#	@(#)Makefile	8.1 (Berkeley) 5/31/93
-
-PROG=	cp
-SRCS=	cp.c utils.c
-
-.include <bsd.prog.mk>

bin/cp/cp.1

@@ -1,254 +0,0 @@
-.\"	$NetBSD: cp.1,v 1.42 2012/03/25 22:37:08 wiz Exp $
-.\"
-.\" Copyright (c) 1989, 1990, 1993, 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the Institute of Electrical and Electronics Engineers, Inc.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
-.\"
-.Dd March 25, 2012
-.Dt CP 1
-.Os
-.Sh NAME
-.Nm cp
-.Nd copy files
-.Sh SYNOPSIS
-.Nm
-.Oo
-.Fl R
-.Op Fl H | Fl L | Fl P
-.Oc
-.Op Fl f | i
-.Op Fl alNpv
-.Ar source_file target_file
-.Nm cp
-.Oo
-.Fl R
-.Op Fl H | Fl L | Fl P
-.Oc
-.Op Fl f | i
-.Op Fl alNpv
-.Ar source_file ... target_directory
-.Sh DESCRIPTION
-In the first synopsis form, the
-.Nm
-utility copies the contents of the
-.Ar source_file
-to the
-.Ar target_file .
-In the second synopsis form,
-the contents of each named
-.Ar source_file
-is copied to the destination
-.Ar target_directory .
-The names of the files themselves are not changed.
-If
-.Nm
-detects an attempt to copy a file to itself, the copy will fail.
-.Pp
-The following options are available:
-.Bl -tag -width flag
-.It Fl a
-Archive mode.
-Same as
-.Fl RpP .
-.It Fl f
-For each existing destination pathname, attempt to overwrite it.
-If permissions do not allow copy to succeed, remove it and create a new
-file, without prompting for confirmation.
-(The
-.Fl i
-option is ignored if the
-.Fl f
-option is specified.)
-.It Fl H
-If the
-.Fl R
-option is specified, symbolic links on the command line are followed.
-(Symbolic links encountered in the tree traversal are not followed.)
-.It Fl i
-Causes
-.Nm
-to write a prompt to the standard error output before copying a file
-that would overwrite an existing file.
-If the response from the standard input begins with the character
-.Sq Li y ,
-the file copy is attempted.
-.It Fl L
-If the
-.Fl R
-option is specified, all symbolic links are followed.
-.It Fl l
-Create hard links to regular files in a hierarchy instead of copying.
-.It Fl N
-When used with
-.Fl p ,
-don't copy file flags.
-.It Fl P
-No symbolic links are followed.
-This is the default.
-.It Fl p
-Causes
-.Nm
-to preserve in the copy as many of the modification time, access time,
-file flags, file mode, user ID, group ID, and extended attributes,
-as allowed by permissions.
-.Pp
-If the user ID and group ID cannot be preserved, no error message
-is displayed and the exit value is not altered.
-.Pp
-If the source file has its set user ID bit on and the user ID cannot
-be preserved, the set user ID bit is not preserved
-in the copy's permissions.
-If the source file has its set group ID bit on and the group ID cannot
-be preserved, the set group ID bit is not preserved
-in the copy's permissions.
-If the source file has both its set user ID and set group ID bits on,
-and either the user ID or group ID cannot be preserved, neither
-the set user ID or set group ID bits are preserved in the copy's
-permissions.
-.Pp
-Extended attributes from all accessible namespaces are copied;
-others are ignored.
-If an error occurs during this copy, a message is displayed and
-.Nm
-skips the other extended attributes for that file.
-.It Fl R
-If
-.Ar source_file
-designates a directory,
-.Nm
-copies the directory and the entire subtree connected at that point.
-This option also causes symbolic links to be copied, rather than
-followed, and for
-.Nm
-to create special files rather than copying them as normal files.
-Created directories have the same mode as the corresponding source
-directory, unmodified by the process's umask.
-.Pp
-Note that
-.Nm
-copies hard linked files as separate files.
-If you need to preserve hard links, consider using a utility like
-.Xr pax 1
-instead.
-.It Fl v
-Causes
-.Nm
-to be verbose, showing files as they are copied.
-.El
-.Pp
-For each destination file that already exists, its contents are
-overwritten if permissions allow, but its mode, user ID, and group
-ID are unchanged.
-.Pp
-In the second synopsis form,
-.Ar target_directory
-must exist unless there is only one named
-.Ar source_file
-which is a directory and the
-.Fl R
-flag is specified.
-.Pp
-If the destination file does not exist, the mode of the source file is
-used as modified by the file mode creation mask
-.Ic ( umask ,
-see
-.Xr csh 1 ) .
-If the source file has its set user ID bit on, that bit is removed
-unless both the source file and the destination file are owned by the
-same user.
-If the source file has its set group ID bit on, that bit is removed
-unless both the source file and the destination file are in the same
-group and the user is a member of that group.
-If both the set user ID and set group ID bits are set, all of the above
-conditions must be fulfilled or both bits are removed.
-.Pp
-Appropriate permissions are required for file creation or overwriting.
-.Pp
-Symbolic links are always followed unless the
-.Fl R
-flag is set, in which case symbolic links are not followed, by default.
-The
-.Fl H
-or
-.Fl L
-flags (in conjunction with the
-.Fl R
-flag), as well as the
-.Fl P
-flag cause symbolic links to be followed as described above.
-The
-.Fl H
-and
-.Fl L
-options are ignored unless the
-.Fl R
-option is specified.
-In addition, these options override each other and the
-command's actions are determined by the last one specified.
-.Sh EXIT STATUS
-.Ex -std cp
-.Sh COMPATIBILITY
-Historic versions of the
-.Nm
-utility had a
-.Fl r
-option.
-This implementation supports that option, however, its use is strongly
-discouraged, as it does not correctly copy special files, symbolic links
-or fifo's.
-.Sh SEE ALSO
-.Xr mv 1 ,
-.Xr pax 1 ,
-.Xr rcp 1 ,
-.Xr umask 2 ,
-.Xr fts 3 ,
-.Xr symlink 7
-.Sh STANDARDS
-The
-.Nm
-utility is expected to be
-.St -p1003.2
-compatible.
-.Pp
-The
-.Fl a
-and
-.Fl l
-flags are non-standard extensions.
-They are intended to be compatible with the same options which
-other implementations, namely GNU coreutils and
-.Fx ,
-of this utility have.
-.Pp
-The
-.Fl v
-option is an extension to
-.St -p1003.2 .

bin/cp/cp.c

@@ -1,548 +0,0 @@
-/* $NetBSD: cp.c,v 1.58 2012/01/04 15:58:37 christos Exp $ */
-
-/*
- * Copyright (c) 1988, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * David Hitz of Auspex Systems Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__COPYRIGHT(
-"@(#) Copyright (c) 1988, 1993, 1994\
- The Regents of the University of California.  All rights reserved.");
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)cp.c	8.5 (Berkeley) 4/29/95";
-#else
-__RCSID("$NetBSD: cp.c,v 1.58 2012/01/04 15:58:37 christos Exp $");
-#endif
-#endif /* not lint */
-
-/*
- * Cp copies source files to target files.
- * 
- * The global PATH_T structure "to" always contains the path to the
- * current target file.  Since fts(3) does not change directories,
- * this path can be either absolute or dot-relative.
- * 
- * The basic algorithm is to initialize "to" and use fts(3) to traverse
- * the file hierarchy rooted in the argument list.  A trivial case is the
- * case of 'cp file1 file2'.  The more interesting case is the case of
- * 'cp file1 file2 ... fileN dir' where the hierarchy is traversed and the
- * path (relative to the root of the traversal) is appended to dir (stored
- * in "to") to form the final target path.
- */
-
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#include <assert.h>
-#include <err.h>
-#include <errno.h>
-#include <fts.h>
-#include <locale.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "extern.h"
-
-#define	STRIP_TRAILING_SLASH(p) {					\
-        while ((p).p_end > (p).p_path + 1 && (p).p_end[-1] == '/')	\
-                *--(p).p_end = '\0';					\
-}
-
-static char empty[] = "";
-PATH_T to = { .p_end = to.p_path, .target_end = empty  };
-
-uid_t myuid;
-int Hflag, Lflag, Rflag, Pflag, fflag, iflag, lflag, pflag, rflag, vflag, Nflag;
-mode_t myumask;
-sig_atomic_t pinfo;
-
-enum op { FILE_TO_FILE, FILE_TO_DIR, DIR_TO_DNE };
-
-static int copy(char *[], enum op, int);
-
-static void
-progress(int sig __unused)
-{
-
-	pinfo++;
-}
-
-int
-main(int argc, char *argv[])
-{
-	struct stat to_stat, tmp_stat;
-	enum op type;
-	int ch, fts_options, r, have_trailing_slash;
-	char *target, **src;
-
-	setprogname(argv[0]);
-	(void)setlocale(LC_ALL, "");
-
-	Hflag = Lflag = Pflag = Rflag = 0;
-	while ((ch = getopt(argc, argv, "HLNPRfailprv")) != -1) 
-		switch (ch) {
-		case 'H':
-			Hflag = 1;
-			Lflag = Pflag = 0;
-			break;
-		case 'L':
-			Lflag = 1;
-			Hflag = Pflag = 0;
-			break;
-		case 'N':
-			Nflag = 1;
-			break;
-		case 'P':
-			Pflag = 1;
-			Hflag = Lflag = 0;
-			break;
-		case 'R':
-			Rflag = 1;
-			break;
-		case 'a':
-			Pflag = 1;
-			pflag = 1;
-			Rflag = 1;
-			Hflag = Lflag = 0;
-			break;
-		case 'f':
-			fflag = 1;
-			iflag = 0;
-			break;
-		case 'i':
-			iflag = isatty(fileno(stdin));
-			fflag = 0;
-			break;
-		case 'l':
-			lflag = 1;
-			break;
-		case 'p':
-			pflag = 1;
-			break;
-		case 'r':
-			rflag = 1;
-			break;
-		case 'v':
-			vflag = 1;
-			break;
-		case '?':
-		default:
-			usage();
-			/* NOTREACHED */
-		}
-	argc -= optind;
-	argv += optind;
-
-	if (argc < 2)
-		usage();
-
-	fts_options = FTS_NOCHDIR | FTS_PHYSICAL;
-	if (rflag) {
-		if (Rflag) {
-			errx(EXIT_FAILURE,
-		    "the -R and -r options may not be specified together.");
-			/* NOTREACHED */
-		}
-		if (Hflag || Lflag || Pflag) {
-			errx(EXIT_FAILURE,
-	"the -H, -L, and -P options may not be specified with the -r option.");
-			/* NOTREACHED */
-		}
-		fts_options &= ~FTS_PHYSICAL;
-		fts_options |= FTS_LOGICAL;
-	}
-
-	if (Rflag) {
-		if (Hflag)
-			fts_options |= FTS_COMFOLLOW;
-		if (Lflag) {
-			fts_options &= ~FTS_PHYSICAL;
-			fts_options |= FTS_LOGICAL;
-		}
-	} else if (!Pflag) {
-		fts_options &= ~FTS_PHYSICAL;
-		fts_options |= FTS_LOGICAL | FTS_COMFOLLOW;
-	}
-
-	myuid = getuid();
-
-	/* Copy the umask for explicit mode setting. */
-	myumask = umask(0);
-	(void)umask(myumask);
-
-	/* Save the target base in "to". */
-	target = argv[--argc];
-	if (strlcpy(to.p_path, target, sizeof(to.p_path)) >= sizeof(to.p_path))
-		errx(EXIT_FAILURE, "%s: name too long", target);
-	to.p_end = to.p_path + strlen(to.p_path);
-	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). */
-	argv[argc] = NULL;     
-	
-	(void)signal(SIGINFO, progress);
-	
-	/*
-	 * Cp has two distinct cases:
-	 *
-	 * cp [-R] source target
-	 * cp [-R] source1 ... sourceN directory
-	 *
-	 * In both cases, source can be either a file or a directory.
-	 *
-	 * In (1), the target becomes a copy of the source. That is, if the
-	 * source is a file, the target will be a file, and likewise for
-	 * directories.
-	 *
-	 * In (2), the real target is not directory, but "directory/source".
-	 */
-	if (Pflag)
-		r = lstat(to.p_path, &to_stat);
-	else
-		r = stat(to.p_path, &to_stat);
-	if (r == -1 && errno != ENOENT) {
-		err(EXIT_FAILURE, "%s", to.p_path);
-		/* NOTREACHED */
-	}
-	if (r == -1 || !S_ISDIR(to_stat.st_mode)) {
-		/*
-		 * Case (1).  Target is not a directory.
-		 */ 
-		if (argc > 1)
-			usage();
-		/*
-		 * Need to detect the case:
-		 *	cp -R dir foo
-		 * Where dir is a directory and foo does not exist, where
-		 * we want pathname concatenations turned on but not for
-		 * the initial mkdir().
-		 */
-		if (r == -1) {
-			if (rflag || (Rflag && (Lflag || Hflag)))
-				r = stat(*argv, &tmp_stat);
-			else
-				r = lstat(*argv, &tmp_stat);
-			if (r == -1) {
-				err(EXIT_FAILURE, "%s", *argv);
-				/* NOTREACHED */
-			}
-			
-			if (S_ISDIR(tmp_stat.st_mode) && (Rflag || rflag))
-				type = DIR_TO_DNE;
-			else
-				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.
-		 */
-		type = FILE_TO_DIR;
-	}
-
-	/*
-	 * make "cp -rp src/ dst" behave like "cp -rp src dst" not
-	 * like "cp -rp src/. dst"
-	 */
-	for (src = argv; *src; src++) {
-		size_t len = strlen(*src);
-		while (len-- > 1 && (*src)[len] == '/')
-			(*src)[len] = '\0';
-	}
-
-	exit(copy(argv, type, fts_options));
-	/* NOTREACHED */
-}
-
-static int dnestack[MAXPATHLEN]; /* unlikely we'll have more nested dirs */
-static ssize_t dnesp;
-static void
-pushdne(int dne)
-{
-
-	dnestack[dnesp++] = dne;
-	assert(dnesp < MAXPATHLEN);
-}
-
-static int
-popdne(void)
-{
-	int rv;
-
-	rv = dnestack[--dnesp];
-	assert(dnesp >= 0);
-	return rv;
-}
-
-static int
-copy(char *argv[], enum op type, int fts_options)
-{
-	struct stat to_stat;
-	FTS *ftsp;
-	FTSENT *curr;
-	int base, dne, sval;
-	int this_failed, any_failed;
-	size_t nlen;
-	char *p, *target_mid;
-
-	base = 0;	/* XXX gcc -Wuninitialized (see comment below) */
-
-	if ((ftsp = fts_open(argv, fts_options, NULL)) == NULL)
-		err(EXIT_FAILURE, "%s", argv[0]);
-		/* NOTREACHED */
-	for (any_failed = 0; (curr = fts_read(ftsp)) != NULL;) {
-		this_failed = 0;
-		switch (curr->fts_info) {
-		case FTS_NS:
-		case FTS_DNR:
-		case FTS_ERR:
-			warnx("%s: %s", curr->fts_path,
-					strerror(curr->fts_errno));
-			this_failed = any_failed = 1;
-			continue;
-		case FTS_DC:			/* Warn, continue. */
-			warnx("%s: directory causes a cycle", curr->fts_path);
-			this_failed = any_failed = 1;
-			continue;
-		}
-
-		/*
-		 * If we are in case (2) or (3) above, we need to append the 
-                 * source name to the target name.  
-                 */
-		if (type != FILE_TO_FILE) {
-			if ((curr->fts_namelen +
-			    to.target_end - to.p_path + 1) > MAXPATHLEN) {
-				warnx("%s/%s: name too long (not copied)",
-						to.p_path, curr->fts_name);
-				this_failed = any_failed = 1;
-				continue;
-			}
-
-			/*
-			 * Need to remember the roots of traversals to create
-			 * correct pathnames.  If there's a directory being
-			 * copied to a non-existent directory, e.g.
-			 *	cp -R a/dir noexist
-			 * the resulting path name should be noexist/foo, not
-			 * noexist/dir/foo (where foo is a file in dir), which
-			 * is the case where the target exists.
-			 *
-			 * Also, check for "..".  This is for correct path
-			 * concatentation for paths ending in "..", e.g.
-			 *	cp -R .. /tmp
-			 * Paths ending in ".." are changed to ".".  This is
-			 * tricky, but seems the easiest way to fix the problem.
-			 *
-			 * XXX
-			 * Since the first level MUST be FTS_ROOTLEVEL, base
-			 * is always initialized.
-			 */
-			if (curr->fts_level == FTS_ROOTLEVEL) {
-				if (type != DIR_TO_DNE) {
-					p = strrchr(curr->fts_path, '/');
-					base = (p == NULL) ? 0 : 
-					    (int)(p - curr->fts_path + 1);
-
-					if (!strcmp(&curr->fts_path[base], 
-					    ".."))
-						base += 1;
-				} else
-					base = curr->fts_pathlen;
-			}
-
-			p = &curr->fts_path[base];
-			nlen = curr->fts_pathlen - base;
-			target_mid = to.target_end;
-			if (*p != '/' && target_mid[-1] != '/')
-				*target_mid++ = '/';
-			*target_mid = 0;
-
-			if (target_mid - to.p_path + nlen >= PATH_MAX) {
-				warnx("%s%s: name too long (not copied)",
-				    to.p_path, p);
-				this_failed = any_failed = 1;
-				continue;
-			}
-			(void)strncat(target_mid, p, nlen);
-			to.p_end = target_mid + nlen;
-			*to.p_end = 0;
-			STRIP_TRAILING_SLASH(to);
-		}
-
-		sval = Pflag ? lstat(to.p_path, &to_stat) : stat(to.p_path, &to_stat);
-		/* Not an error but need to remember it happened */
-		if (sval == -1)
-			dne = 1;
-		else {
-			if (to_stat.st_dev == curr->fts_statp->st_dev &&
-			    to_stat.st_ino == curr->fts_statp->st_ino) {
-				warnx("%s and %s are identical (not copied).",
-				    to.p_path, curr->fts_path);
-				this_failed = any_failed = 1;
-				if (S_ISDIR(curr->fts_statp->st_mode))
-					(void)fts_set(ftsp, curr, FTS_SKIP);
-				continue;
-			}
-			if (!S_ISDIR(curr->fts_statp->st_mode) &&
-			    S_ISDIR(to_stat.st_mode)) {
-		warnx("cannot overwrite directory %s with non-directory %s",
-				    to.p_path, curr->fts_path);
-				this_failed = any_failed = 1;
-				continue;
-			}
-			dne = 0;
-		}
-
-		switch (curr->fts_statp->st_mode & S_IFMT) {
-		case S_IFLNK:
-			/* Catch special case of a non dangling symlink */
-			if((fts_options & FTS_LOGICAL) ||
-			   ((fts_options & FTS_COMFOLLOW) && curr->fts_level == 0)) {
-				if (copy_file(curr, dne))
-					this_failed = any_failed = 1;
-			} else {	
-				if (copy_link(curr, !dne))
-					this_failed = any_failed = 1;
-			}
-			break;
-		case S_IFDIR:
-			if (!Rflag && !rflag) {
-				if (curr->fts_info == FTS_D)
-					warnx("%s is a directory (not copied).",
-					    curr->fts_path);
-				(void)fts_set(ftsp, curr, FTS_SKIP);
-				this_failed = any_failed = 1;
-				break;
-			}
-
-                        /*
-                         * Directories get noticed twice:
-                         *  In the first pass, create it if needed.
-                         *  In the second pass, after the children have been copied, set the permissions.
-                         */
-			if (curr->fts_info == FTS_D) /* First pass */
-			{
-				/*
-				 * If the directory doesn't exist, create the new
-				 * one with the from file mode plus owner RWX bits,
-				 * modified by the umask.  Trade-off between being
-				 * able to write the directory (if from directory is
-				 * 555) and not causing a permissions race.  If the
-				 * umask blocks owner writes, we fail..
-				 */
-				pushdne(dne);
-				if (dne) {
-					if (mkdir(to.p_path, 
-					    curr->fts_statp->st_mode | S_IRWXU) < 0)
-						err(EXIT_FAILURE, "%s",
-						    to.p_path);
-						/* NOTREACHED */
-				} else if (!S_ISDIR(to_stat.st_mode)) {
-					errno = ENOTDIR;
-					err(EXIT_FAILURE, "%s",
-						to.p_path);
-					/* NOTREACHED */
-				}
-			}
-			else if (curr->fts_info == FTS_DP) /* Second pass */
-			{
-	                        /*
-				 * If not -p and directory didn't exist, set it to be
-				 * the same as the from directory, umodified by the 
-                        	 * umask; arguably wrong, but it's been that way 
-                        	 * forever.
-				 */
-				if (pflag && setfile(curr->fts_statp, 0))
-					this_failed = any_failed = 1;
-				else if ((dne = popdne()))
-					(void)chmod(to.p_path, 
-					    curr->fts_statp->st_mode);
-			}
-			else
-			{
-				warnx("directory %s encountered when not expected.",
-				    curr->fts_path);
-				this_failed = any_failed = 1;
-				break;
-			}
-
-			break;
-		case S_IFBLK:
-		case S_IFCHR:
-			if (Rflag) {
-				if (copy_special(curr->fts_statp, !dne))
-					this_failed = any_failed = 1;
-			} else
-				if (copy_file(curr, dne))
-					this_failed = any_failed = 1;
-			break;
-		case S_IFIFO:
-			if (Rflag) {
-				if (copy_fifo(curr->fts_statp, !dne))
-					this_failed = any_failed = 1;
-			} else 
-				if (copy_file(curr, dne))
-					this_failed = any_failed = 1;
-			break;
-		default:
-			if (copy_file(curr, dne))
-				this_failed = any_failed = 1;
-			break;
-		}
-		if (vflag && !this_failed)
-			(void)printf("%s -> %s\n", curr->fts_path, to.p_path);
-	}
-	if (errno) {
-		err(EXIT_FAILURE, "fts_read");
-		/* NOTREACHED */
-	}
-	(void)fts_close(ftsp);
-	return (any_failed);
-}

bin/cp/extern.h

@@ -1,61 +0,0 @@
-/* $NetBSD: extern.h,v 1.17 2012/01/04 15:58:37 christos Exp $ */
-
-/*-
- * Copyright (c) 1991, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)extern.h	8.2 (Berkeley) 4/1/94
- */
-
-#ifndef _EXTERN_H_
-#define _EXTERN_H_
-
-typedef struct {
-	char *p_end;			/* pointer to NULL at end of path */
-	char *target_end;		/* pointer to end of target base */
-	char p_path[MAXPATHLEN + 1];	/* pointer to the start of a path */
-} PATH_T;
-
-extern PATH_T to;
-extern uid_t myuid;
-extern int Rflag, rflag, Hflag, Lflag, Pflag, fflag, iflag, lflag, pflag, Nflag;
-extern mode_t myumask;
-extern sig_atomic_t pinfo;
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	copy_fifo(struct stat *, int);
-int	copy_file(FTSENT *, int);
-int	copy_link(FTSENT *, int);
-int	copy_special(struct stat *, int);
-int	set_utimes(const char *, struct stat *);
-int	setfile(struct stat *, int);
-void	usage(void) __attribute__((__noreturn__));
-__END_DECLS
-
-#endif /* !_EXTERN_H_ */

bin/cp/utils.c

@@ -1,429 +0,0 @@
-/* $NetBSD: utils.c,v 1.41 2012/01/04 15:58:37 christos Exp $ */
-
-/*-
- * Copyright (c) 1991, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)utils.c	8.3 (Berkeley) 4/1/94";
-#else
-__RCSID("$NetBSD: utils.c,v 1.41 2012/01/04 15:58:37 christos Exp $");
-#endif
-#endif /* not lint */
-
-#include <sys/mman.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/extattr.h>
-
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <fts.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "extern.h"
-
-#define	MMAP_MAX_SIZE	(8 * 1048576)
-#define	MMAP_MAX_WRITE	(64 * 1024)
-
-int
-set_utimes(const char *file, struct stat *fs)
-{
-    static struct timeval tv[2];
-
-    TIMESPEC_TO_TIMEVAL(&tv[0], &fs->st_atimespec);
-    TIMESPEC_TO_TIMEVAL(&tv[1], &fs->st_mtimespec);
-
-    if (lutimes(file, tv)) {
-	warn("lutimes: %s", file);
-	return (1);
-    }
-    return (0);
-}
-
-struct finfo {
-	const char *from;
-	const char *to;
-	size_t size;
-};
-
-static void
-progress(const struct finfo *fi, size_t written)
-{
-	int pcent = (int)((100.0 * written) / fi->size);
-
-	pinfo = 0;
-	(void)fprintf(stderr, "%s => %s %zu/%zu bytes %d%% written\n",
-	    fi->from, fi->to, written, fi->size, pcent);
-}
-
-int
-copy_file(FTSENT *entp, int dne)
-{
-	static char buf[MAXBSIZE];
-	struct stat to_stat, *fs;
-	int ch, checkch, from_fd, rcount, rval, to_fd, tolnk, wcount;
-	char *p;
-	size_t ptotal = 0;
-	
-	if ((from_fd = open(entp->fts_path, O_RDONLY, 0)) == -1) {
-		warn("%s", entp->fts_path);
-		return (1);
-	}
-
-	to_fd = -1;
-	fs = entp->fts_statp;
-	tolnk = ((Rflag && !(Lflag || Hflag)) || Pflag);
-
-	/*
-	 * If the file exists and we're interactive, verify with the user.
-	 * If the file DNE, set the mode to be the from file, minus setuid
-	 * bits, modified by the umask; arguably wrong, but it makes copying
-	 * executables work right and it's been that way forever.  (The
-	 * other choice is 666 or'ed with the execute bits on the from file
-	 * modified by the umask.)
-	 */
-	if (!dne) {
-		struct stat sb;
-		int sval;
-
-		if (iflag) {
-			(void)fprintf(stderr, "overwrite %s? ", to.p_path);
-			checkch = ch = getchar();
-			while (ch != '\n' && ch != EOF)
-				ch = getchar();
-			if (checkch != 'y' && checkch != 'Y') {
-				(void)close(from_fd);
-				return (0);
-			}
-		}
-
-		sval = tolnk ?
-			lstat(to.p_path, &sb) : stat(to.p_path, &sb);
-		if (sval == -1) {
-			warn("stat: %s", to.p_path);
-			(void)close(from_fd);
-			return (1);
-		}
-
-		if (!(tolnk && S_ISLNK(sb.st_mode)))
-			to_fd = open(to.p_path, O_WRONLY | O_TRUNC, 0);
-	} else
-		to_fd = open(to.p_path, O_WRONLY | O_TRUNC | O_CREAT,
-		    fs->st_mode & ~(S_ISUID | S_ISGID));
-
-	if (to_fd == -1 && (fflag || tolnk)) {
-		/*
-		 * attempt to remove existing destination file name and
-		 * create a new file
-		 */
-		(void)unlink(to.p_path);
-		to_fd = open(to.p_path, O_WRONLY | O_TRUNC | O_CREAT,
-			     fs->st_mode & ~(S_ISUID | S_ISGID));
-	}
-
-	if (to_fd == -1) {
-		warn("%s", to.p_path);
-		(void)close(from_fd);
-		return (1);
-	}
-
-	rval = 0;
-
-	/* if hard linking then simply close the open fds, link and return */
-	if (lflag) {
-		(void)close(from_fd);
-		(void)close(to_fd);
-		(void)unlink(to.p_path);
-		if (link(entp->fts_path, to.p_path)) {
-			warn("%s", to.p_path);
-			return (1);
-		}
-		return (0);
-	}
-	/* NOTREACHED */
-
-	/*
-	 * There's no reason to do anything other than close the file
-	 * now if it's empty, so let's not bother.
-	 */
-	if (fs->st_size > 0) {
-		struct finfo fi;
-
-		fi.from = entp->fts_path;
-		fi.to = to.p_path;
-		fi.size = (size_t)fs->st_size;
-
-		/*
-		 * Mmap and write if less than 8M (the limit is so
-		 * we don't totally trash memory on big files).
-		 * This is really a minor hack, but it wins some CPU back.
-		 */
-		bool use_read;
-
-		use_read = true;
-		if (fs->st_size <= MMAP_MAX_SIZE) {
-			size_t fsize = (size_t)fs->st_size;
-			p = mmap(NULL, fsize, PROT_READ, MAP_FILE|MAP_SHARED,
-			    from_fd, (off_t)0);
-			if (p != MAP_FAILED) {
-				size_t remainder;
-
-				use_read = false;
-
-#if !defined(__minix)
-				(void) madvise(p, (size_t)fs->st_size,
-				     MADV_SEQUENTIAL);
-#endif /* !defined(__minix) */
-
-				/*
-				 * Write out the data in small chunks to
-				 * avoid locking the output file for a
-				 * long time if the reading the data from
-				 * the source is slow.
-				 */
-				remainder = fsize;
-				do {
-					ssize_t chunk;
-
-					chunk = (remainder > MMAP_MAX_WRITE) ?
-					    MMAP_MAX_WRITE : remainder;
-					if (write(to_fd, &p[fsize - remainder],
-					    chunk) != chunk) {
-						warn("%s", to.p_path);
-						rval = 1;
-						break;
-					}
-					remainder -= chunk;
-					ptotal += chunk;
-					if (pinfo)
-						progress(&fi, ptotal);
-				} while (remainder > 0);
-
-				if (munmap(p, fsize) < 0) {
-					warn("%s", entp->fts_path);
-					rval = 1;
-				}
-			}
-		}
-
-		if (use_read) {
-			while ((rcount = read(from_fd, buf, MAXBSIZE)) > 0) {
-				wcount = write(to_fd, buf, (size_t)rcount);
-				if (rcount != wcount || wcount == -1) {
-					warn("%s", to.p_path);
-					rval = 1;
-					break;
-				}
-				ptotal += wcount;
-				if (pinfo)
-					progress(&fi, ptotal);
-			}
-			if (rcount < 0) {
-				warn("%s", entp->fts_path);
-				rval = 1;
-			}
-		}
-	}
-
-#if !defined(__minix)
-	if (pflag && (fcpxattr(from_fd, to_fd) != 0))
-		warn("%s: error copying extended attributes", to.p_path);
-#endif /* !defined(__minix) */
-
-	(void)close(from_fd);
-
-	if (rval == 1) {
-		(void)close(to_fd);
-		return (1);
-	}
-
-	if (pflag && setfile(fs, to_fd))
-		rval = 1;
-	/*
-	 * If the source was setuid or setgid, lose the bits unless the
-	 * copy is owned by the same user and group.
-	 */
-#define	RETAINBITS \
-	(S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO)
-	if (!pflag && dne
-	    && fs->st_mode & (S_ISUID | S_ISGID) && fs->st_uid == myuid) {
-		if (fstat(to_fd, &to_stat)) {
-			warn("%s", to.p_path);
-			rval = 1;
-		} else if (fs->st_gid == to_stat.st_gid &&
-		    fchmod(to_fd, fs->st_mode & RETAINBITS & ~myumask)) {
-			warn("%s", to.p_path);
-			rval = 1;
-		}
-	}
-	if (close(to_fd)) {
-		warn("%s", to.p_path);
-		rval = 1;
-	}
-	/* set the mod/access times now after close of the fd */
-	if (pflag && set_utimes(to.p_path, fs)) { 
-	    rval = 1;
-	}
-	return (rval);
-}
-
-int
-copy_link(FTSENT *p, int exists)
-{
-	int len;
-	char target[MAXPATHLEN];
-
-	if ((len = readlink(p->fts_path, target, sizeof(target)-1)) == -1) {
-		warn("readlink: %s", p->fts_path);
-		return (1);
-	}
-	target[len] = '\0';
-	if (exists && unlink(to.p_path)) {
-		warn("unlink: %s", to.p_path);
-		return (1);
-	}
-	if (symlink(target, to.p_path)) {
-		warn("symlink: %s", target);
-		return (1);
-	}
-	return (pflag ? setfile(p->fts_statp, 0) : 0);
-}
-
-int
-copy_fifo(struct stat *from_stat, int exists)
-{
-	if (exists && unlink(to.p_path)) {
-		warn("unlink: %s", to.p_path);
-		return (1);
-	}
-	if (mkfifo(to.p_path, from_stat->st_mode)) {
-		warn("mkfifo: %s", to.p_path);
-		return (1);
-	}
-	return (pflag ? setfile(from_stat, 0) : 0);
-}
-
-int
-copy_special(struct stat *from_stat, int exists)
-{
-	if (exists && unlink(to.p_path)) {
-		warn("unlink: %s", to.p_path);
-		return (1);
-	}
-	if (mknod(to.p_path, from_stat->st_mode, from_stat->st_rdev)) {
-		warn("mknod: %s", to.p_path);
-		return (1);
-	}
-	return (pflag ? setfile(from_stat, 0) : 0);
-}
-
-
-/*
- * Function: setfile
- *
- * Purpose:
- *   Set the owner/group/permissions for the "to" file to the information
- *   in the stat structure.  If fd is zero, also call set_utimes() to set
- *   the mod/access times.  If fd is non-zero, the caller must do a utimes
- *   itself after close(fd).
- */
-int
-setfile(struct stat *fs, int fd)
-{
-	int rval, islink;
-
-	rval = 0;
-	islink = S_ISLNK(fs->st_mode);
-	fs->st_mode &= S_ISUID | S_ISGID | S_IRWXU | S_IRWXG | S_IRWXO;
-
-	/*
-	 * Changing the ownership probably won't succeed, unless we're root
-	 * or POSIX_CHOWN_RESTRICTED is not set.  Set uid/gid before setting
-	 * the mode; current BSD behavior is to remove all setuid bits on
-	 * chown.  If chown fails, lose setuid/setgid bits.
-	 */
-	if (fd ? fchown(fd, fs->st_uid, fs->st_gid) :
-	    lchown(to.p_path, fs->st_uid, fs->st_gid)) {
-		if (errno != EPERM) {
-			warn("chown: %s", to.p_path);
-			rval = 1;
-		}
-		fs->st_mode &= ~(S_ISUID | S_ISGID);
-	}
-	if (fd ? fchmod(fd, fs->st_mode) : lchmod(to.p_path, fs->st_mode)) {
-		warn("chmod: %s", to.p_path);
-		rval = 1;
-	}
-
-#if !defined(__minix)
-	if (!islink && !Nflag) {
-		unsigned long fflags = fs->st_flags;
-		/*
-		 * XXX
-		 * NFS doesn't support chflags; ignore errors unless
-		 * there's reason to believe we're losing bits.
-		 * (Note, this still won't be right if the server
-		 * supports flags and we were trying to *remove* flags
-		 * on a file that we copied, i.e., that we didn't create.)
-		 */
-		errno = 0;
-
-		if ((fd ? fchflags(fd, fflags) :
-		    chflags(to.p_path, fflags)) == -1)
-			if (errno != EOPNOTSUPP || fs->st_flags != 0) {
-				warn("chflags: %s", to.p_path);
-				rval = 1;
-			}
-	}
-#endif /* !defined(__minix) */
-
-	/* if fd is non-zero, caller must call set_utimes() after close() */
-	if (fd == 0 && set_utimes(to.p_path, fs))
-	    rval = 1;
-	return (rval);
-}
-
-void
-usage(void)
-{
-	(void)fprintf(stderr,
-	    "usage: %s [-R [-H | -L | -P]] [-f | -i] [-alNpv] src target\n"
-	    "       %s [-R [-H | -L | -P]] [-f | -i] [-alNpv] src1 ... srcN directory\n",
-	    getprogname(), getprogname());
-	exit(1);
-	/* NOTREACHED */
-}

bin/date/Makefile

@@ -7,6 +7,9 @@ DPADD+=	${LIBUTIL}
 LDADD+=	-lutil
 CPPFLAGS+=-I${.CURDIR}
 
+TZDIR=  /usr/share/zoneinfo
+CPPFLAGS+= -DHAVE_ADJTIME=0 -DTZDIR=\"$(TZDIR)\"
+
 COPTS.date.c = -Wno-format-nonliteral
 
 .include <bsd.prog.mk>

bin/date/date.1

@@ -1,4 +1,4 @@
-.\"	$NetBSD: date.1,v 1.42 2012/04/06 11:36:56 wiz Exp $
+.\"	$NetBSD: date.1,v 1.41 2010/02/04 22:56:11 wiz Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -84,7 +84,7 @@ The utility
 .Xr timed 8
 is used to synchronize the clocks on groups of machines.
 By default, if
-.Xr timed 8
+timed
 is running,
 .Nm
 will set the time on all of the machines in the local group.
@@ -153,7 +153,7 @@ The second of the minute, from 00 to 61.
 .Pp
 Everything but the minutes is optional.
 .Pp
-Time changes for Daylight Saving and Standard Time and leap seconds
+Time changes for Daylight Saving and Standard time and leap seconds
 and years are handled automatically.
 .Sh ENVIRONMENT
 The following environment variables affect the execution of
@@ -217,13 +217,12 @@ On these occasions,
 prints:
 .Ql Network time being set .
 The message
-.Ql Communication error with
-.Xr timed 8
+.Ql Communication error with timed
 occurs when the communication
 between
 .Nm
 and
-.Xr timed 8
+timed
 fails.
 .Sh SEE ALSO
 .Xr adjtime 2 ,
@@ -232,7 +231,6 @@ fails.
 .Xr parsedate 3 ,
 .Xr strftime 3 ,
 .Xr utmp 5 ,
-.Xr environ 7 ,
 .Xr timed 8
 .Rs
 .%T "TSP: The Time Synchronization Protocol for UNIX 4.3BSD"

bin/date/date.c

@@ -92,11 +92,11 @@ main(int argc, char *argv[])
 			nflag = 1;
 			break;
 		case 'd':
-#if !defined(__minix)
+#ifndef __minix
 			rflag = 1;
 			tval = parsedate(optarg, NULL, NULL);
 			if (tval == -1) 
-#endif /* !defined(__minix) */
+#endif
 badarg:				 errx(EXIT_FAILURE,
 				    "Cannot parse `%s'", optarg);
 			break;
@@ -311,12 +311,19 @@ setthetime(const char *p)
 	/* set the time */
 	if (nflag || netsettime(new_time)) {
 		logwtmp("|", "date", "");
+#if HAVE_ADJTIME
 		if (aflag) {
 			tv.tv_sec = new_time - tval;
 			tv.tv_usec = 0;
 			if (adjtime(&tv, NULL))
 				err(EXIT_FAILURE, "adjtime");
-		} else {
+		}
+#else
+		if (aflag) {
+			err(EXIT_FAILURE, "no adjtime");
+		}
+#endif
+		else {
 			tval = new_time;
 			tv.tv_sec = tval;
 			tv.tv_usec = 0;

bin/df/Makefile

@@ -1,11 +0,0 @@
-#	$NetBSD: Makefile,v 1.19 2011/08/28 08:20:58 christos Exp $
-#	@(#)Makefile	8.3 (Berkeley) 5/8/95
-
-.include <bsd.own.mk>
-
-PROG=	df
-
-LDADD+=-lutil
-DPADD+=${LIBUTIL}
-
-.include <bsd.prog.mk>

bin/df/df.1

@@ -1,206 +0,0 @@
-.\"	$NetBSD: df.1,v 1.44 2010/04/05 21:17:28 joerg Exp $
-.\"
-.\" Copyright (c) 1989, 1990, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"	@(#)df.1	8.2 (Berkeley) 1/13/92
-.\"
-.Dd March 4, 2008
-.Dt DF 1
-.Os
-.Sh NAME
-.Nm df
-.Nd display free disk space
-.Sh SYNOPSIS
-.Nm
-.Op Fl agklmn
-.Op Fl G | Fl i | Fl P
-.Op Fl t Ar type
-.Op Ar file | Ar file_system ...
-.Sh DESCRIPTION
-.Nm
-displays statistics about the amount of free disk space on the specified
-.Ar file_system
-or on the file system of which
-.Ar file
-is a part.
-By default, all sizes are reported in 512-byte block counts.
-If neither a file or a
-.Ar file_system
-operand is specified,
-statistics for all mounted file systems are displayed
-(subject to the
-.Fl l
-and
-.Fl t
-options below).
-.Pp
-Note that the printed count of available blocks takes
-.Va minfree
-into account, and thus will be negative when the number of free blocks
-on the filesystem is less than
-.Va minfree .
-.Pp
-The following options are available:
-.Bl -tag -width Ds
-.It Fl a
-Show all mount points,
-including those that were mounted with the
-.Dv MNT_IGNORE
-flag.
-.It Fl G
-Display all the fields of the structure(s) returned by
-.Xr statvfs 2 .
-This option cannot be used with the
-.Fl i
-or
-.Fl P
-options, and it is modelled after the Solaris
-.Fl g
-option.
-This option will override the
-.Fl g ,
-.Fl h ,
-.Fl k ,
-and
-.Fl m
-options, as well as any setting of
-.Ev BLOCKSIZE .
-.It Fl g
-The
-.Fl g
-option causes the numbers to be reported in gigabytes (1024*1024*1024
-bytes).
-.It Fl h
-"Human-readable" output.
-Use unit suffixes: Byte, Kilobyte, Megabyte,
-Gigabyte, Terabyte, Petabyte, Exabyte in order to reduce the number of
-digits to four or less.
-.It Fl i
-Include statistics on the number of free inodes.
-.It Fl k
-By default, all sizes are reported in 512-byte block counts.
-The
-.Fl k
-option causes the numbers to be reported in kilobytes (1024 bytes).
-.It Fl l
-Display statistics only about mounted file systems with the
-.Dv MNT_LOCAL
-flag set.
-If a non-local file system is given as an argument, a
-warning is issued and no information is given on that file system.
-.It Fl m
-The
-.Fl m
-option causes the numbers to be reported in megabytes (1024*1024 bytes).
-.It Fl n
-Print out the previously obtained statistics from the file systems.
-This option should be used if it is possible that one or more
-file systems are in a state such that they will not be able to provide
-statistics without a long delay.
-When this option is specified,
-.Nm
-will not request new statistics from the file systems, but will respond
-with the possibly stale statistics that were previously obtained.
-.It Fl P
-Produce output in the following portable format:
-.Pp
-If both the
-.Fl P
-and
-.Fl k
-option are specified, the output will be preceded by the following header
-line, formatted to match the data following it:
-.Bd -literal
-"Filesystem 1024-blocks Used Available Capacity Mounted on\en"
-.Ed
-.Pp
-If the
-.Fl P
-option is specified without the
-.Fl k
-options, the output will be preceded by the following header line,
-formatted to match the data following it:
-.Bd -literal
-"Filesystem \*[Lt]blksize\*[Gt]-blocks Used Available Capacity Mounted on\en"
-.Ed
-.Pp
-The header line is followed by data formatted as follows:
-.Bd -literal
-"%s %d %d %d %d%% %s\en", \*[Lt]file system name\*[Gt], \*[Lt]total space\*[Gt],
-    \*[Lt]space used\*[Gt], \*[Lt]space free\*[Gt], \*[Lt]percentage used\*[Gt],
-    \*[Lt]file system root\*[Gt]
-.Ed
-.Pp
-Note that the
-.Fl i
-option may not be specified with
-.Fl P .
-.It Fl t Ar type
-Is used to indicate the actions should only be taken on
-filesystems of the specified type.
-More than one type may be specified in a comma-separated list.
-The list of filesystem types can be prefixed with
-.Dq no
-to specify the filesystem types for which action should
-.Em not
-be taken.
-If a file system is given on the command line that is not of
-the specified type, a warning is issued and no information is given on
-that file system.
-.El
-.Sh ENVIRONMENT
-.Bl -tag -width BLOCKSIZE
-.It Ev BLOCKSIZE
-If the environment variable
-.Ev BLOCKSIZE
-is set, and the
-.Fl g ,
-.Fl h ,
-.Fl k
-and
-.Fl m
-options are not specified, the block counts will be displayed in units of that
-size block.
-.El
-.Sh SEE ALSO
-.Xr quota 1 ,
-.Xr fstatvfs 2 ,
-.Xr getvfsstat 2 ,
-.Xr statvfs 2 ,
-.Xr getbsize 3 ,
-.Xr getmntinfo 3 ,
-.Xr fs 5 ,
-.Xr fstab 5 ,
-.Xr mount 8 ,
-.Xr quot 8 ,
-.Xr tunefs 8
-.Sh HISTORY
-A
-.Nm
-utility appeared in
-.At v6 .

bin/df/df.c

@@ -1,520 +0,0 @@
-/*	$NetBSD: df.c,v 1.90 2012/01/07 18:45:13 christos Exp $ */
-
-/*
- * Copyright (c) 1980, 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__COPYRIGHT(
-"@(#) Copyright (c) 1980, 1990, 1993, 1994\
- The Regents of the University of California.  All rights reserved.");
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)df.c	8.7 (Berkeley) 4/2/94";
-#else
-__RCSID("$NetBSD: df.c,v 1.90 2012/01/07 18:45:13 christos Exp $");
-#endif
-#endif /* not lint */
-
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/mount.h>
-
-#include <assert.h>
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <locale.h>
-#include <util.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <util.h>
-
-static char	*getmntpt(const char *);
-static void	 prtstat(struct statvfs *, int);
-static int	 selected(const char *, size_t);
-static void	 maketypelist(char *);
-static size_t	 regetmntinfo(struct statvfs **, size_t);
-__dead static void usage(void);
-static void	 prthumanval(int64_t, const char *);
-static void	 prthuman(struct statvfs *, int64_t, int64_t);
-
-static int	 aflag, gflag, hflag, iflag, lflag, nflag, Pflag;
-static long	 usize;
-static char	**typelist;
-
-int
-main(int argc, char *argv[])
-{
-	struct stat stbuf;
-	struct statvfs *mntbuf;
-	long mntsize;
-	int ch, i, maxwidth, width;
-	char *mntpt;
-
-	setprogname(argv[0]);
-	(void)setlocale(LC_ALL, "");
-
-	while ((ch = getopt(argc, argv, "aGghiklmnPt:")) != -1)
-		switch (ch) {
-		case 'a':
-			aflag = 1;
-			break;
-		case 'g':
-			hflag = 0;
-			usize = 1024 * 1024 * 1024;
-			break;
-		case 'G':
-			gflag = 1;
-			break;
-		case 'h':
-			hflag = 1;
-			usize = 0;
-			break;
-		case 'i':
-			iflag = 1;
-			break;
-		case 'k':
-			hflag = 0;
-			usize = 1024;
-			break;
-		case 'l':
-			lflag = 1;
-			break;
-		case 'm':
-			hflag = 0;
-			usize = 1024 * 1024;
-			break;
-		case 'n':
-			nflag = 1;
-			break;
-		case 'P':
-			Pflag = 1;
-			break;
-		case 't':
-			if (typelist != NULL)
-				errx(EXIT_FAILURE,
-				    "only one -t option may be specified.");
-			maketypelist(optarg);
-			break;
-		case '?':
-		default:
-			usage();
-		}
-
-	if (gflag && (Pflag || iflag))
-		errx(EXIT_FAILURE,
-		    "only one of -G and -P or -i may be specified");
-	if (Pflag && iflag)
-		errx(EXIT_FAILURE,
-		    "only one of -P and -i may be specified");
-#if 0
-	/*
-	 * The block size cannot be checked until after getbsize() is called.
-	 */
-	if (Pflag && (hflag || (usize != 1024 && usize != 512)))
-		errx(EXIT_FAILURE,
-		    "non-standard block size incompatible with -P");
-#endif
-	argc -= optind;
-	argv += optind;
-
-	mntsize = getmntinfo(&mntbuf, MNT_NOWAIT);
-	if (mntsize == 0)
-		err(EXIT_FAILURE,
-		    "retrieving information on mounted file systems");
-
-	if (*argv == NULL) {
-		mntsize = regetmntinfo(&mntbuf, mntsize);
-	} else {
-		if ((mntbuf = malloc(argc * sizeof(*mntbuf))) == NULL)
-			err(EXIT_FAILURE, "can't allocate statvfs array");
-		mntsize = 0;
-		for (/*EMPTY*/; *argv != NULL; argv++) {
-			if (stat(*argv, &stbuf) < 0) {
-				if ((mntpt = getmntpt(*argv)) == 0) {
-					warn("%s", *argv);
-					continue;
-				}
-			} else if (S_ISBLK(stbuf.st_mode)) {
-				if ((mntpt = getmntpt(*argv)) == 0)
-					mntpt = *argv;
-			} else
-				mntpt = *argv;
-			/*
-			 * Statfs does not take a `wait' flag, so we cannot
-			 * implement nflag here.
-			 */
-			if (!statvfs(mntpt, &mntbuf[mntsize]))
-				if (lflag &&
-				    (mntbuf[mntsize].f_flag & MNT_LOCAL) == 0)
-					warnx("Warning: %s is not a local %s",
-					    *argv, "file system");
-				else if
-				    (!selected(mntbuf[mntsize].f_fstypename,
-					sizeof(mntbuf[mntsize].f_fstypename)))
-					warnx("Warning: %s mounted as a %s %s",
-					    *argv,
-					    mntbuf[mntsize].f_fstypename,
-					    "file system");
-				else
-					++mntsize;
-			else
-				warn("%s", *argv);
-		}
-	}
-
-	maxwidth = 0;
-	for (i = 0; i < mntsize; i++) {
-		width = (int)strlen(mntbuf[i].f_mntfromname);
-		if (width > maxwidth)
-			maxwidth = width;
-	}
-	for (i = 0; i < mntsize; i++)
-		prtstat(&mntbuf[i], maxwidth);
-	return 0;
-}
-
-static char *
-getmntpt(const char *name)
-{
-	size_t mntsize, i;
-	struct statvfs *mntbuf;
-
-	mntsize = getmntinfo(&mntbuf, MNT_NOWAIT);
-	if (mntsize == 0)
-		err(EXIT_FAILURE, "Can't get mount information");
-	for (i = 0; i < mntsize; i++) {
-		if (!strcmp(mntbuf[i].f_mntfromname, name))
-			return mntbuf[i].f_mntonname;
-	}
-	return 0;
-}
-
-static enum { IN_LIST, NOT_IN_LIST } which;
-
-static int
-selected(const char *type, size_t len)
-{
-	char **av;
-
-	/* If no type specified, it's always selected. */
-	if (typelist == NULL)
-		return 1;
-	for (av = typelist; *av != NULL; ++av)
-		if (!strncmp(type, *av, len))
-			return which == IN_LIST ? 1 : 0;
-	return which == IN_LIST ? 0 : 1;
-}
-
-static void
-maketypelist(char *fslist)
-{
-	size_t i;
-	char *nextcp, **av;
-
-	if ((fslist == NULL) || (fslist[0] == '\0'))
-		errx(EXIT_FAILURE, "empty type list");
-
-	/*
-	 * XXX
-	 * Note: the syntax is "noxxx,yyy" for no xxx's and
-	 * no yyy's, not the more intuitive "noyyy,noyyy".
-	 */
-	if (fslist[0] == 'n' && fslist[1] == 'o') {
-		fslist += 2;
-		which = NOT_IN_LIST;
-	} else
-		which = IN_LIST;
-
-	/* Count the number of types. */
-	for (i = 1, nextcp = fslist;
-	    (nextcp = strchr(nextcp, ',')) != NULL; i++)
-		++nextcp;
-
-	/* Build an array of that many types. */
-	if ((av = typelist = malloc((i + 1) * sizeof(*av))) == NULL)
-		err(EXIT_FAILURE, "can't allocate type array");
-	av[0] = fslist;
-	for (i = 1, nextcp = fslist;
-	    (nextcp = strchr(nextcp, ',')) != NULL; i++) {
-		*nextcp = '\0';
-		av[i] = ++nextcp;
-	}
-	/* Terminate the array. */
-	av[i] = NULL;
-}
-
-/*
- * Make a pass over the filesystem info in ``mntbuf'' filtering out
- * filesystem types not in ``fsmask'' and possibly re-stating to get
- * current (not cached) info.  Returns the new count of valid statvfs bufs.
- */
-static size_t
-regetmntinfo(struct statvfs **mntbufp, size_t mntsize)
-{
-	size_t i, j;
-	struct statvfs *mntbuf;
-
-	if (!lflag && typelist == NULL && aflag)
-		return nflag ? mntsize : (size_t)getmntinfo(mntbufp, MNT_WAIT);
-
-	mntbuf = *mntbufp;
-	j = 0;
-	for (i = 0; i < mntsize; i++) {
-		if (!aflag && (mntbuf[i].f_flag & MNT_IGNORE) != 0)
-			continue;
-		if (lflag && (mntbuf[i].f_flag & MNT_LOCAL) == 0)
-			continue;
-		if (!selected(mntbuf[i].f_fstypename,
-		    sizeof(mntbuf[i].f_fstypename)))
-			continue;
-		if (nflag)
-			mntbuf[j] = mntbuf[i];
-		else {
-			struct statvfs layerbuf = mntbuf[i];
-			(void)statvfs(mntbuf[i].f_mntonname, &mntbuf[j]);
-			/*
-			 * If the FS name changed, then new data is for
-			 * a different layer and we don't want it.
-			 */
-			if (memcmp(layerbuf.f_mntfromname,
-			    mntbuf[j].f_mntfromname, MNAMELEN))
-				mntbuf[j] = layerbuf;
-		}
-		j++;
-	}
-	return j;
-}
-
-static void
-prthumanval(int64_t bytes, const char *pad)
-{
-	char buf[6];
-
-	(void)humanize_number(buf, sizeof(buf) - (bytes < 0 ? 0 : 1),
-	    bytes, "", HN_AUTOSCALE,
-	    HN_B | HN_NOSPACE | HN_DECIMAL);
-
-	(void)printf("%s %6s", pad, buf);
-}
-
-static void
-prthuman(struct statvfs *sfsp, int64_t used, int64_t bavail)
-{
-
-	prthumanval((int64_t)(sfsp->f_blocks * sfsp->f_frsize), "   ");
-	prthumanval((int64_t)(used * sfsp->f_frsize), "    ");
-	prthumanval((int64_t)(bavail * sfsp->f_frsize), "    ");
-}
-
-/*
- * Convert statvfs returned filesystem size into BLOCKSIZE units.
- * Attempts to avoid overflow for large filesystems.
- */
-#define fsbtoblk(num, fsbs, bs)					\
-	(((fsbs) != 0 && (uint64_t)(fsbs) < (uint64_t)(bs)) ?	\
-	    (int64_t)(num) / (int64_t)((bs) / (fsbs)) :		\
-	    (int64_t)(num) * (int64_t)((fsbs) / (bs)))
-
-/*
- * Print out status about a filesystem.
- */
-static void
-prtstat(struct statvfs *sfsp, int maxwidth)
-{
-	static long blocksize;
-	static int headerlen, timesthrough;
-	static const char *header;
-	static const char full[] = "100";
-	static const char empty[] = "  0";
-	int64_t used, availblks, inodes;
-	int64_t bavail;
-	char pb[64];
-
-	if (gflag) {
-		/*
-		 * From SunOS-5.6:
-		 *
-		 * /var               (/dev/dsk/c0t0d0s3 ):         8192 block size          1024 frag size
-		 *   984242 total blocks     860692 free blocks   859708 available         249984 total files
-		 *   248691 free files      8388611 filesys id
-		 *      ufs fstype       0x00000004 flag             255 filename length
-		 *
-		 */
-		(void)printf("%10s (%-12s): %7ld block size %12ld frag size\n",
-		    sfsp->f_mntonname, sfsp->f_mntfromname,
-		    sfsp->f_iosize,	/* On UFS/FFS systems this is
-					 * also called the "optimal
-					 * transfer block size" but it
-					 * is of course the file
-					 * system's block size too.
-					 */
-		    sfsp->f_bsize);	/* not so surprisingly the
-					 * "fundamental file system
-					 * block size" is the frag
-					 * size.
-					 */
-		(void)printf("%10" PRId64 " total blocks %10" PRId64
-		    " free blocks  %10" PRId64 " available\n",
-		    (uint64_t)sfsp->f_blocks, (uint64_t)sfsp->f_bfree,
-		    (uint64_t)sfsp->f_bavail);
-		(void)printf("%10" PRId64 " total files  %10" PRId64
-		    " free files %12lx filesys id\n",
-		    (uint64_t)sfsp->f_ffree, (uint64_t)sfsp->f_files,
-		    sfsp->f_fsid);
-		(void)printf("%10s fstype  %#15lx flag  %17ld filename "
-		    "length\n", sfsp->f_fstypename, sfsp->f_flag,
-		    sfsp->f_namemax);
-		(void)printf("%10lu owner %17" PRId64 " syncwrites %12" PRId64
-		    " asyncwrites\n\n", (unsigned long)sfsp->f_owner,
-		    sfsp->f_syncwrites, sfsp->f_asyncwrites);
-
-		/*
-		 * a concession by the structured programming police to the
-		 * indentation police....
-		 */
-		return;
-	}
-	if (maxwidth < 12)
-		maxwidth = 12;
-	if (++timesthrough == 1) {
-		switch (blocksize = usize) {
-		case 1024:
-			header = Pflag ? "1024-blocks" : "1K-blocks";
-			headerlen = (int)strlen(header);
-			break;
-		case 1024 * 1024:
-			header = "1M-blocks";
-			headerlen = (int)strlen(header);
-			break;
-		case 1024 * 1024 * 1024:
-			header = "1G-blocks";
-			headerlen = (int)strlen(header);
-			break;
-		default:
-			if (hflag) {
-				header = "Size";
-				headerlen = (int)strlen(header);
-			} else
-				header = getbsize(&headerlen, &blocksize);
-			break;
-		}
-		if (Pflag) {
-			/*
-			 * either:
-			 *  "Filesystem 1024-blocks Used Available Capacity Mounted on\n"
-			 * or:
-			 *  "Filesystem 512-blocks Used Available Capacity Mounted on\n"
-			 */
-			if (blocksize != 1024 && blocksize != 512)
-				errx(EXIT_FAILURE,
-				    "non-standard block size incompatible with -P");
-			(void)printf("Filesystem %s Used Available Capacity "
-			    "Mounted on\n", header);
-		} else {
-			(void)printf("%-*.*s %s       Used      Avail %%Cap",
-			    maxwidth - (headerlen - 10),
-			    maxwidth - (headerlen - 10),
-			    "Filesystem", header);
-			if (iflag)
-				(void)printf("    iUsed   iAvail %%iCap");
-			(void)printf(" Mounted on\n");
-		}
-	}
-	used = sfsp->f_blocks - sfsp->f_bfree;
-	bavail = sfsp->f_bfree - sfsp->f_bresvd;
-	availblks = bavail + used;
-	if (Pflag) {
-		assert(hflag == 0);
-		assert(blocksize > 0);
-		/*
-		 * "%s %d %d %d %s %s\n", <file system name>, <total space>,
-		 * <space used>, <space free>, <percentage used>,
-		 * <file system root>
-		 */
-		(void)printf("%s %" PRId64 " %" PRId64 " %" PRId64 " %s%% %s\n",
-		    sfsp->f_mntfromname,
-		    fsbtoblk(sfsp->f_blocks, sfsp->f_frsize, blocksize),
-		    fsbtoblk(used, sfsp->f_frsize, blocksize),
-		    fsbtoblk(bavail, sfsp->f_frsize, blocksize),
-		    availblks == 0 ? full : strspct(pb, sizeof(pb), used,
-		    availblks, 0), sfsp->f_mntonname);
-		/*
-		 * another concession by the structured programming police to
-		 * the indentation police....
-		 *
-		 * Note iflag cannot be set when Pflag is set.
-		 */
-		return;
-	}
-
-	(void)printf("%-*.*s ", maxwidth, maxwidth, sfsp->f_mntfromname);
-
-	if (hflag)
-		prthuman(sfsp, used, bavail);
-	else
-		(void)printf("%10" PRId64 " %10" PRId64 " %10" PRId64,
-		    fsbtoblk(sfsp->f_blocks, sfsp->f_frsize, blocksize),
-		    fsbtoblk(used, sfsp->f_frsize, blocksize),
-		    fsbtoblk(bavail, sfsp->f_frsize, blocksize));
-	(void)printf(" %3s%%",
-	    availblks == 0 ? full :
-	    strspct(pb, sizeof(pb), used, availblks, 0));
-	if (iflag) {
-		inodes = sfsp->f_files;
-		used = inodes - sfsp->f_ffree;
-		(void)printf(" %8jd %8jd %3s%%",
-		    (intmax_t)used, (intmax_t)sfsp->f_ffree,
-		    inodes == 0 ? (used == 0 ? empty : full) :
-		    strspct(pb, sizeof(pb), used, inodes, 0));
-	}
-	(void)printf(" %s\n", sfsp->f_mntonname);
-}
-
-static void
-usage(void)
-{
-
-	(void)fprintf(stderr,
-	    "Usage: %s [-aGgln] [-hkm|-ihkm|-Pk] [-t type] [file | "
-	    "file_system ...]\n",
-	    getprogname());
-	exit(1);
-	/* NOTREACHED */
-}

bin/ed/re.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: re.c,v 1.20 2013/06/28 15:04:35 joerg Exp $	*/
+/*	$NetBSD: re.c,v 1.19 2005/02/17 16:29:26 xtraeme Exp $	*/
 
 /* re.c: This file contains the regular expression interface routines for
    the ed line editor. */
@@ -33,7 +33,7 @@
 #if 0
 static char *rcsid = "@(#)re.c,v 1.6 1994/02/01 00:34:43 alm Exp";
 #else
-__RCSID("$NetBSD: re.c,v 1.20 2013/06/28 15:04:35 joerg Exp $");
+__RCSID("$NetBSD: re.c,v 1.19 2005/02/17 16:29:26 xtraeme Exp $");
 #endif
 #endif /* not lint */
 
@@ -95,7 +95,7 @@ extract_pattern(int delimiter)
 		default:
 			break;
 		case '[':
-			if ((nd = parse_char_class(nd + 1)) == NULL) {
+			if ((nd = parse_char_class(++nd)) == NULL) {
 				sprintf(errmsg, "unbalanced brackets ([])");
 				return NULL;
 			}

bin/hostname/Makefile

@@ -1,6 +0,0 @@
-#	$NetBSD: Makefile,v 1.8 1997/07/20 22:37:07 christos Exp $
-#	@(#)Makefile	8.1 (Berkeley) 5/31/93
-
-PROG=	hostname
-
-.include <bsd.prog.mk>

bin/hostname/hostname.1

@@ -1,87 +0,0 @@
-.\"	$NetBSD: hostname.1,v 1.19 2013/07/19 11:19:23 wiz Exp $
-.\"
-.\" Copyright (c) 1983, 1988, 1990, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"	@(#)hostname.1	8.2 (Berkeley) 4/28/95
-.\"
-.Dd July 19, 2013
-.Dt HOSTNAME 1
-.Os
-.Sh NAME
-.Nm hostname
-.Nd set or print name of current host system
-.Sh SYNOPSIS
-.Nm
-.Op Fl AadfIis
-.Op Ar name-of-host
-.Sh DESCRIPTION
-.Nm
-prints the name of the current host.
-The super-user can set the host name by supplying an argument; this is
-usually done in the network initialization script
-.Pa /etc/rc.d/network ,
-normally run at boot
-time.
-.Pp
-Options:
-.Bl -tag -width flag
-.It Fl A
-Display the FQDN of each address on all interfaces.
-.It Fl a
-Display alias name(s) of the host.
-.It Fl d
-Display the DNS domain.
-.It Fl f
-Display the FQDN for the hostname.
-.It Fl I
-Display each IP address on all interfaces.
-.It Fl i
-Display the IP address(es) for the hostname.
-.It Fl s
-Display the short hostname.
-.El
-.Sh NOTES
-With the exception of
-.Fl I
-and
-.Fl s ,
-the other options will retrieve their results from the resolver.
-.Sh SEE ALSO
-.Xr domainname 1 ,
-.Xr getaddrinfo 3 ,
-.Xr gethostbyname 3 ,
-.Xr gethostname 3 ,
-.Xr getifaddrs 3 ,
-.Xr getnameinfo 3 ,
-.Xr sethostname 3 ,
-.Xr hosts 5
-.Sh HISTORY
-The
-.Nm
-utility appeared in
-.Bx 4.2 .

bin/hostname/hostname.c

@@ -1,209 +0,0 @@
-/* $NetBSD: hostname.c,v 1.20 2013/07/19 15:53:00 christos Exp $ */
-
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__COPYRIGHT("@(#) Copyright (c) 1988, 1993\
- The Regents of the University of California.  All rights reserved.");
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)hostname.c	8.2 (Berkeley) 4/28/95";
-#else
-__RCSID("$NetBSD: hostname.c,v 1.20 2013/07/19 15:53:00 christos Exp $");
-#endif
-#endif /* not lint */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <net/if.h>
-#include <netinet/in.h>
-
-#include <err.h>
-#include <ifaddrs.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-__dead static void usage(void);
-
-int
-main(int argc, char *argv[])
-{
-	int ch, Aflag, aflag, dflag, Iflag, iflag, fflag, sflag, i;
-	char *p, hostname[MAXHOSTNAMELEN + 1];
-	struct addrinfo hints, *ainfos, *ai;
-	struct hostent *hent;
-	struct ifaddrs *ifa, *ifp;
-	struct sockaddr_in6 *sin6;
-	char buf[MAX(MAXHOSTNAMELEN + 1, INET6_ADDRSTRLEN)];
-
-	setprogname(argv[0]);
-	Aflag = aflag = dflag = Iflag = iflag = fflag = sflag = 0;
-	while ((ch = getopt(argc, argv, "AadIifs")) != -1)
-		switch (ch) {
-		case 'A':
-			Aflag = 1;
-			break;
-		case 'a':
-			aflag = 1;
-			break;
-		case 'd':
-			dflag = 1;
-			break;
-		case 'I':
-			Iflag = 1;
-			break;
-		case 'i':
-			iflag = 1;
-			break;
-		case 'f':
-			fflag = 1;
-			break;
-		case 's':
-			sflag = 1;
-			break;
-		case '?':
-		default:
-			usage();
-		}
-	argc -= optind;
-	argv += optind;
-
-	if (argc > 1)
-		usage();
-
-	if (*argv) {
-		if (sethostname(*argv, strlen(*argv)))
-			err(1, "sethostname");
-	} else if (Aflag || Iflag) {
-		if (getifaddrs(&ifa) == -1)
-			err(1, "getifaddrs");
-		for (ifp = ifa; ifp; ifp = ifp->ifa_next) {
-			if (ifp->ifa_addr == NULL ||
-#if !defined(__minix)
-			    ifp->ifa_flags & IFF_LOOPBACK ||
-#endif
-			    !(ifp->ifa_flags & IFF_UP))
-				continue;
-
-			switch(ifp->ifa_addr->sa_family) {
-			case AF_INET:
-				break;
-			case AF_INET6:
-				/* Skip link local addresses */
-				sin6 = (struct sockaddr_in6 *)ifp->ifa_addr;
-				if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr) ||
-				    IN6_IS_ADDR_MC_LINKLOCAL(&sin6->sin6_addr))
-					continue;
-				break;
-			default:
-				/* We only translate IPv4 or IPv6 addresses */
-				continue;
-			}
-			i = getnameinfo(ifp->ifa_addr, ifp->ifa_addr->sa_len,
-			    buf, sizeof(buf), NULL, 0,
-			    Iflag ? NI_NUMERICHOST: NI_NAMEREQD);
-			if (i) {
-				if (Iflag && i != EAI_NONAME)
-					errx(1, "getnameinfo: %s",
-					    gai_strerror(i));
-			} else
-				printf("%s\n", buf);
-		}
-		freeifaddrs(ifa);
-	} else {
-		if (gethostname(hostname, sizeof(hostname)))
-			err(1, "gethostname");
-		hostname[sizeof(hostname) - 1] = '\0';
-		if (aflag) {
-			if ((hent = gethostbyname(hostname)) == NULL)
-				errx(1, "gethostbyname: %s",
-				    hstrerror(h_errno));
-			for (i = 0; hent->h_aliases[i]; i++)
-				printf("%s\n", hent->h_aliases[i]);
-		} else if (dflag || iflag || fflag) {
-			memset(&hints, 0, sizeof(hints));
-			hints.ai_family = AF_UNSPEC;
-			hints.ai_socktype = SOCK_DGRAM;
-			hints.ai_flags = AI_CANONNAME;
-			i = getaddrinfo(hostname, NULL, &hints, &ainfos);
-			if (i)
-				errx(1, "getaddrinfo: %s", gai_strerror(i));
-			if (ainfos) {
-				if (dflag) {
-					if ((p = strchr(ainfos->ai_canonname,
-					    '.')))
-						printf("%s\n", p + 1);
-				} else if (iflag) {
-					for (ai = ainfos; ai; ai = ai->ai_next)
-					{
-						i = getnameinfo(ai->ai_addr,
-						    ai->ai_addrlen,
-						    buf, sizeof(buf), NULL, 0,
-						    NI_NUMERICHOST);
-						if (i)
-							errx(1,
-							    "getnameinfo: %s",
-							    gai_strerror(i));
-						printf("%s\n", buf);
-					}
-				} else {
-					if (sflag &&
-					    (p = strchr(ainfos->ai_canonname,
-					    '.')))
-						*p = '\0';
-					printf("%s\n", ainfos->ai_canonname);
-				}
-				freeaddrinfo(ainfos);
-			}
-		} else {
-			if (sflag && (p = strchr(hostname, '.')))
-				*p = '\0';
-			printf("%s\n", hostname);
-		}
-	}
-	exit(0);
-	/* NOTREACHED */
-}
-
-static void
-usage(void)
-{
-	(void)fprintf(stderr, "usage: %s [-AadfIis] [name-of-host]\n",
-	    getprogname());
-	exit(1);
-	/* NOTREACHED */
-}

bin/ksh/c_sh.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: c_sh.c,v 1.15 2013/10/18 19:53:34 christos Exp $	*/
+/*	$NetBSD: c_sh.c,v 1.14 2011/08/31 16:24:54 plunky Exp $	*/
 
 /*
  * built-in Bourne commands
@@ -6,7 +6,7 @@
 #include <sys/cdefs.h>
 
 #ifndef lint
-__RCSID("$NetBSD: c_sh.c,v 1.15 2013/10/18 19:53:34 christos Exp $");
+__RCSID("$NetBSD: c_sh.c,v 1.14 2011/08/31 16:24:54 plunky Exp $");
 #endif
 
 
@@ -506,8 +506,6 @@ c_trap(wp)
 					shprintf(" %s", p->name);
 			shprintf(newline);
 		}
-#else
-		__USE(anydfl);
 #endif
 		return 0;
 	}

bin/ksh/config.h

@@ -1,5 +1,3 @@
-/*	$NetBSD: config.h,v 1.8 2004/08/19 23:00:22 christos Exp $	*/
-
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
 /*
@@ -11,6 +9,7 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
+
 /* Define if on AIX 3.
    System headers sometimes define this.
    We just want to avoid a redefinition error message.  */
@@ -24,11 +23,12 @@
 /* Define to empty if the keyword does not work.  */
 /* #undef const */
 
+
 /* Define to `int' if <sys/types.h> doesn't define.  */
 /* #undef gid_t */
 
 /* Define if you have a working `mmap' system call.  */
-#define HAVE_MMAP 1
+/* #undef HAVE_MMAP */
 
 /* Define if your struct stat has st_rdev.  */
 #define HAVE_ST_RDEV 1
@@ -53,10 +53,10 @@
 
 /* Define if the system does not provide POSIX.1 features except
    with this defined.  */
-/* #undef _POSIX_1_SOURCE */
+#define _POSIX_1_SOURCE 2
 
 /* Define if you need to in order for stat and other things to work.  */
-/* #undef _POSIX_SOURCE */
+#define _POSIX_SOURCE 1
 
 /* Define as the return type of signal handlers (int or void).  */
 #define RETSIGTYPE void
@@ -76,7 +76,7 @@
 /* Define if the closedir function returns void instead of int.  */
 /* #undef VOID_CLOSEDIR */
 
-/* Define if your kernel doesn't handle scripts starting with #! */
+/* Define if your kernal doesn't handle scripts starting with #! */
 /* #undef SHARPBANG */
 
 /* Define if dup2() preserves the close-on-exec flag (ultrix does this) */
@@ -146,7 +146,7 @@
 #define SYS_ERRLIST_DECLARED 1
 
 /* Define if sys_siglist[] is in the C library */
-#define HAVE_SYS_SIGLIST 1
+/* #undef HAVE_SYS_SIGLIST */
 
 /* Define if you have a sane <termios.h> header file */
 #define HAVE_TERMIOS_H 1
@@ -158,7 +158,7 @@
 #define HAVE_MEMMOVE 1
 
 /* Define if you have a bcopy() function in your C library */
-#define HAVE_BCOPY
+/* #undef HAVE_BCOPY */
 
 /* Define if you have a lstat() function in your C library */
 #define HAVE_LSTAT 1
@@ -172,9 +172,6 @@
 /* Define if opendir() will open non-directory files */
 /* #undef OPENDIR_DOES_NONDIR */
 
-/* Define if you have a dup2() function in your C library */
-#define	HAVE_DUP2 1
-
 /* Define if the pgrp of setpgrp() can't be the pid of a zombie process */
 /* #undef NEED_PGRP_SYNC */
 
@@ -187,54 +184,50 @@
 /* Define if you arg running OS2 with the EMX library */
 /* #undef OS2 */
 
-/* Define if you have a POSIX.1 compatible <sys/wait.h> */
+/* Define if you have a POSIX.1 compatiable <sys/wait.h> */
 #define POSIX_SYS_WAIT 1
 
 /* Define if your OS maps references to /dev/fd/n to file descriptor n */
 /* #undef HAVE_DEV_FD */
 
-/* Default PATH */
-#ifdef RESCUEDIR
-#define DEFAULT_PATH RESCUEDIR ":/bin:/usr/bin:/sbin:/usr/sbin"
-#else
-#define DEFAULT_PATH "/bin:/usr/bin:/sbin:/usr/sbin"
-#endif
-
 /* Define if your C library's getwd/getcwd function dumps core in unreadable
  * directories.  */
 /* #undef HPUX_GETWD_BUG */
 
-/* Include ksh features? */
+/* Default PATH (see comments in configure.in for more details) */
+#define DEFAULT_PATH "/bin:/usr/bin:/usr/ucb"
+
+/* Include ksh features? (see comments in configure.in for more details) */
 #define KSH 1
 
-/* Include emacs editing? */
+/* Include emacs editing? (see comments in configure.in for more details) */
 #define EMACS 1
 
-/* Include vi editing? */
+/* Include vi editing? (see comments in configure.in for more details) */
 #define VI 1
 
-/* Include job control? */
+/* Include job control? (see comments in configure.in for more details) */
 #define JOBS 1
 
-/* Include brace-expansion? */
+/* Include brace-expansion? (see comments in configure.in for more details) */
 #define BRACE_EXPAND 1
 
-/* Include any history? */
+/* Include any history? (see comments in configure.in for more details) */
 #define HISTORY 1
 
-/* Include complex history? */
+/* Include complex history? (see comments in configure.in for more details) */
 /* #undef COMPLEX_HISTORY */
 
-/* Strict POSIX behaviour? */
-#define POSIXLY_CORRECT 1
+/* Strict POSIX behaviour? (see comments in configure.in for more details) */
+/* #undef POSIXLY_CORRECT */
 
-/* Specify default $ENV? */
-#define DEFAULT_ENV	"$HOME/.kshrc"
+/* Specify default $ENV? (see comments in configure.in for more details) */
+/* #undef DEFAULT_ENV */
 
-/* Include shl(1) support? */
+/* Include shl(1) support? (see comments in configure.in for more details) */
 /* #undef SWTCH */
 
-/* Include game-of-life? */
+/* Include game-of-life? (see comments in configure.in for more details) */
 /* #undef SILLY */
 
 /* The number of bytes in a int.  */
@@ -244,11 +237,14 @@
 #define SIZEOF_LONG 4
 
 /* Define if you have the _setjmp function.  */
-#define HAVE__SETJMP
+/* #undef HAVE__SETJMP */
 
 /* Define if you have the confstr function.  */
 /* #undef HAVE_CONFSTR */
 
+/* Define if you have the dup2 function.  */
+#define HAVE_DUP2 1
+
 /* Define if you have the flock function.  */
 #define HAVE_FLOCK 1
 
@@ -265,7 +261,7 @@
 /* #undef HAVE_GETRUSAGE */
 
 /* Define if you have the getwd function.  */
-#define HAVE_GETWD 1
+/* #undef HAVE_GETWD */
 
 /* Define if you have the killpg function.  */
 #define HAVE_KILLPG 1
@@ -285,6 +281,11 @@
 /* Define if you have the strerror function.  */
 #define HAVE_STRERROR 1
 
+/* Define if you have the strlcat function.  */
+#define HAVE_STRLCAT 1
+/* Define if you have the strlcpy function.  */
+#define HAVE_STRLCPY 1
+
 /* Define if you have the strstr function.  */
 #define HAVE_STRSTR 1
 
@@ -295,7 +296,7 @@
 #define HAVE_TCSETPGRP 1
 
 /* Define if you have the ulimit function.  */
-#define HAVE_ULIMIT
+#define HAVE_ULIMIT 1
 
 /* Define if you have the valloc function.  */
 #define HAVE_VALLOC 1
@@ -334,7 +335,7 @@
 #define HAVE_STRING_H 1
 
 /* Define if you have the <sys/dir.h> header file.  */
-#define HAVE_SYS_DIR_H
+/* #undef HAVE_SYS_DIR_H */
 
 /* Define if you have the <sys/ndir.h> header file.  */
 /* #undef HAVE_SYS_NDIR_H */
@@ -352,7 +353,7 @@
 #define HAVE_SYS_WAIT_H 1
 
 /* Define if you have the <ulimit.h> header file.  */
-#define HAVE_ULIMIT_H
+#define HAVE_ULIMIT_H 1
 
 /* Define if you have the <values.h> header file.  */
 /* #undef HAVE_VALUES_H */

bin/ksh/eval.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: eval.c,v 1.15 2013/10/18 19:53:34 christos Exp $	*/
+/*	$NetBSD: eval.c,v 1.14 2011/08/21 21:24:34 dholland Exp $	*/
 
 /*
  * Expansion - quoting, separation, substitution, globbing
@@ -6,7 +6,7 @@
 #include <sys/cdefs.h>
 
 #ifndef lint
-__RCSID("$NetBSD: eval.c,v 1.15 2013/10/18 19:53:34 christos Exp $");
+__RCSID("$NetBSD: eval.c,v 1.14 2011/08/21 21:24:34 dholland Exp $");
 #endif
 
 #include <stdint.h>
@@ -729,11 +729,13 @@ varsub(xp, sp, word, stypep, slenp)
 		/* Check for size of array */
 		if ((p=strchr(sp,'[')) && (p[1]=='*'||p[1]=='@') && p[2]==']') {
 			int n = 0;
+			int max = 0;
 			vp = global(arrayname(sp));
 			if (vp->flag & (ISSET|ARRAY))
 				zero_ok = 1;
 			for (; vp; vp = vp->u.array)
 				if (vp->flag & ISSET) {
+					max = vp->index + 1;
 					n++;
 				}
 			c = n; /* ksh88/ksh93 go for number, not max index */

bin/ksh/expand.h

@@ -1,9 +1,9 @@
-/*	$NetBSD: expand.h,v 1.5 2013/10/18 19:53:34 christos Exp $	*/
+/*	$NetBSD: expand.h,v 1.4 2001/07/26 15:05:07 wiz Exp $	*/
 
 /*
  * Expanding strings
  */
-/* $Id: expand.h,v 1.5 2013/10/18 19:53:34 christos Exp $ */
+/* $Id: expand.h,v 1.4 2001/07/26 15:05:07 wiz Exp $ */
 
 #define X_EXTRA		8	/* this many extra bytes in X string */
 
@@ -40,7 +40,6 @@ typedef char * XStringP;
 			(xs).beg = alloc((xs).len + X_EXTRA, (xs).areap); \
 			(xs).end = (xs).beg + (xs).len; \
 			xp = (xs).beg; \
-			__USE(xp); \
 		} while (0)
 
 /* stuff char into string */

bin/ksh/history.c

@@ -741,8 +741,7 @@ hist_finish()
 {
   static int once;
   int fd;
-#if defined(__minix)
-  /* LSC: FIXME: Minix doesn't implement O_EXLOCK yet. */
+#if !defined(O_EXLOCK) && defined(LOCK_EX)
   int rc;
 #endif
   FILE *fh;
@@ -761,8 +760,13 @@ hist_finish()
   else
     hp = histlist;
 
-  fd = open(hname, O_WRONLY | O_CREAT | O_TRUNC | O_EXLOCK, 0777);
-#if defined(__minix)
+  fd = open(hname, O_WRONLY | O_CREAT | O_TRUNC
+#ifdef O_EXLOCK
+					| O_EXLOCK
+#endif
+					, 0777);
+
+#if !defined(O_EXLOCK) && defined(LOCK_EX)
   do {
     rc = flock(fd, LOCK_EX);
     if (rc == -1 && errno != EINTR)
@@ -775,7 +779,7 @@ hist_finish()
   if (fd >= 0 && (fh = fdopen(fd, "w"))) {
     for (i = 0; hp + i <= histptr && hp[i]; i++)
       fprintf(fh, "%s%c", hp[i], '\0');
-#if defined(__minix)
+#if !defined(O_EXLOCK) && defined(LOCK_EX)
     flock(fd, LOCK_UN);
 #endif
     fclose(fh);