Merge remote branch 'sf/branch-allea' into branch-allea

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

diff --git a/bin/ad/ad.c b/bin/ad/ad.c
index 71a0f7449d36927e43deb7a63bcfc4d4813c3445..ea312fa9f9a1a073ee741ad72a8e7c3f7cc8e6be 100644 (file)
--- a/bin/ad/ad.c
+++ b/bin/ad/ad.c
@@ -27,26 +27,40 @@
 #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"
 
 static void usage_main(void)
 {
     printf("Usage: ad ls|cp|rm|mv|find [file|dir, ...]\n");
+    printf("       ad -v|--version\n");
+}
+
+static void show_version(void)
+{
+    printf("ad (Netatalk %s)\n", VERSION);
 }
 
 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);
     else if (STRCMP(argv[1], ==, "cp"))
@@ -57,6 +71,14 @@ int main(int argc, char **argv)
         return ad_mv(argc, argv);
     else if (STRCMP(argv[1], ==, "find"))
         return ad_find(argc, argv);
+    else if (STRCMP(argv[1], ==, "-v")) {
+        show_version();
+        return 1;
+    }
+    else if  (STRCMP(argv[1], ==, "--version")) {
+        show_version();
+        return 1;
+    }
     else {
         usage_main();
         return 1;