Merge branch 'nohex' into develop

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

diff --git a/bin/ad/ad.c b/bin/ad/ad.c
index 38fd62bb3890099335d3780496af36a1eaaf8004..6115c2f2fb3c21b73e07d70793785fe82aae4417 100644 (file)
--- a/bin/ad/ad.c
+++ b/bin/ad/ad.c
@@ -27,9 +27,9 @@
 #include <errno.h>
 
 #include <atalk/cnid.h>
-#include <atalk/volinfo.h>
 #include <atalk/logger.h>
 #include <atalk/util.h>
+#include <atalk/netatalk_conf.h>
 
 #include "ad.h"
 
@@ -46,23 +46,31 @@ static void show_version(void)
 
 int main(int argc, char **argv)
 {
-    setuplog("default log_note /dev/tty");
+    AFPObj obj = { 0 };
+
+    setuplog("default:note", "/dev/tty");
 
     if (argc < 2) {
         usage_main();
         return 1;
     }
 
+    if (afp_config_parse(&obj) != 0)
+        return 1;
+
+    if (load_volumes(&obj, NULL) != 0)
+        return 1;
+
     if (STRCMP(argv[1], ==, "ls"))
-        return ad_ls(argc - 1, argv + 1);
+        return ad_ls(argc - 1, argv + 1, &obj);
     else if (STRCMP(argv[1], ==, "cp"))
-        return ad_cp(argc - 1, argv + 1);
+        return ad_cp(argc - 1, argv + 1, &obj);
     else if (STRCMP(argv[1], ==, "rm"))
-        return ad_rm(argc - 1, argv + 1);
+        return ad_rm(argc - 1, argv + 1, &obj);
     else if (STRCMP(argv[1], ==, "mv"))
-        return ad_mv(argc, argv);
+        return ad_mv(argc, argv, &obj);
     else if (STRCMP(argv[1], ==, "find"))
-        return ad_find(argc, argv);
+        return ad_find(argc, argv, &obj);
     else if (STRCMP(argv[1], ==, "-v")) {
         show_version();
         return 1;