summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2006-09-03 02:53:58 +0000
committerPaul Eggert <eggert@cs.ucla.edu>2006-09-03 02:53:58 +0000
commit89ffaa19909d31dffbcf12fb4498afb72666f6c9 (patch)
tree32ec9e71bfd5e859634f0d479a20a5faa732b54b /src
parent963d29f916e79e58afca07707762eadd187a7929 (diff)
downloadcoreutils-89ffaa19909d31dffbcf12fb4498afb72666f6c9.tar.xz
Don't include dirname.h, since system.h does it now.
(usage, main): --preserve-root is now the default.
Diffstat (limited to 'src')
-rw-r--r--src/rm.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/rm.c b/src/rm.c
index 4ba63c0e6..28e09ce12 100644
--- a/src/rm.c
+++ b/src/rm.c
@@ -50,7 +50,6 @@
#include "system.h"
#include "argmatch.h"
-#include "dirname.h"
#include "error.h"
#include "lstat.h"
#include "quote.h"
@@ -171,8 +170,8 @@ Remove (unlink) the FILE(s).\n\
always (-i). Without WHEN, prompt always\n\
"), stdout);
fputs (_("\
- --no-preserve-root do not treat `/' specially (the default)\n\
- --preserve-root fail to operate recursively on `/'\n\
+ --no-preserve-root do not treat `/' specially\n\
+ --preserve-root do not remove `/' (default)\n\
-r, -R, --recursive remove directories and their contents recursively\n\
-v, --verbose explain what is being done\n\
"), stdout);
@@ -221,7 +220,7 @@ rm_option_init (struct rm_options *x)
int
main (int argc, char **argv)
{
- bool preserve_root = false;
+ bool preserve_root = true;
struct rm_options x;
bool prompt_once = false;
int c;