From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 5 Mar 2017 21:39:20 +0000 (+0100)
Subject: subcommand: Move up gsu_getopts().
X-Git-Url: http://git.tuebingen.mpg.de/?p=gsu.git;a=commitdiff_plain;h=a67f16ae830226c7afef2f3fad72efe46f3b5ed9

subcommand: Move up gsu_getopts().

It will soon be needed by com_man() which is above gsu_getopts()
at the moment, so move it up. Again, no changes.
---

diff --git a/subcommand b/subcommand
index b12783b..fe6ec57 100644
--- a/subcommand
+++ b/subcommand
@@ -79,6 +79,91 @@ gsu_check_arg_count()
 	ret=$GSU_SUCCESS
 }
 
+# Wrapper for the bash getopts builtin.
+#
+# Aborts on programming errors such as missing or invalid option string.  On
+# success $result contains shell code that can be eval'ed. For each defined
+# option x, the local variable o_x will be created when calling eval "$result".
+# o_x contains true/false for options without argument and either the empty
+# string or the given argument for options that take an argument.
+#
+# Example:
+# 	gsu_getopts abc:x:y
+# 	eval "$result"
+# 	(($ret < 0)) && return
+#
+# 	[[ "$o_a" = 'true' ]] && echo 'The -a flag was given'
+# 	[[ -n "$o_c" ]] && echo "The -c option was given with arg $o_c"
+gsu_getopts()
+{
+	local i c tab='	' cr='
+'
+
+	gsu_check_arg_count $# 1 1
+	if (($ret < 0)); then
+		gsu_err_msg
+		exit 1
+	fi
+
+	ret=-$E_GSU_GETOPTS
+	result="invalid optstring $1"
+	if [[ -z "$1" ]] || grep -q '::' <<< "$1" ; then
+		gsu_err_msg
+		exit 1
+	fi
+
+	for ((i=0; i < ${#1}; i++)); do
+		c=${1:$i:1}
+		case "$c" in
+		[a-zA-Z:]);;
+		*)
+			ret=-$E_GSU_GETOPTS
+			result="invalid character $c in optstring"
+			gsu_err_msg
+			exit 1
+		esac
+	done
+	result="local _gsu_getopts_opt"
+	for ((i=0; i < ${#1}; i++)); do
+		c1=${1:$i:1}
+		c2=${1:$(($i + 1)):1}
+		result+=" o_$c1="
+		if [[ "$c2" = ":" ]]; then
+			let i++
+		else
+			result+="false"
+		fi
+	done
+	result+="
+	OPTIND=1
+	while getopts $1 _gsu_getopts_opt \"\$@\"; do
+		case \"\$_gsu_getopts_opt\" in
+"
+	for ((i=0; i < ${#1}; i++)); do
+		c1=${1:$i:1}
+		c2=${1:$(($i + 1)):1}
+		result+="$tab$tab$c1) o_$c1="
+		if [[ "$c2" = ":" ]]; then
+			result+="\"\$OPTARG\""
+			let i++
+		else
+			result+="true"
+		fi
+		result+=";;$cr"
+	done
+	result+="
+		*)
+			ret=-\$E_GSU_GETOPTS
+			result=\"invalid option given\"
+			return
+			;;
+		esac
+	done
+	shift \$((\$OPTIND - 1))
+"
+	ret=$GSU_SUCCESS
+}
+
 _gsu_print_available_commands()
 {
 	local cmd cmds
@@ -348,91 +433,6 @@ complete_help()
 	echo "$result"
 }
 
-# Wrapper for the bash getopts builtin.
-#
-# Aborts on programming errors such as missing or invalid option string.  On
-# success $result contains shell code that can be eval'ed. For each defined
-# option x, the local variable o_x will be created when calling eval "$result".
-# o_x contains true/false for options without argument and either the empty
-# string or the given argument for options that take an argument.
-#
-# Example:
-# 	gsu_getopts abc:x:y
-# 	eval "$result"
-# 	(($ret < 0)) && return
-#
-# 	[[ "$o_a" = 'true' ]] && echo 'The -a flag was given'
-# 	[[ -n "$o_c" ]] && echo "The -c option was given with arg $o_c"
-gsu_getopts()
-{
-	local i c tab='	' cr='
-'
-
-	gsu_check_arg_count $# 1 1
-	if (($ret < 0)); then
-		gsu_err_msg
-		exit 1
-	fi
-
-	ret=-$E_GSU_GETOPTS
-	result="invalid optstring $1"
-	if [[ -z "$1" ]] || grep -q '::' <<< "$1" ; then
-		gsu_err_msg
-		exit 1
-	fi
-
-	for ((i=0; i < ${#1}; i++)); do
-		c=${1:$i:1}
-		case "$c" in
-		[a-zA-Z:]);;
-		*)
-			ret=-$E_GSU_GETOPTS
-			result="invalid character $c in optstring"
-			gsu_err_msg
-			exit 1
-		esac
-	done
-	result="local _gsu_getopts_opt"
-	for ((i=0; i < ${#1}; i++)); do
-		c1=${1:$i:1}
-		c2=${1:$(($i + 1)):1}
-		result+=" o_$c1="
-		if [[ "$c2" = ":" ]]; then
-			let i++
-		else
-			result+="false"
-		fi
-	done
-	result+="
-	OPTIND=1
-	while getopts $1 _gsu_getopts_opt \"\$@\"; do
-		case \"\$_gsu_getopts_opt\" in
-"
-	for ((i=0; i < ${#1}; i++)); do
-		c1=${1:$i:1}
-		c2=${1:$(($i + 1)):1}
-		result+="$tab$tab$c1) o_$c1="
-		if [[ "$c2" = ":" ]]; then
-			result+="\"\$OPTARG\""
-			let i++
-		else
-			result+="true"
-		fi
-		result+=";;$cr"
-	done
-	result+="
-		*)
-			ret=-\$E_GSU_GETOPTS
-			result=\"invalid option given\"
-			return
-			;;
-		esac
-	done
-	shift \$((\$OPTIND - 1))
-"
-	ret=$GSU_SUCCESS
-}
-
 com_complete()
 {
 	local cmd n cword