X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslurpd%2Fmain.c;h=5a5a61fdb1d6fd146d4fd670a386de7db066792d;hb=84583b6494bb063a6d8d06150449c09a5f14b25f;hp=d4ff5bcc4614869d6ba331cdab68d9aa0cd87f70;hpb=d49de831ef8eee5d3cd2b536b9b06145a77fd39f;p=openldap

diff --git a/servers/slurpd/main.c b/servers/slurpd/main.c
index d4ff5bcc46..5a5a61fdb1 100644
--- a/servers/slurpd/main.c
+++ b/servers/slurpd/main.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
@@ -17,6 +18,8 @@
 
 #include "portable.h"
 
+#include <ac/stdlib.h>
+
 #include <stdio.h>
 
 #include "slurp.h"
@@ -38,20 +41,23 @@ main(
 
     int			i;
 
+    /* initialize thread package */
+    ldap_pvt_thread_initialize();
+
     /* 
      * Create and initialize globals.  init_globals() also initializes
      * the main replication queue.
      */
     if (( sglob = init_globals()) == NULL ) {
 	fprintf( stderr, "Out of memory initializing globals\n" );
-	exit( 1 );
+	exit( EXIT_FAILURE );
     }
 
     /*
      * Process command-line args and fill in globals.
      */
     if ( doargs( argc, argv, sglob ) < 0 ) {
-	exit( 1 );
+	exit( EXIT_FAILURE );
     }
 
     /*
@@ -61,6 +67,14 @@ main(
 	fprintf( stderr,
 		"Errors encountered while processing config file \"%s\"\n",
 		sglob->slapd_configfile );
+	exit( EXIT_FAILURE );
+    }
+
+    /* 
+     * Make sure our directory exists
+     */
+    if ( mkdir(sglob->slurpd_rdir, 0755) == -1 && errno != EEXIST) {
+	perror(sglob->slurpd_rdir);
 	exit( 1 );
     }
 
@@ -70,7 +84,7 @@ main(
     if ( sglob->st->st_read( sglob->st )) {
 	fprintf( stderr, "Malformed slurpd status file \"%s\"\n",
 		sglob->slurpd_status_file, 0, 0 );
-	exit( 1 );
+	exit( EXIT_FAILURE );
     }
 
     /*
@@ -78,30 +92,16 @@ main(
      * Check for any fatal error conditions before we get started
      */
      if ( sanity() < 0 ) {
-	exit( 1 );
+	exit( EXIT_FAILURE );
     }
 
     /*
-     * Detach from the controlling terminal, if debug level = 0,
-     * and if not in one-shot mode.
+     * Detach from the controlling terminal
+     * unless the -d flag is given or in one-shot mode.
      */
-#ifdef LDAP_DEBUG
-    if (( ldap_debug == 0 )  && !sglob->one_shot_mode )
-#else /* LDAP_DEBUG */
-    if ( !sglob->one_shot_mode )
-#endif /* LDAP_DEBUG */
+    if ( ! (sglob->no_detach || sglob->one_shot_mode) )
 	lutil_detach( 0, 0 );
 
-	/* initialize thread package */
-	ldap_pvt_thread_initialize();
-
-    /*
-     * Start threads - one thread for each replica
-     */
-    for ( i = 0; sglob->replicas[ i ] != NULL; i++ ) {
-	start_replica_thread( sglob->replicas[ i ]);
-    }
-
     /*
      * Start the main file manager thread (in fm.c).
      */
@@ -110,14 +110,30 @@ main(
 	{
 	Debug( LDAP_DEBUG_ANY, "file manager ldap_pvt_thread_create failed\n",
 		0, 0, 0 );
-	exit( 1 );
+	exit( EXIT_FAILURE );
+
+    }
 
+    /*
+     * wait for fm to finish if in oneshot mode
+     */
+    if ( sglob->one_shot_mode ) {
+	ldap_pvt_thread_join( sglob->fm_tid, (void *) NULL );
+    }
+
+    /*
+     * Start threads - one thread for each replica
+     */
+    for ( i = 0; sglob->replicas[ i ] != NULL; i++ ) {
+	start_replica_thread( sglob->replicas[ i ]);
     }
 
     /*
      * Wait for the fm thread to finish.
      */
-    ldap_pvt_thread_join( sglob->fm_tid, (void *) NULL );
+    if ( !sglob->one_shot_mode ) {
+	ldap_pvt_thread_join( sglob->fm_tid, (void *) NULL );
+    }
 
     /*
      * Wait for the replica threads to finish.
@@ -126,8 +142,8 @@ main(
 	ldap_pvt_thread_join( sglob->replicas[ i ]->ri_tid, (void *) NULL );
     }
 
-	/* destroy the thread package */
-	ldap_pvt_thread_destroy();
+    /* destroy the thread package */
+    ldap_pvt_thread_destroy();
 
     Debug( LDAP_DEBUG_ANY, "slurpd: terminated.\n", 0, 0, 0 );
 	return 0;