summaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/cp.c4
-rw-r--r--coreutils/mv.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/coreutils/cp.c b/coreutils/cp.c
index b7f0e29..50ca1cc 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -252,7 +252,7 @@ int cp_main(int argc, char **argv)
}
}
}
- /* else: last is DIR from "t -DIR" */
+ /* else: last is DIR from "-t DIR" */
while (1) {
#if ENABLE_FEATURE_CP_LONG_OPTIONS
@@ -274,7 +274,7 @@ int cp_main(int argc, char **argv)
if (copy_file(*argv, dest, flags) < 0) {
status = EXIT_FAILURE;
}
- if (*++argv == last) {
+ if (!*++argv || *argv == last) {
/* possibly leaking dest... */
break;
}
diff --git a/coreutils/mv.c b/coreutils/mv.c
index eae2e99..fd24226 100644
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -108,7 +108,7 @@ int mv_main(int argc, char **argv)
/* else: fall through into "do { move SRC to DIR/SRC } while" loop */
}
}
- /* else: last is DIR from "t -DIR" */
+ /* else: last is DIR from "-t DIR" */
do {
dest = concat_path_file(last, bb_get_last_path_component_strip(*argv));
@@ -185,7 +185,7 @@ int mv_main(int argc, char **argv)
if (dest != last) {
free((void *) dest);
}
- } while (*++argv != last);
+ } while (*++argv && *argv != last);
return status;
}