From nobody Mon Jan 2 18:20:48 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 4Nm41D5SsLz2pB94; Mon, 2 Jan 2023 18:20:48 +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 4Nm41D52Jkz3jB0; Mon, 2 Jan 2023 18:20:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672683648; 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=Xtlf6YYCqpSX5kqOdi3RyKnJlkUsxg5T61bZiRCiS04=; b=RZOpMpF9n6AHFJGbI5C0ZpwBN1nKNfkcoAGvc6If0dIlvwefPyf1fVynI+aJiEGfBFyE77 W+IbiiRUQCpXIOd8HQ/I0yZsZHiepsP3jm8E4SzAnmOiYXj7mjJg+4VIs1ZVa2GCVJ8lmv a4NfBifpg0pvesAu9LGn0HgeOSxbJqLF4dx6ELiQF+kJjXW3Me9BetVjd8B5wh+oGpgEjr yhYRe4W4tUdtg3ZjVKzIAFAXnfqyLGNLPsJTRodELplODw2KO0JvHxOFliSCG39oYGrGvz mCWl1mspGlIBe9Bms9RKitrBWvHj3d9CWH20y6gaE+IixnvOuQnoValSCkhyVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672683648; 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=Xtlf6YYCqpSX5kqOdi3RyKnJlkUsxg5T61bZiRCiS04=; b=X2AMGTU7AjhuqQYw3AKwdp/R82F2RAxUz05VsG9+84aRbxE2o21oZUDN0PruiuKK4ba88t 7urRNV34ZM86fh6An/7uzIq6l+GSnxWDBDWeoqCVaw3GdUCLKXUQ6o0hoBwqLE3HPcNEj5 V+VUCT5/IsYpsCjftmHAOe12RWcPQWwG8trRJwCrkhLhi5V+bu84NUusg7E8pkgXUr7006 MF+7aIak0eAONoPY1EapzRCF5Ps2gkhicETOMaP/tB9+SsNve9U0u3MJz9Oan26IhYiaLJ g4jyhZsCdwo287AH/kfgzjsCFjrVTOtoTBEoQCat5tVReeWfaekx4eDh25VmPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672683648; a=rsa-sha256; cv=none; b=gU3y4P9kU7T4Kx9R1eTkT2np6v9cVkQxe6c/kRK710BGSnxq6dSUYvdsr05XPZ0sUiqvN0 FBuFzWHGqs2Zxpv2eBqs+qZvIoDPZe8mkr0Qx6NNKSSmINo5AX4ngcT/6EDsoauaPQNVqU 3a28TRJLcrMhxVzUwKi02HqWYuuahOUWtqMwvKqg54xo9pY/7waPgiOR0cB4eNky9/ZGQa BdkyIC4aI8Mg6bZkbfewPL3hOnB2FHbnYN2HHXAzdIHjtkE0Y9+Znr4MSuYEDB1VImx+E2 d75Y/lvtxRApD1AIDbIAgU+15VHOQaxkpssx07PNeSQdoRfo3gPcdJWdb1ZNIA== 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 4Nm41D457fz1GfG; Mon, 2 Jan 2023 18:20:48 +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 302IKmPk095173; Mon, 2 Jan 2023 18:20:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 302IKmud095172; Mon, 2 Jan 2023 18:20:48 GMT (envelope-from git) Date: Mon, 2 Jan 2023 18:20:48 GMT Message-Id: <202301021820.302IKmud095172@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: fef0e429f190 - main - 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/main X-Git-Reftype: branch X-Git-Commit: fef0e429f190d396d5b3228166a012e85dd912f2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=fef0e429f190d396d5b3228166a012e85dd912f2 commit fef0e429f190d396d5b3228166a012e85dd912f2 Author: Cy Schubert AuthorDate: 2022-12-21 16:06:02 +0000 Commit: Cy Schubert CommitDate: 2023-01-02 18:20:05 +0000 network.subr: Replace "\ " with "[[:space:]]" "[[:space:]]" is easier to read than "\ " and is conisitent with clone_up(). Reported by: eugen MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D37748 --- 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 2475841ffb40..2d9ee8913c72 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