aboutsummaryrefslogtreecommitdiff
path: root/coreutils/mv.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2021-06-24 15:08:15 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2021-06-25 00:23:29 +0200
commita84bbc54257e68ef149cbaff8835c9cb3605c9ac (patch)
tree9cb21b15f9abfc47f7f1db32985fbb79d78d6bf2 /coreutils/mv.c
parent294d0c85adcbcf48da1fc0f48dae3aed59c07436 (diff)
downloadbusybox-w32-a84bbc54257e68ef149cbaff8835c9cb3605c9ac.tar.gz
busybox-w32-a84bbc54257e68ef149cbaff8835c9cb3605c9ac.tar.bz2
busybox-w32-a84bbc54257e68ef149cbaff8835c9cb3605c9ac.zip
cp,mv: fix -t DIR option
When the '-t DIR' option is used the loop over the remaining arguments should terminate when a NULL pointer is reached. function old new delta mv_main 585 590 +5 cp_main 492 496 +4 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/0 up/down: 9/0) Total: 9 bytes Signed-off-by: Ron Yorston <rmy@pobox.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils/mv.c')
-rw-r--r--coreutils/mv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/coreutils/mv.c b/coreutils/mv.c
index eae2e99bb..fd2422683 100644
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -108,7 +108,7 @@ int mv_main(int argc, char **argv)
108 /* else: fall through into "do { move SRC to DIR/SRC } while" loop */ 108 /* else: fall through into "do { move SRC to DIR/SRC } while" loop */
109 } 109 }
110 } 110 }
111 /* else: last is DIR from "t -DIR" */ 111 /* else: last is DIR from "-t DIR" */
112 112
113 do { 113 do {
114 dest = concat_path_file(last, bb_get_last_path_component_strip(*argv)); 114 dest = concat_path_file(last, bb_get_last_path_component_strip(*argv));
@@ -185,7 +185,7 @@ int mv_main(int argc, char **argv)
185 if (dest != last) { 185 if (dest != last) {
186 free((void *) dest); 186 free((void *) dest);
187 } 187 }
188 } while (*++argv != last); 188 } while (*++argv && *argv != last);
189 189
190 return status; 190 return status;
191} 191}