exit(EXIT_FAILURE);
}
-int ad_rm(int argc, char *argv[])
+int ad_rm(int argc, char *argv[], AFPObj *obj)
{
int ch;
for (int i = 0; argv[i] != NULL; i++) {
/* Load .volinfo file for source */
- openvol(argv[i], &volume);
+ openvol(obj, argv[i], &volume);
if (nftw(argv[i], rm, upfunc, 20, FTW_DEPTH | FTW_PHYS) == -1) {
if (alarmed) {
/* Get CNID of Parent and add new childir to CNID database */
pdid = did;
- if ((cnid = cnid_for_path(&volume, path, &did)) == CNID_INVALID) {
+ if ((cnid = cnid_for_path(volume.vol->v_cdb, volume.vol->v_path, path, &did)) == CNID_INVALID) {
SLOG("Error resolving CNID for %s", path);
return -1;
}
}
/* Get CNID of Parent and add new childir to CNID database */
- if ((did = cnid_for_path(&volume, path, &pdid)) == CNID_INVALID) {
+ if ((did = cnid_for_path(volume.vol->v_cdb, volume.vol->v_path, path, &pdid)) == CNID_INVALID) {
SLOG("Error resolving CNID for %s", path);
return -1;
}
/* Get CNID of Parent and add new childir to CNID database */
pdid = did;
- if ((cnid = cnid_for_path(&volume, path, &did)) == CNID_INVALID) {
+ if ((cnid = cnid_for_path(volume.vol->v_cdb, volume.vol->v_path, path, &did)) == CNID_INVALID) {
SLOG("Error resolving CNID for %s", path);
return -1;
}