63 lines
1.1 KiB
Raw Normal View History

2012-01-30 17:41:33 -05:00
/* See LICENSE file for copyright and license details. */
2015-02-14 15:02:41 -05:00
#include <sys/stat.h>
2012-01-30 17:41:33 -05:00
#include <errno.h>
#include <stdio.h>
2012-01-30 17:41:33 -05:00
#include "fs.h"
#include "util.h"
2015-01-30 06:48:33 -05:00
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, .maxdepth = 0,
.follow = 'P', .flags = 0 };
if (!rename(s1, s2))
return (mv_status = 0);
if (errno == EXDEV) {
cp_aflag = cp_rflag = cp_pflag = 1;
cp_follow = 'P';
cp(s1, s2, depth);
Refactor recurse() again Okay, why yet another recurse()-refactor? The last one added the recursor-struct, which simplified things on the user-end, but there was still one thing that bugged me a lot: Previously, all fn()'s were forced to (l)stat the paths themselves. This does not work well when you try to keep up with H-, L- and P- flags at the same time, as each utility-function would have to set the right function-pointer for (l)stat every single time. This is not desirable. Furthermore, recurse should be easy to use and not involve trouble finding the right (l)stat-function to do it right. So, what we needed was a stat-argument for each fn(), so it is directly accessible. This was impossible to do though when the fn()'s are still directly called by the programs to "start" the recurse. Thus, the fundamental change is to make recurse() the function to go, while designing the fn()'s in a way they can "live" with st being NULL (we don't want a null-pointer-deref). What you can see in this commit is the result of this work. Why all this trouble instead of using nftw? The special thing about recurse() is that you tell the function when to recurse() in your fn(). You don't need special flags to tell nftw() to skip the subtree, just to give an example. The only single downside to this is that now, you are not allowed to unconditionally call recurse() from your fn(). It has to be a directory. However, that is a cost I think is easily weighed up by the advantages. Another thing is the history: I added a procedure at the end of the outmost recurse to free the history. This way we don't leak memory. A simple optimization on the side: - if (h->dev == st.st_dev && h->ino == st.st_ino) + if (h->ino == st.st_ino && h->dev == st.st_dev) First compare the likely difference in inode-numbers instead of checking the unlikely condition that the device-numbers are different.
2015-03-18 19:53:42 -04:00
rm(s1, NULL, NULL, &r);
return (mv_status = cp_status || rm_status);
mv_status = 1;
return -1;
2012-01-30 17:41:33 -05:00
2013-06-14 14:20:47 -04:00
static void
eprintf("usage: %s [-f] source ... dest\n", argv0);
2013-06-14 14:20:47 -04:00
2012-01-30 17:41:33 -05:00
main(int argc, char *argv[])
struct stat st;
2013-06-14 14:20:47 -04:00
case 'f':
2013-06-14 14:20:47 -04:00
if (argc < 2)
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);
2013-06-14 14:20:47 -04:00
return mv_status;
2012-01-30 17:41:33 -05:00