mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-08-28 09:59:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging

Browse Source 
The Darwin host support still needs some more work. It won't make it for
soft-freeze, but I'd like these preparatory patches to be merged anyway.

# gpg: Signature made Fri 29 Jun 2018 11:39:04 BST
# gpg:                using RSA key 71D4D5E5822F73D6
# gpg: Good signature from "Greg Kurz <groug@kaod.org>"
# gpg:                 aka "Gregory Kurz <gregory.kurz@free.fr>"
# gpg:                 aka "[jpeg image of size 3330]"
# Primary key fingerprint: B482 8BAF 9431 40CE F2A3  4910 71D4 D5E5 822F 73D6

* remotes/gkurz/tags/for-upstream:
  9p: darwin: Explicitly cast comparisons of mode_t with -1
  cutils: Provide strchrnul

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
2018-06-29 16:56:45 +01:00
parent 75507f1aba 230f1b31c5
commit b2866c2915
8 changed files with 53 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
util/cutils.c
View File

@ -544,6 +544,21 @@ int qemu_strtou64(const char *nptr, const char **endptr, int base,
return check_strtox_error(nptr, ep, endptr, errno);
}
/**
* Searches for the first occurrence of 'c' in 's', and returns a pointer
* to the trailing null byte if none was found.
*/
#ifndef HAVE_STRCHRNUL
const char *qemu_strchrnul(const char *s, int c)
{
const char *e = strchr(s, c);
if (!e) {
e = s + strlen(s);
}
return e;
}
#endif
/**
* parse_uint:
*

6
util/qemu-option.c
View File

@ -77,11 +77,7 @@ const char *get_opt_value(const char *p, char **value)
*value = NULL;
while (1) {
offset = strchr(p, ',');
if (!offset) {
offset = p + strlen(p);
}
offset = qemu_strchrnul(p, ',');
length = offset - p;
if (*offset != '\0' && *(offset + 1) == ',') {
length++;

6
util/uri.c
View File

@ -52,6 +52,7 @@
*/
#include "qemu/osdep.h"
#include "qemu/cutils.h"
#include "qemu/uri.h"
@ -2266,10 +2267,7 @@ struct QueryParams *query_params_parse(const char *query)
/* Find the next separator, or end of the string. */
end = strchr(query, '&');
if (!end) {
end = strchr(query, ';');
}
if (!end) {
end = query + strlen(query);
end = qemu_strchrnul(query, ';');
}
/* Find the first '=' character between here and end. */