Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.sbin/makemandb obsolete mkstr(1) and xstr(1)
details: https://anonhg.NetBSD.org/src/rev/fb364bc1856c
branches: trunk
changeset: 375980:fb364bc1856c
user: lukem <lukem%NetBSD.org@localhost>
date: Wed May 24 13:00:14 2023 +0000
description:
obsolete mkstr(1) and xstr(1)
These were only used on PDP-11 for two programs we don't ship,
and have been obsolete since the VAX days.
xstr never worked in the build.sh cross-build environment (22 years), or
parallel make environment (nearly 28 years), didn't work in the orignal 386bsd
import, and has never been needed in NetBSD as we don't have the older BSD
programs (pascal, pre-nvi ex) that needed mkstr/xstr on PDP-11.
PR toolchain/35964
diffstat:
distrib/evbsh3/rom/ramdiskcommon/ramdiskbin.conf | 4 +-
distrib/sets/lists/comp/mi | 18 +-
distrib/sets/lists/debug/mi | 6 +-
usr.bin/Makefile | 6 +-
usr.bin/crunch/examples/really-big.conf | 6 +-
usr.bin/mkstr/Makefile | 6 -
usr.bin/mkstr/mkstr.1 | 131 -----
usr.bin/mkstr/mkstr.c | 320 ------------
usr.bin/xstr/Makefile | 6 -
usr.bin/xstr/pathnames.h | 35 -
usr.bin/xstr/xstr.1 | 210 --------
usr.bin/xstr/xstr.c | 569 -----------------------
usr.sbin/makemandb/nostem.txt | 2 -
13 files changed, 20 insertions(+), 1299 deletions(-)
diffs (truncated from 1503 to 300 lines):
diff -r d093cc4d7628 -r fb364bc1856c distrib/evbsh3/rom/ramdiskcommon/ramdiskbin.conf
--- a/distrib/evbsh3/rom/ramdiskcommon/ramdiskbin.conf Wed May 24 10:07:16 2023 +0000
+++ b/distrib/evbsh3/rom/ramdiskcommon/ramdiskbin.conf Wed May 24 13:00:14 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ramdiskbin.conf,v 1.10 2017/04/12 17:29:49 christos Exp $
+# $NetBSD: ramdiskbin.conf,v 1.11 2023/05/24 13:00:14 lukem Exp $
srcdirs bin sbin libexec usr.bin usr.sbin
@@ -39,7 +39,7 @@ progs compress crontab ctags cut dirname
progs fstat ftp gencat getopt head hexdump id
progs indent ipcrm ipcs join jot kdump ktrace lam last lastcomm leave less
progs lex lock logger login logname look m4 mail man menuc mesg mkdep
-progs mkfifo mkstr mktemp msgc msgs netgroup netstat newsyslog nfsstat
+progs mkfifo mktemp msgc msgs netgroup netstat newsyslog nfsstat
progs nice nl nohup paste patch pr printenv printf quota renice rev rpcgen
progs rpcinfo rs sed showmount shuffle skey skeyinfo skeyinit soelim
progs su systat tail tee tftp time touch tset tsort tty uname
diff -r d093cc4d7628 -r fb364bc1856c distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi Wed May 24 10:07:16 2023 +0000
+++ b/distrib/sets/lists/comp/mi Wed May 24 13:00:14 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2428 2023/05/12 11:13:09 riastradh Exp $
+# $NetBSD: mi,v 1.2429 2023/05/24 13:00:15 lukem Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -58,7 +58,7 @@
./usr/bin/lto-dump comp-c-bin gcccmds,gcc=10
./usr/bin/luac comp-util-bin
./usr/bin/menuc comp-c-bin
-./usr/bin/mkstr comp-c-bin
+./usr/bin/mkstr comp-obsolete obsolete
./usr/bin/mkubootimage comp-util-bin
./usr/bin/msgattrib comp-c-bin
./usr/bin/msgc comp-c-bin
@@ -93,7 +93,7 @@
./usr/bin/unifdefall comp-util-bin
./usr/bin/unprotoize comp-obsolete obsolete
./usr/bin/xgettext comp-c-bin
-./usr/bin/xstr comp-c-bin
+./usr/bin/xstr comp-obsolete obsolete
./usr/bin/yacc comp-c-bin
./usr/include/a.out.h comp-c-include
./usr/include/adosfs/adosfs.h comp-c-include
@@ -4613,7 +4613,7 @@
./usr/share/man/cat1/lto-dump.0 comp-c-catman gcccmds,.cat,gcc=10
./usr/share/man/cat1/luac.0 comp-util-catman .cat
./usr/share/man/cat1/menuc.0 comp-c-catman .cat
-./usr/share/man/cat1/mkstr.0 comp-c-catman .cat
+./usr/share/man/cat1/mkstr.0 comp-obsolete obsolete
./usr/share/man/cat1/msg_clear.0 comp-obsolete obsolete
./usr/share/man/cat1/msg_display.0 comp-obsolete obsolete
./usr/share/man/cat1/msg_display_add.0 comp-obsolete obsolete
@@ -4649,7 +4649,7 @@
./usr/share/man/cat1/tsort.0 comp-c-catman .cat
./usr/share/man/cat1/unifdef.0 comp-c-catman .cat
./usr/share/man/cat1/unifdefall.0 comp-c-catman .cat
-./usr/share/man/cat1/xstr.0 comp-c-catman .cat
+./usr/share/man/cat1/xstr.0 comp-obsolete obsolete
./usr/share/man/cat1/yacc.0 comp-c-catman .cat
./usr/share/man/cat2/EV_SET.0 comp-c-catman .cat
./usr/share/man/cat2/_Exit.0 comp-c-catman .cat
@@ -13119,7 +13119,7 @@
./usr/share/man/html1/lto-dump.html comp-c-htmlman gcccmds,html,gcc=10
./usr/share/man/html1/luac.html comp-util-htmlman html
./usr/share/man/html1/menuc.html comp-c-htmlman html
-./usr/share/man/html1/mkstr.html comp-c-htmlman html
+./usr/share/man/html1/mkstr.html comp-obsolete obsolete
./usr/share/man/html1/msgc.html comp-c-htmlman html
./usr/share/man/html1/nbperf.html comp-util-htmlman html
./usr/share/man/html1/nm.html comp-util-htmlman binutils,html
@@ -13144,7 +13144,7 @@
./usr/share/man/html1/tsort.html comp-c-htmlman html
./usr/share/man/html1/unifdef.html comp-c-htmlman html
./usr/share/man/html1/unifdefall.html comp-c-htmlman html
-./usr/share/man/html1/xstr.html comp-c-htmlman html
+./usr/share/man/html1/xstr.html comp-obsolete obsolete
./usr/share/man/html1/yacc.html comp-c-htmlman html
./usr/share/man/html2/EV_SET.html comp-c-htmlman html
./usr/share/man/html2/_Exit.html comp-c-htmlman html
@@ -21415,7 +21415,7 @@
./usr/share/man/man1/lto-dump.1 comp-c-man gcccmds,.man,gcc=10
./usr/share/man/man1/luac.1 comp-util-man .man
./usr/share/man/man1/menuc.1 comp-c-man .man
-./usr/share/man/man1/mkstr.1 comp-c-man .man
+./usr/share/man/man1/mkstr.1 comp-obsolete obsolete
./usr/share/man/man1/msg_clear.1 comp-obsolete obsolete
./usr/share/man/man1/msg_display.1 comp-obsolete obsolete
./usr/share/man/man1/msg_display_add.1 comp-obsolete obsolete
@@ -21452,7 +21452,7 @@
./usr/share/man/man1/tsort.1 comp-util-man .man
./usr/share/man/man1/unifdef.1 comp-util-man .man
./usr/share/man/man1/unifdefall.1 comp-util-man .man
-./usr/share/man/man1/xstr.1 comp-c-man .man
+./usr/share/man/man1/xstr.1 comp-obsolete obsolete
./usr/share/man/man1/yacc.1 comp-c-man .man
./usr/share/man/man2/EV_SET.2 comp-c-man .man
./usr/share/man/man2/_Exit.2 comp-c-man .man
diff -r d093cc4d7628 -r fb364bc1856c distrib/sets/lists/debug/mi
--- a/distrib/sets/lists/debug/mi Wed May 24 10:07:16 2023 +0000
+++ b/distrib/sets/lists/debug/mi Wed May 24 13:00:14 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.398 2023/05/10 15:52:07 christos Exp $
+# $NetBSD: mi,v 1.399 2023/05/24 13:00:15 lukem Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -689,7 +689,7 @@
./usr/libdata/debug/usr/bin/mkesdb.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/mkfifo.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/mklocale.debug comp-locale-debug debug
-./usr/libdata/debug/usr/bin/mkstr.debug comp-c-debug debug
+./usr/libdata/debug/usr/bin/mkstr.debug comp-obsolete obsolete
./usr/libdata/debug/usr/bin/mktemp.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/mkubootimage.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/modstat.debug comp-obsolete obsolete
@@ -896,7 +896,7 @@
./usr/libdata/debug/usr/bin/xargs.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/xgettext.debug comp-c-debug debug
./usr/libdata/debug/usr/bin/xmlwf.debug comp-util-debug debug
-./usr/libdata/debug/usr/bin/xstr.debug comp-c-debug debug
+./usr/libdata/debug/usr/bin/xstr.debug comp-obsolete obsolete
./usr/libdata/debug/usr/bin/xz.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/yacc.debug comp-c-debug debug
./usr/libdata/debug/usr/bin/yes.debug comp-util-debug debug
diff -r d093cc4d7628 -r fb364bc1856c usr.bin/Makefile
--- a/usr.bin/Makefile Wed May 24 10:07:16 2023 +0000
+++ b/usr.bin/Makefile Wed May 24 13:00:14 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.238 2022/06/06 10:56:29 nia Exp $
+# $NetBSD: Makefile,v 1.239 2023/05/24 13:00:15 lukem Exp $
# from: @(#)Makefile 8.3 (Berkeley) 1/7/94
.include <bsd.own.mk>
@@ -17,7 +17,7 @@ SUBDIR= aiomixer apply asa at audio audi
kdump ktrace ktruss lam last lastcomm ldd leave \
locale locate lock logger login logname look lorder m4 \
machine mail make man menuc mesg midiplay midirecord mixerctl \
- mkcsmapper mkdep mkesdb mkfifo mklocale mkstr mktemp mkubootimage \
+ mkcsmapper mkdep mkesdb mkfifo mklocale mktemp mkubootimage \
moduli msgc msgs \
nbperf nc netgroup netstat newgrp newsyslog nfsstat nice nl nohup \
pagesize passwd paste patch pathchk pkill pmap pr \
@@ -34,7 +34,7 @@ SUBDIR= aiomixer apply asa at audio audi
uudecode uuencode uuidgen vacation vgrind videoctl vis \
vmstat vndcompress w \
wall wc what whereis who whois \
- write xargs xinstall xlint xstr yes
+ write xargs xinstall xlint yes
SUBDIR+= ../external/zlib/pigz/bin/pigz
diff -r d093cc4d7628 -r fb364bc1856c usr.bin/crunch/examples/really-big.conf
--- a/usr.bin/crunch/examples/really-big.conf Wed May 24 10:07:16 2023 +0000
+++ b/usr.bin/crunch/examples/really-big.conf Wed May 24 13:00:14 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: really-big.conf,v 1.5 2012/04/21 12:27:29 roy Exp $
+# $NetBSD: really-big.conf,v 1.6 2023/05/24 13:00:15 lukem Exp $
#
# really-big.conf - just about everything, just for testing.
# This ends up having some good examples of the use of specials for
@@ -43,14 +43,14 @@ progs dirname du env error expand false
progs fsplit fstat ftp getconf getopt gprof head hexdump id indent ipcrm
progs ipcs join kdump ktrace last lastcomm leave lex lock logger locate
progs login logname look m4 machine mail make man mesg mkfifo
-progs mkstr modstat more msgs netstat newsyslog nfsstat nice nm nohup
+progs modstat more msgs netstat newsyslog nfsstat nice nm nohup
progs pagesize passwd paste patch pr printenv printf quota ranlib
progs renice rev rlogin rpcgen rpcinfo rsh rup ruptime rusers rwall rwho
progs script sed showmount size soelim split strings strip su tail talk
progs tcopy tee telnet tftp time tip tn3270 touch tput tr true tset tsort
progs tty ul uname unexpand unifdef uniq units unvis users uudecode uuencode
progs vacation vgrind vi vis vmstat w wall wc what whatis whereis who
-progs whois window write xargs xinstall xstr yacc yes ypcat ypmatch ypwhich
+progs whois window write xargs xinstall yacc yes ypcat ypmatch ypwhich
# shell scripts: lorder mkdep shar which
# problems: rdist uses libcompat.a(regex.o), which conflicts with
diff -r d093cc4d7628 -r fb364bc1856c usr.bin/mkstr/Makefile
--- a/usr.bin/mkstr/Makefile Wed May 24 10:07:16 2023 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile,v 1.3 1995/09/28 06:22:18 tls Exp $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
-
-PROG= mkstr
-
-.include <bsd.prog.mk>
diff -r d093cc4d7628 -r fb364bc1856c usr.bin/mkstr/mkstr.1
--- a/usr.bin/mkstr/mkstr.1 Wed May 24 10:07:16 2023 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,131 +0,0 @@
-.\" $NetBSD: mkstr.1,v 1.14 2022/08/28 10:48:16 hgutch Exp $
-.\"
-.\" Copyright (c) 1980, 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.
-.\"
-.\" @(#)mkstr.1 8.1 (Berkeley) 6/6/93
-.\"
-.Dd June 6, 1993
-.Dt MKSTR 1
-.Os
-.Sh NAME
-.Nm mkstr
-.Nd create an error message file by massaging C source
-.Sh SYNOPSIS
-.Nm
-.Op Fl
-.Ar messagefile
-.Ar prefix file ...
-.Sh DESCRIPTION
-.Nm
-creates files containing error messages extracted from C source,
-and restructures the same C source, to use the created error message
-file.
-The intent of
-.Nm
-was to reduce the size of large programs and
-reduce swapping (see
-.Sx BUGS
-section below).
-.Pp
-.Nm
-processes each of the specified
-.Ar files ,
-placing a restructured version of the input in a file whose name
-consists of the specified
-.Ar prefix
-and the original name.
-A typical usage of
-.Nm
-is
-.Bd -literal -offset indent
-mkstr pistrings xx *.c
-.Ed
-.Pp
-This command causes all the error messages from the C source
-files in the current directory to be placed in the file
-.Ar pistrings
-and restructured copies of the sources to be placed in
-files whose names are prefixed with
-.Ar \&xx .
-.Pp
-Options:
-.Bl -tag -width indent
-.It Fl
-Error messages are placed at the end of the specified
-message file for recompiling part of a large
-.Nm
-ed
-program.
-.El
-.Pp
-.Nm
-finds error messages in the source by
-searching for the string
-.Li \&`error("'
-in the input stream.
-Each time it occurs, the C string starting at the
-.Sq \&"\&
-is stored
-in the message file followed by a null character and a new-line character;
-The new source is restructured with
-.Xr lseek 2
-pointers into the error message file for retrieval.
-.Bd -literal -offset indent
-char efilname = "/usr/lib/pi_strings";
-int efil = -1;
-
-error(a1, a2, a3, a4)
-\&{
- char buf[256];
-
- if (efil < 0) {
- efil = open(efilname, 0);
Home |
Main Index |
Thread Index |
Old Index