summaryrefslogtreecommitdiff
path: root/coreutils/ln.c
diff options
context:
space:
mode:
authorEric Andersen2000-06-06 16:15:23 +0000
committerEric Andersen2000-06-06 16:15:23 +0000
commit815e90447064e287ad181c1231636e7f1b44f76c (patch)
tree0955917be0c7adc926b7298bf450fedc67e447e6 /coreutils/ln.c
parentc389d9118152e45303173c221a33a8083e769884 (diff)
downloadbusybox-815e90447064e287ad181c1231636e7f1b44f76c.zip
busybox-815e90447064e287ad181c1231636e7f1b44f76c.tar.gz
Fixed a bunch of stuff:
* Fixed segfault caused by "touch -c" * Fixed segfault caused by "rm -f" * Fixed segfault caused by "ln -s -s" and similar abuses. * Fixed segfault caused by "cp -a -a" and similar abuses. * Implemented "rm -- <foo>" updated docs accordingly. -Erik
Diffstat (limited to 'coreutils/ln.c')
-rw-r--r--coreutils/ln.c37
1 files changed, 21 insertions, 16 deletions
diff --git a/coreutils/ln.c b/coreutils/ln.c
index 29ff938..d4fa473 100644
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -59,25 +59,30 @@ extern int ln_main(int argc, char **argv)
argv++;
/* Parse any options */
- while (**argv == '-') {
- while (*++(*argv))
- switch (**argv) {
- case 's':
- symlinkFlag = TRUE;
- break;
- case 'f':
- removeoldFlag = TRUE;
- break;
- case 'n':
- followLinks = FALSE;
- break;
- default:
- usage(ln_usage);
- }
- argc--;
+ while (--argc >= 0 && *argv && **argv) {
+ while (**argv == '-') {
+ while (*++(*argv))
+ switch (**argv) {
+ case 's':
+ symlinkFlag = TRUE;
+ break;
+ case 'f':
+ removeoldFlag = TRUE;
+ break;
+ case 'n':
+ followLinks = FALSE;
+ break;
+ default:
+ usage(ln_usage);
+ }
+ }
argv++;
}
+ if (argc < 1) {
+ fatalError("ln: missing file argument\n");
+ }
+
linkName = argv[argc - 1];
if (strlen(linkName) > BUFSIZ) {