M server/xrxs-srv.sh → server/xrxs-srv.sh

@@ -2,18 +2,25 @@ #!/bin/sh
 
 PORT=5460
 
-if [ -z "${DISPLAY}"]; then
+if [ -z "${DISPLAY}" ]; then
   export DISPLAY=:0
 fi
 
+seat=$(echo ${DISPLAY} | awk -F. '{print $1}')
+
+debug=""
+
 case $1 in
   start)
-    ./xrxs -s xrxs & sleep 1
-    9pserve -c unix!/tmp/ns.$(whoami).${DISPLAY}/xrxs tcp!0.0.0.0!${PORT} &
+    if [ "$2" = "-d" ]; then
+      debug="-d"
+    fi
+    ./xrxs -s xrxs ${debug} & sleep 1
+    9pserve -c unix!/tmp/ns.$(whoami).${seat}/xrxs tcp!0.0.0.0!${PORT} &
     ;;
   stop)
     killall xrxs
-    rm /tmp/ns.$(whoami).${DISPLAY}/xrxs
+    rm /tmp/ns.$(whoami).${seat}/xrxs
     ;;
   *)
     echo "$0 start|stop"

M server/xrxs.c → server/xrxs.c

@@ -17,7 +17,7 @@ #include "universe.h"
 #include "realm.h"
 #include "user.h"
 
-int chatty9p = 1;
+int chatty9p = 0;
 
 static Tree* tree;
 
@@ -603,6 +603,12 @@ } else if (scmp(argv[i], "-s")) {
         usocket = argv[++i];
         printf("serving socket namespace %s", usocket);
       }
+    }
+  }
+
+  for (i = 0; i < argc; i++) {
+    if (scmp(argv[i], "-d")) {
+      chatty9p = 1;
     }
   }