mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-19 03:33:43 +03:00
Include lstat.h, quotearg.h.
(diagnose_leading_hyphen): New function. (main): Use it.
This commit is contained in:
1 parent
8cb5f87f68
commit
6334db91d3
1 file changed
+30
@@ -51,7 +51,9 @@
|
||||
#include "system.h"
|
||||
#include "dirname.h"
|
||||
#include "error.h"
|
||||
#include "lstat.h"
|
||||
#include "quote.h"
|
||||
#include "quotearg.h"
|
||||
#include "remove.h"
|
||||
#include "root-dev-ino.h"
|
||||
|
||||
@@ -95,6 +97,33 @@ static struct option const long_opts[] =
|
||||
{NULL, 0, NULL, 0}
|
||||
};
|
||||
|
||||
/* Advise the user about invalid usages like "rm -foo" if the file
|
||||
"-foo" exists, assuming ARGC and ARGV are as with `main'. */
|
||||
|
||||
static void
|
||||
diagnose_leading_hyphen (int argc, char **argv)
|
||||
{
|
||||
/* OPTIND is unreliable, so iterate through the arguments looking
|
||||
for a file name that looks like an option. */
|
||||
int i;
|
||||
|
||||
for (i = 1; i < argc; i++)
|
||||
{
|
||||
char const *arg = argv[i];
|
||||
struct stat st;
|
||||
|
||||
if (arg[0] == '-' && arg[1] && lstat (arg, &st) == 0)
|
||||
{
|
||||
fprintf (stderr,
|
||||
_("Try `%s ./%s' to remove the file %s.\n"),
|
||||
argv[0],
|
||||
quotearg_n_style (1, shell_quoting_style, arg),
|
||||
quote (arg));
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
usage (int status)
|
||||
{
|
||||
@@ -222,6 +251,7 @@ main (int argc, char **argv)
|
||||
case_GETOPT_HELP_CHAR;
|
||||
case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
|
||||
default:
|
||||
diagnose_leading_hyphen (argc, argv);
|
||||
usage (EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user