Use itemtype 3 for error messages.

icculus · Sep 8, 2017 · 5d7e147 · 5d7e147
1 parent c33e508
commit 5d7e147
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/IcculusGopher_daemon.pl b/IcculusGopher_daemon.pl
@@ -186,7 +186,7 @@ sub gopher_mainline {
                 { exec $exe, $args; };
                 syslog("info", "Failed to execute '$exe': $!");
             }
-            send_gopher_menu('i', $no_report_string);
+            send_gopher_menu('3', $no_report_string);
             return 1;
         }
     }

diff --git a/gopherspace/default b/gopherspace/default
@@ -35,5 +35,5 @@ if (opendir(my $dh, $gopherspace)) {
     closedir($dh);
 }
 
-send_gopher_info("   ...nothing, apparently!") if !$seen;
+send_gopher_menu(3, '   ...nothing, apparently!') if !$seen;
 
diff --git a/gopherspace/fortune b/gopherspace/fortune
@@ -3,19 +3,34 @@
 use strict;
 use warnings;
 
-sub gopher_info {
+sub send_gopher_menu {
+    my ($itemtype, $str, $selector, $host, $port) = @_;
+    $itemtype = 'i' if not defined $itemtype;
+    $str = '' if not defined $str;
+    $selector = '' if not defined $selector;
+    $host = 'error.host' if not defined $host;
+    $port = 1 if not defined $port;
+    print("$itemtype$str\t$selector\t$host\t$port\r\n");
+}
+
+sub send_gopher_info {
     my $str = shift;
-    print("i$str\t\terror.host\t1\r\n");
+    send_gopher_menu('i', $str);
 }
 
 my @lines = split /^/m, `/usr/games/fortune`;
-gopher_info('');
-gopher_info('');
+if (scalar(@lines) == 0) {
+     send_gopher_menu('3', "Uhoh, fortune process didn't work out. Sorry!");
+     exit(1);
+}
+
+send_gopher_info('');
+send_gopher_info('');
 foreach (@lines) {
     chomp;
     s/\t/    /g;
-    gopher_info($_);
+    send_gopher_info($_);
 }
-gopher_info('');
-gopher_info('');
+send_gopher_info('');
+send_gopher_info('');