#define OPT_FILEUTILS_FORCE 1
#define OPT_FILEUTILS_INTERACTIVE 2
-static const char fmt[] ALIGN1 =
- "cannot overwrite %sdirectory with %sdirectory";
-
int mv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int mv_main(int argc, char **argv)
{
struct stat dest_stat;
const char *last;
const char *dest;
- unsigned long flags;
+ unsigned flags;
int dest_exists;
int status = 0;
int copy_flag = 0;
return EXIT_FAILURE;
}
- if (!(dest_exists & 2)) {
+ if (!(dest_exists & 2)) { /* last is not a directory */
dest = last;
goto DO_MOVE;
}
}
DO_MOVE:
- if (dest_exists && !(flags & OPT_FILEUTILS_FORCE)
+ if (dest_exists
+ && !(flags & OPT_FILEUTILS_FORCE)
&& ((access(dest, W_OK) < 0 && isatty(0))
|| (flags & OPT_FILEUTILS_INTERACTIVE))
) {
int source_exists;
if (errno != EXDEV
- || (source_exists = cp_mv_stat(*argv, &source_stat)) < 1
+ || (source_exists = cp_mv_stat2(*argv, &source_stat, lstat)) < 1
) {
bb_perror_msg("cannot rename '%s'", *argv);
} else {
+ static const char fmt[] ALIGN1 =
+ "cannot overwrite %sdirectory with %sdirectory";
+
if (dest_exists) {
if (dest_exists == 3) {
if (source_exists != 3) {
goto RET_1;
}
}
+ /* FILEUTILS_RECUR also prevents nasties like
+ * "read from device and write contents to dst"
+ * instead of "create same device node" */
copy_flag = FILEUTILS_RECUR | FILEUTILS_PRESERVE_STATUS;
#if ENABLE_SELINUX
copy_flag |= FILEUTILS_PRESERVE_SECURITY_CONTEXT;