Merge commit 'dev/master'
@@ -1,5 +1,5 @@ | ||
1 | 1 | # Process this file with autoconf to produce a configure script. |
2 | -AC_INIT([LHa for UNIX], 1.14i-ac20080802, arai@users.sourceforge.jp, lha) | |
2 | +AC_INIT([LHa for UNIX], 1.14i-ac20080804, arai@users.sourceforge.jp, lha) | |
3 | 3 | AC_DEFINE_UNQUOTED(LHA_CONFIGURE_OPTIONS, "$ac_configure_args", |
4 | 4 | [specified options for the configure script.]) |
5 | 5 | AC_CANONICAL_HOST |
@@ -1,3 +1,11 @@ | ||
1 | +2008-08-04 Koji Arai <arai@users.sourceforge.jp> | |
2 | + | |
3 | + * src/larc.c (decode_start_lz5): should use the dtext[] instead of the text[]. | |
4 | + | |
5 | + * src/lha.h (dtext): defined as global variable. | |
6 | + | |
7 | + * src/slide.c (decode): ditto. | |
8 | + | |
1 | 9 | 2008-08-03 Koji Arai <arai@users.sourceforge.jp> |
2 | 10 | |
3 | 11 | * src/header.c (convert_filename): Fixed a bug: |
@@ -363,7 +363,8 @@ | ||
363 | 363 | EXTERN unsigned short maxmatch; |
364 | 364 | EXTERN off_t decode_count; |
365 | 365 | EXTERN unsigned long loc; /* short -> long .. Changed N.Watazaki */ |
366 | -EXTERN unsigned char *text; | |
366 | +EXTERN unsigned char *text; /* encoding buffer */ | |
367 | +EXTERN unsigned char *dtext; /* decoding buffer */ | |
367 | 368 | |
368 | 369 | /* huf.c */ |
369 | 370 | #ifndef LHA_MAIN_SRC /* t.okamoto 96/2/20 */ |
@@ -386,7 +386,6 @@ | ||
386 | 386 | { |
387 | 387 | unsigned int i, c; |
388 | 388 | unsigned int dicsiz1, adjust; |
389 | - unsigned char *dtext; | |
390 | 389 | unsigned int crc; |
391 | 390 | |
392 | 391 | #ifdef DEBUG |
@@ -82,11 +82,11 @@ | ||
82 | 82 | |
83 | 83 | flagcnt = 0; |
84 | 84 | for (i = 0; i < 256; i++) |
85 | - memset(&text[i * 13 + 18], i, 13); | |
85 | + memset(&dtext[i * 13 + 18], i, 13); | |
86 | 86 | for (i = 0; i < 256; i++) |
87 | - text[256 * 13 + 18 + i] = i; | |
87 | + dtext[256 * 13 + 18 + i] = i; | |
88 | 88 | for (i = 0; i < 256; i++) |
89 | - text[256 * 13 + 256 + 18 + i] = 255 - i; | |
90 | - memset(&text[256 * 13 + 512 + 18], 0, 128); | |
91 | - memset(&text[256 * 13 + 512 + 128 + 18], ' ', 128 - 18); | |
89 | + dtext[256 * 13 + 256 + 18 + i] = 255 - i; | |
90 | + memset(&dtext[256 * 13 + 512 + 18], 0, 128); | |
91 | + memset(&dtext[256 * 13 + 512 + 128 + 18], ' ', 128 - 18); | |
92 | 92 | } |