git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update PO files.
[libguestfs.git]
/
daemon
/
guestfsd.c
diff --git
a/daemon/guestfsd.c
b/daemon/guestfsd.c
index
40b3c2f
..
9691053
100644
(file)
--- a/
daemon/guestfsd.c
+++ b/
daemon/guestfsd.c
@@
-60,6
+60,10
@@
static char *read_cmdline (void);
#define AI_ADDRCONFIG 0
#endif
#define AI_ADDRCONFIG 0
#endif
+#ifndef MAX
+#define MAX(a,b) ((a)>(b)?(a):(b))
+#endif
+
int verbose = 0;
static int print_shell_quote (FILE *stream, const struct printf_info *info, const void *const *args);
int verbose = 0;
static int print_shell_quote (FILE *stream, const struct printf_info *info, const void *const *args);
@@
-335,10
+339,15
@@
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. */