fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor enmasse() and recurse() to reflect depth

Browse Source 
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.
This commit is contained in:
FRIGN
2015-03-02 21:43:56 +01:00
parent 274e86e1aa
commit 8dc92fbd6c
13 changed files with 71 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mv.c
View File

@@ -10,14 +10,15 @@
static int mv_status = 0;
static int
mv(const char *s1, const char *s2, char ff)
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, ff);
cp(s1, s2, depth);
rm(s1, 0);
return (mv_status = cp_status || rm_status);
}
@@ -48,7 +49,7 @@ main(int argc, char *argv[])
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[0], mv, 'P');
enmasse(argc, argv, mv);
return mv_status;
}