Merge 2-2

[netatalk.git] / bin / ad / ad.h

diff --git a/bin/ad/ad.h b/bin/ad/ad.h
index d97f4b0643df9543e9b333179caf533c72af3a53..3195641f7cb291c78e66d580a4d3a047f9d53997 100644 (file)
--- a/bin/ad/ad.h
+++ b/bin/ad/ad.h
@@ -22,6 +22,7 @@
 #include <signal.h>
 #include <arpa/inet.h>
 
+#include <atalk/globals.h>
 #include <atalk/ftw.h>
 #include <atalk/cnid.h>
 #include <atalk/compat.h>
@@ -37,6 +38,8 @@
     }
 #endif
 
+#define ADVOL_V2_OR_EA(ad) ((ad) == AD_VERSION2 || (ad) == AD_VERSION_EA)
+
 enum logtype {STD, DBG};
 
 #define SLOG(...)                             \
@@ -56,14 +59,15 @@ typedef struct {
 extern int log_verbose;             /* Logging flag */
 extern void _log(enum logtype lt, char *fmt, ...);
 
-extern int ad_ls(int argc, char **argv);
-extern int ad_cp(int argc, char **argv);
-extern int ad_rm(int argc, char **argv);
-extern int ad_mv(int argc, char **argv);
-extern int ad_find(int argc, char **argv);
+extern int ad_ls(int argc, char **argv, AFPObj *obj);
+extern int ad_cp(int argc, char **argv, AFPObj *obj);
+extern int ad_rm(int argc, char **argv, AFPObj *obj);
+extern int ad_mv(int argc, char **argv, AFPObj *obj);
+extern int ad_set(int argc, char **argv, AFPObj *obj);
+extern int ad_find(int argc, char **argv, AFPObj *obj);
 
 /* ad_util.c */
-extern int openvol(const char *path, afpvol_t *vol);
+extern int openvol(AFPObj *obj, const char *path, afpvol_t *vol);
 extern void closevol(afpvol_t *vol);
 extern cnid_t cnid_for_path(const afpvol_t *vol, const char *path, cnid_t *did);
 extern cnid_t cnid_for_paths_parent(const afpvol_t *vol, const char *path, cnid_t *did);