Fixes

[netatalk.git] / etc / afpd / fork.c

diff --git a/etc/afpd/fork.c b/etc/afpd/fork.c
index 8092fd398d8b423723f785402748258ec98b2f3b..ea92e06b36975f4eacd6c0cb468b47d58c2f68b1 100644 (file)
--- a/etc/afpd/fork.c
+++ b/etc/afpd/fork.c
@@ -54,7 +54,7 @@ static int getforkparams(struct ofork *ofork, uint16_t bitmap, char *buf, size_t
         return( AFPERR_BITMAP );
     }
 
-    if ( ad_reso_fileno( ofork->of_ad ) == -1 ) { /* META ? */
+    if (! AD_META_OPEN(ofork->of_ad)) {
         adp = NULL;
     } else {
         adp = ofork->of_ad;
@@ -227,6 +227,7 @@ int afp_openfork(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, si
     struct stat     *st;
     uint16_t        bshort;
     struct path     *s_path;
+    struct stat xxx;
 
     ibuf++;
     fork = *ibuf++;
@@ -265,9 +266,6 @@ int afp_openfork(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, si
         return  AFPERR_BADTYPE;
     }
 
-    LOG(log_debug, logtype_afpd, "afp_openfork(\"%s\", %s)",
-        fullpathname(s_path->u_name), (fork & OPENFORK_RSCS) ? "RSRC" : "DATA");
-
     /* stat() data fork st is set because it's not a dir */
     switch ( s_path->st_errno ) {
     case 0:
@@ -310,6 +308,8 @@ int afp_openfork(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, si
     } else {
         eid = ADEID_RFORK;
         adflags = ADFLAGS_RF | ADFLAGS_HF;
+        if (!(access & OPENACC_WR))
+            adflags |= ADFLAGS_NORF;
     }
 
     path = s_path->m_name;
@@ -318,6 +318,11 @@ int afp_openfork(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, si
         return( AFPERR_NFILE );
     }
 
+    LOG(log_debug, logtype_afpd, "afp_openfork(\"%s\", %s, %s)",
+        fullpathname(s_path->u_name),
+        (fork & OPENFORK_RSCS) ? "data" : "reso",
+        !(access & OPENACC_WR) ? "O_RDONLY" : "O_RDWR");
+
     ret = AFPERR_NOOBJ;
     if (access & OPENACC_WR) {
         /* try opening in read-write mode */
@@ -328,7 +333,6 @@ int afp_openfork(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, si
                 ret = AFPERR_VLOCK;
             case EACCES:
                 goto openfork_err;
-                break;
             case ENOENT:
                 if (fork == OPENFORK_DATA) {
                     /* try to open only the data fork */
@@ -343,33 +347,29 @@ int afp_openfork(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, si
                     if (ad_open(ofork->of_ad, upath,
                                 adflags | ADFLAGS_RDWR | ADFLAGS_SETSHRMD | ADFLAGS_CREATE, 0666) < 0)
                         goto openfork_err;
-                    ofork->of_flags |= AFPFORK_OPEN;
+                    ofork->of_flags |= AFPFORK_META;
                 }
                 break;
             case EMFILE :
             case ENFILE :
                 ret = AFPERR_NFILE;
                 goto openfork_err;
-                break;
             case EISDIR :
                 ret = AFPERR_BADTYPE;
                 goto openfork_err;
-                break;
             default:
                 LOG(log_error, logtype_afpd, "afp_openfork(%s): ad_open: %s", s_path->m_name, strerror(errno) );
                 ret = AFPERR_PARAM;
                 goto openfork_err;
-                break;
             }
         }
         else {
             /* the ressource fork is open too */
-            ofork->of_flags |= AFPFORK_OPEN;
+            ofork->of_flags |= AFPFORK_META;
         }
     } else {
         /* try opening in read-only mode */
         ret = AFPERR_NOOBJ;
-        /* we need w access for setting deny mode fcntl excl lock */
         if (ad_open(ofork->of_ad, upath, adflags | ADFLAGS_RDONLY | ADFLAGS_SETSHRMD) < 0) {
             switch ( errno ) {
             case EROFS:
@@ -385,8 +385,8 @@ int afp_openfork(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, si
                     }
                     adflags = ADFLAGS_DF;
                 }
-                /* else we don't set AFPFORK_OPEN because there's no ressource fork file
-                 * We need to check AFPFORK_OPEN in afp_closefork(). eg fork open read-only
+                /* else we don't set AFPFORK_META because there's no ressource fork file
+                 * We need to check AFPFORK_META in afp_closefork(). eg fork open read-only
                  * then create in open read-write.
                  * FIXME , it doesn't play well with byte locking example:
                  * ressource fork open read only
@@ -398,21 +398,16 @@ int afp_openfork(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, si
             case ENFILE :
                 ret = AFPERR_NFILE;
                 goto openfork_err;
-                break;
             case EISDIR :
                 ret = AFPERR_BADTYPE;
                 goto openfork_err;
-                break;
             default:
                 LOG(log_error, logtype_afpd, "afp_openfork(\"%s\"): %s",
                     fullpathname(s_path->m_name), strerror(errno) );
                 goto openfork_err;
-                break;
             }
-        }
-        else {
-            /* the ressource fork is open too */
-            ofork->of_flags |= AFPFORK_OPEN;
+        } else {
+            ofork->of_flags |= AFPFORK_META;
         }
     }
 
@@ -452,9 +447,8 @@ int afp_openfork(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, si
 
     /* don't try to lock non-existent rforks. */
     if ((eid == ADEID_DFORK)
-        || (ad_meta_fileno(ofork->of_ad) != -1)
-        || (vol->v_adouble & AD_VERSION_EA)) { /* META */
-
+        || (ad_reso_fileno(ofork->of_ad) != -1)
+        || (ofork->of_ad->ad_vers == AD_VERSION_EA)) {
         ret = fork_setmode(ofork->of_ad, eid, access, ofrefnum);
         /* can we access the fork? */
         if (ret < 0) {
@@ -569,7 +563,7 @@ int afp_setforkparams(AFPObj *obj _U_, char *ibuf, size_t ibuflen, char *rbuf _U
         if (err < 0)
             goto afp_setfork_err;
     } else if (bitmap == (1<<FILPBIT_RFLEN) || bitmap == (1<<FILPBIT_EXTRFLEN)) {
-        ad_refresh( ofork->of_ad );
+        ad_refresh(NULL, ofork->of_ad );
 
         st_size = ad_size(ofork->of_ad, eid);
         err = -2;
@@ -1075,7 +1069,7 @@ int flushfork(struct ofork *ofork)
          (ofork->of_flags & AFPFORK_RSRC)) {
 
         /* read in the rfork length */
-        ad_refresh(ofork->of_ad);
+        ad_refresh(NULL, ofork->of_ad);
 
         /* set the date if we're dirty */
         if ((ofork->of_flags & AFPFORK_DIRTY) && !gettimeofday(&tv, NULL)) {
@@ -1145,6 +1139,9 @@ static ssize_t write_file(struct ofork *ofork, int eid,
         }
     }
 
+    LOG(log_debug, logtype_afpd, "write_file(off: %ju, size: %zu)",
+        (uintmax_t)offset, rbuflen);
+
     if (( cc = ad_write(ofork->of_ad, eid, offset, 0,
                         rbuf, rbuflen)) < 0 ) {
         switch ( errno ) {
@@ -1250,15 +1247,16 @@ static int write_fork(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, s
     case AFPPROTO_DSI:
     {
         DSI *dsi = obj->handle;
-
         /* find out what we have already and write it out. */
         cc = dsi_writeinit(dsi, rbuf, *rbuflen);
+
         if (!cc || (cc = write_file(ofork, eid, offset, rbuf, cc, xlate)) < 0) {
             dsi_writeflush(dsi);
             *rbuflen = 0;
             ad_tmplock(ofork->of_ad, eid, ADLOCK_CLR, saveoff, reqcount, ofork->of_refnum);
             return cc;
         }
+
         offset += cc;
 
 #if 0 /*def HAVE_SENDFILE_WRITE*/
@@ -1361,15 +1359,14 @@ int afp_getforkparams(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbu
         return( AFPERR_PARAM );
     }
 
-    if ( ad_meta_fileno( ofork->of_ad ) != -1 ) { /* META */
-        if ( ad_refresh( ofork->of_ad ) < 0 ) {
+    if (AD_META_OPEN(ofork->of_ad)) {
+        if ( ad_refresh(NULL, ofork->of_ad ) < 0 ) {
             LOG(log_error, logtype_afpd, "getforkparams(%s): ad_refresh: %s", of_name(ofork), strerror(errno) );
             return( AFPERR_PARAM );
         }
     }
 
-    if (AFP_OK != ( ret = getforkparams( ofork, bitmap,
-                                         rbuf + sizeof( u_short ), &buflen ))) {
+    if (AFP_OK != (ret = getforkparams(ofork, bitmap, rbuf + sizeof( u_short ), &buflen ))) {
         return( ret );
     }