static afpvol_t svolume, dvolume;
static cnid_t did, pdid;
static volatile sig_atomic_t alarmed;
-static char *netatalk_dirs[] = {
- ".AppleDouble",
- ".AppleDB",
- ".AppleDesktop",
- NULL
-};
static int copy(const char *, const char *);
static int do_move(const char *, const char *);
-static void preserve_fd_acls(int source_fd, int dest_fd, const char *source_path,
- const char *dest_path);
-/*
- Check for netatalk special folders e.g. ".AppleDB" or ".AppleDesktop"
- Returns pointer to name or NULL.
-*/
-static const char *check_netatalk_dirs(const char *name)
-{
- int c;
-
- for (c=0; netatalk_dirs[c]; c++) {
- if ((strcmp(name, netatalk_dirs[c])) == 0)
- return netatalk_dirs[c];
- }
- return NULL;
-}
/*
SIGNAL handling:
exit(EXIT_FAILURE);
}
-int ad_mv(int argc, char *argv[])
+int ad_mv(int argc, char *argv[], AFPObj *obj)
{
size_t baselen, len;
int rval;
set_signal();
cnid_init();
- if (openvol(argv[argc - 1], &dvolume) != 0) {
+ if (openvol(obj, argv[argc - 1], &dvolume) != 0) {
SLOG("Error opening CNID database for source \"%s\": ", argv[argc - 1]);
return 1;
}
if (stat(argv[argc - 1], &sb) || !S_ISDIR(sb.st_mode)) {
if (argc > 2)
usage_mv();
- if (openvol(argv[0], &svolume) != 0) {
+ if (openvol(obj, argv[0], &svolume) != 0) {
SLOG("Error opening CNID database for destination \"%s\": ", argv[0]);
return 1;
}
rval = 1;
} else {
memmove(endp, p, (size_t)len + 1);
- openvol(*argv, &svolume);
+ openvol(obj, *argv, &svolume);
if (do_move(*argv, path))
rval = 1;
}
}
-exit:
closevol(&dvolume);
return rval;
}
}
return 0;
}
-
-static void
-preserve_fd_acls(int source_fd,
- int dest_fd,
- const char *source_path,
- const char *dest_path)
-{
- ;
-}