remove redundant debug output, it's already print in afp_dsi

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

diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c
index be346452636531f4e5bac78d95f6f52755081cf2..f5ce7fbca6dc341ec637786624336ca7a1ab3e19 100644 (file)
--- a/etc/afpd/filedir.c
+++ b/etc/afpd/filedir.c
@@ -1,5 +1,5 @@
 /*
- * $Id: filedir.c,v 1.59 2009-10-16 00:15:53 didg Exp $
+ * $Id: filedir.c,v 1.62 2009-10-29 12:58:11 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -29,7 +29,6 @@ char *strchr (), *strrchr ();
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#include <dirent.h>
 #include <errno.h>
 #include <sys/param.h>
 
@@ -142,10 +141,6 @@ int afp_getfildirparams(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *r
     u_int16_t          fbitmap, dbitmap, vid;
     struct path         *s_path;
 
-#ifdef DEBUG
-    LOG(log_info, logtype_afpd, "begin afp_getfildirparams:");
-#endif /* DEBUG */
-
     *rbuflen = 0;
     ibuf += 2;
 
@@ -220,10 +215,6 @@ int afp_getfildirparams(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *r
     rbuf += sizeof( dbitmap ) + sizeof( u_char );
     *rbuf = 0;
 
-#ifdef DEBUG
-    LOG(log_info, logtype_afpd, "end afp_getfildirparams:");
-#endif /* DEBUG */
-
     return( AFP_OK );
 }
 
@@ -236,10 +227,6 @@ int afp_setfildirparams(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf
     u_int16_t  vid, bitmap;
     int                did, rc;
 
-#ifdef DEBUG
-    LOG(log_info, logtype_afpd, "begin afp_setfildirparams:");
-#endif /* DEBUG */
-
     *rbuflen = 0;
     ibuf += 2;
     memcpy( &vid, ibuf, sizeof(vid));
@@ -294,10 +281,6 @@ int afp_setfildirparams(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf
         setvoltime(obj, vol );
     }
 
-#ifdef DEBUG
-    LOG(log_info, logtype_afpd, "end afp_setfildirparams:");
-#endif /* DEBUG */
-
     return( rc );
 }
 
@@ -447,9 +430,6 @@ int afp_rename(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size
     u_int16_t  vid;
     int         isdir = 0;
     int         rc;
-#ifdef DEBUG
-    LOG(log_info, logtype_afpd, "begin afp_rename:");
-#endif /* DEBUG */
 
     *rbuflen = 0;
     ibuf += 2;
@@ -511,10 +491,6 @@ int afp_rename(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size
         setvoltime(obj, vol );
     }
 
-#ifdef DEBUG
-    LOG(log_info, logtype_afpd, "end afp_rename:");
-#endif /* DEBUG */
-
     return( rc );
 }
 
@@ -528,10 +504,6 @@ int afp_delete(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size
     int                        did, rc;
     u_int16_t          vid;
 
-#ifdef DEBUG
-    LOG(log_info, logtype_afpd, "begin afp_delete:");
-#endif /* DEBUG */ 
-
     *rbuflen = 0;
     ibuf += 2;
 
@@ -565,17 +537,22 @@ int afp_delete(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size
     } else if (of_findname(s_path)) {
         rc = AFPERR_BUSY;
     } else {
-        rc = deletefile(vol, upath, 1);
+        /* it's a file st_valid should always be true
+         * only test for ENOENT because EACCES needs
+         * to read meta data in deletefile
+         */
+        if (s_path->st_valid && s_path->st_errno == ENOENT) {
+            rc = AFPERR_NOOBJ;
+        }
+        else {
+            rc = deletefile(vol, upath, 1);
+        }
     }
     if ( rc == AFP_OK ) {
        curdir->offcnt--;
         setvoltime(obj, vol );
     }
 
-#ifdef DEBUG
-    LOG(log_info, logtype_afpd, "end afp_delete:");
-#endif /* DEBUG */
-
     return( rc );
 }
 /* ------------------------ */
@@ -643,10 +620,6 @@ int afp_moveandrename(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U
     int                retvalue;
 #endif /* DROPKLUDGE */
 
-#ifdef DEBUG
-    LOG(log_info, logtype_afpd, "begin afp_moveandrename:");
-#endif /* DEBUG */
-
     *rbuflen = 0;
     ibuf += 2;
 
@@ -738,10 +711,6 @@ int afp_moveandrename(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U
         setvoltime(obj, vol );
     }
 
-#ifdef DEBUG
-    LOG(log_info, logtype_afpd, "end afp_moveandrename:");
-#endif /* DEBUG */
-
     return( rc );
 }