texinfo/makeinfo files.c,1.8,1.9 makeinfo.c,1.33,1.34

[dirt]

Update of /cvsroot/texinfo/texinfo/makeinfo
In directory sheep:/tmp/cvs-serv29987/makeinfo

Modified Files:
        files.c makeinfo.c 
Log Message:
2004-01-29  Alper Ersoy  <address@hidden>

        * makeinfo/makeinfo.c (convert_from_loaded_file): call
        xml_begin_document after opening the output stream for write.

        * makeinfo/files.c (register_delayed_write): use delayed_command
        instead of command in messages as it may differ from the actual
        command name.  Check the usability of current_output_filename.



Index: files.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/files.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** files.c     23 Jan 2004 15:58:35 -0000      1.8
--- files.c     29 Jan 2004 01:20:51 -0000      1.9
***************
*** 590,598 ****
    DELAYED_WRITE *new;
  
    if (STREQ (current_output_filename, "-"))
      {
        /* Do not register a new write if the output file is not seekable.
           Let the user know about it first, though.  */
!       warning (_("@%s omitted since output is to stdout"), command);
        return;
      }
--- 590,605 ----
    DELAYED_WRITE *new;
  
+   if (!current_output_filename || !*current_output_filename)
+     {
+       /* Cannot register if we don't know what the output file is.  */
+       warning (_("``%s'' before output filename is omitted"), 
delayed_command);
+       return;
+     }
+ 
    if (STREQ (current_output_filename, "-"))
      {
        /* Do not register a new write if the output file is not seekable.
           Let the user know about it first, though.  */
!       warning (_("``%s'' omitted since output is to stdout"), 
delayed_command);
        return;
      }

Index: makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** makeinfo.c  25 Jan 2004 14:26:48 -0000      1.33
--- makeinfo.c  29 Jan 2004 01:20:51 -0000      1.34
***************
*** 1587,1592 ****
      {
        get_until ("\n", &output_filename); /* read rest of line */
-       if (xml && !docbook)
-         xml_begin_document (output_filename);
        if (html || xml)
          { /* Change any extension to .html or .xml.  */
--- 1587,1590 ----
***************
*** 1663,1666 ****
--- 1661,1667 ----
  
    set_current_output_filename (real_output_filename);
+ 
+   if (xml && !docbook)
+     xml_begin_document (filename_part (output_filename));
  
    if (verbose_mode)