Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/minoura-xpg4dl]: src/usr.bin Sync w/ netbsd-1-5-base.
details: https://anonhg.NetBSD.org/src/rev/b9b077bf3049
branches: minoura-xpg4dl
changeset: 486694:b9b077bf3049
user: minoura <minoura%NetBSD.org@localhost>
date: Fri Jun 23 16:30:10 2000 +0000
description:
Sync w/ netbsd-1-5-base.
diffstat:
usr.bin/Makefile | 15 +-
usr.bin/at/pathnames.h | 14 +-
usr.bin/audio/common/libaudio.h | 12 +-
usr.bin/banner/banner.1 | 32 +-
usr.bin/banner/banner.c | 79 +-
usr.bin/banner/banner.h | 11 +-
usr.bin/banner/chset.c | 118 +-
usr.bin/bdes/Makefile | 9 +
usr.bin/bdes/bdes.1 | 360 +++++
usr.bin/bdes/bdes.c | 1091 +++++++++++++++++
usr.bin/cdplay/cdplay.1 | 74 +-
usr.bin/cdplay/cdplay.c | 19 +-
usr.bin/compile_et/Makefile | 27 +
usr.bin/crunch/crunchgen/crunchgen.c | 6 +-
usr.bin/crunch/crunchide/crunchide.1 | 2 +-
usr.bin/crunch/crunchide/crunchide.c | 7 +-
usr.bin/crunch/crunchide/exec_aout.c | 6 +-
usr.bin/crunch/crunchide/exec_coff.c | 20 +-
usr.bin/crunch/crunchide/exec_ecoff.c | 20 +-
usr.bin/crunch/crunchide/exec_elf32.c | 20 +-
usr.bin/crunch/crunchide/exec_elf64.c | 20 +-
usr.bin/crunch/crunchide/extern.h | 18 +-
usr.bin/file/magdir/netbsd | 3 +
usr.bin/ftp/cmds.c | 11 +-
usr.bin/ftp/extern.h | 8 +-
usr.bin/ftp/fetch.c | 106 +-
usr.bin/ftp/ftp.1 | 71 +-
usr.bin/ftp/ftp.c | 70 +-
usr.bin/ftp/main.c | 41 +-
usr.bin/ftp/util.c | 121 +-
usr.bin/ftp/version.h | 4 +-
usr.bin/ipcs/Makefile | 4 +-
usr.bin/ipcs/ipcs.1 | 3 +-
usr.bin/ipcs/ipcs.c | 881 +++++++++----
usr.bin/join/join.c | 33 +-
usr.bin/kdestroy/Makefile | 31 +
usr.bin/kdump/setemul.c | 6 +-
usr.bin/kf/Makefile | 27 +
usr.bin/kinit/Makefile | 31 +
usr.bin/klist/Makefile | 31 +
usr.bin/kpasswd/Makefile | 27 +
usr.bin/lex/flex.1 | 2 +-
usr.bin/lex/flex.skl | 8 +-
usr.bin/login/Makefile | 15 +-
usr.bin/login/k5login.c | 38 +-
usr.bin/login/klogin.c | 6 +-
usr.bin/login/login.c | 84 +-
usr.bin/make/for.c | 6 +-
usr.bin/make/hash.c | 8 +-
usr.bin/make/main.c | 20 +-
usr.bin/make/make.1 | 44 +-
usr.bin/make/make.c | 49 +-
usr.bin/make/make.h | 4 +-
usr.bin/make/parse.c | 16 +-
usr.bin/make/suff.c | 29 +-
usr.bin/make/var.c | 225 ++-
usr.bin/man/config.c | 131 +-
usr.bin/man/config.h | 17 +-
usr.bin/man/man.1 | 50 +-
usr.bin/man/man.c | 299 ++--
usr.bin/man/man.conf.5 | 15 +-
usr.bin/mk_cmds/Makefile | 27 +
usr.bin/modstat/modstat.8 | 19 +-
usr.bin/netstat/inet6.c | 8 +-
usr.bin/nfsstat/Makefile | 4 +-
usr.bin/nfsstat/nfsstat.c | 84 +-
usr.bin/openssl/Makefile | 114 +
usr.bin/passwd/Makefile | 11 +-
usr.bin/passwd/krb5_passwd.c | 179 ++
usr.bin/rdist/docmd.c | 7 +-
usr.bin/rdist/main.c | 15 +-
usr.bin/rlogin/Makefile | 15 +-
usr.bin/rpcgen/rpc_cout.c | 15 +-
usr.bin/rpcgen/rpc_hout.c | 12 +-
usr.bin/rpcgen/rpc_main.c | 8 +-
usr.bin/rpcinfo/Makefile | 11 +-
usr.bin/rpcinfo/rpcinfo.8 | 454 +++++--
usr.bin/rpcinfo/rpcinfo.c | 1891 +++++++++++++++++++++++------
usr.bin/rup/rup.c | 116 +-
usr.bin/rusers/rusers.c | 114 +-
usr.bin/rwall/rwall.c | 4 +-
usr.bin/string2key/Makefile | 31 +
usr.bin/su/Makefile | 14 +-
usr.bin/systat/cmds.c | 8 +-
usr.bin/systat/disks.c | 10 +-
usr.bin/systat/extern.h | 4 +-
usr.bin/systat/fetch.c | 36 +-
usr.bin/systat/icmp.c | 6 +-
usr.bin/systat/iostat.c | 8 +-
usr.bin/systat/ip.c | 6 +-
usr.bin/systat/ip6.c | 6 +-
usr.bin/systat/ipsec.c | 6 +-
usr.bin/systat/main.c | 12 +-
usr.bin/systat/mbufs.c | 7 +-
usr.bin/systat/pigs.c | 27 +-
usr.bin/systat/ps.c | 6 +-
usr.bin/systat/ps.h | 4 +-
usr.bin/systat/swap.c | 12 +-
usr.bin/systat/tcp.c | 6 +-
usr.bin/systat/vmstat.c | 58 +-
usr.bin/telnet/Makefile | 30 +-
usr.bin/tip/tip.1 | 4 +-
usr.bin/tn3270/tools/mkastosc/mkastosc.c | 6 +-
usr.bin/tn3270/tools/mkhits/dohits.c | 21 +-
usr.bin/tn3270/tools/mkhits/dohits.h | 6 +-
usr.bin/top/machine.h | 8 +-
usr.bin/top/machine/m_netbsd15.c | 87 +-
usr.bin/tset/extern.h | 4 +-
usr.bin/tset/set.c | 9 +-
usr.bin/tset/term.c | 11 +-
usr.bin/tset/tset.1 | 11 +-
usr.bin/tset/tset.c | 21 +-
usr.bin/ul/ul.c | 53 +-
usr.bin/units/pathnames.h | 14 +-
usr.bin/vi/cl/cl_bsd.c | 13 +-
usr.bin/vi/cl/cl_funcs.c | 68 +-
usr.bin/vi/cl/cl_screen.c | 21 +-
usr.bin/vi/common/gs.h | 4 +-
usr.bin/vi/common/options.c | 53 +-
usr.bin/vi/common/options.h | 3 +-
usr.bin/vi/ex/ex_read.c | 8 +-
usr.bin/vi/ex/ex_shell.c | 6 +-
usr.bin/vi/ex/ex_util.c | 9 +-
123 files changed, 6452 insertions(+), 1948 deletions(-)
diffs (truncated from 13212 to 300 lines):
diff -r 66779edd6b36 -r b9b077bf3049 usr.bin/Makefile
--- a/usr.bin/Makefile Fri Jun 23 16:16:09 2000 +0000
+++ b/usr.bin/Makefile Fri Jun 23 16:30:10 2000 +0000
@@ -1,9 +1,6 @@
-# $NetBSD: Makefile,v 1.107.6.1 2000/05/28 22:41:01 minoura Exp $
+# $NetBSD: Makefile,v 1.107.6.2 2000/06/23 16:30:10 minoura Exp $
# from: @(#)Makefile 8.3 (Berkeley) 1/7/94
-SRCTOP= ..
-.include <bsd.crypto.mk>
-
SUBDIR= apply apropos asa at audio banner basename biff \
bzip2 bzip2recover cal calendar cap_mkdb cdplay checknr chflags \
chpass cksum cmp col colcrt colrm column comm compress \
@@ -25,11 +22,11 @@
uudecode uuencode vacation vgrind vi vis vmstat w \
wall wc what whatis whereis which who whois window \
write xargs xinstall xlint xstr yacc yes ypcat \
- ypmatch ypwhich \
- colldef mklocale
+ ypmatch ypwhich
+SUBDIR+= colldef mklocale
-.if defined(CRYPTOPATH)
-.sinclude "${CRYPTOPATH}/usr.bin/Makefile.frag"
-.endif
+SUBDIR+= openssl
+
+SUBDIR+= compile_et kdestroy kf kinit klist kpasswd mk_cmds string2key
.include <bsd.subdir.mk>
diff -r 66779edd6b36 -r b9b077bf3049 usr.bin/at/pathnames.h
--- a/usr.bin/at/pathnames.h Fri Jun 23 16:16:09 2000 +0000
+++ b/usr.bin/at/pathnames.h Fri Jun 23 16:30:10 2000 +0000
@@ -1,9 +1,9 @@
-/* $NetBSD: pathnames.h,v 1.4 1998/06/27 21:15:08 christos Exp $ */
+/* $NetBSD: pathnames.h,v 1.4.8.1 2000/06/23 16:30:12 minoura Exp $ */
/*
* Copyright (c) 1993 Christopher G. Demetriou
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -14,10 +14,12 @@
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
- * This product includes software developed by Christopher G. Demetriou.
+ * This product includes software developed for the
+ * NetBSD Project. See http://www.netbsd.org/ for
+ * information about NetBSD.
* 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission
- *
+ * derived from this software without specific prior written permission.
+ *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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.
@@ -28,6 +30,8 @@
* 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.
+ *
+ * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
*
* From: $OpenBSD: pathnames.h,v 1.3 1997/03/01 23:40:11 millert Exp $
*/
diff -r 66779edd6b36 -r b9b077bf3049 usr.bin/audio/common/libaudio.h
--- a/usr.bin/audio/common/libaudio.h Fri Jun 23 16:16:09 2000 +0000
+++ b/usr.bin/audio/common/libaudio.h Fri Jun 23 16:30:10 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: libaudio.h,v 1.3 1999/03/27 17:46:00 mrg Exp $ */
+/* $NetBSD: libaudio.h,v 1.3.8.1 2000/06/23 16:30:12 minoura Exp $ */
/*
* Copyright (c) 1999 Matthew R. Green
@@ -163,11 +163,6 @@
#define getbe16(v) (v)
#define getbe32(v) (v)
-#define putle16(v) bswap16(v)
-#define putle32(v) bswap32(v)
-#define putbe16(v) (v)
-#define putbe32(v) (v)
-
#else
#define getle16(v) (v)
@@ -175,9 +170,4 @@
#define getbe16(v) bswap16(v)
#define getbe32(v) bswap32(v)
-#define putle16(v) (v)
-#define putle32(v) (v)
-#define putbe16(v) bswap16(v)
-#define putbe32(v) bswap32(v)
-
#endif
diff -r 66779edd6b36 -r b9b077bf3049 usr.bin/banner/banner.1
--- a/usr.bin/banner/banner.1 Fri Jun 23 16:16:09 2000 +0000
+++ b/usr.bin/banner/banner.1 Fri Jun 23 16:30:10 2000 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: banner.1,v 1.2 1997/10/18 12:12:38 lukem Exp $
+.\" $NetBSD: banner.1,v 1.2.10.1 2000/06/23 16:30:13 minoura Exp $
.\"
.\" @(#)Copyright (c) 1995, Simon J. Gerraty.
.\"
@@ -23,11 +23,41 @@
.Nd print strings in large letters
.Sh SYNOPSIS
.Nm
+.Bk -words
+.Op Fl f Ar fg
+.Ek
+.Bk -words
+.Op Fl b Ar bg
+.Ek
+.Bk -words
+.Op Fl l
+.Ek
.Ar string ...
.Sh DESCRIPTION
.Nm
prints up to 10 chars of each
.Ar string
in large letters on the standard output.
+.Pp
+The options are:
+.Bl -tag -width Ds
+.It Fl b Ar bg
+Use
+.Ar bg
+as the background color (character) rather than the default ``\ ''.
+.It Fl f Ar fg
+Use
+.Ar fg
+as the foreground color (character) rather than the default ``#''.
+If
+.Ar fg
+is ``-'', then the actual letter being printed is used as the
+foreground color in the same way that LPD does it. The results are
+quite variable.
+.It Fl l
+Use the more attractive LPD font instead of the traditional
+.Nm
+font.
+.El
.Sh SEE ALSO
.Xr banner 6
diff -r 66779edd6b36 -r b9b077bf3049 usr.bin/banner/banner.c
--- a/usr.bin/banner/banner.c Fri Jun 23 16:16:09 2000 +0000
+++ b/usr.bin/banner/banner.c Fri Jun 23 16:30:10 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: banner.c,v 1.3 1997/10/18 12:12:47 lukem Exp $ */
+/* $NetBSD: banner.c,v 1.3.10.1 2000/06/23 16:30:13 minoura Exp $ */
/*
* Changes for banner(1)
@@ -62,7 +62,7 @@
#if 0
static char sccsid[] = "@(#)printjob.c 8.2 (Berkeley) 4/16/94";
#else
-__RCSID("$NetBSD: banner.c,v 1.3 1997/10/18 12:12:47 lukem Exp $");
+__RCSID("$NetBSD: banner.c,v 1.3.10.1 2000/06/23 16:30:13 minoura Exp $");
#endif
#endif /* not lint */
@@ -73,6 +73,14 @@
#include "banner.h"
static long PW = LINELEN;
+/*
+ * <sjg> lpd makes chars out of the letter in question.
+ * the results are somewhat mixed. Sticking to '#' as
+ * banner(1) does is more consistent.
+ */
+static int ForeGnd = '#';
+static int BackGnd = ' ';
+static int Drop = 0; /* 3 for the LPD font */
static int dropit __P((int));
int main __P((int, char **));
@@ -89,18 +97,12 @@
{
int scnwidth;
- /*
- * <sjg> lpd makes chars out of the letter in question.
- * the results are somewhat mixed. Sticking to '#' as
- * banner(1) does is more consistent.
- */
-#ifndef NOHASH_ONLY
- c = '#';
-#endif
+ if (ForeGnd)
+ c = ForeGnd;
for (scnwidth = WIDTH; --scnwidth;) {
key <<= 1;
- *p++ = key & 0200 ? c : BACKGND;
+ *p++ = key & 0200 ? c : BackGnd;
}
return (p);
}
@@ -122,7 +124,7 @@
case TRC('p'):
case TRC('q'):
case TRC('y'):
- return (DROP);
+ return (Drop);
default:
return (0);
@@ -139,29 +141,34 @@
int nchrs, j;
char outbuf[LINELEN+1], *sp, c, cc;
int d, scnhgt;
- extern char scnkey[][HEIGHT]; /* in lpdchar.c */
- for (scnhgt = 0; scnhgt++ < HEIGHT+DROP; ) {
+ for (scnhgt = 0; scnhgt++ < HEIGHT+Drop; ) {
strp = &outbuf[0];
+ if (BackGnd != ' ')
+ *strp++ = BackGnd;
sp = scsp;
for (nchrs = 0; ; ) {
d = dropit(c = TRC(cc = *sp++));
- if ((!d && scnhgt > HEIGHT) || (scnhgt <= DROP && d))
+ if ((!d && scnhgt > HEIGHT) || (scnhgt <= Drop && d))
for (j = WIDTH; --j;)
- *strp++ = BACKGND;
+ *strp++ = BackGnd;
+ else if (Drop == 0)
+ strp = scnline(
+ scnkey_def[(int)c][scnhgt-1-d], strp, cc);
else
strp = scnline(
- scnkey[(int)c][scnhgt-1-d], strp, cc);
+ scnkey_lpd[(int)c][scnhgt-1-d], strp, cc);
if (*sp == dlm || *sp == '\0' || nchrs++ >= PW/(WIDTH+1)-1)
break;
- *strp++ = BACKGND;
-#ifdef LPD_CHSET /* <sjg> */
- *strp++ = BACKGND;
-#endif
+ *strp++ = BackGnd;
}
- while (*--strp == BACKGND && strp >= outbuf)
+ if (BackGnd != ' ')
+ *strp++ = BackGnd;
+ else {
+ while (*--strp == ' ' && strp >= outbuf)
;
- strp++;
+ strp++;
+ }
*strp++ = '\n';
(void) write(scfd, outbuf, strp-outbuf);
}
@@ -175,10 +182,28 @@
int argc;
char **argv;
{
- char word[10+1]; /* strings limited to 10 chars */
-
- while (*++argv) {
- (void)strncpy(word, *argv, sizeof (word) - 1);
+ char word[10+1]; /* strings limited to 10 chars */
+ int c;
+
+ while ((c = getopt(argc, argv, "b:f:l")) != EOF) {
+ switch (c) {
+ case 'f':
+ if (*optarg == '-')
+ ForeGnd = 0;
+ else
+ ForeGnd = *optarg;
+ break;
+ case 'b':
+ BackGnd = *optarg;
+ break;
+ case 'l':
+ Drop = 3; /* for LPD font */
+ break;
+ }
+ }
+
+ for (; optind < argc; ++optind) {
+ (void)strncpy(word, argv[optind], sizeof (word) - 1);
word[sizeof (word) - 1] = '\0';
scan_out(1, word, '\0');
}
diff -r 66779edd6b36 -r b9b077bf3049 usr.bin/banner/banner.h
--- a/usr.bin/banner/banner.h Fri Jun 23 16:16:09 2000 +0000
+++ b/usr.bin/banner/banner.h Fri Jun 23 16:30:10 2000 +0000
@@ -1,4 +1,4 @@
Home |
Main Index |
Thread Index |
Old Index