Merge 2-1

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

diff --git a/bin/ad/ad.c b/bin/ad/ad.c
index c18268e6fd8a76662d20afc83734714dbe26e1f1..71a0f7449d36927e43deb7a63bcfc4d4813c3445 100644 (file)
--- a/bin/ad/ad.c
+++ b/bin/ad/ad.c
@@ -29,19 +29,18 @@
 #include <atalk/cnid.h>
 #include <atalk/volinfo.h>
 #include <atalk/logger.h>
+#include <atalk/util.h>
+
 #include "ad.h"
 
 static void usage_main(void)
 {
-/*
-    printf("Usage: ad ls|rm|cp|mv|set [file|dir, ...]\n");
-*/
-    printf("Usage: ad ls|cp [file|dir, ...]\n");
+    printf("Usage: ad ls|cp|rm|mv|find [file|dir, ...]\n");
 }
 
 int main(int argc, char **argv)
 {
-    setuplog("default log_debug /dev/tty");
+    setuplog("default log_note /dev/tty");
 
     if (argc < 2) {
         usage_main();
@@ -52,6 +51,12 @@ int main(int argc, char **argv)
         return ad_ls(argc - 1, argv + 1);
     else if (STRCMP(argv[1], ==, "cp"))
         return ad_cp(argc - 1, argv + 1);
+    else if (STRCMP(argv[1], ==, "rm"))
+        return ad_rm(argc - 1, argv + 1);
+    else if (STRCMP(argv[1], ==, "mv"))
+        return ad_mv(argc, argv);
+    else if (STRCMP(argv[1], ==, "find"))
+        return ad_find(argc, argv);
     else {
         usage_main();
         return 1;