gsu: Set copyright year to 2011.

[gsu.git] / funcs / gsu

diff --git a/funcs/gsu b/funcs/gsu
index abe64ce434187839f6fa97fb4bff87f8d28207b7..c11d19f92ff02e6db1ba4053110780acaa47a438 100644 (file)
--- a/funcs/gsu
+++ b/funcs/gsu
@@ -1,6 +1,6 @@
 #!/bin/bash
 # gsu -- the global subcommand utility
-# (C) 2006-2010 Andre Noll
+# (C) 2006-2011 Andre Noll
 
 _gsu_init_errors()
 {
@@ -378,7 +378,7 @@ _gsu_check_options()
                        return
                esac
 
-               eval ${gsu_config_var_prefix}_$name='"'${val:=$default_value}'"'
+               eval ${gsu_config_var_prefix}_$name='"'\${val:=$default_value}'"'
                # Check option type. ATM, only num and string are supported
                # Other types may be added without breaking compatibility
                case "$option_type" in
@@ -398,24 +398,49 @@ _gsu_check_options()
 }
 export -f _gsu_check_options
 
+# Wrapper for bash's getopts.
+#
+# 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 an argument or the emtpy string/the
+# given argument, depending on whether this option was contained in the "$@"
+# array.
+#
+# Example:
+#      gsu_getopts abc:x:y
+#      eval "$result"
+#      [[ $ret -lt 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
-       [[ $ret -lt 0 ]] && return
+       if [[ $ret -lt 0 ]]; then
+               gsu_err_msg
+               exit 1
+       fi
 
        ret=-$E_GSU_GETOPTS
        result="invalid optstring $1"
-       [[ -z "$1" || "$1" =~ "::" ]] && return
+       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"
-                       return
+                       gsu_err_msg
+                       exit 1
                esac
        done
        result="local opt"