Merge remote branch 'sf/product-2-2' into develop

[netatalk.git] / libatalk / adouble / ad_write.c

diff --git a/libatalk/adouble/ad_write.c b/libatalk/adouble/ad_write.c
index a142ef00fa47ac954beb6765e164085298b1123d..bfed9b400f27f8fd577310bc4052a76e2e6a5017 100644 (file)
--- a/libatalk/adouble/ad_write.c
+++ b/libatalk/adouble/ad_write.c
@@ -55,8 +55,7 @@ ssize_t ad_write(struct adouble *ad, uint32_t eid, off_t off, int end, const cha
     size_t roundup;
     off_t    r_off;
 
-    if (ad_data_fileno(ad) == -2) {
-        /* It's a symlink */
+    if (ad_data_fileno(ad) == AD_SYMLINK) {
         errno = EACCES;
         return -1;
     }
@@ -162,14 +161,22 @@ char            c = 0;
 /* ------------------------ */
 int ad_rtruncate( struct adouble *ad, const off_t size)
 {
-    if (sys_ftruncate(ad_reso_fileno(ad), size + ad->ad_eid[ ADEID_RFORK ].ade_off ) < 0 ) {
-        LOG(log_error, logtype_default, "sys_ftruncate: %s", strerror(errno));
-        return -1;
-    }
+    EC_INIT;
 
-    ad->ad_rlen = size;    
+#ifndef HAVE_EAFD
+    if (ad->ad_vers == AD_VERSION_EA && size == 0)
+        EC_NEG1( unlink(ad->ad_ops->ad_path(ad->ad_name, 0)) );
+    else
+#endif
+        EC_NEG1( sys_ftruncate(ad_reso_fileno(ad), size + ad->ad_eid[ ADEID_RFORK ].ade_off) );
 
-    return 0;
+EC_CLEANUP:
+    if (ret == 0)
+        ad->ad_rlen = size;    
+    else
+        LOG(log_error, logtype_default, "ad_rtruncate(\"%s\"): %s",
+            fullpathname(ad->ad_name), strerror(errno));
+    EC_EXIT;
 }
 
 int ad_dtruncate(struct adouble *ad, const off_t size)