emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cp,mv: fix -t DIR option

Browse Source 
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>
This commit is contained in:
Ron Yorston
2021-06-24 15:08:15 +01:00
committed by Denys Vlasenko
parent 294d0c85ad
commit a84bbc5425
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coreutils/mv.c
View File

@@ -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;
}