ad, afppasswd, megatron: show version

diff --git a/bin/ad/ad.c b/bin/ad/ad.c
index 71a0f7449d36927e43deb7a63bcfc4d4813c3445..38fd62bb3890099335d3780496af36a1eaaf8004 100644 (file)
--- a/bin/ad/ad.c
+++ b/bin/ad/ad.c
@@ -36,6 +36,12 @@
 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)
@@ -57,6 +63,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;

diff --git a/bin/afppasswd/afppasswd.c b/bin/afppasswd/afppasswd.c
index 4c56875d1d59e07566bb69e5829ba7869bb99c35..7a003560b2c9a677128a369008a02ef582e8d53d 100644 (file)
--- a/bin/afppasswd/afppasswd.c
+++ b/bin/afppasswd/afppasswd.c
@@ -1,6 +1,4 @@
 /* 
- * $Id: afppasswd.c,v 1.19 2005-04-28 20:49:19 bfernhomberg Exp $
- *
  * Copyright 1999 (c) Adrian Sun (asun@u.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
  *
@@ -270,6 +268,7 @@ int main(int argc, char **argv)
   flags = ((uid = getuid()) == 0) ? OPT_ISROOT : 0;
 
   if (((flags & OPT_ISROOT) == 0) && (argc > 1)) {
+    fprintf(stderr, "afppasswd (Netatalk %s)\n", VERSION);
     fprintf(stderr, "Usage: afppasswd [-acfn] [-u minuid] [-p path] [username]\n");
     fprintf(stderr, "  -a        add a new user\n");
     fprintf(stderr, "  -c        create and initialize password file or specific user\n");

diff --git a/bin/megatron/megatron.c b/bin/megatron/megatron.c
index 1dc83d777c0991e5f4d7a85b911930f63b6143f8..c86ba637a8980119600e025e1c46041526c59b73 100644 (file)
--- a/bin/megatron/megatron.c
+++ b/bin/megatron/megatron.c
@@ -1,7 +1,3 @@
-/*
- * $Id: megatron.c,v 1.14 2010-01-27 21:27:53 didg Exp $
- */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
@@ -309,6 +305,14 @@ int main(int argc, char **argv)
 
     *newname = '\0';
     for ( c = 1 ; c < argc ; ++c ) {
+        if ( strcmp( argv [ c ], "--version" ) == 0 ) {
+           printf("%s (Netatalk %s megatron)\n", argv[0], VERSION);
+           return( -1 );
+       }
+        if ( strcmp( argv [ c ], "-v" ) == 0 ) {
+           printf("%s (Netatalk %s megatron)\n", argv[0], VERSION);
+           return( -1 );
+       }
         if ( strcmp( argv [ c ], "--header" ) == 0 ) {
            flags |= OPTION_HEADERONLY;
            continue;
@@ -337,4 +341,3 @@ int main(int argc, char **argv)
     }
     return( rv );
 }
-