added version reporting for the main daemons with a -v switch

diff --git a/ChangeLog b/ChangeLog
index 43794057252c36dc61c80a340fbabcc95b78f1a7..fbefe16017f5acd7744ad34895aef2fe2cf96f2a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,23 @@
+
+2001-09-10  jeff b  <jeff@univrel.pr.uconn.edu>
+
+       * etc/afpd/afp_options.c, etc/atalkd/main.c, etc/papd/main.c:
+       added version reporting with -v switch
+
+2001-09-06  jeff b  <jeff@univrel.pr.uconn.edu>
+
+       * etc/atalkd/main.c, etc/papd/main.c, etc/psf/psf.c,
+       libatalk/asp/asp_getsess.c, libatalk/dsi/dsi_getsess.c,
+       libatalk/pap/pap_slinit.c, libatalk/util/server_child.c:
+       autoconf POSIX.1 sys/wait.h check
+
+       * lots of files: AC_HEADER_STDC autoconf changes
+
+       * sys/netatalk/endian.h: used autoconf endian test instead
+       of manually checking every architecture
+
 2001-09-05  joe c <marcus@marcuscom.com>
+
        * libatalk/cnid/cnid_open.c: comment out DB_JOINENV as this is not
        supported in db3 3.1.17
 

diff --git a/etc/afpd/afp_options.c b/etc/afpd/afp_options.c
index 939035652fe35add50687f7e6f771c6c8dce65fc..1f33199fc7f220daeed4bcd80c435e4c7e6e4c94 100644 (file)
--- a/etc/afpd/afp_options.c
+++ b/etc/afpd/afp_options.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: afp_options.c,v 1.9 2001-09-06 20:00:59 rufustfirefly Exp $
+ * $Id: afp_options.c,v 1.10 2001-09-10 18:27:14 rufustfirefly Exp $
  *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
@@ -61,7 +61,7 @@ char *strchr (), *strrchr ();
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
 #endif /* MIN */
 
-#define OPTIONS "dn:f:s:uc:g:P:ptDS:TL:F:U:I"
+#define OPTIONS "dn:f:s:uc:g:P:ptDS:TL:F:U:Iv"
 #define LENGTH 512
 
 /* return an option. this uses an internal array, so it's necessary
@@ -352,6 +352,10 @@ int afp_options_parse(int ac, char **av, struct afp_options *options)
        case 'U':
            options->uamlist = optarg;
            break;
+       case 'v':       /* version */
+           printf( 'afpd (version %s)\n', VERSION );
+           exit ( 1 );
+           break;
        case 'I':
            options->flags |= OPTION_CUSTOMICON;
        default :

diff --git a/etc/atalkd/main.c b/etc/atalkd/main.c
index 64f81948d09f9a96b73c5fceef2024c5b9cf2803..ae4fa9a654d2c7ef51ed11e77b7f2e77507a5590 100644 (file)
--- a/etc/atalkd/main.c
+++ b/etc/atalkd/main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: main.c,v 1.8 2001-09-06 19:04:39 rufustfirefly Exp $
+ * $Id: main.c,v 1.9 2001-09-10 18:27:14 rufustfirefly Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -862,7 +862,7 @@ int main( ac, av )
     char               *prog;
 ;
 
-    while (( c = getopt( ac, av, "12qsdtf:P:" )) != EOF ) {
+    while (( c = getopt( ac, av, "12qsdtf:P:v" )) != EOF ) {
        switch ( c ) {
        case '1' :
            defphase = IFACE_PHASE1;
@@ -896,6 +896,11 @@ int main( ac, av )
            pidfile = optarg;
            break;
 
+       case 'v' :      /* version */
+           printf( 'atalkd (version %s)\n', version );
+           exit ( 1 );
+           break;
+
        default :
            fprintf( stderr, "Unknown option -- '%c'\n", c );
            exit( 1 );

diff --git a/etc/papd/main.c b/etc/papd/main.c
index b5e4c35786252a492ee532813f7b8acdd190a424..3ce1336eb78bb852672c737820ba65c7497bcc9e 100644 (file)
--- a/etc/papd/main.c
+++ b/etc/papd/main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: main.c,v 1.11 2001-09-06 20:00:59 rufustfirefly Exp $
+ * $Id: main.c,v 1.12 2001-09-10 18:27:14 rufustfirefly Exp $
  *
  * Copyright (c) 1990,1995 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -211,7 +211,7 @@ int main( ac, av )
     defprinter.p_pagecost_msg = NULL;
     defprinter.p_lock = "lock";
 
-    while (( c = getopt( ac, av, "adf:p:P:" )) != EOF ) {
+    while (( c = getopt( ac, av, "adf:p:P:v" )) != EOF ) {
        switch ( c ) {
        case 'a' :              /* for compatibility with old papd */
            break;
@@ -232,6 +232,11 @@ int main( ac, av )
            pidfile = optarg;
            break;
 
+       case 'v' :              /* version */
+           printf( 'papd (version %s)\n', VERSION );
+           exit ( 1 );
+           break;
+
        default :
            fprintf( stderr,
                    "Usage:\t%s [ -d ] [ -f conffile ] [ -p printcap ]\n",