Remove bdb env on exit

[netatalk.git] / contrib / timelord / timelord.c

diff --git a/contrib/timelord/timelord.c b/contrib/timelord/timelord.c
index 6adad416cf33144cd5f014067717f4189ce4c9fc..60fdb8e5069c1fa36ff8b6da9e0cdc2bad5b0992 100644 (file)
--- a/contrib/timelord/timelord.c
+++ b/contrib/timelord/timelord.c
@@ -1,5 +1,5 @@
 /*
- * $Id: timelord.c,v 1.4 2001-02-26 15:39:00 rufustfirefly Exp $
+ * $Id: timelord.c,v 1.8 2005-04-28 20:49:36 bfernhomberg Exp $
  *
  * Copyright (c) 1990,1992 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -18,25 +18,32 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+#endif /* HAVE_CONFIG_H */
 
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/file.h>
 #include <sys/uio.h>
+#include <stdlib.h>
+
+#include <unistd.h>
+
 #include <netatalk/at.h>
 #include <netatalk/endian.h>
 #include <atalk/atp.h>
+#include <atalk/nbp.h>
 
 #include <time.h>
 #ifdef HAVE_SGTTY_H
 #include <sgtty.h>
 #endif /* HAVE_SGTTY_H */
+#include <errno.h>
 #include <signal.h>
-#include <syslog.h>
+#pragma warn "testing 123"
+#include <atalk/logger.h>
 #include <stdio.h>
-#include <strings.h>
+#include <string.h>
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif /* HAVE_NETDB_H */
@@ -65,8 +72,7 @@ char  *bad = "Bad request!";
 char   buf[ 4624 ];
 char   *server;
 
-usage( p )
-    char       *p;
+void usage( char *p )
 {
     char       *s;
 
@@ -85,17 +91,15 @@ usage( p )
 void
 goaway(int signal)
 {
-    if ( nbp_unrgstr( server, "TimeLord", "*" ) < 0 ) {
-       syslog( LOG_ERR, "Can't unregister %s", server );
+    if ( nbp_unrgstr( server, "TimeLord", "*", NULL ) < 0 ) {
+       LOG(log_error, logtype_default, "Can't unregister %s", server );
        exit( 1 );
     }
-    syslog( LOG_INFO, "going down" );
+    LOG(log_info, logtype_default, "going down" );
     exit( 0 );
 }
 
-main( ac, av )
-    int                ac;
-    char       **av;
+int main( int ac, char **av )
 {
     ATP                        atp;
     struct sockaddr_at sat;
@@ -148,7 +152,7 @@ main( ac, av )
            }
            if (( i = open( "/dev/tty", O_RDWR )) >= 0 ) {
                (void)ioctl( i, TIOCNOTTY, 0 );
-               setpgrp( 0, getpid());
+               setpgid( 0, getpid());
                (void)close( i );
            }
            break;
@@ -168,23 +172,24 @@ main( ac, av )
 
 #ifdef ultrix
     openlog( p, LOG_PID );
-#else ultrix
-    openlog( p, LOG_NDELAY|LOG_PID, LOG_DAEMON );
-#endif ultrix
+#else /* ultrix */
+    set_processname(p);
+    syslog_setup(log_debug, logtype_default, logoption_ndelay|logoption_pid, logfacility_daemon );
+#endif /* ultrix */
 
     /* allocate memory */
     memset (&sat.sat_addr, 0, sizeof (sat.sat_addr));
 
     if (( atp = atp_open( ATADDR_ANYPORT, &sat.sat_addr )) == NULL ) {
-       syslog( LOG_ERR, "main: atp_open: %m" );
+       LOG(log_error, logtype_default, "main: atp_open: %s", strerror( errno ) );
        exit( 1 );
     }
 
     if ( nbp_rgstr( atp_sockaddr( atp ), server, "TimeLord", "*" ) < 0 ) {
-       syslog( LOG_ERR, "Can't register %s", server );
+       LOG(log_error, logtype_default, "Can't register %s", server );
        exit( 1 );
     }
-    syslog( LOG_INFO, "%s:TimeLord started", server );
+    LOG(log_info, logtype_default, "%s:TimeLord started", server );
 
        signal(SIGHUP, goaway);
        signal(SIGTERM, goaway);
@@ -199,7 +204,7 @@ main( ac, av )
        bzero( &sat, sizeof( struct sockaddr_at ));
        atpb.atp_rreqdlen = sizeof( buf );
        if ( atp_rreq( atp, &atpb ) < 0 ) {
-           syslog( LOG_ERR, "main: atp_rreq: %m" );
+           LOG(log_error, logtype_default, "main: atp_rreq: %s", strerror( errno ) );
            exit( 1 );
        }
 
@@ -213,16 +218,16 @@ main( ac, av )
            if ( atpb.atp_rreqdlen > 5 ) {
                    bcopy( p + 1, &mtime, sizeof( long ));
                    mtime = ntohl( mtime );
-                   syslog( LOG_INFO, "gettime from %s %s was %u",
+                   LOG(log_info, logtype_default, "gettime from %s %s was %lu",
                            (*( p + 5 ) == '\0' ) ? "<unknown>" : p + 5,
                            ( *p == 0 ) ? "at boot" : "in chooser",
                            mtime );
            } else {
-                   syslog( LOG_INFO, "gettime" );
+                   LOG(log_info, logtype_default, "gettime" );
            }
 
            if ( gettimeofday( &tv, &tz ) < 0 ) {
-               syslog( LOG_ERR, "main: gettimeofday: %m" );
+               LOG(log_error, logtype_default, "main: gettimeofday: %s", strerror( errno ) );
                exit( 1 );
            }
            if (( tm = gmtime( &tv.tv_sec )) == 0 ) {
@@ -240,7 +245,7 @@ main( ac, av )
            break;
 
        default :
-           syslog( LOG_ERR, bad );
+           LOG(log_error, logtype_default, bad );
 
            resp = TL_BAD;
            bcopy( &resp, buf, sizeof( long ));
@@ -254,7 +259,7 @@ main( ac, av )
        atpb.atp_sresiov = &iov;
        atpb.atp_sresiovcnt = 1;
        if ( atp_sresp( atp, &atpb ) < 0 ) {
-           syslog( LOG_ERR, "main: atp_sresp: %m" );
+           LOG(log_error, logtype_default, "main: atp_sresp: %s", strerror( errno ) );
            exit( 1 );
        }
     }