git.annexia.org
/
libguestfs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0a302b7
)
daemon/Win32: Win32 can't fork message moved to separate function (Jim Meyering)
author
Richard Jones
<rjones@redhat.com>
Thu, 26 Nov 2009 09:29:02 +0000
(09:29 +0000)
committer
Richard Jones
<rjones@redhat.com>
Thu, 26 Nov 2009 10:32:00 +0000
(10:32 +0000)
daemon/guestfsd.c
patch
|
blob
|
history
diff --git
a/daemon/guestfsd.c
b/daemon/guestfsd.c
index
9691053
..
eef7c6d
100644
(file)
--- 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
#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;
/* 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) {
/* Fork into the background. */
if (!dont_fork) {
-#ifndef WIN32
if (daemon (0, 1) == -1) {
perror ("daemon");
exit (EXIT_FAILURE);
}
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. */
}
/* Enter the main loop, reading and performing actions. */