Index: src/gnu/classpath/tools/gjdoc/AbstractTagImpl.java
===================================================================
RCS file: /cvsroot/cp-tools/gjdoc/src/gnu/classpath/tools/gjdoc/AbstractTagImpl.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 AbstractTagImpl.java
--- src/gnu/classpath/tools/gjdoc/AbstractTagImpl.java	13 Feb 2002 10:57:05 -0000	1.2
+++ src/gnu/classpath/tools/gjdoc/AbstractTagImpl.java	27 Aug 2004 03:10:14 -0000
@@ -37,7 +37,8 @@
    public void resolve() {
       Tag[] allTags=inlineTags();
       for (int i=0; i<allTags.length; ++i) {
-	 if (allTags[i]!=this) ((AbstractTagImpl)allTags[i]).resolve();
+         if (allTags[i]!=this && allTags[i] != null)
+            ((AbstractTagImpl)allTags[i]).resolve();
       }
    }
 
@@ -49,10 +50,15 @@
    }
 
    public Tag[] firstSentenceTags() { 
-      return (tagMap!=null)? (Tag[])tagMap.get("first") : emptyTags; 
+      if (tagMap != null && tagMap.get("first") != null)
+         return (Tag[]) tagMap.get("first");
+      return emptyTags;
    }
+
    public Tag[] inlineTags() { 
-      return (tagMap!=null)? (Tag[])tagMap.get("inline") : emptyTags; 
+      if (tagMap != null && tagMap.get("inline") != null)
+         return (Tag[]) tagMap.get("inline");
+      return emptyTags;
    }
 
    public String name() {
Index: src/gnu/classpath/tools/gjdoc/Main.java
===================================================================
RCS file: /cvsroot/cp-tools/gjdoc/src/gnu/classpath/tools/gjdoc/Main.java,v
retrieving revision 1.22
diff -u -b -B -r1.22 Main.java
--- src/gnu/classpath/tools/gjdoc/Main.java	9 Mar 2003 23:24:33 -0000	1.22
+++ src/gnu/classpath/tools/gjdoc/Main.java	27 Aug 2004 03:10:14 -0000
@@ -536,6 +536,8 @@
 
       List customOptions=new LinkedList();
 
+      rootDoc = new RootDocImpl();
+      reporter = rootDoc.getReporter();
 
       //--- Iterate over all options given on the command line
 
@@ -559,7 +561,7 @@
 	 //         If the option requires more arguments than given on the
 	 //         command line, issue a fatal error
 
-	 else if (!it.hasNext()) {
+         else if (optlen > 1 && !it.hasNext()) {
 	    reporter.printFatal("Missing value for option "+arg+".");
 	 }
 
@@ -576,8 +578,11 @@
 	 else {
 	    String[] option=new String[optlen];
 	    option[0] = arg;
-	    for (int j=1; j<optlen; ++j)
+            for (int j=1; j<optlen; ++j) {
+               if (!it.hasNext())
+                  reporter.printFatal("Missing value for option "+arg+".");
 	       option[j] = (String)it.next();
+            }
 	    options.add(option);
 	 }
       }
@@ -588,9 +593,6 @@
 
       //--- Validate all options and issue warnings/errors
 
-      rootDoc = new RootDocImpl();
-      reporter = rootDoc.getReporter();
-      
       if (validOptions(optionArr, rootDoc)) {
 
 	 //--- We got valid options; parse them and store the parsed values
@@ -775,7 +777,7 @@
 		       "USAGE: gjdoc [options] [packagenames] "+/*"[sourcefiles] "+*/"[classnames] address@hidden"+
 		       "  -doclet <class>         Doclet class to use for generating output\n"+
 		       "  -sourcepath <pathlist>  Where to look for source files\n"+
-		       "  -d                      Set target directory\n"+
+                       "  -d <dir>                Set target directory\n"+
 		       /*
 		       "  -overview <file>        Read overview documentation from HTML file\n"+
 		       */
Index: src/gnu/classpath/tools/doclets/xmldoclet/Driver.java
===================================================================
RCS file: /cvsroot/cp-tools/gjdoc/src/gnu/classpath/tools/doclets/xmldoclet/Driver.java,v
retrieving revision 1.24
diff -u -b -B -r1.24 Driver.java
--- src/gnu/classpath/tools/doclets/xmldoclet/Driver.java	9 Mar 2003 23:30:07 -0000	1.24
+++ src/gnu/classpath/tools/doclets/xmldoclet/Driver.java	27 Aug 2004 03:10:14 -0000
@@ -883,6 +883,10 @@
 	       targets.add(targetContext = htmlTargetContext);
 	    }
 
+            if (targetDirectory == null) {
+               targetDirectory = new File(".");
+            }
+
 	    // Set the same target directory for all output.
 
 	    // FIXME: Allow separate target directories for different