* tools/gnu/classpath/tools/javah/Printer.java (Printer): Don't

	call mkdirs in output-directory case.
	(getPrintStream): Create output directory.
	* tools/gnu/classpath/tools/javah/Main.java (makeOutputDirectory):
	Don't call mkdirs.

3 files changed, 13 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index c8e441a8a..2c501a54f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-09-26  Tom Tromey  <tromey@redhat.com>
+
+	* tools/gnu/classpath/tools/javah/Printer.java (Printer): Don't
+	call mkdirs in output-directory case.
+	(getPrintStream): Create output directory.
+	* tools/gnu/classpath/tools/javah/Main.java (makeOutputDirectory):
+	Don't call mkdirs.
+
 2006-09-27  Raif S. Naffah  <raif@swiftdsl.com.au>
 
 	* tools/gnu/classpath/tools/javah/CniIncludePrinter.java (CniIncludePrinter):
diff --git a/tools/gnu/classpath/tools/javah/Main.java b/tools/gnu/classpath/tools/javah/Main.java
index 14c381bbb..2cddbaae7 100644
--- a/tools/gnu/classpath/tools/javah/Main.java
+++ b/tools/gnu/classpath/tools/javah/Main.java
@@ -272,10 +272,7 @@ public class Main
     if (outputDir == null)
       outputFile = new File(".");
     else
-      {
-        outputFile = new File(outputDir);
-        outputFile.mkdirs();
-      }
+      outputFile = new File(outputDir);
     return outputFile;
   }
 
diff --git a/tools/gnu/classpath/tools/javah/Printer.java b/tools/gnu/classpath/tools/javah/Printer.java
index f84f53c52..9c4b48d2e 100644
--- a/tools/gnu/classpath/tools/javah/Printer.java
+++ b/tools/gnu/classpath/tools/javah/Printer.java
@@ -86,9 +86,7 @@ public abstract class Printer
       throw new IllegalArgumentException("File argument MUST NOT be null");
     outputFileObject = outFile;
     isDirectory = isDir;
-    if (isDirectory)
-      outputFileObject.mkdirs();
-    else
+    if (! isDirectory)
       {
         File parent = outputFileObject.getParentFile();
         if (parent != null)
@@ -114,6 +112,9 @@ public abstract class Printer
         File outFile = new File(outputFileObject, fullName);
         if (outFile.exists() && ! force)
           return null;
+        File parent = outFile.getParentFile();
+        if (parent != null)
+          parent.mkdirs();
         fos = new FileOutputStream(outFile);
         result = getPrintStreamImpl(fos, klass);
         writePreamble(result);