texinfo/makeinfo files.c,1.5,1.6

[karl]

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

Modified Files:
        files.c 
Log Message:
(register_delayed_write): reword warning, and only
warn if writing to stdout, not /dev/null.


Index: files.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/files.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** files.c     12 Jan 2004 21:19:42 -0000      1.5
--- files.c     13 Jan 2004 14:19:08 -0000      1.6
***************
*** 2,6 ****
     $Id$
  
!    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software
     Foundation, Inc.
  
--- 2,6 ----
     $Id$
  
!    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
     Foundation, Inc.
  
***************
*** 590,603 ****
    DELAYED_WRITE *new;
  
!   if (STREQ (current_output_filename, "-")
!       || FILENAME_CMP (current_output_filename, NULL_DEVICE) == 0
!       || FILENAME_CMP (current_output_filename, ALSO_NULL_DEVICE) == 0)
      {
        /* Do not register a new write if the output file is not seekable.
           Let the user know about it first, though.  */
!       warning (_("@%s is useless when the output is not seekable"), command);
        return;
      }
  
    /* We need the HTML header in the output,
       to get a proper output_position.  */
--- 590,607 ----
    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;
      }
  
+   /* Don't complain if the user is writing /dev/null, since surely they
+      don't care, but don't register the delayed write, either.  */
+   if (FILENAME_CMP (current_output_filename, NULL_DEVICE) == 0
+       || FILENAME_CMP (current_output_filename, ALSO_NULL_DEVICE) == 0)
+     return;
+     
    /* We need the HTML header in the output,
       to get a proper output_position.  */