/*
- * $Id: ad_open.c,v 1.69 2010-02-10 14:05:37 franklahm Exp $
+ * $Id: ad_open.c,v 1.74 2010-04-13 08:05:06 franklahm Exp $
*
* Copyright (c) 1999 Adrian Sun (asun@u.washington.edu)
* Copyright (c) 1990,1991 Regents of The University of Michigan.
int st_invalid;
struct stat stbuf;
- LOG(log_debug, logtype_default, "ad_mkdir: creating ad-directory '%s/%s' with mode %04o",
- getcwdpath(), path, mode);
+ LOG(log_debug, logtype_default, "ad_mkdir: creating ad-directory '%s' with mode %04o",
+ path, mode);
st_invalid = ad_mode_st(path, &mode, &stbuf);
ret = mkdir( path, mode );
ad->ad_data_fork.adf_fd =open( path, hoflags | O_NOFOLLOW, admode );
- if (ad->ad_data_fork.adf_fd < 0 ) {
+ if (ad->ad_data_fork.adf_fd == -1) {
if ((errno == EACCES || errno == EROFS) && !(oflags & O_RDWR)) {
hoflags = oflags;
ad->ad_data_fork.adf_fd = open( path, hoflags | O_NOFOLLOW, admode );
}
- if (ad->ad_data_fork.adf_fd < 0 && errno == ELOOP) {
+ if (ad->ad_data_fork.adf_fd == -1 && errno == OPEN_NOFOLLOW_ERRNO) {
int lsz;
- if (oflags != O_RDONLY)
- return -1;
-
- ad->ad_data_fork.adf_syml = malloc(PATH_MAX+1);
- lsz = readlink(path, ad->ad_data_fork.adf_syml, PATH_MAX);
+ ad->ad_data_fork.adf_syml = malloc(MAXPATHLEN+1);
+ lsz = readlink(path, ad->ad_data_fork.adf_syml, MAXPATHLEN);
if (lsz <= 0) {
free(ad->ad_data_fork.adf_syml);
return -1;
}
- ad->ad_data_fork.adf_syml[lsz]=0;
+ ad->ad_data_fork.adf_syml[lsz] = 0;
ad->ad_data_fork.adf_syml = realloc(ad->ad_data_fork.adf_syml,lsz+1);
- // XX
- ad->ad_data_fork.adf_fd = 0;
+ ad->ad_data_fork.adf_fd = -2; /* -2 means its a symlink */
}
}
- if ( ad->ad_data_fork.adf_fd < 0)
+ if ( ad->ad_data_fork.adf_fd == -1 )
return -1;
AD_SET(ad->ad_data_fork.adf_off);
return -1;
}
ad_refresh(ad);
+ /* it's not new anymore */
+ ad->ad_md->adf_flags &= ~( O_TRUNC | O_CREAT );
ad->ad_md->adf_refcount++;
goto sfm;
}
* here.
* if ((oflags & O_CREAT) ==> (oflags & O_RDWR)
*/
- LOG(log_debug, logtype_default, "ad_open: creating new adouble file: %s/%s", getcwdpath(), ad_p);
+ LOG(log_debug, logtype_default, "ad_open: creating new adouble file: %s", ad_p);
admode = mode;
errno = 0;
st_invalid = ad_mode_st(ad_p, &admode, &st_dir);
*
* @param name name of file/dir
* @param flags ADFLAGS_DIR: name is a directory \n
- * ADFLAGS_CREATE: force creation of header file, but only as use, not as root
+ * ADFLAGS_CREATE: force creation of header file, but only as user, not as root\n
+ * ADFLAGS_OPENFORKS: test if name is open by another afpd process
+ *
* @param adp pointer to struct adouble
*
* @note caller MUST pass ADFLAGS_DIR for directories. Whether ADFLAGS_CREATE really creates
{
uid_t uid;
int ret, err, dir;
- int create = 0;
+ int create = O_RDONLY;
dir = flags & ADFLAGS_DIR;
/* Check if we shall call ad_open with O_CREAT */
if ( (adp->ad_options & ADVOL_CACHE)
&& ! (adp->ad_options & ADVOL_NOADOUBLE)
- && (flags & ADFLAGS_CREATE) )
- create = O_CREAT;
-
- if ((ret = ad_open(name, ADFLAGS_HF | dir, O_RDWR | create, 0666, adp)) < 0 && errno == EACCES) {
+ && (flags & ADFLAGS_CREATE) ) {
+ create = O_CREAT | O_RDWR;
+ }
+ if ((ret = ad_open(name, ADFLAGS_HF | dir, create, 0666, adp)) < 0 && errno == EACCES) {
uid = geteuid();
if (seteuid(0)) {
LOG(log_error, logtype_default, "ad_metadata(%s): seteuid failed %s", name, strerror(errno));
return ret;
}
+/*
+ * @brief openat like wrapper for ad_metadata
+ */
+int ad_metadataat(int dirfd, const char *name, int flags, struct adouble *adp)
+{
+ int ret = 0;
+ int cwdfd = -1;
+
+ if (dirfd != -1) {
+ if ((cwdfd = open(".", O_RDONLY) == -1) || (fchdir(dirfd) != 0)) {
+ ret = -1;
+ goto exit;
+ }
+ }
+
+ if (ad_metadata(name, flags, adp) < 0) {
+ ret = -1;
+ goto exit;
+ }
+
+ if (dirfd != -1) {
+ if (fchdir(cwdfd) != 0) {
+ LOG(log_error, logtype_afpd, "ad_openat: cant chdir back, exiting");
+ exit(EXITERR_SYS);
+ }
+ }
+
+exit:
+ if (cwdfd != -1)
+ close(cwdfd);
+
+ return ret;
+
+}
+
/* ----------------------------------- */
static int new_rfork(const char *path, struct adouble *ad, int adflags)
{
return ad->ad_ops->ad_header_read(ad, NULL);
}
+
+int ad_openat(int dirfd, /* dir fd openat like */
+ const char *path,
+ int adflags,
+ int oflags,
+ int mode,
+ struct adouble *ad)
+{
+ int ret = 0;
+ int cwdfd = -1;
+
+ if (dirfd != -1) {
+ if ((cwdfd = open(".", O_RDONLY) == -1) || (fchdir(dirfd) != 0)) {
+ ret = -1;
+ goto exit;
+ }
+ }
+
+ if (ad_open(path, adflags, oflags, mode, ad) < 0) {
+ ret = -1;
+ goto exit;
+ }
+
+ if (dirfd != -1) {
+ if (fchdir(cwdfd) != 0) {
+ LOG(log_error, logtype_afpd, "ad_openat: cant chdir back, exiting");
+ exit(EXITERR_SYS);
+ }
+ }
+
+exit:
+ if (cwdfd != -1)
+ close(cwdfd);
+
+ return ret;
+}