Clean up. Mostly have error handling be a mode.

You probably want to ignore whitespace change when viewing this diff.

1 files changed, 26 insertions, 32 deletions

diff --git a/emacsmail.sh.in b/emacsmail.sh.in
index f3b1fce..f1a3e1c 100644
--- a/emacsmail.sh.in
+++ b/emacsmail.sh.in
@@ -1,6 +1,6 @@
 #!@bash@
 
-# Copyright (C) 2014 Luke Shumaker <lukeshu@sbcglobal.net>
+# Copyright (C) 2014, 2016 Luke Shumaker <lukeshu@sbcglobal.net>
 #
 # This file is not considered part of GNU Emacs.
 #
@@ -32,43 +32,37 @@ usage() {
 
 main() {
 	declare -a flags=()
-	declare error=false
 	declare mode=normal
 
 	emacs_getopt_init
 	declare args
-	args="$(emacs_getopt '' '' "$@")" || error=true
-	eval set -- "$args"
-	while true; do
-		case "$1" in
-			-V|--version) shift; mode=version;;
-			-H|--help) shift; mode=usage;;
-			--) shift; break;;
-			*)
-				if [[ $1 =~ $emacs_getopt_2 ]]; then
-					flags+=("$1" "$2"); shift 2
-				else
-					flags+=("$1"); shift 1
-				fi
-				;;
- 		esac
-	done
-	urls=("$@")
-	if [[ $mode == normal ]]; then
-		[[ ${#urls[@]} = 1 ]] || error=true
+	if ! args="$(emacs_getopt '' '' "$@")"; then
+		mode=error
+	else
+		eval set -- "$args"
+		while true; do
+			case "$1" in
+				-V|--version) shift; mode=version;;
+				-H|--help) shift; mode=usage;;
+				--) shift; break;;
+				*)
+					if [[ $1 =~ $emacs_getopt_2 ]]; then
+						flags+=("$1" "$2"); shift 2
+					else
+						flags+=("$1"); shift 1
+					fi
+					;;
+			esac
+		done
+		urls=("$@")
+		if [[ $mode == normal ]]; then
+			[[ ${#urls[@]} = 1 ]] || mode=error
+		fi
 	fi
 
-	if $error; then
-		usage >&2
-		return 1
-	fi
-	case "$mode" in
-		usage) usage; return 0;;
-		version) version; return 0;;
-	esac
-
-	emacsclient "${flags[@]}" --eval \
-		"(browse-url-mail $(emacs_quote "${urls[@]}"))"
+	next "$mode" \
+	     emacsclient "${flags[@]}" --eval \
+	     "(browse-url-mail $(emacs_quote "${urls[@]}"))"
 }
 
 main "$@"