#include <string.h>
#include <stdio.h>
+#include <stdlib.h>
#include <atalk/afp.h>
#include <atalk/adouble.h>
as well. */
if ((err = for_each_adouble("deletecurdir", ".AppleDouble", deletecurdir_adouble_loop, NULL, 1, vol->v_umask)))
return err;
- return netatalk_rmdir( ".AppleDouble" );
+ return netatalk_rmdir(-1, ".AppleDouble" );
}
/* ----------------- */
/* ----------------- */
static int RF_deletefile_adouble(VFS_FUNC_ARGS_DELETEFILE)
{
- return netatalk_unlink(vol->ad_path(file, ADFLAGS_HF));
+ return netatalk_unlinkat(dirfd, vol->ad_path(file, ADFLAGS_HF));
}
/* ----------------- */
int err = 0;
strcpy( adsrc, vol->ad_path(src, 0 ));
- if (unix_rename( adsrc, vol->ad_path(dst, 0 )) < 0) {
+ if (unix_rename(dirfd, adsrc, -1, vol->ad_path(dst, 0 )) < 0) {
struct stat st;
err = errno;
if (errno == ENOENT) {
struct adouble ad;
- if (stat(adsrc, &st)) /* source has no ressource fork, */
+ if (lstatat(dirfd, adsrc, &st)) /* source has no ressource fork, */
return 0;
-
+
/* We are here because :
* -there's no dest folder.
* -there's no .AppleDouble in the dest folder.
ad_init(&ad, vol->v_adouble, vol->v_ad_options);
if (!ad_open(dst, ADFLAGS_HF, O_RDWR | O_CREAT, 0666, &ad)) {
ad_close(&ad, ADFLAGS_HF);
- if (!unix_rename( adsrc, vol->ad_path(dst, 0 )) )
+ if (!unix_rename(dirfd, adsrc, -1, vol->ad_path(dst, 0 )) )
err = 0;
else
err = errno;
if ((acl(buf, cmd, count, aces)) != 0)
return -1;
/* now set ACL on ressource fork */
- if ((acl(vol->vfs->ad_path(path, ADFLAGS_DIR), cmd, count, aces)) != 0)
+ if ((acl(vol->ad_path(path, ADFLAGS_DIR), cmd, count, aces)) != 0)
return -1;
} else
/* set ACL on ressource fork */
- if ((acl(vol->vfs->ad_path(path, ADFLAGS_HF), cmd, count, aces)) != 0)
+ if ((acl(vol->ad_path(path, ADFLAGS_HF), cmd, count, aces)) != 0)
return -1;
return 0;
if (len < 0 || len >= MAXPATHLEN)
return AFPERR_MISC;
/* remove ACL from .AppleDouble/.Parent first */
- if ((ret = remove_acl(vol->vfs->ad_path(path, ADFLAGS_DIR))) != AFP_OK)
+ if ((ret = remove_acl(vol->ad_path(path, ADFLAGS_DIR))) != AFP_OK)
return ret;
/* now remove from .AppleDouble dir */
if ((ret = remove_acl(buf)) != AFP_OK)
return ret;
} else
/* remove ACL from ressource fork */
- if ((ret = remove_acl(vol->vfs->ad_path(path, ADFLAGS_HF))) != AFP_OK)
+ if ((ret = remove_acl(vol->ad_path(path, ADFLAGS_HF))) != AFP_OK)
return ret;
return AFP_OK;
*/
if ((err = for_each_adouble("deletecurdir", name, deletecurdir_ads1_loop, NULL, 1, 0)))
return err;
- return netatalk_rmdir(name);
+ return netatalk_rmdir(-1, name);
}
static int deletecurdir_ads_loop(struct dirent *de, char *name, void *data _U_, int flag _U_, mode_t v_umask _U_)
static int RF_deletecurdir_ads(VFS_FUNC_ARGS_DELETECURDIR)
{
int err;
-
+
/* delete stray .AppleDouble files. this happens to get .Parent files as well. */
if ((err = for_each_adouble("deletecurdir", ".AppleDouble", deletecurdir_ads_loop, NULL, 1, 0)))
return err;
- return netatalk_rmdir( ".AppleDouble" );
+
+ return netatalk_rmdir(-1, ".AppleDouble" );
}
/* ------------------- */
/* ------------------- */
static int RF_deletefile_ads(VFS_FUNC_ARGS_DELETEFILE)
{
- char *ad_p = ad_dir(vol->ad_path(file, ADFLAGS_HF ));
+ int ret = 0;
+ int cwd = -1;
+ char *ad_p;
+
+ ad_p = ad_dir(vol->ad_path(file, ADFLAGS_HF ));
+
+ if (dirfd != -1) {
+ if (((cwd = open(".", O_RDONLY)) == -1) || (fchdir(dirfd) != 0)) {
+ ret = AFPERR_MISC;
+ goto exit;
+ }
+ }
+
+ ret = ads_delete_rf(ad_p);
+
+ if (dirfd != -1 && fchdir(cwd) != 0) {
+ LOG(log_error, logtype_afpd, "RF_deletefile_ads: cant chdir back. exit!");
+ exit(EXITERR_SYS);
+ }
+
+exit:
+ if (cwd != -1)
+ close(cwd);
- return ads_delete_rf(ad_p);
+ return ret;
}
/* --------------------------- */
int err = 0;
strcpy( adsrc, ad_dir(vol->ad_path(src, 0 )));
- if (unix_rename( adsrc, ad_dir(vol->ad_path(dst, 0 ))) < 0) {
+ if (unix_rename(dirfd, adsrc, -1, ad_dir(vol->ad_path(dst, 0 ))) < 0) {
struct stat st;
err = errno;
if (errno == ENOENT) {
struct adouble ad;
- if (stat(adsrc, &st)) /* source has no ressource fork, */
+ if (lstatat(dirfd, adsrc, &st)) /* source has no ressource fork, */
return 0;
/* We are here because :
ad_close(&ad, ADFLAGS_HF);
/* We must delete it */
- RF_deletefile_ads(vol, dst );
- if (!unix_rename( adsrc, ad_dir(vol->ad_path(dst, 0 ))) )
+ RF_deletefile_ads(vol, -1, dst );
+ if (!unix_rename(dirfd, adsrc, -1, ad_dir(vol->ad_path(dst, 0 ))) )
err = 0;
else
err = errno;
{
/* We simply move the corresponding ad file as well */
char tempbuf[258]="._";
- return rename(vol->ad_path(oldpath,0),strcat(tempbuf,newpath));
+ return unix_rename(dirfd, vol->ad_path(oldpath,0), -1, strcat(tempbuf,newpath));
}
/* ---------------- */
strcpy( adsrc, vol->ad_path(src, 0 ));
- if (unix_rename( adsrc, vol->ad_path(dst, 0 )) < 0) {
+ if (unix_rename(dirfd, adsrc, -1, vol->ad_path(dst, 0 )) < 0) {
struct stat st;
err = errno;
- if (errno == ENOENT && stat(adsrc, &st)) /* source has no ressource fork, */
+ if (errno == ENOENT && lstatat(dirfd, adsrc, &st)) /* source has no ressource fork, */
return 0;
errno = err;
return -1;
/* vfs_setdirowner: */ RF_setdirowner_adouble,
/* vfs_deletefile: */ RF_deletefile_adouble,
/* vfs_renamefile: */ RF_renamefile_adouble,
+ /* vfs_copyfile: */ NULL,
NULL
};
/* vfs_setdirowner: */ RF_setdirowner_osx,
/* vfs_deletefile: */ RF_deletefile_adouble,
/* vfs_renamefile: */ RF_renamefile_osx,
+ /* vfs_copyfile: */ NULL,
NULL
};
/* vfs_setdirowner: */ RF_setdirowner_ads,
/* vfs_deletefile: */ RF_deletefile_ads,
/* vfs_renamefile: */ RF_renamefile_ads,
+ /* vfs_copyfile: */ NULL,
NULL
};
/* vfs_remove */ remove_ea
};
-#ifdef HAVE_SOLARIS_EAS
-static struct vfs_ops netatalk_ea_solaris = {
+static struct vfs_ops netatalk_ea_sys = {
/* validupath: */ NULL,
/* rf_chown: */ NULL,
/* rf_renamedir: */ NULL,
/* rf_setdirowner: */ NULL,
/* rf_deletefile: */ NULL,
/* rf_renamefile: */ NULL,
- /* vfs_copyfile: */ NULL,
+ /* vfs_copyfile: */ sys_ea_copyfile,
/* rf_acl: */ NULL,
/* rf_remove_acl */ NULL,
- /* ea_getsize */ sol_get_easize,
- /* ea_getcontent */ sol_get_eacontent,
- /* ea_list */ sol_list_eas,
- /* ea_set */ sol_set_ea,
- /* ea_remove */ sol_remove_ea
+ /* ea_getsize */ sys_get_easize,
+ /* ea_getcontent */ sys_get_eacontent,
+ /* ea_list */ sys_list_eas,
+ /* ea_set */ sys_set_ea,
+ /* ea_remove */ sys_remove_ea
};
-#endif
/*
* Tertiary VFS modules for ACLs
/* rf_renamefile: */ NULL,
/* vfs_copyfile */ NULL,
/* rf_acl: */ RF_solaris_acl,
- /* rf_remove_acl */ RF_remove_acl,
+ /* rf_remove_acl */ RF_solaris_remove_acl,
NULL
};
#endif
}
/* Extended Attributes */
- if (vol->v_vfs_ea == AFPVOL_EA_SOLARIS) {
-
-#ifdef HAVE_SOLARIS_EAS
- LOG(log_debug, logtype_afpd, "initvol_vfs: Enabling EA support with Solaris native EAs.");
- vol->vfs_modules[1] = &netatalk_ea_solaris;
-#else
- LOG(log_error, logtype_afpd, "initvol_vfs: Can't enable Solaris EA support.");
- goto enable_adea;
-#endif
- } else {
- enable_adea:
- /* default: AFPVOL_EA_AD */
- LOG(log_debug, logtype_afpd, "initvol_vfs: Enabling EA support with adouble files.");
+ if (vol->v_vfs_ea == AFPVOL_EA_SYS) {
+ LOG(log_debug, logtype_afpd, "initvol_vfs: enabling EA support with native EAs");
+ vol->vfs_modules[1] = &netatalk_ea_sys;
+ } else if (vol->v_vfs_ea == AFPVOL_EA_AD) {
+ LOG(log_debug, logtype_afpd, "initvol_vfs: enabling EA support with adouble files");
vol->vfs_modules[1] = &netatalk_ea_adouble;
+ } else {
+ LOG(log_debug, logtype_afpd, "initvol_vfs: volume without EA support");
}
/* ACLs */
projects / netatalk.git / blobdiff