# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1477323788 25200
# Node ID 67a3ee2274958ca2051ef289464693b174d9fd93
# Parent  e4c414ff8fa226b82691c0a01fad682b94aebcd7
fix bug in code allowing folders containing multiple item types

diff -r e4c414ff8fa2 -r 67a3ee227495 regression/regression-tests.bash
--- a/regression/regression-tests.bash	Tue Aug 30 15:04:12 2016 -0700
+++ b/regression/regression-tests.bash	Mon Oct 24 08:43:08 2016 -0700
@@ -27,7 +27,7 @@
     if [ -z "$val" ] || [ $size -lt 10000000 ]; then
         echo $fn
         mkdir output$n
-        $val ../src/pst2dii -f /usr/share/fonts/bitstream-vera/VeraMono.ttf -B "bates-" -o output$n -O $ba.mydii -d $fn.log $fn >$fn.dii.err 2>&1
+        $val ../src/pst2dii -f /usr/share/fonts/liberation/LiberationMono-Regular.ttf -B "bates-" -o output$n -O $ba.mydii -d $fn.log $fn >$fn.dii.err 2>&1
     fi
 }
 
diff -r e4c414ff8fa2 -r 67a3ee227495 src/readpst.c
--- a/src/readpst.c	Tue Aug 30 15:04:12 2016 -0700
+++ b/src/readpst.c	Mon Oct 24 08:43:08 2016 -0700
@@ -2225,12 +2225,11 @@
                     check_filename(temp);
                     while ((f->output[t] = fopen(temp, "r"))) {
                         DEBUG_INFO(("need to increase filename because one already exists with that name\n"));
-                        DEBUG_INFO(("- increasing it to %s%d\n", f->name, x));
                         x++;
-                        sprintf(temp, "%s%08d", f->name, x);
-                        DEBUG_INFO(("- trying \"%s\"\n", f->name));
+                        sprintf(temp, "%s%08d", f->name[t], x);
+                        DEBUG_INFO(("- bump file name and try \"%s\"\n", temp));
                         if (x == 99999999) {
-                            DIE(("create_enter_dir: Why can I not create a folder %s? I have tried %i extensions...\n", f->name, x));
+                            DIE(("create_enter_dir: Why can I not create a folder %s? I have tried %i extensions...\n", f->name[t], x));
                         }
                         fclose(f->output[t]);
                     }