From nobody Mon Feb 17 19:41:45 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YxY221fvqz5p4K6; Mon, 17 Feb 2025 19:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YxY220fRWz3XsV; Mon, 17 Feb 2025 19:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739821306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZGgk4jBhx0QJCtTypVlaQ6a1zuBWKozLWOFPdGTEZiE=; b=OGd+APkHHfFAfJUCkdfP6F1wjtcv8J1EfpexeQ82ogIAtJjI2z2S/HuYnkU8WiUIRqakaJ n9PdC5tFfE8Dpy1p5qFFXvgLYPVGBn9nzJ0N9nssOY3cLN9YJm3qiJjYdsgacUa/w3nUCu hiweAqJnELGiMQG1nYhPes0wciIes1/RUQAH2W5APBcaY+nyCm9czNuiQvL2oO4XIYEcTs XHO6vZEMGIUVbtpxYoWUHeKMyPt1ouKDPCVdtSzz9Hp1VMJ+XKgNtp84JBgRFkVP4b9BBE 4b3rjj09DwpWZuMhvRjr0LlrYbfSRUyYDCflNYCqO1XaBZDCZoqD2UokL8yXow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739821306; a=rsa-sha256; cv=none; b=RJJJoiVr3qFCOJ0iWIhjp80peqo59BCORtSyu/wYG/YYQSL4YC0RUSRMGrN1uuWKsyDbc0 4duUu1WqBQG6RxrkLh8gVn73rUKGR9zQV+qdruMqMMsTJXRVHotBQTLKJdUEKM1AyvcdM3 8T91K8m1nFXZMWGRF4OHYah+qqh0/+8ORboODD9B5Py+CYi9p4tu5dfrJBIyAiDCKMRXki rTBgSqD0pB6Dxje4lbbY0b1Yw3YJLNsPN6AT9dSOn4/gWZ2h63zw3Uu7LtwlpNBic/9xJc uybwUG6xp54ExShiHBWB58+chpWJX++AhvAAqKmYGABmIiTZaPtWPzje7rBGVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739821306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZGgk4jBhx0QJCtTypVlaQ6a1zuBWKozLWOFPdGTEZiE=; b=LwqNo+XOyzKWtxtVfsEYa/VUixqT9cjDG/u1jY2d1T/U2EfXTe7R0t24E2iSTeKABrQ66Q tN4moxSYbkPKdgvXWx71/FK4IOWKW9PHDH/h5HIxYA3ZHLp8nZiDr8LNhDpnD6kBqEbNQ+ 5vAs7t0RFEspoK0Yu6LxzkMiJWVnk3RSrkWcnKh5u7zmZlNsUiLah5MpXFkK5vAkmIXlJh jAlhQ2u6jsPuIw1vEmIApnj7Vipit6Y/G0wJYgGwjGSqRgJ5VgIsOa7iBpeGgFuAzx62m9 Lldi3Soe6afOTxbRa4zWh03s4XZ57F8X86FGXVmrIxk/0FkkHa+Wyku00HuXuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YxY2202rmzmln; Mon, 17 Feb 2025 19:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51HJfjH5036106; Mon, 17 Feb 2025 19:41:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51HJfjwB036103; Mon, 17 Feb 2025 19:41:45 GMT (envelope-from git) Date: Mon, 17 Feb 2025 19:41:45 GMT Message-Id: <202502171941.51HJfjwB036103@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jamie Gritton Subject: git: dc384b96228f - stable/14 - MFC jls: fix the -q option to put quotes around all whitespace PR: 283414 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jamie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dc384b96228f1ffa64afe56abe636a2b6db66a48 Auto-Submitted: auto-generated The branch stable/14 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=dc384b96228f1ffa64afe56abe636a2b6db66a48 commit dc384b96228f1ffa64afe56abe636a2b6db66a48 Author: Jamie Gritton AuthorDate: 2025-02-13 15:48:18 +0000 Commit: Jamie Gritton CommitDate: 2025-02-17 19:41:08 +0000 MFC jls: fix the -q option to put quotes around all whitespace PR: 283414 (cherry picked from commit 3d11af1e595b5a3646be370e33c4aa850dc62bb0) --- usr.sbin/jls/jls.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/usr.sbin/jls/jls.c b/usr.sbin/jls/jls.c index c1cf074cd605..bd0bdfc83f2d 100644 --- a/usr.sbin/jls/jls.c +++ b/usr.sbin/jls/jls.c @@ -38,6 +38,7 @@ #include #include +#include #include #include #include @@ -516,13 +517,21 @@ quoted_print(int pflags, char *name, char *value) } /* - * The value will be surrounded by quotes if it contains spaces - * or quotes. + * The value will be surrounded by quotes if it contains + * whitespace or quotes. */ - qc = strchr(p, '\'') ? '"' - : strchr(p, '"') ? '\'' - : strchr(p, ' ') || strchr(p, '\t') ? '"' - : 0; + if (strchr(p, '\'')) + qc = '"'; + else if (strchr(p, '"')) + qc = '\''; + else { + qc = 0; + for (; *p; ++p) + if (isspace(*p)) { + qc = '"'; + break; + } + } if (qc && pflags & PRINT_QUOTED) xo_emit("{P:/%c}", qc);