[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo ChangeLog Makefile.am configure.ac info...
|
From: |
Karl Berry |
|
Subject: |
texinfo ChangeLog Makefile.am configure.ac info... |
|
Date: |
Mon, 11 Jun 2012 17:54:28 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Karl Berry <karl> 12/06/11 17:54:28
Modified files:
. : ChangeLog Makefile.am configure.ac
info : Makefile.am info.c infokey.c makedoc.c man.c
pcterm.c session.c tilde.c
install-info : Makefile.am install-info.c
makeinfo : Makefile.am
util : Makefile.am texindex.c
Removed files:
lib : .cvsignore Makefile.am README xexit.c
Log message:
use exit instead of xexit, removing need for our own lib dir
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1370&r2=1.1371
http://cvs.savannah.gnu.org/viewcvs/texinfo/Makefile.am?cvsroot=texinfo&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/texinfo/configure.ac?cvsroot=texinfo&r1=1.115&r2=1.116
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/Makefile.am?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/info.c?cvsroot=texinfo&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/infokey.c?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/makedoc.c?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/man.c?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/pcterm.c?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/session.c?cvsroot=texinfo&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/tilde.c?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/install-info/Makefile.am?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/install-info/install-info.c?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/lib/.cvsignore?cvsroot=texinfo&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/lib/Makefile.am?cvsroot=texinfo&r1=1.13&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/lib/README?cvsroot=texinfo&r1=1.4&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/lib/xexit.c?cvsroot=texinfo&r1=1.8&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/makeinfo/Makefile.am?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/Makefile.am?cvsroot=texinfo&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/texindex.c?cvsroot=texinfo&r1=1.27&r2=1.28
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1370
retrieving revision 1.1371
diff -u -b -r1.1370 -r1.1371
--- ChangeLog 5 Jun 2012 21:44:32 -0000 1.1370
+++ ChangeLog 11 Jun 2012 17:54:26 -0000 1.1371
@@ -1,3 +1,12 @@
+2012-06-11 Karl Berry <address@hidden>
+
+ * info/*.c,
+ * util/texindex.c,
+ * install-info/install-info.c: use exit with EXIT_SUCCESS or
+ EXIT_FAILURE instead of xexit.
+ * lib: no longer need this directory.
+ * */Makefile.am, Makefile, configure.ac: do not refer to it.
+
2012-06-05 Karl Berry <address@hidden>
* doc/texinfo.tex (\txiescapepdf): check \pdfescapestring
Index: Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/Makefile.am,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- Makefile.am 22 May 2012 15:48:00 -0000 1.36
+++ Makefile.am 11 Jun 2012 17:54:26 -0000 1.37
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.36 2012/05/22 15:48:00 karl Exp $
+# $Id: Makefile.am,v 1.37 2012/06/11 17:54:26 karl Exp $
# Makefile.am for texinfo.
# Process this file with automake to produce Makefile.in in all directories.
#
@@ -28,13 +28,13 @@
if TOOLS_ONLY
# Build native tools only.
- SUBDIRS = lib info install-info tp util
+ SUBDIRS = info install-info tp util
else
# All subdirectories.
# Do libs first since the C programs depend on it.
# Do doc and man last so makeinfo will be built when we get there.
# Others are alphabetical.
- SUBDIRS = $(native_tools) gnulib/lib lib \
+ SUBDIRS = $(native_tools) gnulib/lib \
install-info info po po_document tp Pod-Simple-Texinfo util \
doc man
endif
Index: configure.ac
===================================================================
RCS file: /sources/texinfo/texinfo/configure.ac,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- configure.ac 19 Apr 2012 21:14:43 -0000 1.115
+++ configure.ac 11 Jun 2012 17:54:26 -0000 1.116
@@ -1,5 +1,5 @@
# Process this file with autoconf to produce a configure script.
-# $Id: configure.ac,v 1.115 2012/04/19 21:14:43 pertusus Exp $
+# $Id: configure.ac,v 1.116 2012/06/11 17:54:26 karl Exp $
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
@@ -313,7 +313,6 @@
info/Makefile
install-info/Makefile
install-info/tests/Makefile
- lib/Makefile
man/Makefile
po/Makefile.in
po_document/Makefile.in
Index: info/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/info/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- info/Makefile.am 24 Jun 2010 00:17:01 -0000 1.16
+++ info/Makefile.am 11 Jun 2012 17:54:26 -0000 1.17
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.16 2010/06/24 00:17:01 karl Exp $
+# $Id: Makefile.am,v 1.17 2012/06/11 17:54:26 karl Exp $
# Makefile.am for texinfo/info.
#
# Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
@@ -29,9 +29,8 @@
-DINFODIR=\"$(infodir)\" \
-DINFODIR2=\"$(infodir2)\"
-LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a \
- $(TERMLIBS) $(LIBINTL)
-infokey_LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
+LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(TERMLIBS) $(LIBINTL)
+infokey_LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
EXTRA_DIST = README pcterm.c
Index: info/info.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/info.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- info/info.c 12 Apr 2012 10:38:29 -0000 1.40
+++ info/info.c 11 Jun 2012 17:54:26 -0000 1.41
@@ -1,5 +1,5 @@
/* info.c -- Display nodes of Info files in multiple windows.
- $Id: info.c,v 1.40 2012/04/12 10:38:29 gray Exp $
+ $Id: info.c,v 1.41 2012/06/11 17:54:26 karl Exp $
Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012
@@ -278,7 +278,7 @@
default:
fprintf (stderr, _("Try --help for more information.\n"));
- xexit (1);
+ exit (EXIT_FAILURE);
}
}
@@ -301,14 +301,14 @@
This is free software: you are free to change and redistribute it.\n\
There is NO WARRANTY, to the extent permitted by law.\n"),
"2012");
- xexit (0);
+ exit (EXIT_SUCCESS);
}
/* If the `--help' option was present, show the help and exit. */
if (print_help_p)
{
info_short_help ();
- xexit (0);
+ exit (EXIT_SUCCESS);
}
/* If the user hasn't specified a path for Info files, default it.
@@ -358,7 +358,7 @@
if (apropos_p)
{
info_apropos (apropos_search_string);
- xexit (0);
+ exit (EXIT_SUCCESS);
}
/* Get the initial Info node. It is either "(dir)Top", or what the user
@@ -375,7 +375,7 @@
else
info_error (msg_cant_find_node,
user_nodenames ? user_nodenames[0] : "Top");
- xexit (1);
+ exit (EXIT_FAILURE);
}
/* Special cases for when the user specifies multiple nodes. If we
@@ -394,7 +394,7 @@
else
begin_multiple_window_info_session (user_filename, user_nodenames);
- xexit (0);
+ exit (EXIT_SUCCESS);
}
/* If there are arguments remaining, they are the names of menu items
@@ -424,8 +424,8 @@
&& !is_dir_name (filename_non_directory (initial_node->filename)))
printf ("%s\n", initial_node->filename);
else
- xexit (1);
- xexit (0);
+ exit (EXIT_FAILURE);
+ exit (EXIT_SUCCESS);
}
/* If the user specified that this node should be output, then do that
@@ -453,7 +453,7 @@
corresponding to what they want. */
else if (index_search_p || goto_invocation_p)
{
- int status = 0;
+ int status = EXIT_SUCCESS;
initialize_info_session (initial_node, 0);
@@ -512,17 +512,17 @@
{
fprintf (stderr, _("no index entries found for `%s'\n"),
index_search_string);
- status = 2;
+ status = EXIT_FAILURE;
}
close_dribble_file ();
- xexit (status);
+ exit (status);
}
else
begin_info_session (initial_node);
}
- xexit (0);
+ exit (EXIT_SUCCESS);
}
return 0; /* Avoid bogus warnings. */
@@ -686,7 +686,7 @@
general questions and discussion to address@hidden
Texinfo home page: http://www.gnu.org/software/texinfo/";));
- xexit (0);
+ exit (EXIT_SUCCESS);
}
Index: info/infokey.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/infokey.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- info/infokey.c 1 Jan 2012 17:09:11 -0000 1.21
+++ info/infokey.c 11 Jun 2012 17:54:26 -0000 1.22
@@ -1,5 +1,5 @@
/* infokey.c -- compile ~/.infokey to ~/.info.
- $Id: infokey.c,v 1.21 2012/01/01 17:09:11 karl Exp $
+ $Id: infokey.c,v 1.22 2012/06/11 17:54:26 karl Exp $
Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009,
2010, 2011, 2012
@@ -133,7 +133,7 @@
default:
suggest_help ();
- xexit (1);
+ exit (EXIT_FAILURE);
}
}
@@ -147,14 +147,14 @@
This is free software: you are free to change and redistribute it.\n\
There is NO WARRANTY, to the extent permitted by law.\n"),
"2012");
- xexit (0);
+ exit (EXIT_SUCCESS);
}
/* If the `--help' option was present, show the help and exit. */
if (print_help_p)
{
short_help ();
- xexit (0);
+ exit (EXIT_SUCCESS);
}
/* If there is one argument remaining, it is the name of the input
@@ -169,7 +169,7 @@
{
error_message (0, _("incorrect number of arguments"));
suggest_help ();
- xexit (1);
+ exit (EXIT_FAILURE);
}
/* Use default filenames where none given. */
@@ -199,7 +199,7 @@
{
error_message (errno, _("cannot open input file `%s'"),
input_filename);
- xexit (1);
+ exit (EXIT_FAILURE);
}
/* Compile the input file to its verious sections, then write the
@@ -213,7 +213,7 @@
{
error_message (errno, _("cannot create output file `%s'"),
output_filename);
- xexit (1);
+ exit (EXIT_FAILURE);
}
/* Write the contents of the output file and close it. If there is
@@ -235,7 +235,7 @@
if (write_error)
{
unlink (output_filename);
- xexit (1);
+ exit (EXIT_FAILURE);
}
}
@@ -914,5 +914,5 @@
general questions and discussion to address@hidden
Texinfo home page: http://www.gnu.org/software/texinfo/";));
- xexit (0);
+ exit (EXIT_SUCCESS);
}
Index: info/makedoc.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/makedoc.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- info/makedoc.c 11 Jun 2008 09:55:42 -0000 1.10
+++ info/makedoc.c 11 Jun 2012 17:54:26 -0000 1.11
@@ -1,8 +1,8 @@
/* makedoc.c -- make doc.c and funs.h from input files.
- $Id: makedoc.c,v 1.10 2008/06/11 09:55:42 gray Exp $
+ $Id: makedoc.c,v 1.11 2012/06/11 17:54:26 karl Exp $
Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007,
- 2008 Free Software Foundation, Inc.
+ 2008, 2012 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
@@ -554,7 +554,7 @@
fatal_file_error (char *filename)
{
fprintf (stderr, _("Couldn't manipulate the file %s.\n"), filename);
- xexit (2);
+ exit (EXIT_FAILURE);
}
static FILE *
Index: info/man.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/man.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- info/man.c 12 Apr 2012 10:38:29 -0000 1.19
+++ info/man.c 11 Jun 2012 17:54:26 -0000 1.20
@@ -1,8 +1,8 @@
/* man.c: How to read and format man files.
- $Id: man.c,v 1.19 2012/04/12 10:38:29 gray Exp $
+ $Id: man.c,v 1.20 2012/06/11 17:54:26 karl Exp $
Copyright (C) 1995, 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005,
- 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
+ 2007, 2008, 2009, 2011, 2012 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
@@ -333,7 +333,7 @@
/* If we get here, we couldn't exec, so close out the pipe and
exit. */
close (pipes[1]);
- xexit (0);
+ exit (EXIT_SUCCESS);
}
#else /* !PIPE_USE_FORK */
/* Cannot fork/exec, but can popen/pclose. */
Index: info/pcterm.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/pcterm.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- info/pcterm.c 11 Jun 2008 09:55:42 -0000 1.8
+++ info/pcterm.c 11 Jun 2012 17:54:26 -0000 1.9
@@ -1,7 +1,7 @@
/* pcterm.c -- How to handle the PC terminal for Info under MS-DOS/MS-Windows.
- $Id: pcterm.c,v 1.8 2008/06/11 09:55:42 gray Exp $
+ $Id: pcterm.c,v 1.9 2012/06/11 17:54:26 karl Exp $
- Copyright (C) 1998, 1999, 2003, 2004, 2007, 2008
+ Copyright (C) 1998, 1999, 2003, 2004, 2007, 2008, 2012
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -684,7 +684,7 @@
getxkey ();
#endif
pc_write_chars (interrupted_msg, sizeof (interrupted_msg) - 1);
- xexit (1);
+ exit (EXIT_FAILURE);
case SIGUSR1:
/* Simulate SIGTSTP by invoking a subsidiary shell. */
pc_goto_xy (0, outside_info.screenheight - 1);
Index: info/session.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/session.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- info/session.c 21 Apr 2012 00:38:06 -0000 1.55
+++ info/session.c 11 Jun 2012 17:54:26 -0000 1.56
@@ -1,8 +1,8 @@
/* session.c -- user windowing interface to Info.
- $Id: session.c,v 1.55 2012/04/21 00:38:06 karl Exp $
+ $Id: session.c,v 1.56 2012/06/11 17:54:26 karl Exp $
Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
- 2004, 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
+ 2004, 2007, 2008, 2009, 2011, 2012 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
@@ -117,7 +117,7 @@
display_update_display (windows);
info_error ("%s", msg_cant_find_window);
info_session ();
- xexit (0);
+ exit (EXIT_SUCCESS);
}
active_window = largest;
@@ -132,7 +132,7 @@
display_update_display (windows);
info_error ("%s", msg_win_too_small);
info_session ();
- xexit (0);
+ exit (EXIT_SUCCESS);
}
}
}
@@ -261,7 +261,7 @@
term_name = "dumb";
info_error (msg_term_too_dumb, term_name);
- xexit (1);
+ exit (EXIT_FAILURE);
}
if (clear_screen)
@@ -5504,7 +5504,7 @@
{
terminal_unprep_terminal ();
close_dribble_file ();
- xexit (0);
+ exit (EXIT_SUCCESS);
}
}
}
Index: info/tilde.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/tilde.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- info/tilde.c 11 Jun 2008 09:55:43 -0000 1.8
+++ info/tilde.c 11 Jun 2012 17:54:27 -0000 1.9
@@ -1,8 +1,8 @@
/* tilde.c -- tilde expansion code (~/foo := $HOME/foo).
- $Id: tilde.c,v 1.8 2008/06/11 09:55:43 gray Exp $
+ $Id: tilde.c,v 1.9 2012/06/11 17:54:27 karl Exp $
Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1996, 1998, 1999,
- 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+ 2002, 2004, 2006, 2007, 2008, 2012 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
@@ -296,7 +296,7 @@
printf (" --> %s\n", result);
free (result);
}
- xexit (0);
+ exit (EXIT_SUCCESS);
}
static void memory_error_and_abort ();
Index: install-info/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/install-info/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- install-info/Makefile.am 24 Jun 2010 00:17:01 -0000 1.2
+++ install-info/Makefile.am 11 Jun 2012 17:54:27 -0000 1.3
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.2 2010/06/24 00:17:01 karl Exp $
+# $Id: Makefile.am,v 1.3 2012/06/11 17:54:27 karl Exp $
# Makefile.am for texinfo/install-info.
#
# Copyright 2008, 2009, 2010 Free Software Foundation, Inc.
@@ -29,4 +29,4 @@
-I$(top_srcdir)/gnulib/lib \
-I$(top_builddir)/gnulib/lib \
-DLOCALEDIR=\"$(localedir)\"
-LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
+LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
Index: install-info/install-info.c
===================================================================
RCS file: /sources/texinfo/texinfo/install-info/install-info.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- install-info/install-info.c 1 Jan 2012 17:09:11 -0000 1.18
+++ install-info/install-info.c 11 Jun 2012 17:54:27 -0000 1.19
@@ -1,5 +1,5 @@
/* install-info -- create Info directory entry(ies) for an Info file.
- $Id: install-info.c,v 1.18 2012/01/01 17:09:11 karl Exp $
+ $Id: install-info.c,v 1.19 2012/06/11 17:54:27 karl Exp $
Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
2005, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
@@ -244,7 +244,7 @@
va_start (ap, fmt);
vdiag (fmt, NULL, ap);
va_end (ap);
- xexit (1);
+ exit (EXIT_FAILURE);
}
/* Return a newly-allocated string
@@ -518,7 +518,7 @@
{
fprintf (stderr, _("\tTry `%s --help' for a complete list of options.\n"),
progname);
- xexit (1);
+ exit (EXIT_FAILURE);
}
void
@@ -896,7 +896,7 @@
if (!output)
{
perror (dirfile);
- xexit (1);
+ exit (EXIT_FAILURE);
}
for (i = 0; i <= dir_nlines; i++)
@@ -2060,7 +2060,7 @@
case 'h':
case 'H':
print_help ();
- xexit (0);
+ exit (EXIT_SUCCESS);
case 'i':
if (infile)
@@ -2135,7 +2135,7 @@
This is free software: you are free to change and redistribute it.\n\
There is NO WARRANTY, to the extent permitted by law.\n"),
"2012");
- xexit (0);
+ exit (EXIT_SUCCESS);
case 'W':
{
@@ -2317,7 +2317,7 @@
subsequent parts of `make install' to fail. */
if (!quiet_flag)
warning (_("no info dir entry in `%s'"), infile);
- xexit (0);
+ exit (EXIT_SUCCESS);
}
/* If the entries came from the command-line arguments, their
@@ -2575,8 +2575,7 @@
n_entries_to_add, entries_to_add,
input_sections, compression_program);
- xexit (0);
- return 0; /* Avoid bogus warnings. */
+ exit (EXIT_SUCCESS);
}
/* Divide the text at DATA (of SIZE bytes) into lines.
Index: makeinfo/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- makeinfo/Makefile.am 15 Jul 2010 15:20:28 -0000 1.11
+++ makeinfo/Makefile.am 11 Jun 2012 17:54:28 -0000 1.12
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.11 2010/07/15 15:20:28 pertusus Exp $
+# $Id: Makefile.am,v 1.12 2012/06/11 17:54:28 karl Exp $
# Makefile.am for texinfo/makeinfo.
# Run automake in .. to produce Makefile.in from this.
#
@@ -21,7 +21,7 @@
-I$(top_srcdir)/gnulib/lib \
-I$(top_builddir)/gnulib/lib \
-DLOCALEDIR=\"$(localedir)\"
-LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
+LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
makeinfo_SOURCES = \
cmds.c cmds.h defun.c defun.h \
Index: util/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/util/Makefile.am,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- util/Makefile.am 19 Apr 2012 21:15:23 -0000 1.44
+++ util/Makefile.am 11 Jun 2012 17:54:28 -0000 1.45
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.44 2012/04/19 21:15:23 pertusus Exp $
+# $Id: Makefile.am,v 1.45 2012/06/11 17:54:28 karl Exp $
# Makefile.am for texinfo/util.
# Run automake in .. to produce Makefile.in from this.
#
@@ -26,7 +26,7 @@
-I$(top_srcdir)/gnulib/lib \
-I$(top_builddir)/gnulib/lib \
-DLOCALEDIR=\"$(localedir)\"
-LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
+LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
dist_pkgdata_DATA = htmlxref.cnf texinfo.dtd texinfo.xsl texinfo.cat
Index: util/texindex.c
===================================================================
RCS file: /sources/texinfo/texinfo/util/texindex.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- util/texindex.c 1 Jan 2012 17:09:11 -0000 1.27
+++ util/texindex.c 11 Jun 2012 17:54:28 -0000 1.28
@@ -1,5 +1,5 @@
/* texindex -- sort TeX index dribble output into an actual index.
- $Id: texindex.c,v 1.27 2012/01/01 17:09:11 karl Exp $
+ $Id: texindex.c,v 1.28 2012/06/11 17:54:28 karl Exp $
Copyright (C) 1987, 1991, 1992, 1996, 1997, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
@@ -200,13 +200,12 @@
{
fprintf (stderr, "%s: %s: file too large\n", program_name,
infiles[i]);
- xexit (1);
+ exit (EXIT_FAILURE);
}
sort_in_core (infiles[i], (int)ptr, outfile);
}
- xexit (0);
- return 0; /* Avoid bogus warnings. */
+ exit (EXIT_SUCCESS);
}
typedef struct
@@ -263,7 +262,7 @@
Texinfo home page: http://www.gnu.org/software/texinfo/";), f);
fputs ("\n", f);
- xexit (result_value);
+ exit (result_value);
}
/* Decode the command line arguments to set the parameter variables
@@ -298,7 +297,7 @@
This is free software: you are free to change and redistribute it.\n\
There is NO WARRANTY, to the extent permitted by law.\n"),
"2012");
- xexit (0);
+ exit (EXIT_SUCCESS);
}
else if ((strcmp (arg, "--keep") == 0) ||
(strcmp (arg, "-k") == 0))
@@ -308,7 +307,7 @@
else if ((strcmp (arg, "--help") == 0) ||
(strcmp (arg, "-h") == 0))
{
- usage (0);
+ usage (EXIT_SUCCESS);
}
else if ((strcmp (arg, "--output") == 0) ||
(strcmp (arg, "-o") == 0))
@@ -320,10 +319,10 @@
*(op - 1) = argv[arg_index];
}
else
- usage (1);
+ usage (EXIT_FAILURE);
}
else
- usage (1);
+ usage (EXIT_FAILURE);
}
else
{
@@ -336,7 +335,7 @@
num_infiles = ip - infiles;
*ip = (char *)NULL;
if (num_infiles == 0)
- usage (1);
+ usage (EXIT_FAILURE);
}
/* Compare LINE1 and LINE2 according to the specified set of keyfields. */
@@ -1174,7 +1173,7 @@
va_start (ap, fmt);
vdiag (fmt, NULL, ap);
va_end (ap);
- xexit (1);
+ exit (EXIT_FAILURE);
}
void
@@ -1188,7 +1187,7 @@
pfatal_with_name (const char *name)
{
perror_with_name (name);
- xexit (1);
+ exit (EXIT_FAILURE);
}
Index: lib/.cvsignore
===================================================================
RCS file: lib/.cvsignore
diff -N lib/.cvsignore
--- lib/.cvsignore 3 Sep 2002 23:44:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-.deps
-Makefile
-Makefile.in
Index: lib/Makefile.am
===================================================================
RCS file: lib/Makefile.am
diff -N lib/Makefile.am
--- lib/Makefile.am 14 Oct 2011 16:02:06 -0000 1.13
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-# $Id: Makefile.am,v 1.13 2011/10/14 16:02:06 karl Exp $
-# Makefile.am for texinfo/lib.
-#
-# Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-# Free Software Foundation, Inc.
-#
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-noinst_LIBRARIES = libtxi.a
-
-AM_CPPFLAGS = -I$(top_srcdir) \
- -I$(top_srcdir)/gnulib/lib \
- -I$(top_builddir)/gnulib/lib \
- -DLOCALEDIR=\"$(localedir)\"
-
-libtxi_a_SOURCES = xexit.c
-
-EXTRA_DIST = README
Index: lib/README
===================================================================
RCS file: lib/README
diff -N lib/README
--- lib/README 14 Oct 2011 16:02:06 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$Id: README,v 1.4 2011/10/14 16:02:06 karl Exp $
-texinfo/lib/README
-
- Copyright (C) 2002, 2011 Free Software Foundation, Inc.
-
- Copying and distribution of this file, with or without modification,
- are permitted in any medium without royalty provided the copyright
- notice and this notice are preserved.
-
-Common routines for the Texinfo programs -- down to one.
-
-The bulk of the common sources come from Gnulib:
-http://savannah.gnu.org/projects/gnulib
Index: lib/xexit.c
===================================================================
RCS file: lib/xexit.c
diff -N lib/xexit.c
--- lib/xexit.c 1 Jul 2007 21:20:31 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,87 +0,0 @@
-/* xexit.c -- exit with attention to return values and closing stdout.
- $Id: xexit.c,v 1.8 2007/07/01 21:20:31 karl Exp $
-
- Copyright (C) 1999, 2003, 2004, 2007 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
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-
-#include "system.h"
-
-/* SunOS 4.1.1 gets STDC_HEADERS defined, but it doesn't provide
- EXIT_FAILURE. So far no system has defined one of EXIT_FAILURE and
- EXIT_SUCCESS without the other. */
-#ifdef EXIT_SUCCESS
- /* The following test is to work around the gross typo in
- systems like Sony NEWS-OS Release 4.0C, whereby EXIT_FAILURE
- is defined to 0, not 1. */
-# if !EXIT_FAILURE
-# undef EXIT_FAILURE
-# define EXIT_FAILURE 1
-# endif
-#else /* not EXIT_SUCCESS */
-# ifdef VMS /* these values suppress some messages; from gnuplot */
-# define EXIT_SUCCESS 1
-# define EXIT_FAILURE 0x10000002
-# else /* not VMS */
-# define EXIT_SUCCESS 0
-# define EXIT_FAILURE 1
-# endif /* not VMS */
-#endif /* not EXIT_SUCCESS */
-
-
-/* Flush stdout first, exit if failure (therefore, xexit should be
- called to exit every program, not just `return' from main).
- Otherwise, if EXIT_STATUS is zero, exit successfully, else
- unsuccessfully. */
-
-void
-xexit (int exit_status)
-{
- if (ferror (stdout))
- {
- fputs (_("ferror on stdout\n"), stderr);
- exit_status = 1;
- }
- else if (fflush (stdout) != 0)
- {
- fputs (_("fflush error on stdout\n"), stderr);
- exit_status = 1;
- }
-
- exit_status = exit_status == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
-
- exit (exit_status);
-}
-
-
-/* Why do we care about stdout you may ask? Here's why, from Jim
- Meyering in the lib/closeout.c file. */
-
-/* If a program writes *anything* to stdout, that program should close
- stdout and make sure that the close succeeds. Otherwise, suppose that
- you go to the extreme of checking the return status of every function
- that does an explicit write to stdout. The last printf can succeed in
- writing to the internal stream buffer, and yet the fclose(stdout) could
- still fail (due e.g., to a disk full error) when it tries to write
- out that buffered data. Thus, you would be left with an incomplete
- output file and the offending program would exit successfully.
-
- Besides, it's wasteful to check the return value from every call
- that writes to stdout -- just let the internal stream state record
- the failure. That's what the ferror test is checking below.
-
- It's important to detect such failures and exit nonzero because many
- tools (most notably `make' and other build-management systems) depend
- on being able to detect failure in other tools via their exit status. */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo ChangeLog Makefile.am configure.ac info...,
Karl Berry <=