rename the ad binary to nad, GitHub #2337

The new name, nad, stands for Netatalk AppleDouble, emphasizing that it
is operating on Netatalk style AppleDouble metadata specifically,
and depends on Netatalk running on the same host that you run nad on.

This also reduces some ambiguity in the Netatalk codebase, since "ad"
is used internally to also refer to the AppleDouble module in libatalk,
for instance the "logtype_ad" logtype in the netatalk logger module.

Author: rdmark

bin/ad/meson.build

@@ -1,6 +1,6 @@
-subdir('ad')
 subdir('afppasswd')
 subdir('misc')
+subdir('nad')
 
 if have_appletalk
     subdir('aecho')

bin/meson.build

@@ -0,0 +1,33 @@
+nad_sources = [
+    'ftw.c',
+    'nad_cp.c',
+    'nad_find.c',
+    'nad_ls.c',
+    'nad_mv.c',
+    'nad_rm.c',
+    'nad_set.c',
+    'nad_util.c',
+    'nad.c',
+]
+
+nad_deps = [bstring, iniparser]
+
+if have_iconv
+    nad_deps += iconv
+endif
+
+if use_mysql_backend
+    nad_deps += mysqlclient
+endif
+
+executable(
+    'nad',
+    nad_sources,
+    include_directories: root_includes,
+    dependencies: nad_deps,
+    link_with: libatalk,
+    c_args: [naddir, dversion],
+    install: true,
+    build_rpath: rpath_libdir,
+    install_rpath: rpath_libdir,
+)

bin/ad/ftw.c renamed to bin/nad/ftw.c

@@ -32,17 +32,17 @@
 #include <atalk/netatalk_conf.h>
 #include <atalk/util.h>
 
-#include "ad.h"
+#include "nad.h"
 
 static void usage_main(void)
 {
-    printf("Usage: ad ls|cp|rm|mv|set|find [file|dir, ...]\n");
-    printf("       ad -v|--version\n");
+    printf("Usage: nad ls|cp|rm|mv|set|find [file|dir, ...]\n");
+    printf("       nad -v|--version\n");
 }
 
 static void show_version(void)
 {
-    printf("ad (Netatalk %s)\n", VERSION);
+    printf("nad (Netatalk %s)\n", VERSION);
 }
 
 int main(int argc, char **argv)
@@ -54,7 +54,7 @@ int main(int argc, char **argv)
         return 1;
     }
 
-    if (afp_config_parse(&obj, "ad") != 0) {
+    if (afp_config_parse(&obj, "nad") != 0) {
         return 1;
     }
 

bin/ad/ftw.h renamed to bin/nad/ftw.h

@@ -73,7 +73,7 @@
 #include <atalk/vfs.h>
 #include <atalk/volume.h>
 
-#include "ad.h"
+#include "nad.h"
 #include "ftw.h"
 
 #define STRIP_TRAILING_SLASH(p) {                                   \
@@ -163,8 +163,8 @@ static void set_signal(void)
 static void usage_cp(void)
 {
     printf(
-        "Usage: ad cp [-R] [-aipvf] <source_file> <target_file>\n"
-        "       ad cp [-R] [-aipvfx] <source_file [source_file ...]> <target_directory>\n\n"
+        "Usage: nad cp [-R] [-aipvf] <source_file> <target_file>\n"
+        "       nad cp [-R] [-aipvfx] <source_file [source_file ...]> <target_directory>\n\n"
         "In the first synopsis form, the cp utility copies the contents of the source_file to the\n"
         "target_file.  In the second synopsis form, the contents of each named source_file is copied to the\n"
         "destination target_directory.  The names of the files themselves are not changed.  If cp detects an\n"

bin/nad/meson.build

@@ -34,7 +34,7 @@
 #include <atalk/unicode.h>
 #include <atalk/util.h>
 
-#include "ad.h"
+#include "nad.h"
 
 static volatile sig_atomic_t alarmed;
 
@@ -84,7 +84,7 @@ static void set_signal(void)
 static void usage_find(void)
 {
     printf(
-        "Usage: ad find [-v VOLUME_PATH] NAME\n"
+        "Usage: nad find [-v VOLUME_PATH] NAME\n"
     );
 }
 

bin/ad/ad.c renamed to bin/nad/nad.c

@@ -34,7 +34,7 @@
 #include <atalk/adouble.h>
 #include <atalk/cnid.h>
 
-#include "ad.h"
+#include "nad.h"
 
 #define ADv2_DIRNAME ".AppleDouble"
 
@@ -136,7 +136,7 @@ static const char *check_netatalk_dirs(const char *name)
 static void usage_ls(void)
 {
     printf(
-        "Usage: ad ls [-dRl[u]] [file|dir, ...]\n\n"
+        "Usage: nad ls [-dRl[u]] [file|dir, ...]\n\n"
         "  -l Long Output [-u: unix info]:\n"
         "     <unixinfo ...> <FinderFlags> <AFPAttributes> <Color> <Type> <Creator> <CNID from AppleDouble> <name>\n\n"
         "     FinderFlags (valid for (f)ile and/or (d)irectory):\n"