From nobody Wed Feb 01 02:56:13 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 4P664Y66jCz3bqQh; Wed, 1 Feb 2023 02:56:13 +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 4P664Y53YHz4LxT; Wed, 1 Feb 2023 02:56:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675220173; 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=7afqy0HM6H5t0yyuftLgN7r9RfiJ1Z729UHyPIJOYcM=; b=QljroHjpwih02DdhK/GrtjAN+zZC7BS3KUqBASyixRXT7dLFjoi2u+2620u8jYmBGv2NLq eumwjLT6LAscm+yIDZNkODm9pWpqs8mRb8l1J5DLYchKfpXWgVPcYjELRhmL82fYZhy+YS vnQQKJy6hgV51EyEHfSj0ogDApxP9hOgx/SjL2REPRDpbYGltCSfa/t/pdQw9CXDHQMNLw 0oPVlEj7WxhsnYTrn2lim2OP6Nme32YtKwSyFr8kGqDImGJw1eaOnbj6uoYu2KXYj7NP7X c4NAzhMWhYhaeS8OliWrU2MQF2Xqvev8DYdD8EfoVR/RJWIqmEcQOvAHQiQKiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675220173; 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=7afqy0HM6H5t0yyuftLgN7r9RfiJ1Z729UHyPIJOYcM=; b=wfmKkTwQByXNwNYJzlVCyCmHDfNNPKzvaZYtpdOOKv8R67Fi+i5NIlibISijmUh/UwExzh XUqPe7j3Eh0sdJlp7q9sLuIugc2sowckrSFyU3lbjA0VQIz+Xvml0q/IQOcwOk/2ovIgy9 w0EvIbu0JsIFf+pFLGlOKDRlUixBf8Xm5EAMz3Ca66gKjIlAd8jhRTxFsW3DaWqL8FW2Y9 tN09ugTAfE7wYuify8dEIgBLOREyaA89Lw4BDR+0Xgr8/N4cSB+DNwoB2tXVP+Sj1KTaYa qWYX1ErquqXRq94IdAoTAchMq+tDwJQ/jtnm8ulOajXDEKTt6MdLuFK9cvIk/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675220173; a=rsa-sha256; cv=none; b=yPXZfAq0YRa8+49E1Lw43SIaaDJaLr5CiOB6xnN/q7nioENJ61Om+hsV0fGwS/w0afmmmA 7sUL38Vn7XQJwSX+cFV/4tnIPmPYrGbZ0Rk2OZPTitBEdoP3yu3tHj3BUGrv2yp918kLHk lAe/OCRJLkqhxZgAqi8EB3NNPMqwpBYLaaHv284T6ywZwvBR3pexn8NAj3uCaodpOusYtU CbhHeMJPzk5UcbRFpiT9ntoLPSmKy+COQN8Sqxu6CWrKQd82kyRYUA/EqPevbjXN5/OIoB ud+w+SHs+huPqFOu7uAUQDf+lmSon4+ePHAI1qbSp2Qonmvv8dcWWUI/0nTxlw== 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 4P664Y453fz1CVn; Wed, 1 Feb 2023 02:56:13 +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 3112uDYH006679; Wed, 1 Feb 2023 02:56:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3112uDNt006678; Wed, 1 Feb 2023 02:56:13 GMT (envelope-from git) Date: Wed, 1 Feb 2023 02:56:13 GMT Message-Id: <202302010256.3112uDNt006678@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: 82de173cbc81 - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: 82de173cbc81a09191ac23a2b2e2df3d83dd55ef Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=82de173cbc81a09191ac23a2b2e2df3d83dd55ef commit 82de173cbc81a09191ac23a2b2e2df3d83dd55ef Author: Cy Schubert AuthorDate: 2022-12-21 16:06:02 +0000 Commit: Cy Schubert CommitDate: 2023-02-01 02:55:19 +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 623c3d95b32e..793784f8c927 100644 --- a/libexec/rc/network.subr +++ b/libexec/rc/network.subr @@ -709,7 +709,7 @@ ipv4_down() for _inet in $inetList ; do # get rid of extraneous line case $_inet in - inet\ *) ;; + inet[[:space:]]*) ;; *) continue ;; esac @@ -749,7 +749,7 @@ ipv6_down() for _inet6 in $inetList ; do # get rid of extraneous line case $_inet6 in - inet6\ *) ;; + inet6[[:space:]]*) ;; *) continue ;; esac @@ -1016,7 +1016,7 @@ ifalias_af_common_handler() _args=$* case $_args in - ${_af}\ *) ;; + ${_af}[[:space:]]*) ;; *) return ;; esac @@ -1030,11 +1030,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 @@ -1048,11 +1048,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 @@ -1085,10 +1085,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 @@ -1136,7 +1136,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 @@ -1148,7 +1148,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 @@ -1259,7 +1259,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. @@ -1299,7 +1299,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. @@ -1332,7 +1332,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 @@ -1368,7 +1368,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. @@ -1433,7 +1433,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