texinfo update (Mon Jul 26 20:22:01 EDT 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.361
retrieving revision 1.362
diff -c -r1.361 -r1.362
*** ChangeLog   25 Jul 2004 00:10:49 -0000      1.361
--- ChangeLog   27 Jul 2004 00:06:31 -0000      1.362
***************
*** 1,3 ****
--- 1,13 ----
+ 2004-07-26  Karl Berry  <address@hidden>
+ 
+       * makeinfo/files.c (find_and_load): introduce second parameter
+               use_path, set to 0 from the call in handle_delayed_writes,
+               1 in all cases.
+         * makeinfo/files.h: change decl.
+         * makeinfo/cmds.c, makeinfo.c, node.c: change calls.
+       From: Thomas Klausner <address@hidden>,
+       14 Jul 2004 00:31:54 +0200.
+ 
  2004-07-25  Werner Lemberg  <address@hidden>
  
        Rename @s to @slanted.
Index: makeinfo/cmds.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/cmds.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -c -r1.49 -r1.50
*** makeinfo/cmds.c     25 Jul 2004 00:16:18 -0000      1.49
--- makeinfo/cmds.c     27 Jul 2004 00:06:31 -0000      1.50
***************
*** 1,5 ****
  /* cmds.c -- Texinfo commands.
!    $Id: cmds.c,v 1.49 2004/07/25 00:16:18 wl Exp $
  
     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
     Foundation, Inc.
--- 1,5 ----
  /* cmds.c -- Texinfo commands.
!    $Id: cmds.c,v 1.50 2004/07/27 00:06:31 karl Exp $
  
     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
     Foundation, Inc.
***************
*** 1665,1671 ****
        fflush (stdout);
      }
  
!   if (!find_and_load (filename))
      {
        popfile ();
        line_number--;
--- 1665,1671 ----
        fflush (stdout);
      }
  
!   if (!find_and_load (filename, 1))
      {
        popfile ();
        line_number--;
Index: makeinfo/files.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/files.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** makeinfo/files.c    11 Apr 2004 17:56:47 -0000      1.4
--- makeinfo/files.c    27 Jul 2004 00:06:31 -0000      1.5
***************
*** 1,5 ****
  /* files.c -- file-related functions for makeinfo.
!    $Id: files.c,v 1.4 2004/04/11 17:56:47 karl Exp $
  
     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
     Foundation, Inc.
--- 1,5 ----
  /* files.c -- file-related functions for makeinfo.
!    $Id: files.c,v 1.5 2004/07/27 00:06:31 karl Exp $
  
     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
     Foundation, Inc.
***************
*** 183,191 ****
  }
  
  /* Find and load the file named FILENAME.  Return a pointer to
!    the loaded file, or NULL if it can't be loaded. */
  char *
! find_and_load (char *filename)
  {
    struct stat fileinfo;
    long file_size;
--- 183,194 ----
  }
  
  /* Find and load the file named FILENAME.  Return a pointer to
!    the loaded file, or NULL if it can't be loaded.  If USE_PATH is zero,
!    just look for the given file (this is used in handle_delayed_writes),
!    else search along include_files_path.   */
! 
  char *
! find_and_load (char *filename, int use_path)
  {
    struct stat fileinfo;
    long file_size;
***************
*** 195,201 ****
  
    result = fullpath = NULL;
  
!   fullpath = get_file_info_in_path (filename, include_files_path, &fileinfo);
  
    if (!fullpath)
      goto error_exit;
--- 198,206 ----
  
    result = fullpath = NULL;
  
!   fullpath
!     = get_file_info_in_path (filename, use_path ? include_files_path : NULL, 
!                              &fileinfo);
  
    if (!fullpath)
      goto error_exit;
***************
*** 682,688 ****
  
    while (temp)
      {
!       delayed_buf = find_and_load (temp->filename);
  
        if (output_paragraph_offset > 0)
          {
--- 687,693 ----
  
    while (temp)
      {
!       delayed_buf = find_and_load (temp->filename, 0);
  
        if (output_paragraph_offset > 0)
          {
Index: makeinfo/files.h
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/files.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** makeinfo/files.h    11 Apr 2004 17:56:47 -0000      1.3
--- makeinfo/files.h    27 Jul 2004 00:06:31 -0000      1.4
***************
*** 1,7 ****
  /* files.h -- declarations for files.c.
!    $Id: files.h,v 1.3 2004/04/11 17:56:47 karl Exp $
  
!    Copyright (C) 1998, 2002 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
--- 1,7 ----
  /* files.h -- declarations for files.c.
!    $Id: files.h,v 1.4 2004/07/27 00:06:31 karl Exp $
  
!    Copyright (C) 1998, 2002, 2004 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
***************
*** 39,45 ****
  extern void flush_file_stack (void);
  extern char *get_file_info_in_path (char *filename, char *path,
      struct stat *finfo);
! extern char *find_and_load (char *filename);
  extern char *output_name_from_input_name (char *name);
  extern char *expand_filename (char *filename, char *input_name);
  extern char *filename_part (char *filename);
--- 39,45 ----
  extern void flush_file_stack (void);
  extern char *get_file_info_in_path (char *filename, char *path,
      struct stat *finfo);
! extern char *find_and_load (char *filename, int use_path);
  extern char *output_name_from_input_name (char *name);
  extern char *expand_filename (char *filename, char *input_name);
  extern char *filename_part (char *filename);
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -c -r1.64 -r1.65
*** makeinfo/makeinfo.c 19 Jul 2004 19:35:47 -0000      1.64
--- makeinfo/makeinfo.c 27 Jul 2004 00:06:31 -0000      1.65
***************
*** 1,5 ****
  /* makeinfo -- convert Texinfo source into other formats.
!    $Id: makeinfo.c,v 1.64 2004/07/19 19:35:47 dirt Exp $
  
     Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
--- 1,5 ----
  /* makeinfo -- convert Texinfo source into other formats.
!    $Id: makeinfo.c,v 1.65 2004/07/27 00:06:31 karl Exp $
  
     Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
***************
*** 1359,1365 ****
        strcpy (filename, name);
        strcat (filename, suffixes[i]);
  
!       if (find_and_load (filename))
          break;
  
        if (!suffixes[i][0] && strrchr (filename, '.'))
--- 1359,1365 ----
        strcpy (filename, name);
        strcat (filename, suffixes[i]);
  
!       if (find_and_load (filename, 1))
          break;
  
        if (!suffixes[i][0] && strrchr (filename, '.'))
Index: makeinfo/node.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/node.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -c -r1.20 -r1.21
*** makeinfo/node.c     11 Jul 2004 13:24:59 -0000      1.20
--- makeinfo/node.c     27 Jul 2004 00:06:31 -0000      1.21
***************
*** 1,5 ****
  /* node.c -- nodes for Texinfo.
!    $Id: node.c,v 1.20 2004/07/11 13:24:59 karl Exp $
  
     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
     Foundation, Inc.
--- 1,5 ----
  /* node.c -- nodes for Texinfo.
!    $Id: node.c,v 1.21 2004/07/27 00:06:31 karl Exp $
  
     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
     Foundation, Inc.
***************
*** 1715,1721 ****
      return;
    file_size = (long) fileinfo.st_size;
  
!   the_file = find_and_load (filename);
    if (!the_file)
      return;
  
--- 1715,1721 ----
      return;
    file_size = (long) fileinfo.st_size;
  
!   the_file = find_and_load (filename, 1);
    if (!the_file)
      return;
  
P ChangeLog
P makeinfo/cmds.c
P makeinfo/files.c
P makeinfo/files.h
P makeinfo/makeinfo.c
P makeinfo/node.c