/*
- * $Id: ad_open.c,v 1.30.6.4 2003-12-12 19:34:27 didg Exp $
+ * $Id: ad_open.c,v 1.30.6.18.2.1 2005-01-25 14:32:00 didg Exp $
*
* Copyright (c) 1999 Adrian Sun (asun@u.washington.edu)
* Copyright (c) 1990,1991 Regents of The University of Michigan.
#include "config.h"
#endif /* HAVE_CONFIG_H */
-#include <string.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif /* HAVE_UNISTD_H */
#include <errno.h>
-#include <atalk/logger.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+#include <atalk/adouble.h>
#include <sys/param.h>
-#include <sys/mman.h>
+#include <atalk/logger.h>
-#include <netatalk/endian.h>
-#include <atalk/adouble.h>
#include <atalk/util.h>
+#include <string.h>
#include "ad_private.h"
+#include <stdlib.h>
#ifndef MAX
#define MAX(a, b) ((a) < (b) ? (b) : (a))
#define ADEDOFF_PRIVDEV (ADEDOFF_PRODOSFILEI + ADEDLEN_PRODOSFILEI)
#define ADEDOFF_PRIVINO (ADEDOFF_PRIVDEV + ADEDLEN_PRIVDEV)
#define ADEDOFF_PRIVSYN (ADEDOFF_PRIVINO + ADEDLEN_PRIVINO)
+#define ADEDOFF_PRIVID (ADEDOFF_PRIVSYN + ADEDLEN_PRIVSYN)
-#define ADEDOFF_RFORK_V2 (ADEDOFF_PRIVSYN + ADEDLEN_PRIVSYN)
+#define ADEDOFF_RFORK_V2 (ADEDOFF_PRIVID + ADEDLEN_PRIVID)
+
+#define ADEID_NUM_OSX 2
+#define ADEDOFF_FINDERI_OSX (AD_HEADER_LEN + ADEID_NUM_OSX*AD_ENTRY_LEN)
+#define ADEDOFF_RFORK_OSX (ADEDOFF_FINDERI_OSX + ADEDLEN_FINDERI)
/* we keep local copies of a bunch of stuff so that we can initialize things
* correctly. */
return ADEID_PRIVINO;
if (eid == AD_SYN)
return ADEID_PRIVSYN;
+ if (eid == AD_ID)
+ return ADEID_PRIVID;
return 0;
}
{ADEID_PRIVDEV, ADEDOFF_PRIVDEV, ADEDLEN_INIT},
{ADEID_PRIVINO, ADEDOFF_PRIVINO, ADEDLEN_INIT},
{ADEID_PRIVSYN, ADEDOFF_PRIVSYN, ADEDLEN_INIT},
+ {ADEID_PRIVID, ADEDOFF_PRIVID, ADEDLEN_INIT},
{ADEID_RFORK, ADEDOFF_RFORK_V2, ADEDLEN_INIT},
{0, 0, 0}
};
+
+/* OS X adouble finder info and resource fork only
+*/
+static const struct entry entry_order_osx[ADEID_NUM_OSX +1] = {
+ {ADEID_FINDERI, ADEDOFF_FINDERI_OSX, ADEDLEN_FINDERI},
+ {ADEID_RFORK, ADEDOFF_RFORK_OSX, ADEDLEN_INIT},
+
+ {0, 0, 0}
+};
+
#endif /* AD_VERSION == AD_VERSION2 */
#if AD_VERSION == AD_VERSION2
+static int ad_update(struct adouble *ad, const char *path)
+{
+ struct stat st;
+ u_int16_t nentries = 0;
+ off_t off, shiftdata=0;
+ const struct entry *eid;
+ static off_t entry_len[ADEID_MAX];
+ static char databuf[ADEID_MAX][256], *buf;
+ int fd;
+
+ /* check to see if we should convert this header. */
+ if (!path || (ad->ad_flags != AD_VERSION2))
+ return 0;
+
+ if (!(ad->ad_hf.adf_flags & ( O_RDWR | O_WRONLY))) {
+ /* we were unable to open the file read write the last time
+ */
+ return 0;
+ }
+
+ if (ad->ad_eid[ADEID_RFORK].ade_off)
+ shiftdata = ADEDOFF_RFORK_V2 -ad->ad_eid[ADEID_RFORK].ade_off;
+
+ memcpy(&nentries, ad->ad_data + ADEDOFF_NENTRIES, sizeof( nentries ));
+ nentries = ntohs( nentries );
+
+ if ( shiftdata == 0 && nentries == ADEID_NUM_V2)
+ return 0;
+
+ memset(entry_len, 0, sizeof(entry_len));
+ memset(databuf, 0, sizeof(databuf));
+
+ /* bail if we can't get a lock */
+ 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) ||
+ sys_ftruncate(fd, st.st_size + shiftdata) < 0) {
+ goto bail_open;
+ }
+ if (st.st_size > 0x7fffffff) {
+ LOG(log_debug, logtype_default, "ad_update: file '%s' too big for update.", path);
+ goto bail_truncate;
+ }
+
+ off = ad->ad_eid[ADEID_RFORK].ade_off;
+ if (off > st.st_size) {
+ LOG(log_error, logtype_default, "ad_v1tov2: invalid resource fork offset. (off: %u)", off);
+ errno = EIO;
+ goto bail_truncate;
+ }
+
+ if (ad->ad_eid[ADEID_RFORK].ade_len > st.st_size - off) {
+ LOG(log_error, logtype_default, "ad_v1tov2: invalid resource fork length. (rfork len: %u)", ad->ad_eid[ADEID_RFORK].ade_len);
+ errno = EIO;
+ goto bail_truncate;
+ }
+
+ /* last place for failure. */
+ if ((void *) (buf = (char *)
+ mmap(NULL, st.st_size + shiftdata,
+ PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0)) ==
+ MAP_FAILED) {
+ goto bail_truncate;
+ }
+
+
+ /* move the RFORK. this assumes that the RFORK is at the end */
+ if (off) {
+ memmove(buf + ADEDOFF_RFORK_V2, 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));
+
+ /* save the header entries */
+ eid = entry_order2;
+ while (eid->id) {
+ if( ad->ad_eid[eid->id].ade_off != 0) {
+ if ( eid->id > 2 && ad->ad_eid[eid->id].ade_len < 256)
+ memcpy( databuf[eid->id], ad->ad_data +ad->ad_eid[eid->id].ade_off, ad->ad_eid[eid->id].ade_len);
+ entry_len[eid->id] = ad->ad_eid[eid->id].ade_len;
+ }
+ eid++;
+ }
+
+ memset(ad->ad_data + AD_HEADER_LEN, 0, AD_DATASZ - AD_HEADER_LEN);
+
+ /* copy the saved entries to the new header */
+ eid = entry_order2;
+ while (eid->id) {
+ if ( eid->id > 2 && entry_len[eid->id] > 0) {
+ memcpy(ad->ad_data+eid->offset, databuf[eid->id], entry_len[eid->id]);
+ }
+ ad->ad_eid[eid->id].ade_off = eid->offset;
+ ad->ad_eid[eid->id].ade_len = entry_len[eid->id];
+ eid++;
+ }
+
+ /* rebuild the header and cleanup */
+ ad_flush(ad, ADFLAGS_HF );
+ ad_tmplock(ad, ADEID_RFORK, ADLOCK_CLR, 0, 0, 0);
+
+ LOG(log_debug, logtype_default, "updated AD2 header %s", path);
+
+ return 0;
+
+bail_truncate:
+ sys_ftruncate(fd, st.st_size);
+bail_open:
+ close(fd);
+bail_lock:
+ ad_tmplock(ad, ADEID_RFORK, ADLOCK_CLR, 0, 0, 0);
+bail_err:
+ return -1;
+}
+
+
/* FIXME work only if < 2GB */
static int ad_v1tov2(struct adouble *ad, const char *path)
{
u_int16_t attr;
char *buf;
int fd, off;
+ /* use resource fork offset from file */
+ int shiftdata;
/* check to see if we should convert this header. */
if (!path || (ad->ad_version != AD_VERSION1))
return 0;
/* we want version1 anyway */
- if (ad->ad_flags == AD_VERSION1)
+ if (ad->ad_flags != AD_VERSION2)
return 0;
+ if (!(ad->ad_hf.adf_flags & ( O_RDWR | O_WRONLY))) {
+ /* we were unable to open the file read write the last time
+ */
+ return 0;
+ }
if (!ad->ad_flags) {
/* we don't really know what we want */
* 2) create space for SHORTNAME, AFPFILEI, DID, and PRODOSI
* 3) move FILEI attributes into AFPFILEI
* 4) initialize ACCESS field of FILEDATESI.
+ * 5) move the resource fork
*/
-
-#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) < 0)
goto bail_err;
if ((fd = open(path, O_RDWR)) < 0)
goto bail_lock;
-
+
+ if (ad->ad_eid[ADEID_RFORK].ade_off) {
+ shiftdata = ADEDOFF_RFORK_V2 -ad->ad_eid[ADEID_RFORK].ade_off;
+ }
+ else {
+ shiftdata = ADEDOFF_RFORK_V2 -ADEDOFF_RFORK_V1; /* 136 */
+ }
+
if (fstat(fd, &st) ||
- sys_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;
}
+
+ off = ad->ad_eid[ADEID_RFORK].ade_off;
+
+ if (off > st.st_size) {
+ LOG(log_error, logtype_default, "ad_v1tov2: invalid resource fork offset. (off: %u)", off);
+ errno = EIO;
+ goto bail_truncate;
+ }
+
+ if (ad->ad_eid[ADEID_RFORK].ade_len > st.st_size - off) {
+ LOG(log_error, logtype_default, "ad_v1tov2: invalid resource fork length. (rfork len: %u)", ad->ad_eid[ADEID_RFORK].ade_len);
+ errno = EIO;
+ goto bail_truncate;
+ }
/* last place for failure. */
if ((void *) (buf = (char *)
- mmap(NULL, st.st_size + SHIFTDATA,
+ mmap(NULL, st.st_size + shiftdata,
PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0)) ==
MAP_FAILED) {
goto bail_truncate;
}
- off = ad->ad_eid[ADEID_RFORK].ade_off;
-
/* move the RFORK. this assumes that the RFORK is at the end */
- memmove(buf + off + SHIFTDATA, buf + off,
- ad->ad_eid[ADEID_RFORK].ade_len);
-
- munmap(buf, st.st_size + SHIFTDATA);
+ if (off) {
+ memmove(buf + ADEDOFF_RFORK_V2, 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 */
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;
+ ad->ad_eid[ADEID_PRIVID].ade_off = ADEDOFF_PRIVID;
+ ad->ad_eid[ADEID_PRIVID].ade_len = ADEDLEN_INIT;
/* shift the old entries (NAME, COMMENT, FINDERI, RFORK) */
ad->ad_eid[ADEID_NAME].ade_off = ADEDOFF_NAME_V2;
#ifdef ATACC
mode_t ad_hf_mode (mode_t mode)
{
+ /* we always need RW mode for file owner */
+#if 0
+ mode |= S_IRUSR;
+#endif
/* fnctl lock need write access */
if ((mode & S_IRUSR))
mode |= S_IWUSR;
len = ntohl( len );
buf += sizeof( len );
- if ( 0 < eid && eid < ADEID_MAX ) {
+ if (eid && eid < ADEID_MAX && ( (off < sizeof(ad->ad_data) &&
+ off +len <= sizeof(ad->ad_data)) || eid == ADEID_RFORK)) {
ad->ad_eid[ eid ].ade_off = off;
ad->ad_eid[ eid ].ade_len = len;
} else if (!warning) {
warning = 1;
- LOG(log_debug, logtype_default, "ad_refresh: nentries %hd eid %d\n",
+ LOG(log_debug, logtype_default, "ad_refresh: nentries %hd eid %d",
nentries, eid );
}
}
if (!ad_getentryoff(ad, ADEID_RFORK)
|| (ad_getentryoff(ad, ADEID_RFORK) > sizeof(ad->ad_data))
) {
- LOG(log_debug, logtype_default, "ad_header_read: problem with rfork entry offset.");
- return -1;
+ errno = EIO;
+ LOG(log_debug, logtype_default, "ad_header_read: problem with rfork entry offset.");
+ return -1;
}
if (ad_getentryoff(ad, ADEID_RFORK) > header_len) {
return 0;
}
-
-/*
+/* ---------------------------------------
* Put the .AppleDouble where it needs to be:
*
* / a/.AppleDouble/b
* a/b
* \ b/.AppleDouble/.Parent
+ *
+ * FIXME: should do something for pathname > MAXPATHLEN
*/
char *
ad_path( path, adflags )
{
static char pathbuf[ MAXPATHLEN + 1];
char c, *slash, buf[MAXPATHLEN + 1];
+ size_t l;
- strncpy(buf, path, MAXPATHLEN);
+ l = strlcpy(buf, path, MAXPATHLEN +1);
if ( adflags & ADFLAGS_DIR ) {
- strncpy( pathbuf, buf, MAXPATHLEN );
- if ( *buf != '\0' ) {
- strcat( pathbuf, "/" );
+ strcpy( pathbuf, buf);
+ if ( *buf != '\0' && l < MAXPATHLEN) {
+ pathbuf[l++] = '/';
+ pathbuf[l] = 0;
}
slash = ".Parent";
} else {
if (NULL != ( slash = strrchr( buf, '/' )) ) {
c = *++slash;
*slash = '\0';
- strncpy( pathbuf, buf, MAXPATHLEN);
+ strcpy( pathbuf, buf);
*slash = c;
} else {
pathbuf[ 0 ] = '\0';
slash = buf;
}
}
- strncat( pathbuf, ".AppleDouble/", MAXPATHLEN - strlen(pathbuf));
- strncat( pathbuf, slash, MAXPATHLEN - strlen(pathbuf));
+ strlcat( pathbuf, ".AppleDouble/", MAXPATHLEN +1);
+ strlcat( pathbuf, slash, MAXPATHLEN +1);
return( pathbuf );
}
+/* ---------------------------------------
+ * Put the resource fork where it needs to be:
+ * ._name
+ */
+char *
+ad_path_osx( path, adflags )
+ const char *path;
+ int adflags;
+{
+ static char pathbuf[ MAXPATHLEN + 1];
+ char c, *slash, buf[MAXPATHLEN + 1];
+
+ if (!strcmp(path,".")) {
+ /* fixme */
+ getcwd(buf, MAXPATHLEN);
+ }
+ else {
+ strlcpy(buf, path, MAXPATHLEN +1);
+ }
+ if (NULL != ( slash = strrchr( buf, '/' )) ) {
+ c = *++slash;
+ *slash = '\0';
+ strlcpy( pathbuf, buf, MAXPATHLEN +1);
+ *slash = c;
+ } else {
+ pathbuf[ 0 ] = '\0';
+ slash = buf;
+ }
+ strlcat( pathbuf, "._", MAXPATHLEN +1);
+ strlcat( pathbuf, slash, MAXPATHLEN +1);
+ return pathbuf;
+}
+
/*
* Support inherited protection modes for AppleDouble files. The supplied
* mode is ANDed with the parent directory's mask value in lieu of "umask",
/* ----------------- */
static int ad_error(struct adouble *ad, int adflags)
{
+int err = errno;
if ((adflags & ADFLAGS_NOHF)) {
/* FIXME double check : set header offset ?*/
return 0;
}
if ((adflags & ADFLAGS_DF)) {
ad_close( ad, ADFLAGS_DF );
+ err = errno;
}
return -1 ;
}
{
memset( ad, 0, sizeof( struct adouble ) );
ad->ad_flags = flags;
+ if (flags == AD_VERSION2_OSX) {
+ ad->ad_path = ad_path_osx;
+ }
+ else {
+ ad->ad_path = ad_path;
+ }
}
/* -------------------
return 0;
}
- ad_p = ad_path( path, adflags );
+ ad_p = ad->ad_path( path, adflags );
hoflags = oflags & ~O_CREAT;
- hoflags = (hoflags & ~(O_RDONLY | O_WRONLY)) | O_RDWR;
+ if (!(adflags & ADFLAGS_RDONLY)) {
+ hoflags = (hoflags & ~(O_RDONLY | O_WRONLY)) | 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)) {
* if ((oflags & O_CREAT) ==> (oflags & O_RDWR)
*/
admode = mode;
+ errno = 0;
st_invalid = ad_mode_st(ad_p, &admode, &st);
admode = ad_hf_mode(admode);
- errno = 0;
- ad->ad_hf.adf_fd = open( ad_p, oflags,admode );
- if ( ad->ad_hf.adf_fd < 0 ) {
+ if ( errno == ENOENT && !(adflags & ADFLAGS_NOADOUBLE) && ad->ad_flags != AD_VERSION2_OSX) {
/*
* Probably .AppleDouble doesn't exist, try to
* mkdir it.
*/
- if (errno == ENOENT && (adflags & ADFLAGS_NOADOUBLE) == 0) {
- if (NULL == ( slash = strrchr( ad_p, '/' )) ) {
- return ad_error(ad, adflags);
- }
- *slash = '\0';
- errno = 0;
- if ( ad_mkdir( ad_p, 0777 ) < 0 ) {
- return ad_error(ad, adflags);
- }
- *slash = '/';
- 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 {
- return ad_error(ad, adflags);
+ if (NULL == ( slash = strrchr( ad_p, '/' )) ) {
+ return ad_error(ad, adflags);
}
+ *slash = '\0';
+ errno = 0;
+ if ( ad_mkdir( ad_p, 0777 ) < 0 ) {
+ return ad_error(ad, adflags);
+ }
+ *slash = '/';
+ admode = mode;
+ st_invalid = ad_mode_st(ad_p, &admode, &st);
+ admode = ad_hf_mode(admode);
+ }
+ /* retry with O_CREAT */
+ ad->ad_hf.adf_fd = open( ad_p, oflags,admode );
+ if ( ad->ad_hf.adf_fd < 0 ) {
+ return ad_error(ad, adflags);
}
ad->ad_hf.adf_flags = oflags;
/* just created, set owner if admin owner (root) */
if (!st_invalid) {
- ad_chown(path, &st);
+ ad_chown(ad_p, &st);
}
}
else {
* instead of reading it.
*/
if (new_rfork(path, ad, adflags) < 0) {
+ int err = errno;
/* the file is already deleted, perm, whatever, so return an error*/
ad_close(ad, adflags);
+ errno = err;
return -1;
}
} else {
/* Read the adouble header in and parse it.*/
if ((ad_header_read( ad , &st) < 0)
#if AD_VERSION == AD_VERSION2
- || (ad_v1tov2(ad, ad_p) < 0)
+ || (ad_v1tov2(ad, ad_p) < 0) || (ad_update(ad, ad_p) < 0)
#endif /* AD_VERSION == AD_VERSION2 */
) {
+ int err = errno;
+
ad_close( ad, adflags );
- return( -1 );
+ errno = err;
+ return -1;
}
}
return 0 ;
}
+/* -----------------------------------
+ * return only metadata but try very hard
+*/
+int ad_metadata(const char *name, int flags, struct adouble *adp)
+{
+ uid_t uid;
+ int ret, err;
+
+ if ((ret = ad_open(name, ADFLAGS_HF | (flags), O_RDONLY, 0, adp)) < 0 && errno == EACCES) {
+ uid = geteuid();
+ if (seteuid(0)) {
+ LOG(log_error, logtype_default, "ad_metadata(%s): seteuid failed %s", name, strerror(errno));
+ errno = EACCES;
+ return -1;
+ }
+ /* we are root open read only */
+ ret = ad_open(name, ADFLAGS_HF|ADFLAGS_RDONLY|(flags), O_RDONLY, 0, adp);
+ err = errno;
+ if ( seteuid(uid) < 0) {
+ LOG(log_error, logtype_default, "ad_metadata: can't seteuid back");
+ exit(EXITERR_SYS);
+ }
+ errno = err;
+ }
+ return ret;
+}
+
/* ----------------------------------- */
static int new_rfork(const char *path, struct adouble *ad, int adflags)
{
-#if 0
- struct timeval tv;
-#endif
const struct entry *eid;
u_int16_t ashort;
struct stat st;
ad->ad_magic = AD_MAGIC;
- ad->ad_version = ad->ad_flags;
- if (!ad->ad_version)
- ad->ad_version = AD_VERSION;
+ ad->ad_version = ad->ad_flags & 0x0f0000;
+ 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));
#if AD_VERSION == AD_VERSION2
- if (ad->ad_version == AD_VERSION2)
+ if (ad->ad_flags == AD_VERSION2)
eid = entry_order2;
+ else if (ad->ad_flags == AD_VERSION2_OSX)
+ eid = entry_order_osx;
else
#endif
eid = entry_order1;
&ashort, sizeof(ashort));
} else {
/* set default creator/type fields */
- memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRTYPEOFF,"TEXT", 4);
- memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRCREATOFF,"UNIX", 4);
+ memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRTYPEOFF,"\0\0\0\0", 4);
+ memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRCREATOFF,"\0\0\0\0", 4);
}
/* make things invisible */
&ashort, sizeof(ashort));
}
-#if 0
- if (gettimeofday(&tv, NULL) < 0) {
- return -1;
- }
-#endif
-
if (stat(path, &st) < 0) {
return -1;
}
int ad_refresh(struct adouble *ad)
{
- if (ad->ad_hf.adf_fd < -1)
+ if (ad->ad_hf.adf_fd < 0)
return -1;
return ad_header_read(ad, NULL);
projects / netatalk.git / blobdiff