diff options
author | tjr <tjr@FreeBSD.org> | 2002-05-30 01:05:15 +0000 |
---|---|---|
committer | tjr <tjr@FreeBSD.org> | 2002-05-30 01:05:15 +0000 |
commit | 09ec5168342f11f38474dbfd9f0cf71d07c031e6 (patch) | |
tree | 0466739e563f536572233df585087e30f7b03b50 /bin/rm/rm.c | |
parent | f3e84ff8bd02e854ae15332b288ec0bb48d809bb (diff) | |
download | FreeBSD-src-09ec5168342f11f38474dbfd9f0cf71d07c031e6.zip FreeBSD-src-09ec5168342f11f38474dbfd9f0cf71d07c031e6.tar.gz |
Reject options, handle "--" correctly in unlink(1).
Diffstat (limited to 'bin/rm/rm.c')
-rw-r--r-- | bin/rm/rm.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/bin/rm/rm.c b/bin/rm/rm.c index 0161c82..f2665ed 100644 --- a/bin/rm/rm.c +++ b/bin/rm/rm.c @@ -95,11 +95,14 @@ main(int argc, char *argv[]) else ++p; if (strcmp(p, "unlink") == 0) { - if (argc == 2) { - rm_file(&argv[1]); - exit(eval); - } else + while (getopt(argc, argv, "") != -1) usage(); + argc -= optind; + argv += optind; + if (argc == 0) + usage(); + rm_file(&argv[0]); + exit(eval); } Pflag = rflag = 0; |