/*
- * $Id: ad_open.c,v 1.25 2003-01-12 14:40:04 didg Exp $
+ * $Id: ad_open.c,v 1.30.6.4 2003-12-12 19:34:27 didg Exp $
*
* Copyright (c) 1999 Adrian Sun (asun@u.washington.edu)
* Copyright (c) 1990,1991 Regents of The University of Michigan.
* Ann Arbor, Michigan
* +1-313-763-0525
* netatalk@itd.umich.edu
+ *
+ * NOTE: I don't use inline because a good compiler should be
+ * able to optimize all the static below. Didier
*/
#ifdef HAVE_CONFIG_H
#include <netatalk/endian.h>
#include <atalk/adouble.h>
+#include <atalk/util.h>
#include "ad_private.h"
#undef ADEDOFF_FILEI
#endif /* ADEDOFF_FILEI */
-#define ADEID_NUM_V1 5
#define ADEDOFF_NAME_V1 (AD_HEADER_LEN + ADEID_NUM_V1*AD_ENTRY_LEN)
#define ADEDOFF_COMMENT_V1 (ADEDOFF_NAME_V1 + ADEDLEN_NAME)
#define ADEDOFF_FILEI (ADEDOFF_COMMENT_V1 + ADEDLEN_COMMENT)
/* i stick things in a slightly different order than their eid order in
* case i ever want to separate RootInfo behaviour from the rest of the
* stuff. */
-#define ADEID_NUM_V2 9
#define ADEDOFF_NAME_V2 (AD_HEADER_LEN + ADEID_NUM_V2*AD_ENTRY_LEN)
#define ADEDOFF_COMMENT_V2 (ADEDOFF_NAME_V2 + ADEDLEN_NAME)
#define ADEDOFF_FILEDATESI (ADEDOFF_COMMENT_V2 + ADEDLEN_COMMENT)
#define ADEDOFF_AFPFILEI (ADEDOFF_DID + ADEDLEN_DID)
#define ADEDOFF_SHORTNAME (ADEDOFF_AFPFILEI + ADEDLEN_AFPFILEI)
#define ADEDOFF_PRODOSFILEI (ADEDOFF_SHORTNAME + ADEDLEN_SHORTNAME)
-#define ADEDOFF_RFORK_V2 (ADEDOFF_PRODOSFILEI + ADEDLEN_PRODOSFILEI)
-
+#define ADEDOFF_PRIVDEV (ADEDOFF_PRODOSFILEI + ADEDLEN_PRODOSFILEI)
+#define ADEDOFF_PRIVINO (ADEDOFF_PRIVDEV + ADEDLEN_PRIVDEV)
+#define ADEDOFF_PRIVSYN (ADEDOFF_PRIVINO + ADEDLEN_PRIVINO)
+#define ADEDOFF_RFORK_V2 (ADEDOFF_PRIVSYN + ADEDLEN_PRIVSYN)
/* we keep local copies of a bunch of stuff so that we can initialize things
* correctly. */
u_int32_t id, offset, len;
};
-#if AD_VERSION == AD_VERSION1
-static const struct entry entry_order[] = {
- {ADEID_NAME, ADEDOFF_NAME_V1, ADEDLEN_INIT},
- {ADEID_COMMENT, ADEDOFF_COMMENT_V1, ADEDLEN_INIT},
- {ADEID_FILEI, ADEDOFF_FILEI, ADEDLEN_FILEI},
- {ADEID_FINDERI, ADEDOFF_FINDERI_V1, ADEDLEN_FINDERI},
- {ADEID_RFORK, ADEDOFF_RFORK_V1, ADEDLEN_INIT},
+static const struct entry entry_order1[ADEID_NUM_V1 +1] = {
+ {ADEID_NAME, ADEDOFF_NAME_V1, ADEDLEN_INIT}, /* 3 */
+ {ADEID_COMMENT, ADEDOFF_COMMENT_V1, ADEDLEN_INIT}, /* 4 */
+ {ADEID_FILEI, ADEDOFF_FILEI, ADEDLEN_FILEI}, /* 7 */
+ {ADEID_FINDERI, ADEDOFF_FINDERI_V1, ADEDLEN_FINDERI}, /* 9 */
+ {ADEID_RFORK, ADEDOFF_RFORK_V1, ADEDLEN_INIT}, /* 2 */
{0, 0, 0}
};
+
+#if AD_VERSION == AD_VERSION1
+#define DISK_EID(ad, a) (a)
+
#else /* AD_VERSION == AD_VERSION2 */
-static const struct entry entry_order[] = {
+
+static u_int32_t get_eid(struct adouble *ad, u_int32_t eid)
+{
+ if (eid <= 15)
+ return eid;
+ if (ad->ad_version == AD_VERSION1)
+ return 0;
+ if (eid == AD_DEV)
+ return ADEID_PRIVDEV;
+ if (eid == AD_INO)
+ return ADEID_PRIVINO;
+ if (eid == AD_SYN)
+ return ADEID_PRIVSYN;
+
+ return 0;
+}
+
+#define DISK_EID(ad, a) get_eid(ad, a)
+
+static const struct entry entry_order2[ADEID_NUM_V2 +1] = {
{ADEID_NAME, ADEDOFF_NAME_V2, ADEDLEN_INIT},
{ADEID_COMMENT, ADEDOFF_COMMENT_V2, ADEDLEN_INIT},
{ADEID_FILEDATESI, ADEDOFF_FILEDATESI, ADEDLEN_FILEDATESI},
{ADEID_AFPFILEI, ADEDOFF_AFPFILEI, ADEDLEN_AFPFILEI},
{ADEID_SHORTNAME, ADEDOFF_SHORTNAME, ADEDLEN_INIT},
{ADEID_PRODOSFILEI, ADEDOFF_PRODOSFILEI, ADEDLEN_PRODOSFILEI},
+ {ADEID_PRIVDEV, ADEDOFF_PRIVDEV, ADEDLEN_INIT},
+ {ADEID_PRIVINO, ADEDOFF_PRIVINO, ADEDLEN_INIT},
+ {ADEID_PRIVSYN, ADEDOFF_PRIVSYN, ADEDLEN_INIT},
{ADEID_RFORK, ADEDOFF_RFORK_V2, ADEDLEN_INIT},
+
{0, 0, 0}
};
#endif /* AD_VERSION == AD_VERSION2 */
#if AD_VERSION == AD_VERSION2
-
-static __inline__ int ad_v1tov2(struct adouble *ad, const char *path)
+/* FIXME work only if < 2GB */
+static int ad_v1tov2(struct adouble *ad, const char *path)
{
struct stat st;
u_int16_t attr;
if (!path || (ad->ad_version != AD_VERSION1))
return 0;
+ /* we want version1 anyway */
+ if (ad->ad_flags == AD_VERSION1)
+ return 0;
+
+
+ if (!ad->ad_flags) {
+ /* we don't really know what we want */
+ ad->ad_flags = ad->ad_version;
+ return 0;
+ }
+
/* convert from v1 to v2. what does this mean?
* 1) change FILEI into FILEDATESI
* 2) create space for SHORTNAME, AFPFILEI, DID, and PRODOSI
* 3) move FILEI attributes into AFPFILEI
* 4) initialize ACCESS field of FILEDATESI.
- *
- * so, we need 4*12 (entry ids) + 12 (shortname) + 4 (afpfilei) +
- * 4 (did) + 8 (prodosi) = 76 more bytes. */
-
+ */
+
#define SHIFTDATA (AD_DATASZ2 - AD_DATASZ1)
/* bail if we can't get a lock */
- if (ad_tmplock(ad, ADEID_RFORK, ADLOCK_WR, 0, 0) < 0)
+ if (ad_tmplock(ad, ADEID_RFORK, ADLOCK_WR, 0, 0, 0) < 0)
goto bail_err;
if ((fd = open(path, O_RDWR)) < 0)
goto bail_lock;
if (fstat(fd, &st) ||
- ftruncate(fd, st.st_size + SHIFTDATA) < 0) {
+ sys_ftruncate(fd, st.st_size + SHIFTDATA) < 0) {
goto bail_open;
}
+ if (st.st_size > 0x7fffffff) {
+ LOG(log_debug, logtype_default, "ad_v1tov2: file too big.");
+ goto bail_truncate;
+ }
/* last place for failure. */
if ((void *) (buf = (char *)
memmove(buf + off + SHIFTDATA, buf + off,
ad->ad_eid[ADEID_RFORK].ade_len);
+ munmap(buf, st.st_size + SHIFTDATA);
+ close(fd);
+
/* now, fix up our copy of the header */
memset(ad->ad_filler, 0, sizeof(ad->ad_filler));
ad->ad_eid[ADEID_PRODOSFILEI].ade_off = ADEDOFF_PRODOSFILEI;
ad->ad_eid[ADEID_PRODOSFILEI].ade_len = ADEDLEN_PRODOSFILEI;
+ ad->ad_eid[ADEID_PRIVDEV].ade_off = ADEDOFF_PRIVDEV;
+ ad->ad_eid[ADEID_PRIVDEV].ade_len = ADEDLEN_INIT;
+ ad->ad_eid[ADEID_PRIVINO].ade_off = ADEDOFF_PRIVINO;
+ ad->ad_eid[ADEID_PRIVINO].ade_len = ADEDLEN_INIT;
+ ad->ad_eid[ADEID_PRIVSYN].ade_off = ADEDOFF_PRIVSYN;
+ ad->ad_eid[ADEID_PRIVSYN].ade_len = ADEDLEN_INIT;
+
/* shift the old entries (NAME, COMMENT, FINDERI, RFORK) */
ad->ad_eid[ADEID_NAME].ade_off = ADEDOFF_NAME_V2;
ad->ad_eid[ADEID_COMMENT].ade_off = ADEDOFF_COMMENT_V2;
ad->ad_version = AD_VERSION2;
/* move our data buffer to make space for the new entries. */
- memmove(buf + ADEDOFF_NAME_V2, buf + ADEDOFF_NAME_V1,
+ memmove(ad->ad_data + ADEDOFF_NAME_V2, ad->ad_data + ADEDOFF_NAME_V1,
ADEDOFF_RFORK_V1 - ADEDOFF_NAME_V1);
/* now, fill in the space with appropriate stuff. we're
memset(ad_entry(ad, ADEID_PRODOSFILEI), 0, ADEDLEN_PRODOSFILEI);
/* rebuild the header and cleanup */
- ad_rebuild_header(ad);
- munmap(buf, st.st_size + SHIFTDATA);
- close(fd);
- ad_tmplock(ad, ADEID_RFORK, ADLOCK_CLR, 0, 0);
+ ad_flush(ad, ADFLAGS_HF );
+ ad_tmplock(ad, ADEID_RFORK, ADLOCK_CLR, 0, 0, 0);
return 0;
bail_truncate:
- ftruncate(fd, st.st_size);
+ sys_ftruncate(fd, st.st_size);
bail_open:
close(fd);
bail_lock:
- ad_tmplock(ad, ADEID_RFORK, ADLOCK_CLR, 0, 0);
+ ad_tmplock(ad, ADEID_RFORK, ADLOCK_CLR, 0, 0, 0);
bail_err:
return -1;
}
static void parse_entries(struct adouble *ad, char *buf,
u_int16_t nentries)
{
- u_int32_t eid, len, off;
+ u_int32_t eid, len, off;
+ int warning = 0;
/* now, read in the entry bits */
for (; nentries > 0; nentries-- ) {
memcpy(&eid, buf, sizeof( eid ));
- eid = ntohl( eid );
+ eid = DISK_EID(ad, ntohl( eid ));
buf += sizeof( eid );
memcpy(&off, buf, sizeof( off ));
off = ntohl( off );
if ( 0 < eid && eid < ADEID_MAX ) {
ad->ad_eid[ eid ].ade_off = off;
ad->ad_eid[ eid ].ade_len = len;
- } else {
+ } else if (!warning) {
+ warning = 1;
LOG(log_debug, logtype_default, "ad_refresh: nentries %hd eid %d\n",
nentries, eid );
}
/* figure out all of the entry offsets and lengths. if we aren't
* able to read a resource fork entry, bail. */
+ nentries = len / AD_ENTRY_LEN;
parse_entries(ad, buf, nentries);
if (!ad_getentryoff(ad, ADEID_RFORK)
|| (ad_getentryoff(ad, ADEID_RFORK) > sizeof(ad->ad_data))
{
static char modebuf[ MAXPATHLEN + 1];
char *slash;
+ size_t len;
- if ( strlen( path ) >= MAXPATHLEN ) {
+ if ( (len = strlen( path )) >= MAXPATHLEN ) {
+ errno = ENAMETOOLONG;
return NULL; /* can't do it */
}
* For a path which is just a filename, use "." instead.
*/
strcpy( modebuf, path );
- if (NULL != ( slash = strrchr( modebuf, '/' )) ) {
+ slash = strrchr( modebuf, '/' );
+ /* is last char a '/' */
+ if (slash && slash[1] == 0) {
+ while (modebuf < slash && slash[-1] == '/') {
+ --slash;
+ }
+ if (modebuf < slash) {
+ *slash = '\0'; /* remove pathname component */
+ slash = strrchr( modebuf, '/' );
+ }
+ }
+ if (slash) {
*slash = '\0'; /* remove pathname component */
} else {
modebuf[0] = '.'; /* use current directory */
return modebuf;
}
-int
-ad_mode( path, mode )
- const char *path;
- int mode;
+/* ---------------- */
+static uid_t default_uid = -1;
+
+int ad_setfuid(const uid_t id)
+{
+ default_uid = id;
+ return 0;
+}
+
+/* ---------------- */
+uid_t ad_getfuid(void)
+{
+ return default_uid;
+}
+
+/* ----------------
+ return inode of path parent directory
+*/
+int ad_stat(const char *path, struct stat *stbuf)
{
- struct stat stbuf;
char *p;
-
- if ( mode == 0 ) {
- return( mode ); /* save on syscalls */
- }
+
p = ad_dir(path);
if (!p) {
- return( mode & DEFMASK ); /* can't do it */
+ return -1;
+ }
+
+ return stat( p, stbuf );
+}
+
+/* ----------------
+ if we are root change path user/ group
+ It can be a native function for BSD cf. FAQ.Q10
+ path: pathname to chown
+ stbuf: parent directory inode
+
+ use fstat and fchown or lchown with linux?
+*/
+#define EMULATE_SUIDDIR
+
+static int ad_chown(const char *path, struct stat *stbuf)
+{
+int ret = 0;
+#ifdef EMULATE_SUIDDIR
+uid_t id;
+
+ if (default_uid != -1) {
+ /* we are root (admin) */
+ id = (default_uid)?default_uid:stbuf->st_uid;
+ ret = chown( path, id, stbuf->st_gid );
}
+#endif
+ return ret;
+}
- if ( stat( p, &stbuf ) != 0 ) {
- return( mode & DEFMASK ); /* bail out... can't stat dir? */
+/* ----------------
+ return access right and inode of path parent directory
+*/
+static int ad_mode_st(const char *path, int *mode, struct stat *stbuf)
+{
+ if (*mode == 0) {
+ return -1;
}
+ if (ad_stat(path, stbuf) != 0) {
+ *mode &= DEFMASK;
+ return -1;
+ }
+ *mode &= stbuf->st_mode;
+ return 0;
+}
- return( mode & stbuf.st_mode );
+/* ----------------
+ return access right of path parent directory
+*/
+int
+ad_mode( path, mode )
+ const char *path;
+ int mode;
+{
+ struct stat stbuf;
+ ad_mode_st(path, &mode, &stbuf);
+ return mode;
}
/*
const char *path;
int mode;
{
+int ret;
+int st_invalid;
+struct stat stbuf;
+
#ifdef DEBUG
LOG(log_info, logtype_default, "ad_mkdir: Creating directory with mode %d", mode);
#endif /* DEBUG */
- return mkdir( path, ad_mode( path, mode ) );
+
+ st_invalid = ad_mode_st(path, &mode, &stbuf);
+ ret = mkdir( path, mode );
+ if (ret || st_invalid)
+ return ret;
+ ad_chown(path, &stbuf);
+
+ return ret;
}
+/* ----------------- */
+static int ad_error(struct adouble *ad, int adflags)
+{
+ if ((adflags & ADFLAGS_NOHF)) {
+ /* FIXME double check : set header offset ?*/
+ return 0;
+ }
+ if ((adflags & ADFLAGS_DF)) {
+ ad_close( ad, ADFLAGS_DF );
+ }
+ return -1 ;
+}
static int new_rfork(const char *path, struct adouble *ad, int adflags);
#else
#define AD_SET(a) a = 0
#endif
-/*
+
+void ad_init(struct adouble *ad, int flags)
+{
+ memset( ad, 0, sizeof( struct adouble ) );
+ ad->ad_flags = flags;
+}
+
+/* -------------------
* It's not possible to open the header file O_RDONLY -- the read
* will fail and return an error. this refcounts things now.
*/
struct stat st;
char *slash, *ad_p;
int hoflags, admode;
-
+ int st_invalid;
+ int open_df = 0;
+
if (ad->ad_inited != AD_INITED) {
ad_dfileno(ad) = -1;
ad_hfileno(ad) = -1;
if ((adflags & ADFLAGS_DF)) {
if (ad_dfileno(ad) == -1) {
hoflags = (oflags & ~(O_RDONLY | O_WRONLY)) | O_RDWR;
- admode = ad_mode( path, mode );
- if (( ad->ad_df.adf_fd = open( path, hoflags, admode )) < 0 ) {
- if (errno == EACCES && !(oflags & O_RDWR)) {
+ admode = mode;
+ st_invalid = ad_mode_st(path, &admode, &st);
+ ad->ad_df.adf_fd =open( path, hoflags, admode );
+ if (ad->ad_df.adf_fd < 0 ) {
+ if ((errno == EACCES || errno == EROFS) && !(oflags & O_RDWR)) {
hoflags = oflags;
ad->ad_df.adf_fd =open( path, hoflags, admode );
}
AD_SET(ad->ad_df.adf_off);
ad->ad_df.adf_flags = hoflags;
+ if ((oflags & O_CREAT) && !st_invalid) {
+ /* just created, set owner if admin (root) */
+ ad_chown(path, &st);
+ }
}
else {
/* the file is already open... but */
errno = EACCES;
return -1;
}
+ /* FIXME
+ * for now ad_open is never called with O_TRUNC or O_EXCL if the file is
+ * already open. Should we check for it? ie
+ * O_EXCL --> error
+ * O_TRUNC --> truncate the fork.
+ * idem for ressource fork.
+ */
}
+ open_df = ADFLAGS_DF;
ad->ad_df.adf_refcount++;
}
if (ad_hfileno(ad) != -1) { /* the file is already open */
if ((oflags & ( O_RDWR | O_WRONLY)) &&
!(ad->ad_hf.adf_flags & ( O_RDWR | O_WRONLY))) {
- if (adflags & ADFLAGS_DF) {
+ if (open_df) {
/* don't call with ADFLAGS_HF because we didn't open ressource fork */
- ad_close( ad, ADFLAGS_DF );
+ ad_close( ad, open_df );
}
errno = EACCES;
return -1;
hoflags = oflags & ~O_CREAT;
hoflags = (hoflags & ~(O_RDONLY | O_WRONLY)) | O_RDWR;
- if (( ad->ad_hf.adf_fd = open( ad_p, hoflags, 0 )) < 0 ) {
- if (errno == EACCES && !(oflags & O_RDWR)) {
+ ad->ad_hf.adf_fd = open( ad_p, hoflags, 0 );
+ if (ad->ad_hf.adf_fd < 0 ) {
+ if ((errno == EACCES || errno == EROFS) && !(oflags & O_RDWR)) {
hoflags = oflags & ~O_CREAT;
ad->ad_hf.adf_fd = open( ad_p, hoflags, 0 );
}
* here.
* if ((oflags & O_CREAT) ==> (oflags & O_RDWR)
*/
- admode = ad_hf_mode(ad_mode( ad_p, mode ));
+ admode = mode;
+ st_invalid = ad_mode_st(ad_p, &admode, &st);
+ admode = ad_hf_mode(admode);
errno = 0;
- if (( ad->ad_hf.adf_fd = open( ad_p, oflags,admode )) < 0 ) {
+ ad->ad_hf.adf_fd = open( ad_p, oflags,admode );
+ if ( ad->ad_hf.adf_fd < 0 ) {
/*
* Probably .AppleDouble doesn't exist, try to
* mkdir it.
*/
if (errno == ENOENT && (adflags & ADFLAGS_NOADOUBLE) == 0) {
if (NULL == ( slash = strrchr( ad_p, '/' )) ) {
- ad_close( ad, adflags );
- return( -1 );
+ return ad_error(ad, adflags);
}
*slash = '\0';
errno = 0;
if ( ad_mkdir( ad_p, 0777 ) < 0 ) {
- ad_close( ad, adflags );
- return( -1 );
+ return ad_error(ad, adflags);
}
*slash = '/';
- if (( ad->ad_hf.adf_fd =
- open( ad_p, oflags, ad_mode( ad_p, mode) )) < 0 ) {
- ad_close( ad, adflags );
- return( -1 );
+ admode = mode;
+ st_invalid = ad_mode_st(ad_p, &admode, &st);
+ admode = ad_hf_mode(admode);
+ ad->ad_hf.adf_fd = open( ad_p, oflags, admode);
+ if ( ad->ad_hf.adf_fd < 0 ) {
+ return ad_error(ad, adflags);
}
} else {
- ad_close( ad, adflags );
- return( -1 );
+ return ad_error(ad, adflags);
}
}
ad->ad_hf.adf_flags = oflags;
- } else {
- ad_close( ad, adflags );
- return( -1 );
+ /* just created, set owner if admin owner (root) */
+ if (!st_invalid) {
+ ad_chown(path, &st);
+ }
+ }
+ else {
+ return ad_error(ad, adflags);
}
} else if (fstat(ad->ad_hf.adf_fd, &st) == 0 && st.st_size == 0) {
/* for 0 length files, treat them as new. */
- ad->ad_hf.adf_flags = (oflags & ~(O_RDONLY | O_WRONLY)) | O_RDWR | O_TRUNC;
+ ad->ad_hf.adf_flags = hoflags| O_TRUNC;
} else {
ad->ad_hf.adf_flags = hoflags;
}
* instead of reading it.
*/
if (new_rfork(path, ad, adflags) < 0) {
+ /* the file is already deleted, perm, whatever, so return an error*/
ad_close(ad, adflags);
return -1;
}
struct stat st;
ad->ad_magic = AD_MAGIC;
+ ad->ad_version = ad->ad_flags;
+ if (!ad->ad_version)
ad->ad_version = AD_VERSION;
memset(ad->ad_filler, 0, sizeof( ad->ad_filler ));
memset(ad->ad_data, 0, sizeof(ad->ad_data));
- eid = entry_order;
+#if AD_VERSION == AD_VERSION2
+ if (ad->ad_version == AD_VERSION2)
+ eid = entry_order2;
+ else
+#endif
+ eid = entry_order1;
+
while (eid->id) {
ad->ad_eid[eid->id].ade_off = eid->offset;
ad->ad_eid[eid->id].ade_len = eid->len;
}
/* put something sane in the directory finderinfo */
- if (adflags & ADFLAGS_DIR) {
+ if ((adflags & ADFLAGS_DIR)) {
/* set default view */
ashort = htons(FINDERINFO_CLOSEDVIEW);
memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRVIEWOFF,
projects / netatalk.git / blobdiff