svn commit: r290634 - stable/10/bin/rm

[Baptiste Daroussin]

Author: bapt
Date: Tue Nov 10 07:17:38 2015
New Revision: 290634
URL: https://svnweb.freebsd.org/changeset/base/290634

Log:
  MFC r290480
  
  Protecting against rm -rf / is now POSIXLY_CORRECT per posix 1003.1
  edition 2013. No need anymore to disable the protection if one set
  the POXILY_CORRECT environment variable.
  
  Reviewed by:	imp
  Differential Revision:	https://reviews.freebsd.org/D4092

Modified:
  stable/10/bin/rm/rm.1
  stable/10/bin/rm/rm.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/bin/rm/rm.1
==============================================================================
--- stable/10/bin/rm/rm.1	Tue Nov 10 02:29:19 2015	(r290633)
+++ stable/10/bin/rm/rm.1	Tue Nov 10 07:17:38 2015	(r290634)
@@ -32,7 +32,7 @@
 .\"	@(#)rm.1	8.5 (Berkeley) 12/5/94
 .\" $FreeBSD$
 .\"
-.Dd April 25, 2013
+.Dd November 7, 2015
 .Dt RM 1
 .Os
 .Sh NAME
@@ -235,7 +235,7 @@ not the standard error output.
 The
 .Nm
 command conforms to
-.St -p1003.2 .
+.St -p1003.1-2013 .
 .Pp
 The simplified
 .Nm unlink

Modified: stable/10/bin/rm/rm.c
==============================================================================
--- stable/10/bin/rm/rm.c	Tue Nov 10 02:29:19 2015	(r290633)
+++ stable/10/bin/rm/rm.c	Tue Nov 10 07:17:38 2015	(r290634)
@@ -155,8 +155,7 @@ main(int argc, char *argv[])
 	}
 
 	checkdot(argv);
-	if (getenv("POSIXLY_CORRECT") == NULL)
-		checkslash(argv);
+	checkslash(argv);
 	uid = geteuid();
 
 	(void)signal(SIGINFO, siginfo);