Generate pid/arg files after detaching

diff --git a/servers/slurpd/main.c b/servers/slurpd/main.c
index 6db0b0fbee9ec41020e7576a9544485f0870c14b..5f53a89e6b9aea63e4126a77e8c708258a1dfc0a 100644 (file)
--- a/servers/slurpd/main.c
+++ b/servers/slurpd/main.c
@@ -178,42 +178,43 @@ int main( int argc, char **argv )
     }
 
 
-    if ( slurpd_pid_file != NULL ) {
-       FILE *fp = fopen( slurpd_pid_file, "w" );
+    /*
+     * Detach from the controlling terminal
+     * unless the -d flag is given or in one-shot mode.
+     */
+#ifndef HAVE_WINSOCK
+       if ( ! (sglob->no_detach || sglob->one_shot_mode) ) {
+               lutil_detach( 0, 0 );
+       }
+#endif
+
+       if ( slurpd_pid_file != NULL ) {
+               FILE *fp = fopen( slurpd_pid_file, "w" );
 
-       if( fp != NULL ) {
-               fprintf( fp, "%d\n", (int) getpid() );
-               fclose( fp );
+               if( fp != NULL ) {
+                       fprintf( fp, "%d\n", (int) getpid() );
+                       fclose( fp );
 
-       } else {
+               } else {
                free(slurpd_pid_file);
                slurpd_pid_file = NULL;
+               }
        }
-    }
 
-    if ( slurpd_args_file != NULL ) {
-       FILE *fp = fopen( slurpd_args_file, "w" );
-
-       if( fp != NULL ) {
-               for ( i = 0; i < argc; i++ ) {
-                       fprintf( fp, "%s ", argv[i] );
+       if ( slurpd_args_file != NULL ) {
+               FILE *fp = fopen( slurpd_args_file, "w" );
+
+               if( fp != NULL ) {
+                       for ( i = 0; i < argc; i++ ) {
+                               fprintf( fp, "%s ", argv[i] );
+                       }
+                       fprintf( fp, "\n" );
+                       fclose( fp );
+               } else {
+                       free(slurpd_args_file);
+                       slurpd_args_file = NULL;
                }
-               fprintf( fp, "\n" );
-               fclose( fp );
-       } else {
-               free(slurpd_args_file);
-               slurpd_args_file = NULL;
        }
-    }
-
-    /*
-     * Detach from the controlling terminal
-     * unless the -d flag is given or in one-shot mode.
-     */
-#ifndef HAVE_WINSOCK
-    if ( ! (sglob->no_detach || sglob->one_shot_mode) )
-       lutil_detach( 0, 0 );
-#endif
 
     if ( (rc = lutil_pair( sglob->wake_sds )) < 0 ) {
        SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 16 );