From nobody Mon Sep 29 02:42:51 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547726431776419.3085436051083; Thu, 17 Jan 2019 04:00:31 -0800 (PST) Received: from localhost ([127.0.0.1]:42767 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gk6LR-00007L-NK for importer@patchew.org; Thu, 17 Jan 2019 07:00:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57720) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gk678-0006LJ-5a for qemu-devel@nongnu.org; Thu, 17 Jan 2019 06:45:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gk677-0005gK-8n for qemu-devel@nongnu.org; Thu, 17 Jan 2019 06:45:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36022) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gk675-0005L8-Am for qemu-devel@nongnu.org; Thu, 17 Jan 2019 06:45:37 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 88AB15AF7B; Thu, 17 Jan 2019 11:45:23 +0000 (UTC) Received: from localhost (unknown [10.36.112.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 465385C57C; Thu, 17 Jan 2019 11:45:21 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 17 Jan 2019 15:43:47 +0400 Message-Id: <20190117114359.5164-16-marcandre.lureau@redhat.com> In-Reply-To: <20190117114359.5164-1-marcandre.lureau@redhat.com> References: <20190117114359.5164-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 17 Jan 2019 11:45:23 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 15/27] slirp: add slirp own version of pstrcpy 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: Li Zhijian , Jan Kiszka , Jason Wang , Zhang Chen , Samuel Thibault , pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Remove a dependency on qemu util. Signed-off-by: Marc-Andr=C3=A9 Lureau --- slirp/util.h | 2 ++ slirp/slirp.c | 4 ++-- slirp/tftp.c | 2 +- slirp/util.c | 17 +++++++++++++++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/slirp/util.h b/slirp/util.h index 782ae8ef0ee..e3332cdcd60 100644 --- a/slirp/util.h +++ b/slirp/util.h @@ -89,4 +89,6 @@ static inline int slirp_socket_set_fast_reuse(int fd) #endif } =20 +void slirp_pstrcpy(char *buf, int buf_size, const char *str); + #endif diff --git a/slirp/slirp.c b/slirp/slirp.c index 5450b52dbf4..9e38d3f8cb3 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -320,8 +320,8 @@ Slirp *slirp_init(int restricted, bool in_enabled, stru= ct in_addr vnetwork, slirp->vprefix_len =3D vprefix_len; slirp->vhost_addr6 =3D vhost6; if (vhostname) { - pstrcpy(slirp->client_hostname, sizeof(slirp->client_hostname), - vhostname); + slirp_pstrcpy(slirp->client_hostname, sizeof(slirp->client_hostnam= e), + vhostname); } slirp->tftp_prefix =3D g_strdup(tftp_path); slirp->bootp_filename =3D g_strdup(bootfile); diff --git a/slirp/tftp.c b/slirp/tftp.c index 6fb381ef337..f0bcc72c925 100644 --- a/slirp/tftp.c +++ b/slirp/tftp.c @@ -216,7 +216,7 @@ static void tftp_send_error(struct tftp_session *spt, =20 tp->tp_op =3D htons(TFTP_ERROR); tp->x.tp_error.tp_error_code =3D htons(errorcode); - pstrcpy((char *)tp->x.tp_error.tp_msg, sizeof(tp->x.tp_error.tp_msg), ms= g); + slirp_pstrcpy((char *)tp->x.tp_error.tp_msg, sizeof(tp->x.tp_error.tp_ms= g), msg); =20 m->m_len =3D sizeof(struct tftp_t) - (TFTP_BLOCKSIZE_MAX + 2) + 3 + strl= en(msg) - sizeof(struct udphdr); diff --git a/slirp/util.c b/slirp/util.c index 499c5cea46f..60f474f0aab 100644 --- a/slirp/util.c +++ b/slirp/util.c @@ -186,3 +186,20 @@ int slirp_closesocket(int fd) return ret; } #endif /* WIN32 */ + +void slirp_pstrcpy(char *buf, int buf_size, const char *str) +{ + int c; + char *q =3D buf; + + if (buf_size <=3D 0) + return; + + for(;;) { + c =3D *str++; + if (c =3D=3D 0 || q >=3D buf + buf_size - 1) + break; + *q++ =3D c; + } + *q =3D '\0'; +} --=20 2.20.1.98.gecbdaf0899