[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo ChangeLog NEWS doc/info-stnd.texi insta...
From: |
Karl Berry |
Subject: |
texinfo ChangeLog NEWS doc/info-stnd.texi insta... |
Date: |
Sat, 14 Mar 2009 17:57:42 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Karl Berry <karl> 09/03/14 17:57:42
Modified files:
. : ChangeLog NEWS
doc : info-stnd.texi
install-info : install-info.c
info : filesys.c
Log message:
support xz compression, http://tukaani.org/xz
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.980&r2=1.981
http://cvs.savannah.gnu.org/viewcvs/texinfo/NEWS?cvsroot=texinfo&r1=1.187&r2=1.188
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/info-stnd.texi?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/install-info/install-info.c?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/filesys.c?cvsroot=texinfo&r1=1.13&r2=1.14
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.980
retrieving revision 1.981
diff -u -b -r1.980 -r1.981
--- ChangeLog 14 Mar 2009 17:31:29 -0000 1.980
+++ ChangeLog 14 Mar 2009 17:57:41 -0000 1.981
@@ -1,3 +1,9 @@
+2009-03-14 Karl Berry <address@hidden>
+
+ * info/filesys.c (compress_suffixes): add .xz/unxz.
+
+ * info/filesys.h (DEFAULT_INFOPATH): include PATH by default.
+
2009-03-14 Peter Breitenlohner <address@hidden>
* info/filesys.c (build_infopath_from_path): new fn.
Index: NEWS
===================================================================
RCS file: /sources/texinfo/texinfo/NEWS,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -b -r1.187 -r1.188
--- NEWS 14 Mar 2009 17:31:30 -0000 1.187
+++ NEWS 14 Mar 2009 17:57:41 -0000 1.188
@@ -1,4 +1,4 @@
-$Id: NEWS,v 1.187 2009/03/14 17:31:30 karl Exp $
+$Id: NEWS,v 1.188 2009/03/14 17:57:41 karl Exp $
This NEWS file records noteworthy changes, very tersely.
See the manual for detailed information.
@@ -32,6 +32,10 @@
* info:
. INFOPATH is determined by PATH by default, or if an element "PATH"
is specified.
+ . xz compression supported.
+
+* install-info:
+ . xz compression supported.
* texinfo.tex:
. support some per-language hyphenation, when the underlying TeX
Index: doc/info-stnd.texi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/info-stnd.texi,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- doc/info-stnd.texi 14 Mar 2009 17:31:30 -0000 1.25
+++ doc/info-stnd.texi 14 Mar 2009 17:57:42 -0000 1.26
@@ -1,5 +1,5 @@
vb\input texinfo.tex @c -*-texinfo-*-
address@hidden $Id: info-stnd.texi,v 1.25 2009/03/14 17:31:30 karl Exp $
address@hidden $Id: info-stnd.texi,v 1.26 2009/03/14 17:57:42 karl Exp $
@c We must \input texinfo.tex instead of texinfo, otherwise make
@c distcheck in the Texinfo distribution fails, because the texinfo Info
@c file is made first, and texi2dvi must include . first in the path.
@@ -18,7 +18,7 @@
Texinfo source files).
Copyright @copyright{} 1992, 1993, 1996, 1997, 1998, 1999, 2001, 2002,
-2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -202,21 +202,21 @@
@cindex Info files, compressed
In every directory Info tries, if @var{filename} is not found, Info
looks for it with a number of known extensions of Info address@hidden
address@hidden, @file{-info}, @file{/index}, and @file{.inf}.}. For every
-known extension, Info looks for a compressed file, if a regular file
-isn't found. Info supports files compressed with @code{gzip},
address@hidden, @code{compress} and @code{yabba} programs; it calls
address@hidden, @code{bunzip2}, @code{uncompress} and @code{unyabba},
-accordingly, to decompress such files. Compressed Info files are
-assumed to have @file{.z}, @file{.gz}, @file{.bz2}, @file{.Z}, or
address@hidden extensions, possibly in addition to one of the known Info
-files address@hidden MS-DOS version allows for the Info
-extension, such as @code{.inf}, and the short compressed file
-extensions, such as @file{.z} and @file{.gz}, to be merged into a single
-extension, since DOS doesn't allow more than a single dot in the
-basename of a file. Thus, on MS-DOS, if Info looks for @file{bison},
-file names like @file{bison.igz} and @file{bison.inz} will be found and
-decompressed by @code{gunzip}.}.
address@hidden, @file{-info}, @file{/index}, and @file{.inf}.}. For
+every known extension, Info looks for a compressed file, if a regular
+file isn't found. Info supports files compressed with @code{gzip},
address@hidden, @code{bzip2}, @code{lzma}, @code{compress} and @code{yabba}
+programs, assumed to have @file{.z}, @file{.gz}, @file{.xz},
address@hidden, @file{.lzma}, @file{.Z}, or @file{.Y} extensions,
+possibly after one of the known Info files extensions.
+
+On MS-DOS, Info allows for the Info extension, such as @code{.inf},
+and the short compressed file extensions, such as @file{.z} and
address@hidden, to be merged into a single extension, since DOS doesn't
+allow more than a single dot in the basename of a file. Thus, on
+MS-DOS, if Info looks for @file{bison}, file names like
address@hidden and @file{bison.inz} will be found and decompressed
+by @code{gunzip}.
@item --help
@itemx -h
@@ -281,7 +281,7 @@
@item --show-malformed-multibytes
@itemx --no-show-malformed-multibytes
- Show malformed multibyte sequences in the output. By default, such
+Show malformed multibyte sequences in the output. By default, such
sequences are dropped.
@anchor{--show-options}
Index: install-info/install-info.c
===================================================================
RCS file: /sources/texinfo/texinfo/install-info/install-info.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- install-info/install-info.c 18 May 2008 16:54:02 -0000 1.13
+++ install-info/install-info.c 14 Mar 2009 17:57:42 -0000 1.14
@@ -1,8 +1,8 @@
/* install-info -- create Info directory entry(ies) for an Info file.
- $Id: install-info.c,v 1.13 2008/05/18 16:54:02 karl Exp $
+ $Id: install-info.c,v 1.14 2009/03/14 17:57:42 karl Exp $
- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005, 2007, 2008 Free Software Foundation, Inc.
+ Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ 2005, 2007, 2008, 2009 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
@@ -400,6 +400,11 @@
len -= 3;
ret[len] = 0;
}
+ else if (len > 3 && FILENAME_CMP (ret + len - 3, ".xz") == 0)
+ {
+ len -= 3;
+ ret[len] = 0;
+ }
else if (len > 4 && FILENAME_CMP (ret + len - 4, ".bz2") == 0)
{
len -= 4;
@@ -659,6 +664,12 @@
{
*opened_filename = concat (filename, ".gz", "");
f = fopen (*opened_filename, FOPEN_RBIN);
+ }
+ if (!f)
+ {
+ *opened_filename = concat (filename, ".xz", "");
+ f = fopen (*opened_filename, FOPEN_RBIN);
+ }
if (!f)
{
free (*opened_filename);
@@ -671,7 +682,6 @@
*opened_filename = concat (filename, ".lzma", "");
f = fopen (*opened_filename, FOPEN_RBIN);
}
-
#ifdef __MSDOS__
if (!f)
{
@@ -702,7 +712,6 @@
else
pfatal_with_name (filename);
}
- }
/* Read first few bytes of file rather than relying on the filename.
If the file is shorter than this it can't be usable anyway. */
@@ -727,18 +736,29 @@
#else
*compression_program = "gzip";
#endif
+
+ else if (data[0] == '\xFD' && data[1] == '7' && data[2] == 'z'
+ && data[3] == 'X' && data[4] == 'Z' && data[5] == 0)
+#ifndef STRIP_DOT_EXE
+ *compression_program = "xz.exe";
+#else
+ *compression_program = "xz";
+#endif
+
else if (data[0] == 'B' && data[1] == 'Z' && data[2] == 'h')
#ifndef STRIP_DOT_EXE
*compression_program = "bzip2.exe";
#else
*compression_program = "bzip2";
#endif
+
else if (data[0] == 'B' && data[1] == 'Z' && data[2] == '0')
#ifndef STRIP_DOT_EXE
*compression_program = "bzip.exe";
#else
*compression_program = "bzip";
#endif
+
/* We (try to) match against old lzma format (which lacks proper
header, two first matches), as well as the new format (last match). */
else if ((data[9] == 0x00 && data[10] == 0x00 && data[11] == 0x00
@@ -753,6 +773,7 @@
#else
*compression_program = "lzma";
#endif
+
else
*compression_program = NULL;
Index: info/filesys.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/filesys.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- info/filesys.c 14 Mar 2009 17:31:30 -0000 1.13
+++ info/filesys.c 14 Mar 2009 17:57:42 -0000 1.14
@@ -1,5 +1,5 @@
/* filesys.c -- filesystem specific functions.
- $Id: filesys.c,v 1.13 2009/03/14 17:31:30 karl Exp $
+ $Id: filesys.c,v 1.14 2009/03/14 17:57:42 karl Exp $
Copyright 1993, 1997, 1998, 2000, 2002, 2003, 2004, 2007, 2008, 2009
Free Software Foundation, Inc.
@@ -55,6 +55,7 @@
static COMPRESSION_ALIST compress_suffixes[] = {
{ ".gz", "gunzip" },
+ { ".xz", "unxz" },
{ ".bz2", "bunzip2" },
{ ".z", "gunzip" },
{ ".lzma", "unlzma" },
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo ChangeLog NEWS doc/info-stnd.texi insta...,
Karl Berry <=