git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include HFS (Mac OS X) driver.
[libguestfs.git]
/
src
/
guestfs.c
diff --git
a/src/guestfs.c
b/src/guestfs.c
index
03089ea
..
a25e9e7
100644
(file)
--- a/
src/guestfs.c
+++ b/
src/guestfs.c
@@
-25,7
+25,6
@@
#include <stdarg.h>
#include <stddef.h>
#include <unistd.h>
#include <stdarg.h>
#include <stddef.h>
#include <unistd.h>
-#include <ctype.h>
#include <string.h>
#include <fcntl.h>
#include <time.h>
#include <string.h>
#include <fcntl.h>
#include <time.h>
@@
-62,6
+61,7
@@
#include "guestfs.h"
#include "guestfs-internal-actions.h"
#include "guestfs_protocol.h"
#include "guestfs.h"
#include "guestfs-internal-actions.h"
#include "guestfs_protocol.h"
+#include "c-ctype.h"
#include "ignore-value.h"
#ifdef HAVE_GETTEXT
#include "ignore-value.h"
#ifdef HAVE_GETTEXT
@@
-1195,6
+1195,8
@@
guestfs__launch (guestfs_h *g)
setpgid (0, 0);
#endif
setpgid (0, 0);
#endif
+ setenv ("LC_ALL", "C", 1);
+
execv (g->qemu, g->cmdline); /* Run qemu. */
perror (g->qemu);
_exit (1);
execv (g->qemu, g->cmdline); /* Run qemu. */
perror (g->qemu);
_exit (1);
@@
-1486,7
+1488,7
@@
test_qemu (guestfs_h *g)
g->qemu_help = NULL;
g->qemu_version = NULL;
g->qemu_help = NULL;
g->qemu_version = NULL;
- snprintf (cmd, sizeof cmd, "'%s' -help", g->qemu);
+ snprintf (cmd, sizeof cmd, "
LC_ALL=C
'%s' -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
@@
-1508,7
+1510,7
@@
test_qemu (guestfs_h *g)
if (pclose (fp) == -1)
goto error;
if (pclose (fp) == -1)
goto error;
- snprintf (cmd, sizeof cmd, "'%s' -version 2>/dev/null", g->qemu);
+ snprintf (cmd, sizeof cmd, "
LC_ALL=C
'%s' -version 2>/dev/null", g->qemu);
fp = popen (cmd, "r");
if (fp) {
fp = popen (cmd, "r");
if (fp) {
@@
-2136,7
+2138,7
@@
recv_from_daemon (guestfs_h *g, uint32_t *size_rtn, void **buf_rtn)
printf (" ");
printf ("|");
for (j = i; j < MIN (i+16, nr); ++j)
printf (" ");
printf ("|");
for (j = i; j < MIN (i+16, nr); ++j)
- if (isprint ((*(char **)buf_rtn)[j]))
+ if (
c_
isprint ((*(char **)buf_rtn)[j]))
printf ("%c", (*(char **)buf_rtn)[j]);
else
printf (".");
printf ("%c", (*(char **)buf_rtn)[j]);
else
printf (".");