changelog.md

[gofetch.git] / gopher.sh

diff --git a/gopher.sh b/gopher.sh
old mode 100644 (file)
new mode 100755 (executable)
index d0c9ea5..a728d0b
--- a/gopher.sh
+++ b/gopher.sh
@@ -1,19 +1,34 @@
-#!/bin/sh
+#!/bin/bash
 
-# $0 [prog ($1 will be the query)] ([port])
+# Note: bash is required, sh will fail to output anything to the client
+# Probably related to interactions beteween & and output redirections
+# 
+# It seems the timeout on netcat does not work when listening...
+# So you will have to either kill the process or make a last connection
+# (which will not be processed)
+
+# $0 [prog] ([port])
+# You can use the evironment variable $QUERY_STRING for the query
 
 [ "$ADDR"    = "" ] && ADDR=127.0.0.1
-[ "$LOG"     = "" ] && LOG=/tmp/log.err
+[ "$LOG"     = "" ] && LOG=/tmp/gopher.service.err
 [ "$PIDF"    = "" ] && PIDF="`mktemp`"
 [ "$TIMEOUT" = "" ] && TIMEOUT=10
 [ "$MAXCON"  = "" ] && MAXCON=1024
+
 prog="$1"
 port="$2"
+defn="$3"
 [ "$port"    = "" ] && port=70
 
 if [ "$prog" = "" ]; then
        rm "$PIDF"
-       echo "Syntax: $0 [prog (\$1 will be the query)] ([port])" >&2
+       echo "Syntax: $0 [prog] ([port]) (default non-7)" >&2
+       echo '  You can use the evironment variable $QUERY_STRING for the query' >&2
+       echo '  The default port is 70' >&2
+       echo '  A default message for non-service (7) request can be given' >&2
+       echo '  A filename will be displayed, you can delete it to stop the service' >&2
+       echo '  (you still have to make a last connection on $port)' >&2
        exit 1
 fi
 
@@ -24,7 +39,17 @@ if [ ! -d "$tmpd" ]; then
        exit 2
 fi
 
-touch "$PIDF"
+echo "#!/bin/sh
+# PID: $$
+# PID File (this file): $PIDF
+# You can stop the service by deleting this file then making a last
+# connection (which will not be processed) to the service:
+rm \"$PIDF\"
+nc -q0 $ADDR $port 2>/dev/null </dev/null
+" > "$PIDF"
+
+chmod u+rx "$PIDF"
+
 echo "$PIDF"
 
 i=0
@@ -32,16 +57,24 @@ while [ -e "$PIDF" ]; do
        i=`expr $i + 1`
        [ $i -gt "$MAXCON" ] && i=1
        fifo="$tmpd/fifo.$i"
-       rm -f "$fifo"
+       rm -f "$fifo" 2>/dev/null
        mkfifo "$fifo"
        < "$fifo" nc -l -q0 -w"$TIMEOUT" "$ADDR" -p "$port" | (
-               read -r query
-               query="`echo "$query" | cut -f2 -d'     '`"
-               (
-                       "$prog" "$query" 2>> "$LOG"
-                       rm "$fifo"
-               )&
+               if [ -e "$PIDF" ]; then
+                       read -r query
+                       selector="`echo "$query" | cut -f1 -d'  ' | sed 's:[\r\n]::g'`"
+                       query="`echo "$query" | cut -f2 -d'     ' | sed 's:[\r\n]::g'`"
+                       if [ "$query" = "" ]; then
+                               if [ "$defn" = "" ]; then
+                                       echo "7Search   $selector       $ADDR   $port"
+                               else
+                                       echo "$defn"
+                               fi
+                       else
+                               QUERY_STRING="$query" "$prog" 2>> "$LOG" &
+                       fi
+               fi
        ) > "$fifo"
 done
-rm -rf "$tmpd"
+rm -rf "$tmpd" 2>/dev/null