/*
- * $Id: filedir.c,v 1.59 2009-10-16 00:15:53 didg Exp $
+ * $Id: filedir.c,v 1.63 2009-10-29 13:17:28 didg Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
#ifdef HAVE_STRINGS_H
#include <strings.h>
#endif
-#include <dirent.h>
#include <errno.h>
#include <sys/param.h>
uid_t uid;
int ret = AFP_OK;
#ifdef DEBUG
- LOG(log_info, logtype_afpd, "begin matchfile2dirperms:");
+ LOG(log_debug, logtype_afpd, "begin matchfile2dirperms:");
#endif /* DEBUG */
if (stat(upath, &st ) < 0) {
} /* end else if stat success */
#ifdef DEBUG
- LOG(log_info, logtype_afpd, "end matchfile2dirperms:");
+ LOG(log_debug, logtype_afpd, "end matchfile2dirperms:");
#endif /* DEBUG */
return ret;
}
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;
rbuf += sizeof( dbitmap ) + sizeof( u_char );
*rbuf = 0;
-#ifdef DEBUG
- LOG(log_info, logtype_afpd, "end afp_getfildirparams:");
-#endif /* DEBUG */
-
return( AFP_OK );
}
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));
setvoltime(obj, vol );
}
-#ifdef DEBUG
- LOG(log_info, logtype_afpd, "end afp_setfildirparams:");
-#endif /* DEBUG */
-
return( rc );
}
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;
setvoltime(obj, vol );
}
-#ifdef DEBUG
- LOG(log_info, logtype_afpd, "end afp_rename:");
-#endif /* DEBUG */
-
return( rc );
}
int did, rc;
u_int16_t vid;
-#ifdef DEBUG
- LOG(log_info, logtype_afpd, "begin afp_delete:");
-#endif /* DEBUG */
-
*rbuflen = 0;
ibuf += 2;
} 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 );
}
/* ------------------------ */
int retvalue;
#endif /* DROPKLUDGE */
-#ifdef DEBUG
- LOG(log_info, logtype_afpd, "begin afp_moveandrename:");
-#endif /* DEBUG */
-
*rbuflen = 0;
ibuf += 2;
setvoltime(obj, vol );
}
-#ifdef DEBUG
- LOG(log_info, logtype_afpd, "end afp_moveandrename:");
-#endif /* DEBUG */
-
return( rc );
}