From: Richard Jones <rjones@redhat.com>
Date: Thu, 26 Nov 2009 09:29:02 +0000 (+0000)
Subject: daemon/Win32: Win32 can't fork message moved to separate function (Jim Meyering)
X-Git-Tag: 1.0.80~32
X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=fcae398873453d0542123e040b388c3be10b14f8;ds=sidebyside

daemon/Win32: Win32 can't fork message moved to separate function (Jim Meyering)
---

diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c
index 9691053..eef7c6d 100644
--- a/daemon/guestfsd.c
+++ b/daemon/guestfsd.c
@@ -78,6 +78,17 @@ static int print_arginfo (const struct printf_info *info, size_t n, int *argtype
 #endif
 #endif
 
+#ifdef WIN32
+static int
+daemon (int nochdir, int noclose)
+{
+  fprintf (stderr,
+           "On Windows the daemon does not support forking into the "
+           "background.\nYou *must* run the daemon with the -f option.\n");
+  exit (EXIT_FAILURE);
+}
+#endif /* WIN32 */
+
 /* Location to mount root device. */
 const char *sysroot = "/sysroot"; /* No trailing slash. */
 int sysroot_len = 8;
@@ -339,15 +350,10 @@ main (int argc, char *argv[])
 
   /* Fork into the background. */
   if (!dont_fork) {
-#ifndef WIN32
     if (daemon (0, 1) == -1) {
       perror ("daemon");
       exit (EXIT_FAILURE);
     }
-#else /* WIN32 */
-    fprintf (stderr, "On Windows the daemon does not support forking into the background.\nYou *must* run the daemon with the -f option.\n");
-    exit (EXIT_FAILURE);
-#endif /* WIN32 */
   }
 
   /* Enter the main loop, reading and performing actions. */