git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mac OS X: strerror_r on Macs is not like GNU strerror_r.
[libguestfs.git]
/
src
/
guestfs.c
diff --git
a/src/guestfs.c
b/src/guestfs.c
index
02d5fdb
..
01642b4
100644
(file)
--- a/
src/guestfs.c
+++ b/
src/guestfs.c
@@
-33,6
+33,7
@@
#include <sys/stat.h>
#include <sys/select.h>
#include <dirent.h>
#include <sys/stat.h>
#include <sys/select.h>
#include <dirent.h>
+#include <signal.h>
#include <rpc/types.h>
#include <rpc/xdr.h>
#include <rpc/types.h>
#include <rpc/xdr.h>
@@
-95,6
+96,10
@@
static int qemu_supports (guestfs_h *g, const char *option);
#define UNIX_PATH_MAX 108
#define UNIX_PATH_MAX 108
+#ifndef MAX
+#define MAX(a,b) ((a)>(b)?(a):(b))
+#endif
+
/* Also in guestfsd.c */
#define GUESTFWD_ADDR "10.0.2.4"
#define GUESTFWD_PORT "6666"
/* Also in guestfsd.c */
#define GUESTFWD_ADDR "10.0.2.4"
#define GUESTFWD_PORT "6666"
@@
-390,7
+395,7
@@
guestfs_perrorf (guestfs_h *g, const char *fs, ...)
if (err < 0) return;
if (err < 0) return;
-#if
ndef _GNU_SOURCE
+#if
!defined(_GNU_SOURCE) || defined(__APPLE__)
char buf[256];
strerror_r (errnum, buf, sizeof buf);
#else
char buf[256];
strerror_r (errnum, buf, sizeof buf);
#else
@@
-1620,7
+1625,7
@@
test_qemu (guestfs_h *g)
char cmd[1024];
FILE *fp;
char cmd[1024];
FILE *fp;
- snprintf (cmd, sizeof cmd, "LC_ALL=C '%s' -help", g->qemu);
+ snprintf (cmd, sizeof cmd, "LC_ALL=C '%s' -
nographic -
help", g->qemu);
fp = popen (cmd, "r");
/* qemu -help should always work (qemu -version OTOH wasn't
fp = popen (cmd, "r");
/* qemu -help should always work (qemu -version OTOH wasn't
@@
-1642,7
+1647,8
@@
test_qemu (guestfs_h *g)
if (pclose (fp) == -1)
goto error;
if (pclose (fp) == -1)
goto error;
- snprintf (cmd, sizeof cmd, "LC_ALL=C '%s' -version 2>/dev/null", g->qemu);
+ snprintf (cmd, sizeof cmd, "LC_ALL=C '%s' -nographic -version 2>/dev/null",
+ g->qemu);
fp = popen (cmd, "r");
if (fp) {
fp = popen (cmd, "r");
if (fp) {