Changeset 7507 for trunk/daemon/daemon.c

Timestamp:

Dec 26, 2008, 1:36:32 AM (12 years ago)

Author:

charles

Message:

(trunk daemon) #1619: tm-daemon: daemon mode fails on mipsel

File:

• trunk/daemon/daemon.c (modified) (3 diffs)

trunk/daemon/daemon.c

@@ -82 +82 @@
 }
 
+#if defined(WIN32)
+ #define USE_NO_DAEMON
+#elif !defined(HAVE_DAEMON) || defined(__MIPSEL__)
+ #define USE_TR_DAEMON
+#else
+ #define USE_OS_DAEMON
+#endif
+
 static int
 tr_daemon( int nochdir, int noclose )
 {
-#if defined(HAVE_DAEMON) && !defined(WIN32)
+#if defined(USE_OS_DAEMON)
     return daemon( nochdir, noclose );
-#else
+#elif defined(USE_TR_DAEMON)
     pid_t pid = fork( );
     if( pid < 0 )
@@ -126 +134 @@
         }
     }
+#else /* USE_NO_DAEMON */
+    return 0;
 #endif
 }
@@ -218 +228 @@
     }
 
-#ifndef WIN32
-    if( !foreground )
+    if( !foreground && tr_daemon( TRUE, FALSE ) < 0 )
     {
-        if( 0 > tr_daemon( TRUE, FALSE ) )
-        {
-            fprintf( stderr, "failed to daemonize: %s\n", strerror( errno ) );
-            exit( 1 );
-        }
-    }
-#endif
+        fprintf( stderr, "failed to daemonize: %s\n", strerror( errno ) );
+        exit( 1 );
+    }
 
     /* start the session */