Attachment #191196 for bug #269742

View | Details | Raw Unified | Return to bug 269742
Collapse All | Expand All




++ doc/texinfo.txi

@cindex Compressed dir files, reading
@cindex Bzipped dir files, reading
@cindex LZMA-compressed dir files, reading
@cindex xz-compressed dir files, reading
@cindex Dir files, compressed
If any input file is compressed with @code{gzip} (@pxref{Top,,,gzip,
Gzip}), @code{install-info} automatically uncompresses it
for reading.  And if @var{dir-file} is compressed, @code{install-info}
also automatically leaves it compressed after writing any changes.
If @var{dir-file} itself does not exist, @code{install-info} tries to
open @file{@var{dir-file}.gz}, @file{@var{dir-file}.bz2},
@file{@var{dir-file}.lzma}, and @file{@var{dir-file}.xz}, in that order.

Options:

++ info/filesys.c

  { ".gz", "gunzip" },
  { ".bz2", "bunzip2" },
  { ".lzma", "unlzma" },
  { ".xz", "unxz" },
  { ".z", "gunzip" },
  { ".Z", "uncompress" },
  { ".Y", "unyabba" },
++ install-info/install-info.c

      len -= 5;
      ret[len] =0;
   }
  else if (len > 3 && FILENAME_CMP (ret + len - 3, ".xz") == 0)
   {
      len -= 3;
      ret[len] =0;
   }

  if (len > 5 && FILENAME_CMP (ret + len - 5, ".info") == 0)
    {

     *opened_filename = concat (filename, ".lzma", "");
     f = fopen (*opened_filename, FOPEN_RBIN);
    }
  if (!f)
    {
     free (*opened_filename);
     *opened_filename = concat (filename, ".xz", "");
     f = fopen (*opened_filename, FOPEN_RBIN);
    }

#ifdef __MSDOS__
      if (!f)

#else
    *compression_program = "bzip";
#endif
  else if (data[0] == (char)0xFD && data[1] == '7' && data[2] == 'z'
           && data[3] == 'X' && data[4] == 'Z' && data[5] == 0x00)
#ifndef STRIP_DOT_EXE
    *compression_program = "xz.exe";
#else
    *compression_program = "xz";
#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

Return to bug 269742

Line Link Here

(-)file_not_specified_in_diff (-5 / +25 lines)
0	-- doc/texinfo.txi	0	++ doc/texinfo.txi
Lines 16489-16502 Link Here
16489	@cindex Compressed dir files, reading	16489	@cindex Compressed dir files, reading
16490	@cindex Bzipped dir files, reading	16490	@cindex Bzipped dir files, reading
16491	@cindex LZMA-compressed dir files, reading	16491	@cindex LZMA-compressed dir files, reading
		16492	@cindex xz-compressed dir files, reading
16492	@cindex Dir files, compressed	16493	@cindex Dir files, compressed
16493	If any input file is compressed with @code{gzip} (@pxref{Top,,,gzip,	16494	If any input file is compressed with @code{gzip} (@pxref{Top,,,gzip,
16494	Gzip}), @code{install-info} automatically uncompresses it	16495	Gzip}), @code{install-info} automatically uncompresses it
16495	for reading. And if @var{dir-file} is compressed, @code{install-info}	16496	for reading. And if @var{dir-file} is compressed, @code{install-info}
16496	also automatically leaves it compressed after writing any changes.	16497	also automatically leaves it compressed after writing any changes.
16497	If @var{dir-file} itself does not exist, @code{install-info} tries to	16498	If @var{dir-file} itself does not exist, @code{install-info} tries to
16498	open @file{@var{dir-file}.gz}, @file{@var{dir-file}.bz2}, and	16499	open @file{@var{dir-file}.gz}, @file{@var{dir-file}.bz2},
16499	@file{@var{dir-file}.lzma}, in that order.	16500	@file{@var{dir-file}.lzma}, and @file{@var{dir-file}.xz}, in that order.
16500		16501
16501	Options:	16502	Options:
16502		16503
16503	-- info/filesys.c	16504	++ info/filesys.c
Lines 56-61 Link Here
56	{ ".gz", "gunzip" },	56	{ ".gz", "gunzip" },
57	{ ".bz2", "bunzip2" },	57	{ ".bz2", "bunzip2" },
58	{ ".lzma", "unlzma" },	58	{ ".lzma", "unlzma" },
		59	{ ".xz", "unxz" },
59	{ ".z", "gunzip" },	60	{ ".z", "gunzip" },
60	{ ".Z", "uncompress" },	61	{ ".Z", "uncompress" },
61	{ ".Y", "unyabba" },	62	{ ".Y", "unyabba" },
62	-- install-info/install-info.c	63	++ install-info/install-info.c
Lines 410-415 Link Here
410	len -= 5;	410	len -= 5;
411	ret[len] =0;	411	ret[len] =0;
412	}	412	}
		413	else if (len > 3 && FILENAME_CMP (ret + len - 3, ".xz") == 0)
		414	{
		415	len -= 3;
		416	ret[len] =0;
		417	}
413		418
414	if (len > 5 && FILENAME_CMP (ret + len - 5, ".info") == 0)	419	if (len > 5 && FILENAME_CMP (ret + len - 5, ".info") == 0)
415	{	420	{
Lines 671-676 Link Here
671	*opened_filename = concat (filename, ".lzma", "");	676	*opened_filename = concat (filename, ".lzma", "");
672	f = fopen (*opened_filename, FOPEN_RBIN);	677	f = fopen (*opened_filename, FOPEN_RBIN);
673	}	678	}
		679	if (!f)
		680	{
		681	free (*opened_filename);
		682	*opened_filename = concat (filename, ".xz", "");
		683	f = fopen (*opened_filename, FOPEN_RBIN);
		684	}
674		685
675	#ifdef __MSDOS__	686	#ifdef __MSDOS__
676	if (!f)	687	if (!f)
Lines 739-744 Link Here
739	#else	750	#else
740	*compression_program = "bzip";	751	*compression_program = "bzip";
741	#endif	752	#endif
		753	else if (data[0] == (char)0xFD && data[1] == '7' && data[2] == 'z'
		754	&& data[3] == 'X' && data[4] == 'Z' && data[5] == 0x00)
		755	#ifndef STRIP_DOT_EXE
		756	*compression_program = "xz.exe";
		757	#else
		758	*compression_program = "xz";
		759	#endif
742	/* We (try to) match against old lzma format (which lacks proper	760	/* We (try to) match against old lzma format (which lacks proper
743	header, two first matches), as well as the new format (last match). */	761	header, two first matches), as well as the new format (last match). */
744	else if ((data[9] == 0x00 && data[10] == 0x00 && data[11] == 0x00	762	else if ((data[9] == 0x00 && data[10] == 0x00 && data[11] == 0x00