GH#79 : add more tests and get them to pass

handle NULL pointers

Author: shlomif

fortune-mod/fortune/fortune.c

@@ -429,7 +429,9 @@ static FILEDESC *new_fp(void)
     fp->tbl.stuff[1] = 0;
     fp->tbl.stuff[2] = 0;
     fp->tbl.stuff[3] = 0;
+    fp->name = NULL;
     fp->next = NULL;
+    fp->path = NULL;
     fp->prev = NULL;
     fp->child = NULL;
     fp->parent = NULL;
@@ -1129,8 +1131,18 @@ static int form_file_list(char **files, int file_cnt)
                 if (system_dir_tail)
                 {
                     system_dir_tail->percent = percent;
-                    File_tail = system_dir_tail;
-                    File_list = system_dir_list;
+                    if (File_tail)
+                    {
+                        FILEDESC *old = File_tail;
+                        system_dir_list->prev = File_list;
+                        old->next = system_dir_list;
+                        File_tail = system_dir_tail;
+                    }
+                    else
+                    {
+                        File_tail = system_dir_tail;
+                        File_list = system_dir_list;
+                    }
                 }
                 else
                 {
@@ -1567,7 +1579,6 @@ static FILEDESC *pick_child(FILEDESC *parent)
             continue;
         }
         DPRINTF(1, (stderr, "    using %s\n", fp->name));
-        return fp;
     }
     else
     {
@@ -1584,8 +1595,8 @@ static FILEDESC *pick_child(FILEDESC *parent)
         }
         DPRINTF(
             1, (stderr, "    using %s, %ld\n", fp->name, fp->tbl.str_numstr));
-        return fp;
     }
+    return (fp->child ? (pick_child(fp)) : fp);
 }
 
 /*
@@ -1686,7 +1697,9 @@ static void get_fort(void)
     {
         DPRINTF(1, (stderr, "%s", "picking child\n"));
         fp = pick_child(fp);
+        assert(!fp->child);
     }
+    assert(!fp->child);
     Fortfile = fp;
     get_pos(fp);
     open_dat(fp);

fortune-mod/tests/t/test-fortune-percent.t

@@ -9,10 +9,40 @@ use lib "$FindBin::Bin/lib";
 use FortTestInst ();
 
 use Path::Tiny qw/ cwd path tempdir tempfile /;
-use Test::More tests => 13;
+use Test::More tests => 17;
 use Test::Trap
     qw( trap $trap :flow:stderr(systemsafe):stdout(systemsafe):warn );
 
+# TEST:$_common_tests=2;
+sub _common_tests
+{
+    my ( $blurb_base, $inst_dir ) = @_;
+
+    {
+        my @cmd = (
+            $inst_dir->child( 'games', 'fortune' ),
+            qw/ 70% all 30% computers /,
+        );
+
+        print "Running [@cmd]\n";
+        trap
+        {
+            system(@cmd);
+        };
+
+        # TEST*$_common_tests
+        like( $trap->stdout(), qr/\S/ms,
+            "$blurb_base : 70/30 percentages : stdout was used",
+        );
+
+        # TEST*$_common_tests
+        like( $trap->stderr(), qr/\A\r?\n?\z/ms,
+            "$blurb_base : 70/30 percentages : stderr is empty. ",
+        );
+    }
+    return;
+}
+
 {
     my $inst_dir = FortTestInst::install("fortune-percent-overflow");
     my $IS_WIN   = ( $^O eq "MSWin32" );
@@ -58,6 +88,8 @@ use Test::Trap
         }
     }
 
+    _common_tests( "local-dir == system-dir", $inst_dir, );
+
     my @cmd = (
         $inst_dir->child( 'games', 'fortune' ),
         "999999999999999%", "songs-poems"
@@ -180,4 +212,6 @@ EOF
 "[ local+system paths have fortunes ] error message for No fortunes found",
         );
     }
+
+    _common_tests( "local-dir is populated and not system-dir", $inst_dir, );
 }