From a7ecdcf5d0d55e8e695d5724c579f89ca2704f87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Thu, 19 Aug 2021 18:02:16 +0200 Subject: Switch to portable [!...] vs. [^...] patterns. --- subr.rtl/rtl_complex.subr | 10 +++++----- subr.rtl/rtl_string.subr | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'subr.rtl') diff --git a/subr.rtl/rtl_complex.subr b/subr.rtl/rtl_complex.subr index f315fd90..1e13fce7 100644 --- a/subr.rtl/rtl_complex.subr +++ b/subr.rtl/rtl_complex.subr @@ -36,11 +36,11 @@ rtl_filter_vars() { fi; continue; ;; *) case "${_var_spec}" in - [^=]*=\"*\") _qchar=""; _vname="${_var_spec%%=\"*}"; ;; - [^=]*=\"*) _qchar="\""; _vname="${_var_spec%%=\"*}"; ;; - [^=]*=\'*\') _qchar=""; _vname="${_var_spec%%=\'*}"; ;; - [^=]*=\'*) _qchar="\'"; _vname="${_var_spec%%=\'*}"; ;; - [^=]*=*) _qchar=""; _vname="${_var_spec%%=*}"; ;; + [!=]*=\"*\") _qchar=""; _vname="${_var_spec%%=\"*}"; ;; + [!=]*=\"*) _qchar="\""; _vname="${_var_spec%%=\"*}"; ;; + [!=]*=\'*\') _qchar=""; _vname="${_var_spec%%=\'*}"; ;; + [!=]*=\'*) _qchar="\'"; _vname="${_var_spec%%=\'*}"; ;; + [!=]*=*) _qchar=""; _vname="${_var_spec%%=*}"; ;; esac; ;; esac; if "${_fn}" "${_vname}"; then diff --git a/subr.rtl/rtl_string.subr b/subr.rtl/rtl_string.subr index e642bebe..e3e98601 100644 --- a/subr.rtl/rtl_string.subr +++ b/subr.rtl/rtl_string.subr @@ -71,10 +71,10 @@ rtl_tolower() { X*) _s_new="${_s_new:+${_s_new}}x"; _s="${_s#X}"; ;; Y*) _s_new="${_s_new:+${_s_new}}y"; _s="${_s#Y}"; ;; Z*) _s_new="${_s_new:+${_s_new}}z"; _s="${_s#Z}"; ;; - [^ABCDEFGHIJKLMNOPQRSTUVWXYZ]*) + [!ABCDEFGHIJKLMNOPQRSTUVWXYZ]*) _s_new="${_s_new:+${_s_new}}${_s%%[ABCDEFGHIJKLMNOPQRSTUVWXYZ]*}"; - while [ "${_s#[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]}" != "${_s}" ]; do - _s="${_s#[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]}"; + while [ "${_s#[!ABCDEFGHIJKLMNOPQRSTUVWXYZ]}" != "${_s}" ]; do + _s="${_s#[!ABCDEFGHIJKLMNOPQRSTUVWXYZ]}"; done; ;; esac; done; printf "%s" "${_s_new}"; @@ -110,10 +110,10 @@ rtl_toupper() { x*) _s_new="${_s_new:+${_s_new}}X"; _s="${_s#x}"; ;; y*) _s_new="${_s_new:+${_s_new}}Y"; _s="${_s#y}"; ;; z*) _s_new="${_s_new:+${_s_new}}Z"; _s="${_s#z}"; ;; - [^abcdefghijklmnopqrstuvwxyz]*) + [!abcdefghijklmnopqrstuvwxyz]*) _s_new="${_s_new:+${_s_new}}${_s%%[abcdefghijklmnopqrstuvwxyz]*}"; - while [ "${_s#[^abcdefghijklmnopqrstuvwxyz]}" != "${_s}" ]; do - _s="${_s#[^abcdefghijklmnopqrstuvwxyz]}"; + while [ "${_s#[!abcdefghijklmnopqrstuvwxyz]}" != "${_s}" ]; do + _s="${_s#[!abcdefghijklmnopqrstuvwxyz]}"; done; ;; esac; done; printf "%s" "${_s_new}"; -- cgit v1.2.3