[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] qemu-io: Improve portability (win32 now supported).
From: |
Stefan Weil |
Subject: |
[Qemu-devel] [PATCH] qemu-io: Improve portability (win32 now supported). |
Date: |
Mon, 31 Aug 2009 22:16:16 +0200 |
* Add missing include for struct timeval.
* Replace non-portable strsep by local qemu_strsep.
* Use POSIX basename by including libgen.h.
Signed-off-by: Stefan Weil <address@hidden>
---
cmd.c | 23 ++++++++++++++++++++++-
configure | 2 ++
qemu-io.c | 2 ++
3 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/cmd.c b/cmd.c
index f3f4385..d86ba7c 100644
--- a/cmd.c
+++ b/cmd.c
@@ -20,6 +20,7 @@
#include <string.h>
#include <ctype.h>
#include <errno.h>
+#include <sys/time.h>
#include "cmd.h"
@@ -283,6 +284,26 @@ fetchline(void)
}
#endif
+static char *qemu_strsep(char **input, const char *delim)
+{
+ char *result = *input;
+ if (result != NULL) {
+ char *p = result;
+ for (p = result; *p != '\0'; p++) {
+ if (strchr(delim, *p)) {
+ break;
+ }
+ }
+ if (*p == '\0') {
+ *input = NULL;
+ } else {
+ *p = '\0';
+ *input = p + 1;
+ }
+ }
+ return result;
+}
+
char **
breakline(
char *input,
@@ -292,7 +313,7 @@ breakline(
char *p;
char **rval = calloc(sizeof(char *), 1);
- while (rval && (p = strsep(&input, " ")) != NULL) {
+ while (rval && (p = qemu_strsep(&input, " ")) != NULL) {
if (!*p)
continue;
c++;
diff --git a/configure b/configure
index 47fb57c..61ce1f6 100755
--- a/configure
+++ b/configure
@@ -1919,6 +1919,8 @@ if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then
tools="qemu-img\$(EXESUF) $tools"
if [ "$linux" = "yes" ] ; then
tools="qemu-nbd\$(EXESUF) qemu-io\$(EXESUF) $tools"
+ elif test "$mingw32" = "yes" ; then
+ tools="qemu-io\$(EXESUF) $tools"
fi
fi
echo "TOOLS=$tools" >> $config_host_mak
diff --git a/qemu-io.c b/qemu-io.c
index f96a4de..cac72e9 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -7,10 +7,12 @@
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
+#include <sys/time.h>
#include <sys/types.h>
#include <stdarg.h>
#include <stdio.h>
#include <getopt.h>
+#include <libgen.h>
#include "qemu-common.h"
#include "block_int.h"
--
1.5.6.5
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [PATCH] qemu-io: Improve portability (win32 now supported).,
Stefan Weil <=