From 85468eb5c8d2a99fadbfba94b6e6d4a00b9f80da Mon Sep 17 00:00:00 2001 From: Thomas Cort Date: Fri, 15 Mar 2013 23:29:53 +0000 Subject: [PATCH] Importing usr.bin/yes Change-Id: Ia76d7ce9c6b2bf7523d2ecbc6470e3e1e7ab5ee5 --- commands/Makefile | 2 +- commands/yes/Makefile | 4 --- commands/yes/yes.c | 23 ---------------- man/man1/Makefile | 2 +- man/man1/yes.1 | 27 ------------------- releasetools/nbsd_ports | 1 + usr.bin/Makefile | 2 +- usr.bin/yes/Makefile | 6 +++++ usr.bin/yes/yes.1 | 52 ++++++++++++++++++++++++++++++++++++ usr.bin/yes/yes.c | 59 +++++++++++++++++++++++++++++++++++++++++ 10 files changed, 121 insertions(+), 57 deletions(-) delete mode 100644 commands/yes/Makefile delete mode 100644 commands/yes/yes.c delete mode 100644 man/man1/yes.1 create mode 100644 usr.bin/yes/Makefile create mode 100644 usr.bin/yes/yes.1 create mode 100644 usr.bin/yes/yes.c diff --git a/commands/Makefile b/commands/Makefile index 8e78cfc91..a38a66cb0 100644 --- a/commands/Makefile +++ b/commands/Makefile @@ -30,7 +30,7 @@ SUBDIR= add_route arp ash at backup banner basename btrace cal \ truncate tty udpstat umount uname unexpand \ unstack update uud uue version vol wc \ whereis which write writeisofs fetch \ - xargs yes zdump zmodem pkgin_cd pkgin_all \ + xargs zdump zmodem pkgin_cd pkgin_all \ worldstone updateboot update_bootcfg .if ${MACHINE_ARCH} == "i386" diff --git a/commands/yes/Makefile b/commands/yes/Makefile deleted file mode 100644 index c1c7115c8..000000000 --- a/commands/yes/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -PROG= yes -MAN= - -.include diff --git a/commands/yes/yes.c b/commands/yes/yes.c deleted file mode 100644 index b05ad14af..000000000 --- a/commands/yes/yes.c +++ /dev/null @@ -1,23 +0,0 @@ -/* yes 1.4 - print 'y' or argv[1] continuously. Author: Kees J. Bot - * 15 Apr 1989 - */ -#include -#include -#include -#include - -int main(int argc, char **argv) -{ - char *yes; - static char y[] = "y"; - int n; - - yes= argc == 1 ? y : argv[1]; - - n= strlen(yes); - - yes[n++]= '\n'; - - while (write(1, yes, n) != -1) {} - exit(1); -} diff --git a/man/man1/Makefile b/man/man1/Makefile index 8661dec80..ccc3e5d2e 100644 --- a/man/man1/Makefile +++ b/man/man1/Makefile @@ -21,7 +21,7 @@ MAN= ash.1 at.1 banner.1 basename.1 \ term.1 termcap.1 tget.1 time.1 tr.1 true.1 \ truncate.1 tty.1 umount.1 uname.1 unexpand.1 \ uud.1 uue.1 vol.1 wc.1 whereis.1 which.1 \ - write.1 xargs.1 yap.1 yes.1 linkfarm.1 pkg_view.1 + write.1 xargs.1 yap.1 linkfarm.1 pkg_view.1 MLINKS += ash.1 sh.1 MLINKS += ash.1 ..1 diff --git a/man/man1/yes.1 b/man/man1/yes.1 deleted file mode 100644 index 03e31bc24..000000000 --- a/man/man1/yes.1 +++ /dev/null @@ -1,27 +0,0 @@ -.TH YES 1 -.SH NAME -yes \- an endless stream of the same word -.SH SYNOPSIS -\fByes\fR [\fIanswer\fR]\fR -.br -.de FL -.TP -\\fB\\$1\\fR -\\$2 -.. -.de EX -.TP 20 -\\fB\\$1\\fR -# \\$2 -.. -.SH EXAMPLES -.TP 20 -.B yes | script -# Answer yes to all questions from the script -.SH DESCRIPTION -.PP -\fIYes\fP sends out an endless stream of y's, each on one line. One -uses it to automatically say "yes" to all questions a command may ask. -This is useful for commands that ask too many "Are you sure?" questions. -The optional argument makes \fIyes\fP use \fIanswer\fP as the word to -print instead of a single y character. diff --git a/releasetools/nbsd_ports b/releasetools/nbsd_ports index 65ceef899..fad10506b 100644 --- a/releasetools/nbsd_ports +++ b/releasetools/nbsd_ports @@ -160,6 +160,7 @@ 2010/10/06 07:59:18,usr.bin/uniq 2013/03/15 12:00:00,usr.bin/who 2012/10/17 12:00:00,usr.bin/xinstall +2013/03/15 12:00:00,usr.bin/yes 2012/02/10 16:16:12,usr.sbin/chroot 2011/11/03 20:46:41,usr.sbin/installboot 2012/10/17 12:00:00,usr.sbin/Makefile diff --git a/usr.bin/Makefile b/usr.bin/Makefile index fc39a7285..20427ea8b 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -31,7 +31,7 @@ SUBDIR= \ \ \ who \ - xinstall + xinstall yes .if !defined(__MINIX) SUBDIR+= ../external/zlib/pigz/bin/pigz diff --git a/usr.bin/yes/Makefile b/usr.bin/yes/Makefile new file mode 100644 index 000000000..47d16a590 --- /dev/null +++ b/usr.bin/yes/Makefile @@ -0,0 +1,6 @@ +# @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $NetBSD: Makefile,v 1.5 2009/04/14 22:15:29 lukem Exp $ + +PROG= yes + +.include diff --git a/usr.bin/yes/yes.1 b/usr.bin/yes/yes.1 new file mode 100644 index 000000000..f2cf10063 --- /dev/null +++ b/usr.bin/yes/yes.1 @@ -0,0 +1,52 @@ +.\" $NetBSD: yes.1,v 1.7 2003/08/07 11:17:56 agc Exp $ +.\" +.\" Copyright (c) 1980, 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. +.\" +.\" @(#)yes.1 8.1 (Berkeley) 6/6/93 +.\" +.Dd June 6, 1993 +.Dt YES 1 +.Os +.Sh NAME +.Nm yes +.Nd be repetitively affirmative +.Sh SYNOPSIS +.Nm +.Op Ar expletive +.Sh DESCRIPTION +.Nm +outputs +.Ar expletive , +or, by default, +.Dq y , +forever. +.Sh HISTORY +The +.Nm +command appeared in +.At v7 . diff --git a/usr.bin/yes/yes.c b/usr.bin/yes/yes.c new file mode 100644 index 000000000..5fc4db10b --- /dev/null +++ b/usr.bin/yes/yes.c @@ -0,0 +1,59 @@ +/* $NetBSD: yes.c,v 1.9 2008/07/21 14:19:28 lukem Exp $ */ + +/* + * Copyright (c) 1987, 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 +#ifndef lint +__COPYRIGHT("@(#) Copyright (c) 1987, 1993\ + The Regents of the University of California. All rights reserved."); +#endif /* not lint */ + +#ifndef lint +#if 0 +static char sccsid[] = "@(#)yes.c 8.1 (Berkeley) 6/6/93"; +#endif +__RCSID("$NetBSD: yes.c,v 1.9 2008/07/21 14:19:28 lukem Exp $"); +#endif /* not lint */ + +#include +#include + +int +main(int argc, char **argv) +{ + const char *yes; + + yes = (argc > 1) ? argv[1] : "y"; + + while(puts(yes) >= 0) + continue; + + return EXIT_FAILURE; +}