8dc92fbd6c
The HLP-changes to sbase have been a great addition of functionality, but they kind of "polluted" the enmasse() and recurse() prototypes. As this will come in handy in the future, knowing at which "depth" you are inside a recursing function is an important functionality. Instead of having a special HLP-flag passed to enmasse, each sub- function needs to provide it on its own and can calculate results based on the current depth (for instance, 'H' implies 'P' at depth > 0). A special case is recurse(), because it actually depends on the follow-type. A new flag "recurse_follow" brings consistency into what used to be spread across different naming conventions (fflag, HLP_flag, ...). This also fixes numerous bugs with the behaviour of HLP in the tools using it.
56 lines
902 B
C
56 lines
902 B
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)
|
|
{
|
|
if (rename(s1, s2) == 0)
|
|
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, 0);
|
|
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 > 3 && !(stat(argv[argc-1], &st) == 0 && S_ISDIR(st.st_mode)))
|
|
eprintf("%s: not a directory\n", argv[argc-1]);
|
|
enmasse(argc, argv, mv);
|
|
|
|
return mv_status;
|
|
}
|