GH#79 : Got old+new tests to pass.

See #79 .

"Specifying percentage for "all" breaks if both FORTDIR and LOCFORTDIR
have fortunes #79"

Author: shlomif

fortune-mod/fortune/fortune.c

@@ -969,6 +969,7 @@ static int form_file_list(char **files, int file_cnt)
     for (i = 0; i < file_cnt; i++)
     {
         percent = NO_PROB;
+        sp = NULL;
         if (!isdigit(files[i][0]))
         {
             sp = files[i];
@@ -1111,22 +1112,42 @@ static int form_file_list(char **files, int file_cnt)
                 lang = p;
             }
             /* default */
+            FILEDESC *system_dir_list = NULL, *local_list = NULL;
+            FILEDESC *system_dir_tail = NULL, *local_tail = NULL;
             if (!ret)
             {
-                ret = add_file(
-                    percent, fullpathname, NULL, &File_list, &File_tail, NULL);
+                ret = add_file(100, fullpathname, NULL, &system_dir_list,
+                    &system_dir_tail, NULL);
             }
-            if (!ret &&
-                strncmp(fullpathname, locpathname, sizeof(fullpathname)))
+            if (strncmp(fullpathname, locpathname, sizeof(fullpathname)))
             {
-                ret = add_file(
-                    percent, locpathname, NULL, &File_list, &File_tail, NULL);
+                add_file(
+                    100, locpathname, NULL, &local_list, &local_tail, NULL);
             }
-            if (strncmp(fullpathname, locpathname, sizeof(fullpathname)) &&
-                strcmp(sp, "all") == 0)
+            if (!local_list)
             {
-                add_file(
-                    percent, locpathname, NULL, &File_list, &File_tail, NULL);
+                system_dir_tail->percent = percent;
+                File_tail = system_dir_tail;
+                File_list = system_dir_list;
+            }
+            else if (strncmp(fullpathname, locpathname, sizeof(fullpathname)) &&
+                     strcmp(sp, "all") == 0)
+            {
+                FILEDESC *parent_node = new_fp();
+                parent_node->percent = percent;
+                parent_node->child = system_dir_list;
+                system_dir_list->next = local_list;
+                if (local_list)
+                {
+                    local_list->prev = system_dir_list;
+                }
+                system_dir_list->parent = parent_node;
+                if (local_list)
+                {
+                    local_list->parent = parent_node;
+                }
+                File_tail = File_list = parent_node;
+                ret = 1;
             }
             if (!ret)
             {

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

@@ -9,7 +9,7 @@ use lib "$FindBin::Bin/lib";
 use FortTestInst ();
 
 use Path::Tiny qw/ cwd path tempdir tempfile /;
-use Test::More tests => 4;
+use Test::More tests => 7;
 use Test::Trap
     qw( trap $trap :flow:stderr(systemsafe):stdout(systemsafe):warn );
 
@@ -81,9 +81,13 @@ EOF
             system(@cmd);
         };
 
-    TODO:
         {
-            local $TODO = "Not fixed yet.";
+            # TEST
+            like(
+                $trap->stderr(),
+                qr/fortune: no place to put residual probability/ms,
+"percent overflow: https://github.com/shlomif/fortune-mod/issues/79 [all percent when local+system dirs have fortunes]"
+            );
 
             # TEST
             unlike(
@@ -93,4 +97,22 @@ EOF
             );
         }
     }
+
+    {
+        my @cmd = ( $inst_dir->child( 'games', 'fortune' ), "art" );
+
+        print "Running [@cmd]\n";
+        trap
+        {
+            system(@cmd);
+        };
+
+        {
+            # TEST
+            like( $trap->stdout(), qr/\S/ms, "basic test", );
+
+            # TEST
+            like( $trap->stderr(), qr/\A\r?\n?\z/ms, "basic test: stderr", );
+        }
+    }
 }