9fd4a745f8
For loop detection, a history is mandatory. In the process of also adding a flexible struct to recurse, the recurse-definition was moved to fs.h. The motivation behind the struct is to allow easy extensions to the recurse-function without having to change the prototypes of all functions in the process. Adding flags is really simple as well now. Using the recursor-struct, it's also easier to see which defaults apply to a program (for instance, which type of follow, ...). Another change was to add proper stat-lstat-usage in recurse. It was wrong before.
63 lines
1.0 KiB
C
63 lines
1.0 KiB
C
/* See LICENSE file for copyright and license details. */
|
|
#include <sys/stat.h>
|
|
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
|
|
#include "fs.h"
|
|
#include "util.h"
|
|
|
|
static int mv_status = 0;
|
|
|
|
static int
|
|
mv(const char *s1, const char *s2, int depth)
|
|
{
|
|
struct recursor r = { .fn = rm, .hist = NULL, .depth = 0, .follow = 'P', .flags = 0};
|
|
|
|
if (!rename(s1, s2))
|
|
return (mv_status = 0);
|
|
if (errno == EXDEV) {
|
|
cp_aflag = cp_rflag = cp_pflag = 1;
|
|
cp_HLPflag = 'P';
|
|
rm_rflag = 1;
|
|
cp(s1, s2, depth);
|
|
rm(s1, NULL, &r);
|
|
return (mv_status = cp_status || rm_status);
|
|
}
|
|
mv_status = 1;
|
|
|
|
return -1;
|
|
}
|
|
|
|
static void
|
|
usage(void)
|
|
{
|
|
eprintf("usage: %s [-f] source ... dest\n", argv0);
|
|
}
|
|
|
|
int
|
|
main(int argc, char *argv[])
|
|
{
|
|
struct stat st;
|
|
|
|
ARGBEGIN {
|
|
case 'f':
|
|
break;
|
|
default:
|
|
usage();
|
|
} ARGEND;
|
|
|
|
if (argc < 2)
|
|
usage();
|
|
|
|
if (argc > 2) {
|
|
if (stat(argv[argc - 1], &st) < 0)
|
|
eprintf("stat %s:", argv[argc - 1]);
|
|
if (!S_ISDIR(st.st_mode))
|
|
eprintf("%s: not a directory\n", argv[argc - 1]);
|
|
}
|
|
enmasse(argc, argv, mv);
|
|
|
|
return mv_status;
|
|
}
|