From ef03affb849429015772640e8e579db16b6f3ca5 Mon Sep 17 00:00:00 2001 From: Thomas Cort Date: Mon, 18 Nov 2013 16:40:55 -0500 Subject: [PATCH] Importing usr.bin/mkfifo Replaces commands/mkfifo. No Minix-specific changes needed. Change-Id: Idb20430d4297c7011fb7e2ef6b0876ebb2776c1c --- commands/Makefile | 2 +- releasetools/nbsd_ports | 1 + usr.bin/Makefile | 2 +- {commands => usr.bin}/mkfifo/Makefile | 0 {commands => usr.bin}/mkfifo/mkfifo.1 | 0 {commands => usr.bin}/mkfifo/mkfifo.c | 17 +++++------------ 6 files changed, 8 insertions(+), 14 deletions(-) rename {commands => usr.bin}/mkfifo/Makefile (100%) rename {commands => usr.bin}/mkfifo/mkfifo.1 (100%) rename {commands => usr.bin}/mkfifo/mkfifo.c (91%) diff --git a/commands/Makefile b/commands/Makefile index 99bc45def..746e7d437 100644 --- a/commands/Makefile +++ b/commands/Makefile @@ -15,7 +15,7 @@ SUBDIR= add_route arp ash at backup btrace \ intr ipcrm ipcs irdpd isoread last \ less loadkeys loadramdisk logger look lp \ lpd lspci mail MAKEDEV \ - mined mkfifo \ + mined \ mount mt netconf \ nonamed patch \ ping postinstall poweroff prep printroot \ diff --git a/releasetools/nbsd_ports b/releasetools/nbsd_ports index ec06af2f5..e53b93791 100644 --- a/releasetools/nbsd_ports +++ b/releasetools/nbsd_ports @@ -200,6 +200,7 @@ 2012/10/17 12:00:00,usr.bin/menuc 2013/10/25 12:00:00,usr.bin/mesg 2010/10/15 05:46:48,usr.bin/mkdep +2012/10/17 12:00:00,usr.bin/mkfifo 2012/10/17 12:00:00,usr.bin/mkstr 2009/08/15 20:44:56,usr.bin/mktemp 2012/10/17 12:00:00,usr.bin/msgc diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 1c52e2b5f..9dfaf34ab 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -16,7 +16,7 @@ SUBDIR= asa \ lam ldd leave \ lock login logname lorder m4 \ machine make man menuc mesg \ - mkdep mkstr mktemp \ + mkdep mkfifo mkstr mktemp \ msgc \ nbperf newgrp nice nl nohup nvi \ passwd paste pathchk pr \ diff --git a/commands/mkfifo/Makefile b/usr.bin/mkfifo/Makefile similarity index 100% rename from commands/mkfifo/Makefile rename to usr.bin/mkfifo/Makefile diff --git a/commands/mkfifo/mkfifo.1 b/usr.bin/mkfifo/mkfifo.1 similarity index 100% rename from commands/mkfifo/mkfifo.1 rename to usr.bin/mkfifo/mkfifo.1 diff --git a/commands/mkfifo/mkfifo.c b/usr.bin/mkfifo/mkfifo.c similarity index 91% rename from commands/mkfifo/mkfifo.c rename to usr.bin/mkfifo/mkfifo.c index 368787def..9d49ec57d 100644 --- a/commands/mkfifo/mkfifo.c +++ b/usr.bin/mkfifo/mkfifo.c @@ -1,4 +1,4 @@ -/* $NetBSD: mkfifo.c,v 1.12 2008/07/21 14:19:24 lukem Exp $ */ +/* $NetBSD: mkfifo.c,v 1.13 2011/09/04 20:30:34 joerg Exp $ */ /* * Copyright (c) 1990, 1993 @@ -30,21 +30,17 @@ */ #include -#if 0 #ifndef lint __COPYRIGHT("@(#) Copyright (c) 1990, 1993\ The Regents of the University of California. All rights reserved."); #endif /* not lint */ -#endif -#if 0 #ifndef lint #if 0 static char sccsid[] = "@(#)mkfifo.c 8.2 (Berkeley) 1/5/94"; #endif -__RCSID("$NetBSD: mkfifo.c,v 1.12 2008/07/21 14:19:24 lukem Exp $"); +__RCSID("$NetBSD: mkfifo.c,v 1.13 2011/09/04 20:30:34 joerg Exp $"); #endif /* not lint */ -#endif #include #include @@ -56,13 +52,10 @@ __RCSID("$NetBSD: mkfifo.c,v 1.12 2008/07/21 14:19:24 lukem Exp $"); #include #include -int main __P((int, char **)); -static void usage __P((void)); +__dead static void usage(void); int -main(argc, argv) - int argc; - char *argv[]; +main(int argc, char *argv[]) { int ch, exitval; void *set; @@ -107,7 +100,7 @@ main(argc, argv) } static void -usage() +usage(void) { (void)fprintf(stderr, "usage: mkfifo [-m mode] fifoname ...\n"); exit(1);