Merge branch 'develop' into ad_set

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

diff --git a/bin/ad/ad.c b/bin/ad/ad.c
index 883378f58f68b2217feccb8c805f6df2883148b1..083bb62ae3905f0562706ea06dc986e92b5e6902 100644 (file)
--- a/bin/ad/ad.c
+++ b/bin/ad/ad.c
@@ -35,7 +35,7 @@
 
 static void usage_main(void)
 {
-    printf("Usage: ad ls|cp|rm|mv|find [file|dir, ...]\n");
+    printf("Usage: ad ls|cp|rm|mv|set|find [file|dir, ...]\n");
     printf("       ad -v|--version\n");
 }
 
@@ -48,8 +48,6 @@ int main(int argc, char **argv)
 {
     AFPObj obj = { 0 };
 
-    setuplog("default:note", "/dev/tty");
-
     if (argc < 2) {
         usage_main();
         return 1;
@@ -58,6 +56,8 @@ int main(int argc, char **argv)
     if (afp_config_parse(&obj, "") != 0)
         return 1;
 
+    setuplog("default:note", "/dev/tty");
+
     if (load_volumes(&obj, NULL) != 0)
         return 1;
 
@@ -69,6 +69,8 @@ int main(int argc, char **argv)
         return ad_rm(argc - 1, argv + 1, &obj);
     else if (STRCMP(argv[1], ==, "mv"))
         return ad_mv(argc, argv, &obj);
+    else if (STRCMP(argv[1], ==, "set"))
+        return ad_set(argc - 1, argv + 1, &obj);
     else if (STRCMP(argv[1], ==, "find"))
         return ad_find(argc, argv, &obj);
     else if (STRCMP(argv[1], ==, "-v")) {