diff options
| -rw-r--r-- | ObsoleteFiles.inc | 5 | ||||
| -rw-r--r-- | games/Makefile | 2 | ||||
| -rw-r--r-- | games/bcd/Makefile | 9 | ||||
| -rw-r--r-- | games/bcd/bcd.6 | 52 | ||||
| -rw-r--r-- | games/bcd/bcd.c | 215 | ||||
| -rw-r--r-- | games/ppt/Makefile | 8 | ||||
| -rw-r--r-- | games/ppt/ppt.c | 82 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 4 |
8 files changed, 5 insertions, 372 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 749b381..762ce27 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,11 @@ # xargs -n1 | sort | uniq -d; # done +# 20150222: Removed bcd(6) and ppt(6) +OLD_FILES+=usr/bin/bcd +OLD_FILES+=usr/bin/ppt +OLD_FILES+=usr/share/man/man6/bcd.6.gz +OLD_FILES+=usr/share/man/man6/ppt.6.gz # 20150217: Removed remnants of ar(4) driver OLD_FILES+=usr/include/sys/dev/ic/hd64570.h # 20150212: /usr/games moving into /usr/bin diff --git a/games/Makefile b/games/Makefile index a3bb296..4a3da52 100644 --- a/games/Makefile +++ b/games/Makefile @@ -3,7 +3,6 @@ .include <src.opts.mk> SUBDIR= \ - bcd \ caesar \ factor \ fortune \ @@ -11,7 +10,6 @@ SUBDIR= \ morse \ number \ pom \ - ppt \ primes \ random \ ${_tests} diff --git a/games/bcd/Makefile b/games/bcd/Makefile deleted file mode 100644 index 1e0bbfc..0000000 --- a/games/bcd/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD$ - -PROG= bcd -MAN= bcd.6 -MLINKS= bcd.6 ppt.6 - -.include <bsd.prog.mk> - diff --git a/games/bcd/bcd.6 b/games/bcd/bcd.6 deleted file mode 100644 index e9343fe..0000000 --- a/games/bcd/bcd.6 +++ /dev/null @@ -1,52 +0,0 @@ -.\" Copyright (c) 1988, 1991, 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. -.\" -.\" @(#)bcd.6 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD$ -.\" -.Dd December 7, 2000 -.Dt BCD 6 -.Os -.Sh NAME -.Nm bcd , -.Nm ppt -.Nd "reformat input as punch cards or paper tape" -.Sh SYNOPSIS -.Nm -.Op Ar string ... -.Nm ppt -.Op Ar string ... -.Sh DESCRIPTION -The commands -.Nm -and -.Nm ppt -read the given input and reformat it in the form of punched cards or -paper tape. -Acceptable input are command line arguments or the standard input. -.Sh SEE ALSO -.Xr morse 6 diff --git a/games/bcd/bcd.c b/games/bcd/bcd.c deleted file mode 100644 index 04ccccc..0000000 --- a/games/bcd/bcd.c +++ /dev/null @@ -1,215 +0,0 @@ -/* - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Steve Hayman of the Indiana University Computer Science Dept. - * - * 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. - */ - -#ifndef lint -static const char copyright[] = -"@(#) Copyright (c) 1989, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint -#if 0 -static char sccsid[] = "@(#)bcd.c 8.2 (Berkeley) 3/20/94"; -#endif -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - -/* - * bcd -- - * - * Read one line of standard input and produce something that looks like a - * punch card. An attempt to reimplement /usr/games/bcd. All I looked at - * was the man page. - * - * I couldn't find a BCD table handy so I wrote a shell script to deduce what - * the patterns were that the old bcd was using for each possible 8-bit - * character. These are the results -- the low order 12 bits represent the - * holes. (A 1 bit is a hole.) These may be wrong, but they match the old - * program! - * - * Steve Hayman - * sahayman@iuvax.cs.indiana.edu - * 1989 11 30 - * - * - * I found an error in the table. The same error is found in the SunOS 4.1.1 - * version of bcd. It has apparently been around a long time. The error caused - * 'Q' and 'R' to have the same punch code. I only noticed the error due to - * someone pointing it out to me when the program was used to print a cover - * for an APA! The table was wrong in 4 places. The other error was masked - * by the fact that the input is converted to upper case before lookup. - * - * Dyane Bruce - * db@diana.ocunix.on.ca - * Nov 5, 1993 - */ - -#include <sys/types.h> - -#include <ctype.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - -static u_short holes[256] = { - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x206, 0x20a, 0x042, 0x442, 0x222, 0x800, 0x406, - 0x812, 0x412, 0x422, 0xa00, 0x242, 0x400, 0x842, 0x300, - 0x200, 0x100, 0x080, 0x040, 0x020, 0x010, 0x008, 0x004, - 0x002, 0x001, 0x012, 0x40a, 0x80a, 0x212, 0x00a, 0x006, - 0x022, 0x900, 0x880, 0x840, 0x820, 0x810, 0x808, 0x804, - 0x802, 0x801, 0x500, 0x480, 0x440, 0x420, 0x410, 0x408, - 0x404, 0x402, 0x401, 0x280, 0x240, 0x220, 0x210, 0x208, - 0x204, 0x202, 0x201, 0x082, 0x822, 0x600, 0x282, 0x30f, - 0x900, 0x880, 0x840, 0x820, 0x810, 0x808, 0x804, 0x802, - 0x801, 0x500, 0x480, 0x440, 0x420, 0x410, 0x408, 0x404, - 0x402, 0x401, 0x280, 0x240, 0x220, 0x210, 0x208, 0x204, - 0x202, 0x201, 0x082, 0x806, 0x822, 0x600, 0x282, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x206, 0x20a, 0x042, 0x442, 0x222, 0x800, 0x406, 0x812, - 0x412, 0x422, 0xa00, 0x242, 0x400, 0x842, 0x300, 0x200, - 0x100, 0x080, 0x040, 0x020, 0x010, 0x008, 0x004, 0x002, - 0x001, 0x012, 0x40a, 0x80a, 0x212, 0x00a, 0x006, 0x022, - 0x900, 0x880, 0x840, 0x820, 0x810, 0x808, 0x804, 0x802, - 0x801, 0x500, 0x480, 0x440, 0x420, 0x410, 0x408, 0x404, - 0x402, 0x401, 0x280, 0x240, 0x220, 0x210, 0x208, 0x204, - 0x202, 0x201, 0x082, 0x806, 0x822, 0x600, 0x282, 0x30f, - 0x900, 0x880, 0x840, 0x820, 0x810, 0x808, 0x804, 0x802, - 0x801, 0x500, 0x480, 0x440, 0x420, 0x410, 0x408, 0x404, - 0x402, 0x401, 0x280, 0x240, 0x220, 0x210, 0x208, 0x204, - 0x202, 0x201, 0x082, 0x806, 0x822, 0x600, 0x282, 0x0 -}; - -static void printcard(char *); - -/* - * i'th bit of w. - */ -#define bit(w,i) ((w)&(1<<(i))) - -int -main(int argc, char **argv) -{ - char cardline[80]; - - /* - * The original bcd prompts with a "%" when reading from stdin, - * but this seems kind of silly. So this one doesn't. - */ - - if (argc > 1) { - while (--argc) - printcard(*++argv); - } else - while (fgets(cardline, sizeof(cardline), stdin)) - printcard(cardline); - exit(0); -} - -#define COLUMNS 48 - -static void -printcard(char *str) -{ - static char rowchars[] = " 123456789"; - int i, row; - char *p; - - /* ruthlessly remove newlines and truncate at 48 characters. */ - if ((p = strchr(str, '\n'))) - *p = '\0'; - - if (strlen(str) > COLUMNS) - str[COLUMNS] = '\0'; - - /* make string upper case. */ - for (p = str; *p; ++p) - if (isascii(*p) && islower(*p)) - *p = toupper(*p); - - /* top of card */ - putchar(' '); - for (i = 1; i <= COLUMNS; ++i) - putchar('_'); - putchar('\n'); - - /* - * line of text. Leave a blank if the character doesn't have - * a hole pattern. - */ - p = str; - putchar('/'); - for (i = 1; *p; i++, p++) - if (holes[(unsigned char)*p]) - putchar(*p); - else - putchar(' '); - while (i++ <= COLUMNS) - putchar(' '); - putchar('|'); - putchar('\n'); - - /* - * 12 rows of potential holes; output a ']', which looks kind of - * like a hole, if the appropriate bit is set in the holes[] table. - * The original bcd output a '[', a backspace, five control A's, - * and then a ']'. This seems a little excessive. - */ - for (row = 0; row <= 11; ++row) { - putchar('|'); - for (i = 0, p = str; *p; i++, p++) { - if (bit(holes[(unsigned char)*p], 11 - row)) - putchar(']'); - else - putchar(rowchars[row]); - } - while (i++ < COLUMNS) - putchar(rowchars[row]); - putchar('|'); - putchar('\n'); - } - - /* bottom of card */ - putchar('|'); - for (i = 1; i <= COLUMNS; i++) - putchar('_'); - putchar('|'); - putchar('\n'); -} diff --git a/games/ppt/Makefile b/games/ppt/Makefile deleted file mode 100644 index 4a3629f..0000000 --- a/games/ppt/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD$ - -PROG= ppt -MAN= - -.include <bsd.prog.mk> - diff --git a/games/ppt/ppt.c b/games/ppt/ppt.c deleted file mode 100644 index a032e13..0000000 --- a/games/ppt/ppt.c +++ /dev/null @@ -1,82 +0,0 @@ -/* - * 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. - */ - -#ifndef lint -static const char copyright[] = -"@(#) Copyright (c) 1988, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint -#if 0 -static char sccsid[] = "@(#)ppt.c 8.1 (Berkeley) 5/31/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - -#include <stdio.h> -#include <stdlib.h> - -static void putppt(int); - -int -main(int argc, char **argv) -{ - int c; - char *p; - - (void) puts("___________"); - if (argc > 1) - while ((p = *++argv)) - for (; *p; ++p) - putppt((int)*p); - else while ((c = getchar()) != EOF) - putppt(c); - (void) puts("___________"); - exit(0); -} - -static void -putppt(int c) -{ - int i; - - (void) putchar('|'); - for (i = 7; i >= 0; i--) { - if (i == 2) - (void) putchar('.'); /* feed hole */ - if ((c&(1<<i)) != 0) - (void) putchar('o'); - else - (void) putchar(' '); - } - (void) putchar('|'); - (void) putchar('\n'); -} diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 0745451..61369b5 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1606,7 +1606,6 @@ OLD_FILES+=usr/share/man/man8/freebsd-update.8.gz .endif .if ${MK_GAMES} == no -OLD_FILES+=usr/bin/bcd OLD_FILES+=usr/bin/caesar OLD_FILES+=usr/bin/factor OLD_FILES+=usr/bin/fortune @@ -1614,7 +1613,6 @@ OLD_FILES+=usr/bin/grdc OLD_FILES+=usr/bin/morse OLD_FILES+=usr/bin/number OLD_FILES+=usr/bin/pom -OLD_FILES+=usr/bin/ppt OLD_FILES+=usr/bin/primes OLD_FILES+=usr/bin/random OLD_FILES+=usr/bin/rot13 @@ -1638,7 +1636,6 @@ OLD_FILES+=usr/share/games/fortune/zippy OLD_FILES+=usr/share/games/fortune/zippy.dat OLD_DIRS+=usr/share/games/fortune OLD_DIRS+=usr/share/games -OLD_FILES+=usr/share/man/man6/bcd.6.gz OLD_FILES+=usr/share/man/man6/caesar.6.gz OLD_FILES+=usr/share/man/man6/factor.6.gz OLD_FILES+=usr/share/man/man6/fortune.6.gz @@ -1646,7 +1643,6 @@ OLD_FILES+=usr/share/man/man6/grdc.6.gz OLD_FILES+=usr/share/man/man6/morse.6.gz OLD_FILES+=usr/share/man/man6/number.6.gz OLD_FILES+=usr/share/man/man6/pom.6.gz -OLD_FILES+=usr/share/man/man6/ppt.6.gz OLD_FILES+=usr/share/man/man6/primes.6.gz OLD_FILES+=usr/share/man/man6/random.6.gz OLD_FILES+=usr/share/man/man6/rot13.6.gz |
