#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
+#endif /* HAVE_CONFIG_H */
+#include <stdlib.h>
#include <string.h>
-#include <sys/types.h>
#include <sys/param.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
#include <errno.h>
#include <atalk/adouble.h>
+#include <atalk/ea.h>
+#include <atalk/bstrlib.h>
+#include <atalk/bstradd.h>
+#include <atalk/logger.h>
+#include <atalk/util.h>
+#include <atalk/errchk.h>
-#ifndef MIN
-#define MIN(a,b) ((a)<(b)?(a):(b))
-#endif
-
-/* XXX: this would benefit from pwrite.
- * locking has to be checked before each stream of consecutive
+/* XXX: locking has to be checked before each stream of consecutive
* ad_writes to prevent a lock in the middle from causing problems.
*/
-ssize_t ad_write( ad, eid, off, end, buf, buflen )
- struct adouble *ad;
- const u_int32_t eid;
- off_t off;
- const int end;
- const char *buf;
- const size_t buflen;
+
+ssize_t adf_pwrite(struct ad_fd *ad_fd, const void *buf, size_t count, off_t offset)
{
+ ssize_t cc;
+
+#ifndef HAVE_PWRITE
+ if ( ad_fd->adf_off != offset ) {
+ if ( lseek( ad_fd->adf_fd, offset, SEEK_SET ) < 0 ) {
+ return -1;
+ }
+ ad_fd->adf_off = offset;
+ }
+ cc = write( ad_fd->adf_fd, buf, count );
+ if ( cc < 0 ) {
+ return -1;
+ }
+ ad_fd->adf_off += cc;
+#else
+ cc = pwrite(ad_fd->adf_fd, buf, count, offset );
+#endif
+ return cc;
+}
+
+/* end is always 0 */
+ssize_t ad_write(struct adouble *ad, uint32_t eid, off_t off, int end, const char *buf, size_t buflen)
+{
+ EC_INIT;
struct stat st;
ssize_t cc;
+ off_t r_off;
+
+ if (ad_data_fileno(ad) == AD_SYMLINK) {
+ errno = EACCES;
+ return -1;
+ }
+ LOG(log_debug, logtype_ad, "ad_write: off: %ju, size: %zu, eabuflen: %zu",
+ (uintmax_t)off, buflen, ad->ad_rlen);
+
if ( eid == ADEID_DFORK ) {
- if ( end ) {
- if ( fstat( ad->ad_df.adf_fd, &st ) < 0 ) {
- return( -1 );
- }
- off = st.st_size - off;
- }
+ if ( end ) {
+ if ( fstat( ad_data_fileno(ad), &st ) < 0 ) {
+ return( -1 );
+ }
+ off = st.st_size - off;
+ }
+ cc = adf_pwrite(&ad->ad_data_fork, buf, buflen, off);
+ } else if ( eid == ADEID_RFORK ) {
+ if (end) {
+ if (fstat( ad_reso_fileno(ad), &st ) < 0)
+ return(-1);
+ off = st.st_size - off - ad_getentryoff(ad, eid);
+ }
+ if (ad->ad_vers == AD_VERSION_EA) {
+#ifdef HAVE_EAFD
+ r_off = off;
+#else
+ r_off = ADEDOFF_RFORK_OSX + off;
+#endif
+ } else {
+ r_off = ad_getentryoff(ad, eid) + off;
+ }
+ cc = adf_pwrite(&ad->ad_resource_fork, buf, buflen, r_off);
- if ( ad->ad_df.adf_off != off ) {
- if ( lseek( ad->ad_df.adf_fd, (off_t) off, SEEK_SET ) < 0 ) {
- return( -1 );
- }
- ad->ad_df.adf_off = off;
- }
- cc = write( ad->ad_df.adf_fd, buf, buflen );
- if ( cc < 0 ) {
- return( -1 );
- }
- ad->ad_df.adf_off += cc;
+ if ( ad->ad_rlen < off + cc )
+ ad->ad_rlen = off + cc;
} else {
- if ( end ) {
- off = ad->ad_eid[ eid ].ade_len - off;
- }
- cc = ad->ad_eid[eid].ade_off + off;
-
-#ifdef USE_MMAPPED_HEADERS
- if (eid != ADEID_RFORK) {
- memcpy(ad->ad_data + cc, buf, buflen);
- cc = buflen;
- goto ad_write_done;
- }
+ return -1; /* we don't know how to write if it's not a ressource or data fork */
+ }
+
+ if (ret != 0)
+ return ret;
+ return( cc );
+}
+
+/*
+ * the caller set the locks
+ * ftruncate is undefined when the file length is smaller than 'size'
+ */
+int sys_ftruncate(int fd, off_t length)
+{
+
+#ifndef HAVE_PWRITE
+off_t curpos;
#endif
+int err;
+struct stat st;
+char c = 0;
- if ( ad->ad_hf.adf_off != cc ) {
- if ( lseek( ad->ad_hf.adf_fd, (off_t) cc, SEEK_SET ) < 0 ) {
- return( -1 );
- }
- ad->ad_hf.adf_off = cc;
- }
-
- if ((cc = write( ad->ad_hf.adf_fd, buf, buflen )) < 0)
- return( -1 );
- ad->ad_hf.adf_off += cc;
-
-#ifndef USE_MMAPPED_HEADERS
- /* sync up our internal buffer */
- if (ad->ad_hf.adf_off < ad_getentryoff(ad, ADEID_RFORK))
- memcpy(ad->ad_data + ad->ad_hf.adf_off, buf,
- MIN(sizeof(ad->ad_data) - ad->ad_hf.adf_off, cc));
-#else
-ad_write_done:
+ if (!ftruncate(fd, length)) {
+ return 0;
+ }
+ /* maybe ftruncate doesn't work if we try to extend the size */
+ err = errno;
+
+#ifndef HAVE_PWRITE
+ /* we only care about file pointer if we don't use pwrite */
+ if ((off_t)-1 == (curpos = lseek(fd, 0, SEEK_CUR)) ) {
+ errno = err;
+ return -1;
+ }
#endif
- if ( ad->ad_eid[ eid ].ade_len < off + cc ) {
- ad->ad_eid[ eid ].ade_len = off + cc;
- }
+
+ if ( fstat( fd, &st ) < 0 ) {
+ errno = err;
+ return -1;
+ }
+
+ if (st.st_size > length) {
+ errno = err;
+ return -1;
}
- return( cc );
+ if (lseek(fd, length -1, SEEK_SET) != length -1) {
+ errno = err;
+ return -1;
+ }
+
+ if (1 != write( fd, &c, 1 )) {
+ /* return the write errno */
+ return -1;
+ }
+
+#ifndef HAVE_PWRITE
+ if (curpos != lseek(fd, curpos, SEEK_SET)) {
+ errno = err;
+ return -1;
+ }
+#endif
+
+ return 0;
}
-/* set locks here */
-int ad_rtruncate( ad, size )
- struct adouble *ad;
- const size_t size;
+/* ------------------------ */
+int ad_rtruncate(struct adouble *ad, const char *uname, const off_t size)
{
- int err;
+ EC_INIT;
+
+ /*
+ * We can't delete 0 byte size resource forks either, because a
+ * fork may reference the adouble handle with an open fd for the
+ * file, which means we would only delete the directory entry, not
+ * the file. Subsequently all code that works with fork handles
+ * finds the fork open, so eg flushing a fork (ad_flush()) will
+ * recreate ._ files. The correct place to delete 0 byte sized
+ * resource forks is in of_closefork().
+ */
+
+ EC_NEG1( sys_ftruncate(ad_reso_fileno(ad), size + ad->ad_eid[ ADEID_RFORK ].ade_off) );
+
+ ad->ad_rlen = size;
- if (ad_tmplock(ad, ADEID_RFORK, ADLOCK_WR, 0, 0) < 0)
- return -2;
+EC_CLEANUP:
+ if (ret != 0)
+ LOG(log_error, logtype_ad, "ad_rtruncate(\"%s\"): %s",
+ fullpathname(uname), strerror(errno));
+ EC_EXIT;
+}
- if ( ftruncate( ad->ad_hf.adf_fd,
- size + ad->ad_eid[ ADEID_RFORK ].ade_off ) < 0 ) {
- err = errno;
- ad_tmplock(ad, ADEID_RFORK, ADLOCK_CLR, 0, 0);
- errno = err;
- return( -1 );
+int ad_dtruncate(struct adouble *ad, const off_t size)
+{
+ if (sys_ftruncate(ad_data_fileno(ad), size) < 0) {
+ LOG(log_error, logtype_ad, "sys_ftruncate(fd: %d): %s",
+ ad_data_fileno(ad), strerror(errno));
+ return -1;
}
- ad->ad_eid[ ADEID_RFORK ].ade_len = size;
- if ( lseek( ad->ad_hf.adf_fd, ad->ad_eid[ADEID_RFORK].ade_off,
- SEEK_SET ) < 0 ) {
- err = errno;
- ad_tmplock(ad, ADEID_RFORK, ADLOCK_CLR, 0, 0);
- errno = err;
- return( -1 );
+ return 0;
+}
+
+/* ----------------------- */
+static int copy_all(const int dfd, const void *buf,
+ size_t buflen)
+{
+ ssize_t cc;
+
+ while (buflen > 0) {
+ if ((cc = write(dfd, buf, buflen)) < 0) {
+ switch (errno) {
+ case EINTR:
+ continue;
+ default:
+ return -1;
+ }
+ }
+ buflen -= cc;
}
- ad->ad_hf.adf_off = ad->ad_eid[ADEID_RFORK].ade_off;
- ad_tmplock(ad, ADEID_RFORK, ADLOCK_CLR, 0, 0);
- return( 0 );
+ return 0;
}
-int ad_dtruncate(ad, size)
- struct adouble *ad;
- const size_t size;
+/* --------------------------
+ * copy only the fork data stream
+*/
+int copy_fork(int eid, struct adouble *add, struct adouble *ads)
{
- int err;
+ ssize_t cc;
+ int err = 0;
+ char filebuf[8192];
+ int sfd, dfd;
- if (ad_tmplock(ad, ADEID_DFORK, ADLOCK_WR, 0, 0) < 0)
- return -2;
+ if (eid == ADEID_DFORK) {
+ sfd = ad_data_fileno(ads);
+ dfd = ad_data_fileno(add);
+ }
+ else {
+ sfd = ad_reso_fileno(ads);
+ dfd = ad_reso_fileno(add);
+ }
- if (ftruncate(ad->ad_df.adf_fd, size) < 0) {
- err = errno;
- ad_tmplock(ad, ADEID_DFORK, ADLOCK_CLR, 0, 0);
- errno = err;
- } else
- ad_tmplock(ad, ADEID_DFORK, ADLOCK_CLR, 0, 0);
+ if ((off_t)-1 == lseek(sfd, ad_getentryoff(ads, eid), SEEK_SET))
+ return -1;
- return 0;
+ if ((off_t)-1 == lseek(dfd, ad_getentryoff(add, eid), SEEK_SET))
+ return -1;
+
+#if 0 /* ifdef SENDFILE_FLAVOR_LINUX */
+ /* doesn't work With 2.6 FIXME, only check for EBADFD ? */
+ off_t offset = 0;
+ size_t size;
+ struct stat st;
+ #define BUF 128*1024*1024
+
+ if (fstat(sfd, &st) == 0) {
+
+ while (1) {
+ if ( offset >= st.st_size) {
+ return 0;
+ }
+ size = (st.st_size -offset > BUF)?BUF:st.st_size -offset;
+ if ((cc = sys_sendfile(dfd, sfd, &offset, size)) < 0) {
+ switch (errno) {
+ case ENOSYS:
+ case EINVAL: /* there's no guarantee that all fs support sendfile */
+ goto no_sendfile;
+ default:
+ return -1;
+ }
+ }
+ }
+ }
+ no_sendfile:
+ lseek(sfd, offset, SEEK_SET);
+#endif
+
+ while (1) {
+ if ((cc = read(sfd, filebuf, sizeof(filebuf))) < 0) {
+ if (errno == EINTR)
+ continue;
+ err = -1;
+ break;
+ }
+
+ if (!cc || ((err = copy_all(dfd, filebuf, cc)) < 0)) {
+ break;
+ }
+ }
+ return err;
}
projects / netatalk.git / blobdiff