From 9a006432629dfa66cdcb4a7af6db411d2c2804dd Mon Sep 17 00:00:00 2001 From: Thomas Cort Date: Wed, 6 Nov 2013 22:08:33 -0500 Subject: [PATCH] Importing usr.sbin/unlink No Minix-specific changes needed Change-Id: Iab2345f6a661e1c1f21f8ae1a414b88762de26fc --- distrib/sets/lists/minix/mi | 2 ++ releasetools/nbsd_ports | 1 + usr.sbin/Makefile | 3 +- usr.sbin/unlink/Makefile | 6 ++++ usr.sbin/unlink/unlink.8 | 60 +++++++++++++++++++++++++++++++ usr.sbin/unlink/unlink.c | 70 +++++++++++++++++++++++++++++++++++++ 6 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 usr.sbin/unlink/Makefile create mode 100644 usr.sbin/unlink/unlink.8 create mode 100644 usr.sbin/unlink/unlink.c diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi index 2e8941570..2fcfd9e72 100644 --- a/distrib/sets/lists/minix/mi +++ b/distrib/sets/lists/minix/mi @@ -4505,6 +4505,7 @@ ./usr/man/man8/syslogd.8 minix-sys ./usr/man/man8/tcpd.8 minix-sys ./usr/man/man8/unix.8 minix-sys +./usr/man/man8/unlink.8 minix-sys ./usr/man/man8/update.8 minix-sys ./usr/man/man8/usage.8 minix-sys ./usr/man/man8/user.8 minix-sys @@ -4559,6 +4560,7 @@ ./usr/sbin/rs minix-sys ./usr/sbin/sched minix-sys ./usr/sbin/tty minix-sys +./usr/sbin/unlink minix-sys ./usr/sbin/user minix-sys ./usr/sbin/useradd minix-sys ./usr/sbin/userdel minix-sys diff --git a/releasetools/nbsd_ports b/releasetools/nbsd_ports index 8a4a004fa..c25c099f2 100644 --- a/releasetools/nbsd_ports +++ b/releasetools/nbsd_ports @@ -253,6 +253,7 @@ 2012/10/17 12:00:00,usr.sbin/postinstall 2011/01/04 10:01:51,usr.sbin/pwd_mkdb 2013/04/05 12:00:00,usr.sbin/rdate +2012/10/17 12:00:00,usr.sbin/unlink 2011/01/04 10:30:21,usr.sbin/user 2009/04/19 00:44:49,usr.sbin/vipw 2009/04/22 15:23:10,usr.sbin/zic diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 24e673ed7..0282e1624 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -9,7 +9,8 @@ SUBDIR= \ link \ mtree \ pwd_mkdb postinstall \ - rdate user \ + rdate \ + unlink user \ vipw \ zic diff --git a/usr.sbin/unlink/Makefile b/usr.sbin/unlink/Makefile new file mode 100644 index 000000000..e9a8d08a0 --- /dev/null +++ b/usr.sbin/unlink/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 1999/07/19 09:11:26 kleink Exp $ + +PROG= unlink +MAN= unlink.8 + +.include diff --git a/usr.sbin/unlink/unlink.8 b/usr.sbin/unlink/unlink.8 new file mode 100644 index 000000000..7dc0787b1 --- /dev/null +++ b/usr.sbin/unlink/unlink.8 @@ -0,0 +1,60 @@ +.\" $NetBSD: unlink.8,v 1.6 2008/04/30 13:11:03 martin Exp $ +.\" +.\" Copyright (c) 1999 The NetBSD Foundation, Inc. +.\" All rights reserved. +.\" +.\" This code is derived from software contributed to The NetBSD Foundation +.\" by Klaus Klein. +.\" +.\" 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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. +.\" +.Dd July 18, 1998 +.Dt UNLINK 8 +.Os +.Sh NAME +.Nm unlink +.Nd call the unlink function +.Sh SYNOPSIS +.Nm +.Ar file +.Sh DESCRIPTION +The +.Nm +utility performs the function call +.Fn unlink file . +.Pp +.Ar file +must be the pathname of an existing file. +.Sh EXIT STATUS +The +.Nm +utility exits 0 on success, and \*[Gt]0 if an error occurs. +.Sh SEE ALSO +.Xr rm 1 , +.Xr rmdir 1 , +.Xr unlink 2 , +.Xr link 8 +.Sh STANDARDS +The +.Nm +utility conforms to +.St -xcu5 . diff --git a/usr.sbin/unlink/unlink.c b/usr.sbin/unlink/unlink.c new file mode 100644 index 000000000..40d715d77 --- /dev/null +++ b/usr.sbin/unlink/unlink.c @@ -0,0 +1,70 @@ +/* $NetBSD: unlink.c,v 1.5 2011/08/30 20:50:24 joerg Exp $ */ + +/*- + * Copyright (c) 1999 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Klaus Klein. + * + * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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) 1999\ + The NetBSD Foundation, Inc. All rights reserved."); +__RCSID("$NetBSD: unlink.c,v 1.5 2011/08/30 20:50:24 joerg Exp $"); +#endif + +#include +#include +#include +#include + +__dead static void usage(void); + +int +main(int argc, char *argv[]) +{ + + (void)setlocale(LC_ALL, ""); + + if (argc != 2) + usage(); + + if (unlink(argv[1]) != 0) { + perror("unlink"); + exit(EXIT_FAILURE); + } + + exit(EXIT_SUCCESS); + /* NOTREACHED */ +} + +static void +usage(void) +{ + + (void)fprintf(stderr, "usage: unlink file\n"); + exit(EXIT_FAILURE); +}