From: Jim Meyering <jim@meyering.net>
Date: Sat, 26 Jul 2003 09:02:54 +0000 (+0000)
Subject: 	* src/rm.c: Include "dirname.h".
X-Git-Tag: v5.0.90~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46baf9f422af2437c97dcab3169ba425d045c6dc;p=thirdparty%2Fcoreutils.git

	* src/rm.c: Include "dirname.h".
	(usage): Use base_name (program_name) in body of --help output.
	This lets me...
	* man/Makefile.am (.x.1): ...back out the kludge of 2003-07-22.
---

diff --git a/src/rm.c b/src/rm.c
index 4779f2e3c4..a2be56d451 100644
--- a/src/rm.c
+++ b/src/rm.c
@@ -49,6 +49,7 @@
 #include <assert.h>
 
 #include "system.h"
+#include "dirname.h"
 #include "error.h"
 #include "remove.h"
 #include "save-cwd.h"
@@ -96,6 +97,7 @@ usage (int status)
 	     program_name);
   else
     {
+      char *base = base_name (program_name);
       printf (_("Usage: %s [OPTION]... FILE...\n"), program_name);
       fputs (_("\
 Remove (unlink) the FILE(s).\n\
@@ -118,7 +120,7 @@ use one of these commands:\n\
 \n\
   %s ./-foo\n\
 "),
-	      program_name, program_name);
+	      base, base);
       fputs (_("\
 \n\
 Note that if you use rm to remove a file, it is usually possible to recover\n\