diff --git a/mozilla/webtools/tinderbox2/src/test/genbugs.tst b/mozilla/webtools/tinderbox2/src/test/genbugs.tst
index 41d87b67127..b88b660d20c 100644
--- a/mozilla/webtools/tinderbox2/src/test/genbugs.tst
+++ b/mozilla/webtools/tinderbox2/src/test/genbugs.tst
@@ -5,8 +5,8 @@
 # current time.
 
 
-# $Revision: 1.2 $ 
-# $Date: 2000-10-17 23:56:31 $ 
+# $Revision: 1.3 $ 
+# $Date: 2000-11-09 19:14:31 $ 
 # $Author: kestes%staff.mail.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/test/genbugs.tst,v $ 
 # $Name: not supported by cvs2svn $ 
@@ -54,8 +54,12 @@ use HTMLPopUp;
 # make it easy to change.
 
 
-$TINDERBOX_DIR = ( $TinderConfig::TINDERBOX_DIR ||
-		   "/usr/apache/cgibin/webtools/tinderbox");
+
+$TINDERBOX_HTML_DIR = ( $TinderConfig::TINDERBOX_HTML_DIR ||
+			"/usr/apache/cgibin/webtools/tinderbox");
+
+$TINDERBOX_DATA_DIR = ( $TinderConfig::TINDERBOX_DATA_DIR ||
+			"/usr/apache/cgibin/webtools/tinderbox");
 
 
 @TREES = ('Project_A', 'Project_B', 'Project_C');
@@ -99,8 +103,8 @@ $TINDERBOX_DIR = ( $TinderConfig::TINDERBOX_DIR ||
 foreach $tree (@TREES) {
 
 
-  mkdir_R("$TINDERBOX_DIR/$tree/db", 0777);
-  mkdir_R("$TINDERBOX_DIR/$tree/h", 0777);
+  mkdir_R("$TINDERBOX_DATA_DIR/$tree/db", 0777);
+  mkdir_R("$TINDERBOX_DATA_DIR/$tree/h", 0777);
       
   my ($timenow) = time();
 
@@ -163,7 +167,7 @@ $out = <<EOF;
 EOF
   ;
  
-      open(FILE, ">$TINDERBOX_DIR/$tree/db/BT.Update.$timenow.$bug_id");
+      open(FILE, ">$TINDERBOX_DATA_DIR/$tree/db/BT.Update.$timenow.$bug_id");
       
       print FILE $out;
       
diff --git a/mozilla/webtools/tinderbox2/src/test/genbuilds.tst b/mozilla/webtools/tinderbox2/src/test/genbuilds.tst
index 4bb595ffd58..6704c17b0e6 100755
--- a/mozilla/webtools/tinderbox2/src/test/genbuilds.tst
+++ b/mozilla/webtools/tinderbox2/src/test/genbuilds.tst
@@ -6,8 +6,8 @@
 # URL.
 
 
-# $Revision: 1.8 $ 
-# $Date: 2000-09-22 14:55:47 $ 
+# $Revision: 1.9 $ 
+# $Date: 2000-11-09 19:14:20 $ 
 # $Author: kestes%staff.mail.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/test/genbuilds.tst,v $ 
 # $Name: not supported by cvs2svn $ 
@@ -53,14 +53,17 @@ use HTMLPopUp;
 # sufficent, we hardcode the test data here at the top of the file to
 # make it easy to change.
 
-$TINDERBOX_DIR = ( $TinderConfig::TINDERBOX_DIR ||
-		   "/usr/apache/cgibin/webtools/tinderbox");
+$TINDERBOX_HTML_DIR = ( $TinderConfig::TINDERBOX_HTML_DIR ||
+			"/usr/apache/cgibin/webtools/tinderbox");
+
+$TINDERBOX_DATA_DIR = ( $TinderConfig::TINDERBOX_DATA_DIR ||
+			"/usr/apache/cgibin/webtools/tinderbox");
 
 
 @TREES = ('Project_A', 'Project_B', 'Project_C');
 
 @BUILD_NAMES = (
-		'Build_Packages (Solaris)', 'Build_Packages (Linux)',
+		'Build_Packages_(Solaris)', 'Build_Packages_(Linux)',
 		'Coverage_Tests', 'Performance_Tests', 'Failover_Tests', 
 		'Lint_Tests', 
 		'Next_Milestone',
@@ -192,10 +195,17 @@ $out = <<EOF;
 EOF
   ;
  
-      mkdir_R("$TINDERBOX_DIR/$tree/db", 0777);
-      mkdir_R("$TINDERBOX_DIR/$tree/h", 0777);
-      
-      open(FILE, ">$TINDERBOX_DIR/$tree/db/Build.Update.$tree.$build.$timenow");
+       mkdir_R("$TINDERBOX_DATA_DIR/$tree/db", 0777);
+       mkdir_R("$TINDERBOX_DATA_DIR/$tree/h", 0777);
+    
+       my ($update_file) = ("$TINDERBOX_DATA_DIR/$tree/db/".
+			   "Build.Update.$tree.$build.$timenow");
+    
+      $update_file =~ s/([^0-9a-zA-Z\.\-\_\/\:]+)/\./g;
+
+      $update_file = main::extract_filename_chars($update_file);
+
+      open(FILE, ">$update_file");
       
       print FILE $out;
       
diff --git a/mozilla/webtools/tinderbox2/src/test/gennotices.tst b/mozilla/webtools/tinderbox2/src/test/gennotices.tst
index 0d6db7528d0..01d9c320e8c 100755
--- a/mozilla/webtools/tinderbox2/src/test/gennotices.tst
+++ b/mozilla/webtools/tinderbox2/src/test/gennotices.tst
@@ -5,8 +5,8 @@
 # current time.
 
 
-# $Revision: 1.6 $ 
-# $Date: 2000-09-22 14:55:58 $ 
+# $Revision: 1.7 $ 
+# $Date: 2000-11-09 19:14:00 $ 
 # $Author: kestes%staff.mail.com $ 
 # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/test/gennotices.tst,v $ 
 # $Name: not supported by cvs2svn $ 
@@ -54,8 +54,12 @@ use HTMLPopUp;
 # make it easy to change.
 
 
-$TINDERBOX_DIR = ( $TinderConfig::TINDERBOX_DIR ||
-		   "/usr/apache/cgibin/webtools/tinderbox");
+
+$TINDERBOX_HTML_DIR = ( $TinderConfig::TINDERBOX_HTML_DIR ||
+			"/usr/apache/cgibin/webtools/tinderbox");
+
+$TINDERBOX_DATA_DIR = ( $TinderConfig::TINDERBOX_DATA_DIR ||
+			"/usr/apache/cgibin/webtools/tinderbox");
 
 
 @TREES = ('Project_A', 'Project_B', 'Project_C');
@@ -94,8 +98,8 @@ $TINDERBOX_DIR = ( $TinderConfig::TINDERBOX_DIR ||
 foreach $tree (@TREES) {
 
 
-  mkdir_R("$TINDERBOX_DIR/$tree/db", 0777);
-  mkdir_R("$TINDERBOX_DIR/$tree/h", 0777);
+  mkdir_R("$TINDERBOX_DATA_DIR/$tree/db", 0777);
+  mkdir_R("$TINDERBOX_DATA_DIR/$tree/h", 0777);
       
   my ($timenow) = time();
 
@@ -155,8 +159,17 @@ $out = <<EOF;
            };
 EOF
   ;
- 
-      open(FILE, ">$TINDERBOX_DIR/$tree/db/Notice.Update.$timenow.$mailaddr");
+
+      my ($update_file) = ("$TINDERBOX_DATA_DIR/$tree/db/".
+			   "Notice.Update.$timenow.$mailaddr");
+      
+      # first we try and make the file name leagal, then we check by using
+      # the definiative legal filename checker.
+
+      $update_file =~ s/\@/\./g;
+      $update_file = main::extract_filename_chars($update_file);
+
+      open(FILE, ">$update_file");
       
       print FILE $out;