X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=gopher.sh;h=a6cc44d7058aa659fe0fbeec1eb73a259c933333;hb=528c6011e9364f138761e2658ec5941e0638dbf9;hp=91a02bb497360e3e3cfe32741685062dc901c56d;hpb=a1fd1565357206c988b3c44bf868314cf0e8e60f;p=gofetch.git

diff --git a/gopher.sh b/gopher.sh
index 91a02bb..a6cc44d 100755
--- a/gopher.sh
+++ b/gopher.sh
@@ -24,22 +24,37 @@
 # 		0 : do not invert (default)
 #		1 : invert 
 
+# EXIT Codes:
+#	  0: ok
+#	  1: syntax error
+#	  2: cannot contact server
+#	  3: unknown selector mode
+#	255: special exit more 'q'
+
 SERVER="$1"
 SELECTOR="$2"
 PORT="$3"
 MODE="$4"
 
+PREFIX="[0-9hIg+]"
+
 # Defaults:
 [ "$PORT" = "" ] && PORT=70
 if [ "$MODE" = "" ]; then
 	# "" or dir-like selector? -> 1 ; if not -> 0 
 	echo "$SELECTOR" | grep "/$" >/dev/null && MODE=1 || MODE=0
 	[ "$SELECTOR" = "" ] && MODE=1
+	
+	# check explicit modes:
+	if echo "$SELECTOR" | grep "^/\($PREFIX\|download\)/" >/dev/null; then
+		MODE="`echo "$SELECTOR" | cut -f2 -d/`"
+		SELECTOR="`echo "$SELECTOR" | sed 's:^/[^/]*/::'`"
+	fi
 fi
 
 if [ "$SERVER" = "" ]; then
 	echo "Syntax error: $0 [SERVER] ([SELECTOR]) ([PORT]) ([MODE])" >&2
-	exit 2
+	exit 1
 fi
 
 # can be "-" for no escape sequences
@@ -70,8 +85,6 @@ else
 	INVERT=
 fi
 
-PREFIX="[0-9hIg+]"
-
 # $0 [FILE] (dialog)
 # Display a gopher menu for the given resource
 cat_menu() {
@@ -126,10 +139,14 @@ finish() {
 }
 trap finish EXIT
 
+echo "$SELECTOR" | nc "$SERVER" "$PORT" > "$tmp"
+if [ $? != 0 ]; then
+	echo Cannot contact gopher server "[$SERVER]" >&2
+	exit 2
+fi
+
 if [ $MODE = 1 ]; then
-	echo "$SELECTOR" | nc "$SERVER" "$PORT" | sed 's:\r::g' > "$tmp"
-else
-	echo "$SELECTOR" | nc "$SERVER" "$PORT" > "$tmp"
+	sed --in-place 's:\r::g' "$tmp"
 fi
 
 # Process page content