From 6dc4f1b4aaab378ab191a89a12e54c86596e7b04 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Thu, 2 Aug 2007 10:27:01 +0000 Subject: [PATCH] Retire the getNAME utility which was only used by an old script in share/man/man0 (which no longer exists). --- etc/Makefile | 4 +- libexec/Makefile | 3 +- libexec/getNAME/Makefile | 7 - libexec/getNAME/getNAME.1 | 66 -------- libexec/getNAME/getNAME.c | 334 -------------------------------------- 5 files changed, 4 insertions(+), 410 deletions(-) delete mode 100644 libexec/getNAME/Makefile delete mode 100644 libexec/getNAME/getNAME.1 delete mode 100644 libexec/getNAME/getNAME.c diff --git a/etc/Makefile b/etc/Makefile index 08c97c2d1a..6a521118cf 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,6 +1,6 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 # $FreeBSD: src/etc/Makefile,v 1.219.2.38 2003/03/04 09:49:00 ru Exp $ -# $DragonFly: src/etc/Makefile,v 1.180 2007/08/02 06:53:14 dillon Exp $ +# $DragonFly: src/etc/Makefile,v 1.181 2007/08/02 10:27:01 swildner Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -517,6 +517,8 @@ upgrade_etc: preupgrade csh -c "rm -f ${DESTDIR}/usr/share/man/{man,cat}4/sata.4.gz" csh -c "rm -f ${DESTDIR}/usr/share/man/{man,cat}4/snd_emu10kx.4.gz" csh -c "rm -f ${DESTDIR}/usr/share/man/{man,cat}9/{cpu,mi}_switch.9.gz" + rm -f ${DESTDIR}/usr/libexec/getNAME + csh -c "rm -f ${DESTDIR}/usr/share/man/{man,cat}1/getNAME.1.gz" ldconfig -R .if !defined(BINARY_UPGRADE) # binary upgrade just copies these nodes .if !defined(NOMAN) diff --git a/libexec/Makefile b/libexec/Makefile index de48e80b13..78bb65195e 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/libexec/Makefile,v 1.42.2.5 2002/11/12 17:32:48 obrien Exp $ -# $DragonFly: src/libexec/Makefile,v 1.11 2006/11/09 18:44:52 pavalos Exp $ +# $DragonFly: src/libexec/Makefile,v 1.12 2007/08/02 10:27:01 swildner Exp $ # Present but disabled: kpasswdd SUBDIR= atrun \ @@ -9,7 +9,6 @@ SUBDIR= atrun \ fingerd \ ftpd \ ftp-proxy \ - getNAME \ getty \ makekey \ makewhatis.local \ diff --git a/libexec/getNAME/Makefile b/libexec/getNAME/Makefile deleted file mode 100644 index 29b699064f..0000000000 --- a/libexec/getNAME/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/libexec/getNAME/Makefile,v 1.5 1999/08/28 00:09:33 peter Exp $ -# $DragonFly: src/libexec/getNAME/Attic/Makefile,v 1.2 2003/06/17 04:27:07 dillon Exp $ - -PROG= getNAME - -.include diff --git a/libexec/getNAME/getNAME.1 b/libexec/getNAME/getNAME.1 deleted file mode 100644 index 7edea87f81..0000000000 --- a/libexec/getNAME/getNAME.1 +++ /dev/null @@ -1,66 +0,0 @@ -.\" Copyright (c) July 1996 Wolfram Schneider . Berlin. -.\" 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. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. -.\" -.\" $FreeBSD: src/libexec/getNAME/getNAME.1,v 1.8.2.3 2001/08/16 10:44:15 ru Exp $ -.\" $DragonFly: src/libexec/getNAME/Attic/getNAME.1,v 1.4 2006/03/21 04:24:28 swildner Exp $ -.Dd July 8, 1996 -.Dt GETNAME 1 -.Os -.Sh NAME -.Nm getNAME -.Nd get name sections from manual pages -.Sh SYNOPSIS -.Nm /usr/libexec/getNAME -.Op Fl itw -.Ar -.Sh DESCRIPTION -The -.Nm -utility -get name sections from manual pages. -Without options -.Nm -building -.Xr apropos 1 -database entries. -.Pp -The options are as follows: -.Bl -tag -width indent -.It Fl i -For building intro entries. -.It Fl t -For building toc. -.It Fl w -Print type of manual page (OLD, NEW, UNKNOWN). -.El -.\" .Sh BUGS -.Sh SEE ALSO -.Xr apropos 1 , -.Xr man 1 , -.Xr makewhatis 8 -.Sh HISTORY -The manual page for -.Nm -command appeared in -.Fx 2.2 . diff --git a/libexec/getNAME/getNAME.c b/libexec/getNAME/getNAME.c deleted file mode 100644 index 50e35e495a..0000000000 --- a/libexec/getNAME/getNAME.c +++ /dev/null @@ -1,334 +0,0 @@ -/*- - * Copyright (c) 1980, 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - * - * @(#) Copyright (c) 1980, 1993 The Regents of the University of California. All rights reserved. - * @(#)getNAME.c 8.1 (Berkeley) 6/30/93 - * $FreeBSD: src/libexec/getNAME/getNAME.c,v 1.7 1999/08/28 00:09:33 peter Exp $ - * $DragonFly: src/libexec/getNAME/Attic/getNAME.c,v 1.3 2003/11/14 03:54:30 dillon Exp $ - */ - -/* - * Get name sections from manual pages. - * -t for building toc - * -i for building intro entries - * other apropos database - */ -#include -#include -#include -#include -#include - -int tocrc; -int intro; -int typeflag; - -void doname (char *); -void dorefname (char *); -void getfrom (char *); -void split (char *, char *); -void trimln (char *); -static void usage (void); - -int -main(argc, argv) - int argc; - char *argv[]; -{ - int ch; - - while ((ch = getopt(argc, argv, "itw")) != -1) - switch(ch) { - case 'i': - intro = 1; - break; - case 't': - tocrc = 1; - break; - case 'w': - typeflag = 1; - break; - default: - usage(); - } - argc -= optind; - argv += optind; - - if (!*argv) - usage(); - - for (; *argv; ++argv) - getfrom(*argv); - exit(0); -} - -void -getfrom(pathname) - char *pathname; -{ - int i = 0; - char *name, *loc; - char headbuf[BUFSIZ]; - char linbuf[BUFSIZ]; - - if (freopen(pathname, "r", stdin) == 0) { - warn("%s", pathname); - return; - } - if ((name = strrchr(pathname, '/'))) - name++; - else - name = pathname; - for (;;) { - if (fgets(headbuf, sizeof headbuf, stdin) == NULL) { - if (typeflag) - printf("%-60s UNKNOWN\n", pathname); - return; - } - if (headbuf[0] != '.') - continue; - if ((headbuf[1] == 'T' && headbuf[2] == 'H') || - (headbuf[1] == 't' && headbuf[2] == 'h')) - break; - if (headbuf[1] == 'D' && headbuf[2] == 't') { - if (typeflag) { - printf("%-60s NEW\n", pathname); - return; - } - goto newman; - } - } - if (typeflag) { - printf("%-60s OLD\n", pathname); - return; - } - for (;;) { - if (fgets(linbuf, sizeof linbuf, stdin) == NULL) - return; - if (linbuf[0] != '.') - continue; - if (linbuf[1] == 'S' && linbuf[2] == 'H') - break; - if (linbuf[1] == 's' && linbuf[2] == 'h') - break; - } - trimln(headbuf); - if (tocrc) - doname(name); - if (!tocrc && !intro) - printf("%s\t", headbuf); - linbuf[0] = '\0'; - for (;;) { - if (fgets(headbuf, sizeof headbuf, stdin) == NULL) - break; - if (headbuf[0] == '.') { - if (headbuf[1] == 'S' && headbuf[2] == 'H') - break; - if (headbuf[1] == 's' && headbuf[2] == 'h') - break; - } - if (i != 0) - strcat(linbuf, " "); - i++; - trimln(headbuf); - strcat(linbuf, headbuf); - } - if (intro) - split(linbuf, name); - else - printf("%s\n", linbuf); - return; - -newman: - for (;;) { - if (fgets(linbuf, sizeof linbuf, stdin) == NULL) - return; - if (linbuf[0] != '.') - continue; - if (linbuf[1] == 'S' && linbuf[2] == 'h') - break; - } - trimln(headbuf); - if (tocrc) - doname(name); - if (!tocrc && !intro) - printf(".TH%s\t", &headbuf[3]); - linbuf[0] = '\0'; - for (;;) { - if (fgets(headbuf, sizeof headbuf, stdin) == NULL) - break; - if (headbuf[0] == '.') { - if (headbuf[1] == 'S' && headbuf[2] == 'h') - break; - } - if (i != 0) - strcat(linbuf, " "); - i++; - trimln(headbuf); - for (loc = strchr(headbuf, ' '); loc; loc = strchr(loc, ' ')) - if (loc[1] == ',') - strcpy(loc, &loc[1]); - else - loc++; - if (headbuf[0] != '.') { - strcat(linbuf, headbuf); - } else { - /* - * Get rid of quotes in macros. - */ - for (loc = strchr(&headbuf[4], '"'); loc; ) { - strcpy(loc, &loc[1]); - loc = strchr(loc, '"'); - } - /* - * Handle cross references - */ - if (headbuf[1] == 'X' && headbuf[2] == 'r') { - for (loc = &headbuf[4]; *loc != ' '; loc++) - continue; - loc[0] = '('; - loc[2] = ')'; - loc[3] = '\0'; - } - /* - * Put dash between names and description. - */ - if (headbuf[1] == 'N' && headbuf[2] == 'd') - strcat(linbuf, "\\- "); - /* - * Skip over macro names. - */ - strcat(linbuf, &headbuf[4]); - } - } - if (intro) - split(linbuf, name); - else - printf("%s\n", linbuf); -} - -void -trimln(cp) - register char *cp; -{ - - while (*cp) - cp++; - if (*--cp == '\n') - *cp = 0; -} - -void -doname(name) - char *name; -{ - register char *dp = name, *ep; - -again: - while (*dp && *dp != '.') - putchar(*dp++); - if (*dp) - for (ep = dp+1; *ep; ep++) - if (*ep == '.') { - putchar(*dp++); - goto again; - } - putchar('('); - if (*dp) - dp++; - while (*dp) - putchar (*dp++); - putchar(')'); - putchar(' '); -} - -void -split(line, name) - char *line, *name; -{ - register char *cp, *dp; - char *sp, *sep; - - cp = strchr(line, '-'); - if (cp == 0) - return; - sp = cp + 1; - for (--cp; *cp == ' ' || *cp == '\t' || *cp == '\\'; cp--) - ; - *++cp = '\0'; - while (*sp && (*sp == ' ' || *sp == '\t')) - sp++; - for (sep = "", dp = line; dp && *dp; dp = cp, sep = "\n") { - cp = strchr(dp, ','); - if (cp) { - register char *tp; - - for (tp = cp - 1; *tp == ' ' || *tp == '\t'; tp--) - ; - *++tp = '\0'; - for (++cp; *cp == ' ' || *cp == '\t'; cp++) - ; - } - printf("%s%s\t", sep, dp); - dorefname(name); - printf("\t%s", sp); - } -} - -void -dorefname(name) - char *name; -{ - register char *dp = name, *ep; - -again: - while (*dp && *dp != '.') - putchar(*dp++); - if (*dp) - for (ep = dp+1; *ep; ep++) - if (*ep == '.') { - putchar(*dp++); - goto again; - } - putchar('.'); - if (*dp) - dp++; - while (*dp) - putchar (*dp++); -} - -static void -usage() -{ - (void)fprintf(stderr, "usage: getNAME [-itw] file ...\n"); - exit(1); -} -- 2.41.0