From 89ffaa19909d31dffbcf12fb4498afb72666f6c9 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 3 Sep 2006 02:53:58 +0000 Subject: Don't include dirname.h, since system.h does it now. (usage, main): --preserve-root is now the default. --- src/rm.c | 7 +++---- 1 file 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; -- cgit v1.2.3-70-g09d2