From nobody Wed Feb 1 02:54:20 2023 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 4P662P1BWgz3bq7Q; Wed, 1 Feb 2023 02:54:21 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P662N6xRjz4LZc; Wed, 1 Feb 2023 02:54:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675220061; 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=zcozVP9t7ScUtGVyEzF+bMo7ITKeTdxBf0xpC9z5hKI=; b=BsleV4meygkbYvvPdV4fVhna41fJ8oKB8+951MuHr1oTJ3DUuT+VxnMYi7rJWSzH3QjN6i 6j/e+yCOnevDSB9daC0wgaukoJPDX9bfk8uNdUDbprPEEmXM7NdLcOs8F2fOSkzKWubZ1e bR2147Zo682VNuAHf8rIGDry9xpgVhgpnx4nUtJa7ML+WFhwX6cwVbqTz2t4r7JujiTVhH U4ptM5FhZYnEidEbRb7oO+5q3IovaXZQgKVUgTcmP9Fz897NQet7mvmizc/5iVafJmzNi3 lVWEWZ0mS+CmihCwBRAfUC0XkvBClyi2vn8Kp2CU2bK9hiFFgulpSspWjR2ksQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675220061; 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=zcozVP9t7ScUtGVyEzF+bMo7ITKeTdxBf0xpC9z5hKI=; b=CfovVMw0jD+l03ObRQg9o3lb40ZnGsEZsOgIPhrHvucT4P3bJb0o9+NjYcS0LaV3mwvprK LrkgnLp4Ld7dmGmnjppZpcQ1VlNS8X/nlkGtY5QZ+2Xu69KgO4RL75BRc7KSLiL//ZPHfk 8E+1k4kpcBgXihFFvUvvjZjHyfyPavxws0GxDy9JbgdEuMud5KVvwmHvwaO4JFd+Irh4Qm fIrHubSSml7HKDaT68PhKacNU1X1aeJ/mBxvZSTPYT1pLnI+6nW7ZTHfwsjLHSB/zh5ZKk 23ZZd3jiOTQ8dr5mC915ZSfm7U/RN3dfqNJoG8mxJnHsFpGjXImzMW8+T0Rk7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675220061; a=rsa-sha256; cv=none; b=cgKacujpL33f4dmYhK6v2iA94sLTdv0Fr0Vtpce2C2yOTC9hfe4anHrLeHQ7ME3S4uI+By /G9c2qzSAnZwmAQEt22vVzQkCYCifZ+g4gobZc4n9FHvaPBobOSs57gksrGgbAFtVp1QWk mg34x5mj+BK3RcdOYokJfuwe4Bor2jyZ98qVnRfxE14Yvzcnv4ChHlvLZgGHwClhZMgX2C QXt1SKtMCeCvuw82twDqvV2QzBG5DC5xXN+9xN97M7ty0GTdCA2Xjkl3s63SNHaBlIxQhh PUKQ9WdDdNLTWALAI/KxZNbnWLpuvZY731j+K8X4frwTsoFlaCWICUAeaEnriQ== 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 4P662N61W0z1CGt; Wed, 1 Feb 2023 02:54:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3112sKGu006306; Wed, 1 Feb 2023 02:54:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3112sKhg006305; Wed, 1 Feb 2023 02:54:20 GMT (envelope-from git) Date: Wed, 1 Feb 2023 02:54:20 GMT Message-Id: <202302010254.3112sKhg006305@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 3f89a2974875 - stable/13 - network.subr: Replace "\ " with "[[:space:]]" 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3f89a29748755a6bd06d8bb1f3ed77aa9e2b6293 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=3f89a29748755a6bd06d8bb1f3ed77aa9e2b6293 commit 3f89a29748755a6bd06d8bb1f3ed77aa9e2b6293 Author: Cy Schubert AuthorDate: 2022-12-21 16:06:02 +0000 Commit: Cy Schubert CommitDate: 2023-02-01 02:53:11 +0000 network.subr: Replace "\ " with "[[:space:]]" "[[:space:]]" is easier to read than "\ " and is conisitent with clone_up(). Reported by: eugen Differential Revision: https://reviews.freebsd.org/D37748 (cherry picked from commit fef0e429f190d396d5b3228166a012e85dd912f2) --- libexec/rc/network.subr | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/libexec/rc/network.subr b/libexec/rc/network.subr index f79e9314043c..76a5b94bc408 100644 --- a/libexec/rc/network.subr +++ b/libexec/rc/network.subr @@ -710,7 +710,7 @@ ipv4_down() for _inet in $inetList ; do # get rid of extraneous line case $_inet in - inet\ *) ;; + inet[[:space:]]*) ;; *) continue ;; esac @@ -750,7 +750,7 @@ ipv6_down() for _inet6 in $inetList ; do # get rid of extraneous line case $_inet6 in - inet6\ *) ;; + inet6[[:space:]]*) ;; *) continue ;; esac @@ -1017,7 +1017,7 @@ ifalias_af_common_handler() _args=$* case $_args in - ${_af}\ *) ;; + ${_af}[[:space:]]*) ;; *) return ;; esac @@ -1031,11 +1031,11 @@ ifalias_af_common_handler() case $_c in ${_af}) case $_tmpargs in - ${_af}\ *[0-9a-fA-F]-*) + ${_af}[[:space:]]*[0-9a-fA-F]-*) ifalias_af_common_handler $_if $_af $_action \ - `ifalias_expand_addr $_af $_action ${_tmpargs#${_af}\ }` + `ifalias_expand_addr $_af $_action ${_tmpargs#${_af}[[:space:]]}` ;; - ${_af}\ *) + ${_af}[[:space:]]*) ${IFCONFIG_CMD} $_if $_tmpargs $_action && _ret=0 ;; esac @@ -1049,11 +1049,11 @@ ifalias_af_common_handler() # Process the last component if any. if [ -n "${_tmpargs}" ]; then case $_tmpargs in - ${_af}\ *[0-9a-fA-F]-*) + ${_af}[[:space:]]*[0-9a-fA-F]-*) ifalias_af_common_handler $_if $_af $_action \ - `ifalias_expand_addr $_af $_action ${_tmpargs#${_af}\ }` + `ifalias_expand_addr $_af $_action ${_tmpargs#${_af}[[:space:]]}` ;; - ${_af}\ *) + ${_af}[[:space:]]*) ${IFCONFIG_CMD} $_if $_tmpargs $_action && _ret=0 ;; esac @@ -1086,10 +1086,10 @@ ifalias_af_common() eval ifconfig_args=\"\$$alias\" _iaf= case $ifconfig_args in - inet\ *) _iaf=inet ;; - inet6\ *) _iaf=inet6 ;; - link\ *) _iaf=link ;; - ether\ *) _iaf=ether ;; + inet[[:space:]]*) _iaf=inet ;; + inet6[[:space:]]*) _iaf=inet6 ;; + link[[:space:]]*) _iaf=link ;; + ether[[:space:]]*) _iaf=ether ;; esac case ${_af}:${_action}:${_iaf}:"${ifconfig_args}" in @@ -1137,7 +1137,7 @@ ifalias_af_common() case $_c in inet|inet6|link|ether) case $_tmpargs in - ${_af}\ *) + ${_af}[[:space:]]*) eval ifalias_af_common_handler $_if $_af $_action $_tmpargs && _ret=0 ;; esac @@ -1149,7 +1149,7 @@ ifalias_af_common() done # Process the last component case $_tmpargs in - ${_af}\ *) + ${_af}[[:space:]]*) ifalias_af_common_handler $_if $_af $_action $_tmpargs && _ret=0 ;; esac @@ -1262,7 +1262,7 @@ wlan_up() create_args="wlandev $parent `get_if_var $child create_args_IF`" debug_flags="`get_if_var $child wlandebug_IF`" case $_iflist in - ""|$child|$child\ *|*\ $child\ *|*\ $child) ;; + ""|$child|$child[[:space:]]*|*[[:space:]]$child[[:space:]]*|*[[:space:]]$child) ;; *) continue ;; esac # Skip if ${child} already exists. @@ -1302,7 +1302,7 @@ wlan_down() child_wlans=`get_if_var $parent wlans_IF` for child in ${child_wlans}; do case $_iflist in - ""|$child|$child\ *|*\ $child\ *|*\ $child) ;; + ""|$child|$child[[:space:]]*|*[[:space:]]$child[[:space:]]*|*[[:space:]]$child) ;; *) continue ;; esac # Skip if ${child} doesn't exists. @@ -1335,7 +1335,7 @@ clone_up() # Parse ifn:ifopt. OIFS=$IFS; IFS=:; set -- $ifn; ifn=$1; ifopt=$2; IFS=$OIFS case $_iflist in - ""|$ifn|$ifn\ *|*\ $ifn\ *|*\ $ifn) ;; + ""|$ifn|$ifn[[:space:]]*|*[[:space:]]$ifn[[:space:]]*|*[[:space:]]$ifn) ;; *) continue ;; esac case $ifn in @@ -1371,7 +1371,7 @@ clone_up() # Parse ifn:ifopt. OIFS=$IFS; IFS=:; set -- $ifn; ifn=$1; ifopt=$2; IFS=$OIFS case $_iflist in - ""|$ifn|$ifn\ *|*\ $ifn\ *|*\ $ifn) ;; + ""|$ifn|$ifn[[:space:]]*|*[[:space:]]$ifn[[:space:]]*|*[[:space:]]$ifn) ;; *) continue ;; esac # Skip if ifn already exists. @@ -1436,7 +1436,7 @@ clone_down() *:1) continue ;; # global sticky knob == 1 esac case $_iflist in - ""|$ifn|$ifn\ *|*\ $ifn\ *|*\ $ifn) ;; + ""|$ifn|$ifn[[:space:]]*|*[[:space:]]$ifn[[:space:]]*|*[[:space:]]$ifn) ;; *) continue ;; esac case $ifn in