From 09ea8dbf1ed3d37f02217b6c10c2fb60fa64fbc1 Mon Sep 17 00:00:00 2001 From: emaste Date: Wed, 12 Sep 2018 19:41:16 +0000 Subject: [PATCH] Fix unlink(1) for files starting with - Restore the original behavior of unlink(1), passing the provided filename directly to unlink(2), handling the first argument being "--" correctly. This fixes "unlink -foo", broken in r97533. PR: 228448 Submitted by: Brennan Vincent (original version) Submitted by: Yuri Pankov Reported by: Brennan Vincent Reviewed by: emaste, kevans, vangyzen, 0mp Approved by: re (delphij) Differential Revision: https://reviews.freebsd.org/D17132 --- bin/rm/Makefile | 5 ++++ bin/rm/rm.1 | 9 ++++++-- bin/rm/rm.c | 13 +++++------ bin/rm/tests/Makefile | 5 ++++ bin/rm/tests/Makefile.depend | 11 +++++++++ bin/rm/tests/rm_test.sh | 45 ++++++++++++++++++++++++++++++++++++ etc/mtree/BSD.tests.dist | 2 ++ 7 files changed, 81 insertions(+), 9 deletions(-) create mode 100644 bin/rm/tests/Makefile create mode 100644 bin/rm/tests/Makefile.depend create mode 100755 bin/rm/tests/rm_test.sh diff --git a/bin/rm/Makefile b/bin/rm/Makefile index e0d27134825..b044ba86e55 100644 --- a/bin/rm/Makefile +++ b/bin/rm/Makefile @@ -1,10 +1,15 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +.include + PACKAGE=runtime PROG= rm LINKS= ${BINDIR}/rm ${BINDIR}/unlink MLINKS= rm.1 unlink.1 +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include diff --git a/bin/rm/rm.1 b/bin/rm/rm.1 index 192b1652bc5..295082b07cf 100644 --- a/bin/rm/rm.1 +++ b/bin/rm/rm.1 @@ -32,7 +32,7 @@ .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 .\" $FreeBSD$ .\" -.Dd November 7, 2015 +.Dd September 12, 2018 .Dt RM 1 .Os .Sh NAME @@ -45,6 +45,7 @@ .Op Fl dIPRrvWx .Ar .Nm unlink +.Op Fl - .Ar file .Sh DESCRIPTION The @@ -154,6 +155,9 @@ No options may be supplied in this simple mode of operation, which performs an .Xr unlink 2 operation on the passed argument. +However, the usual option-end delimiter, +.Fl - , +may optionally precede the argument. .Sh EXIT STATUS The .Nm @@ -201,11 +205,12 @@ directory hierarchy: .Pp .Dl $ rm -rf foobar .Pp -Either of these commands will remove the file +Any of these commands will remove the file .Pa -f : .Bd -literal -offset indent $ rm -- -f $ rm ./-f +$ unlink -f .Ed .Sh COMPATIBILITY The diff --git a/bin/rm/rm.c b/bin/rm/rm.c index 0aa110248d4..ba69ece1151 100644 --- a/bin/rm/rm.c +++ b/bin/rm/rm.c @@ -101,13 +101,12 @@ main(int argc, char *argv[]) else ++p; if (strcmp(p, "unlink") == 0) { - while (getopt(argc, argv, "") != -1) - usage(); - argc -= optind; - argv += optind; - if (argc != 1) + if (argc == 2) + rm_file(&argv[1]); + else if (argc == 3 && strcmp(argv[1], "--") == 0) + rm_file(&argv[2]); + else usage(); - rm_file(&argv[0]); exit(eval); } @@ -634,7 +633,7 @@ usage(void) (void)fprintf(stderr, "%s\n%s\n", "usage: rm [-f | -i] [-dIPRrvWx] file ...", - " unlink file"); + " unlink [--] file"); exit(EX_USAGE); } diff --git a/bin/rm/tests/Makefile b/bin/rm/tests/Makefile new file mode 100644 index 00000000000..aa0984b529d --- /dev/null +++ b/bin/rm/tests/Makefile @@ -0,0 +1,5 @@ +# $FreeBSD$ + +ATF_TESTS_SH+= rm_test + +.include diff --git a/bin/rm/tests/Makefile.depend b/bin/rm/tests/Makefile.depend new file mode 100644 index 00000000000..f80275d86ab --- /dev/null +++ b/bin/rm/tests/Makefile.depend @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/bin/rm/tests/rm_test.sh b/bin/rm/tests/rm_test.sh new file mode 100755 index 00000000000..31ee64961a9 --- /dev/null +++ b/bin/rm/tests/rm_test.sh @@ -0,0 +1,45 @@ +# +# Copyright 2018 Yuri Pankov +# +# 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$ +# + +atf_test_case unlink_dash_filename +unlink_dash_filename_head() +{ + atf_set "descr" "unlink correctly handles -filename" +} +unlink_dash_filename_body() +{ + touch -- foo bar -foo -bar + atf_check -s exit:0 unlink foo + atf_check -s exit:0 unlink -- bar + atf_check -s exit:0 unlink -foo + atf_check -s exit:0 unlink -- -bar +} + +atf_init_test_cases() +{ + atf_add_test_case unlink_dash_filename +} diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 35107e8dc0c..24bad91a0fd 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -34,6 +34,8 @@ .. pwait .. + rm + .. rmdir .. sh -- 2.45.0