From nobody Sun Nov 2 17:23:29 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1527975303781828.4278258351078; Sat, 2 Jun 2018 14:35:03 -0700 (PDT) Received: from localhost ([::1]:32857 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fPEAw-0002Ri-UN for importer@patchew.org; Sat, 02 Jun 2018 17:35:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44432) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fPE6y-0007wZ-I4 for qemu-devel@nongnu.org; Sat, 02 Jun 2018 17:30:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fPE6u-0005lj-H4 for qemu-devel@nongnu.org; Sat, 02 Jun 2018 17:30:56 -0400 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:33963) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fPE6u-0005lQ-B1 for qemu-devel@nongnu.org; Sat, 02 Jun 2018 17:30:52 -0400 Received: by mail-qk0-x243.google.com with SMTP id q70-v6so13894775qke.1 for ; Sat, 02 Jun 2018 14:30:52 -0700 (PDT) Received: from localhost.localdomain (96-86-104-61-static.hfc.comcastbusiness.net. [96.86.104.61]) by smtp.gmail.com with ESMTPSA id k2-v6sm21366628qkl.95.2018.06.02.14.30.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 02 Jun 2018 14:30:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juliacomputing-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=si7VNUK4mI3QWawkK5K75wtjdteYW0WFYdUqAuNTNI4=; b=wD8StwQqyJZ6rE8iyMrUSY7q1GiTHGKBuxPLi6+sz1YrMp878Etd5gPxniW2bISeBo w7h9wjzZetB4jMWidyaZMxgtuqnH0nJaUX7zFhkrh15+W5GnNxLUZimiCvQxCnHtedZb wPW0mpz+/AsJY84DJFM6yzIaYB+A1iJEawclAuA5/Zetr2lKGp9v5/deopQ3EEqYIAFt mME9Aq2RHjXsER3cijeK8rq7GoFgIKh3a01Ke9K/YZS5f+7CvVrN8lcmYx9l8Kl6I8qP 17aNrWMBXrctoOfX6wvyvamr3t7io+JALTF9rNXMwpe1os1MQt1Jb/iAvLNnHFQ5Qqz9 Nhpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=si7VNUK4mI3QWawkK5K75wtjdteYW0WFYdUqAuNTNI4=; b=I4UkEdIi6UNoC+U+p9XTymWS/mPcXyONcXkQRMthFTFHOdqXgeYUesKD1WCWwJucBa GIsnIw3Ka0UPPpfHn/gIEBDL+xEXYlsBJ71+M9tTJ2VfA3v5Y1+5kX9giCF+k9j+LMsw NqEn1A7yScxEuuFtxMri56NO3n6VVEwWGJklz9na8nc8tO7ipPvLt1lMImScfu5qast2 BXTpGXstkG8Gz1R7yUGvRULZbbgi+jGztyxBpw4UJv1Gkm1xys4uv7t6KZjrBa+SEsCP 4AIDNSYbKjFElh1/V3blXjAqFOr74VLBgltL63vIqbkhEGzEsjGWGL39DLoDjI+NZWpI MrCg== X-Gm-Message-State: APt69E0ZeQnwFm66Zkh3uBaVtkN7790X19XAU7NFij2TfURbCSo2y95q Qq+lKp9Fq/bABQeyaQwgqgHDachLF+k= X-Google-Smtp-Source: ADUXVKIlXHQXq9Hs1k6unFAjAg+yHHnzbUG/bd+m4y+Lc0c5sCiY9aamsuj9KdTKPlqzCL1r1k8UfQ== X-Received: by 2002:a37:6ac6:: with SMTP id f189-v6mr6205388qkc.169.1527975051289; Sat, 02 Jun 2018 14:30:51 -0700 (PDT) From: Keno Fischer To: qemu-devel@nongnu.org Date: Sat, 2 Jun 2018 17:29:35 -0400 Message-Id: <51be4c123dbf92a45184e386bd7a62614430ba29.1527973524.git.keno@juliacomputing.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PATCH v3 1/5] cutils: Provide strchrnul X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Keno Fischer , groug@kaod.org, "Dr. David Alan Gilbert" , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" strchrnul is a GNU extension and thus unavailable on a number of targets. In the review for a commit removing strchrnul from 9p, I was asked to create a qemu_strchrnul helper to factor out this functionality. Do so, and use it in a number of other places in the code base that inlined the replacement pattern in a place where strchrnul could be used. Signed-off-by: Keno Fischer Acked-by: Greg Kurz --- Changes since v2: * Add configure check as suggested by Greg Kurz , and requested by Eric Blake * Use qemu_strchrnul in hmp_sendkey as suggested by Dr. David Alan Gilbert configure | 15 +++++++++++++++ hmp.c | 8 ++++---- hw/9pfs/9p-local.c | 2 +- include/qemu/cutils.h | 8 ++++++++ monitor.c | 8 ++------ util/cutils.c | 15 +++++++++++++++ util/qemu-option.c | 6 +----- util/uri.c | 6 ++---- 8 files changed, 48 insertions(+), 20 deletions(-) diff --git a/configure b/configure index a6a4616..1b3ca4e 100755 --- a/configure +++ b/configure @@ -4754,6 +4754,18 @@ if compile_prog "" "" ; then fi =20 ########################################## +# check if we have strchrnul + +strchrnul=3Dno +cat > $TMPC << EOF +#include +int main(void) { (void)strchrnul("Hello World", 'W'); } +EOF +if compile_prog "" "" ; then + strchrnul=3Dyes +fi + +########################################## # check if trace backend exists =20 $python "$source_path/scripts/tracetool.py" "--backends=3D$trace_backends"= --check-backends > /dev/null 2> /dev/null @@ -6210,6 +6222,9 @@ fi if test "$sem_timedwait" =3D "yes" ; then echo "CONFIG_SEM_TIMEDWAIT=3Dy" >> $config_host_mak fi +if test "$strchrnul" =3D "yes" ; then + echo "CONFIG_STRCHRNUL=3Dy" >> $config_host_mak +fi if test "$byteswap_h" =3D "yes" ; then echo "CONFIG_BYTESWAP_H=3Dy" >> $config_host_mak fi diff --git a/hmp.c b/hmp.c index ef93f48..416d4c9 100644 --- a/hmp.c +++ b/hmp.c @@ -2123,12 +2123,12 @@ void hmp_sendkey(Monitor *mon, const QDict *qdict) int has_hold_time =3D qdict_haskey(qdict, "hold-time"); int hold_time =3D qdict_get_try_int(qdict, "hold-time", -1); Error *err =3D NULL; - char *separator; + const char *separator; int keyname_len; =20 while (1) { - separator =3D strchr(keys, '-'); - keyname_len =3D separator ? separator - keys : strlen(keys); + separator =3D qemu_strchrnul(keys, '-'); + keyname_len =3D separator - keys; =20 /* Be compatible with old interface, convert user inputted "<" */ if (keys[0] =3D=3D '<' && keyname_len =3D=3D 1) { @@ -2165,7 +2165,7 @@ void hmp_sendkey(Monitor *mon, const QDict *qdict) keylist->value->u.qcode.data =3D idx; } =20 - if (!separator) { + if (!*separator) { break; } keys =3D separator + 1; diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c index 7758c38..304ef72 100644 --- a/hw/9pfs/9p-local.c +++ b/hw/9pfs/9p-local.c @@ -65,7 +65,7 @@ int local_open_nofollow(FsContext *fs_ctx, const char *pa= th, int flags, assert(*path !=3D '/'); =20 head =3D g_strdup(path); - c =3D strchrnul(path, '/'); + c =3D qemu_strchrnul(path, '/'); if (*c) { /* Intermediate path element */ head[c - path] =3D 0; diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h index a663340..809090c 100644 --- a/include/qemu/cutils.h +++ b/include/qemu/cutils.h @@ -122,6 +122,14 @@ int qemu_strnlen(const char *s, int max_len); * Returns: the pointer originally in @input. */ char *qemu_strsep(char **input, const char *delim); +#ifdef CONFIG_STRCHRNUL +static inline const char *qemu_strchrnul(const char *s, int c) +{ + return strchrnul(s, c); +} +#else +const char *qemu_strchrnul(const char *s, int c); +#endif time_t mktimegm(struct tm *tm); int qemu_fdatasync(int fd); int fcntl_setfl(int fd, int flag); diff --git a/monitor.c b/monitor.c index 922cfc0..e1f01c4 100644 --- a/monitor.c +++ b/monitor.c @@ -798,9 +798,7 @@ static int compare_cmd(const char *name, const char *li= st) p =3D list; for(;;) { pstart =3D p; - p =3D strchr(p, '|'); - if (!p) - p =3D pstart + strlen(pstart); + p =3D qemu_strchrnul(p, '|'); if ((p - pstart) =3D=3D len && !memcmp(pstart, name, len)) return 1; if (*p =3D=3D '\0') @@ -3401,9 +3399,7 @@ static void cmd_completion(Monitor *mon, const char *= name, const char *list) p =3D list; for(;;) { pstart =3D p; - p =3D strchr(p, '|'); - if (!p) - p =3D pstart + strlen(pstart); + p =3D qemu_strchrnul(p, '|'); len =3D p - pstart; if (len > sizeof(cmd) - 2) len =3D sizeof(cmd) - 2; diff --git a/util/cutils.c b/util/cutils.c index 0de69e6..c365ddb 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -545,6 +545,21 @@ int qemu_strtou64(const char *nptr, const char **endpt= r, int base, } =20 /** + * Searches for the first occurrence of 'c' in 's', and returns a pointer + * to the trailing null byte if none was found. + */ +#ifndef CONFIG_STRCHRNUL +const char *qemu_strchrnul(const char *s, int c) +{ + const char *e =3D strchr(s, c); + if (!e) { + e =3D s + strlen(s); + } + return e; +} +#endif + +/** * parse_uint: * * @s: String to parse diff --git a/util/qemu-option.c b/util/qemu-option.c index 58d1c23..54eca12 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -77,11 +77,7 @@ const char *get_opt_value(const char *p, char **value) =20 *value =3D NULL; while (1) { - offset =3D strchr(p, ','); - if (!offset) { - offset =3D p + strlen(p); - } - + offset =3D qemu_strchrnul(p, ','); length =3D offset - p; if (*offset !=3D '\0' && *(offset + 1) =3D=3D ',') { length++; diff --git a/util/uri.c b/util/uri.c index 8624a7a..8bdef84 100644 --- a/util/uri.c +++ b/util/uri.c @@ -52,6 +52,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/cutils.h" =20 #include "qemu/uri.h" =20 @@ -2266,10 +2267,7 @@ struct QueryParams *query_params_parse(const char *q= uery) /* Find the next separator, or end of the string. */ end =3D strchr(query, '&'); if (!end) { - end =3D strchr(query, ';'); - } - if (!end) { - end =3D query + strlen(query); + end =3D qemu_strchrnul(query, ';'); } =20 /* Find the first '=3D' character between here and end. */ --=20 2.8.1