Commit c32d766a authored by Stefan Weil's avatar Stefan Weil Committed by Anthony Liguori
Browse files

qemu-io: Improve portability (win32 now supported). 



* Add missing include for struct timeval.
* Replace non-portable strsep by local qemu_strsep.
* Use POSIX basename by including libgen.h.

Signed-off-by: default avatarStefan Weil <weil@mail.berlios.de>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent cc2040f8

cmd.c

+22 −1
Original line number Diff line number Diff line
@@ -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++;

configure

+2 −0
Original line number Diff line number Diff line
@@ -1929,6 +1929,8 @@ if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then 
    if [ "$check_utests" = "yes" ]; then

      tools="check-qint check-qstring check-qdict $tools"

    fi

  elif test "$mingw32" = "yes" ; then

      tools="qemu-io\$(EXESUF) $tools"

  fi

fi

echo "TOOLS=$tools" >> $config_host_mak

qemu-io.c

+2 −0
Original line number Diff line number Diff line
@@ -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"