• R/O
  • SSH
  • HTTPS

lha: コミット


コミットメタ情報

リビジョン894 (tree)
日時2008-08-04 23:53:18
作者arai

ログメッセージ

Merge commit 'dev/master'

変更サマリ

差分

--- lha/trunk/configure.ac (revision 893)
+++ lha/trunk/configure.ac (revision 894)
@@ -1,5 +1,5 @@
11 # 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)
33 AC_DEFINE_UNQUOTED(LHA_CONFIGURE_OPTIONS, "$ac_configure_args",
44 [specified options for the configure script.])
55 AC_CANONICAL_HOST
--- lha/trunk/ChangeLog (revision 893)
+++ lha/trunk/ChangeLog (revision 894)
@@ -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+
19 2008-08-03 Koji Arai <arai@users.sourceforge.jp>
210
311 * src/header.c (convert_filename): Fixed a bug:
--- lha/trunk/src/lha.h (revision 893)
+++ lha/trunk/src/lha.h (revision 894)
@@ -363,7 +363,8 @@
363363 EXTERN unsigned short maxmatch;
364364 EXTERN off_t decode_count;
365365 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 */
367368
368369 /* huf.c */
369370 #ifndef LHA_MAIN_SRC /* t.okamoto 96/2/20 */
--- lha/trunk/src/slide.c (revision 893)
+++ lha/trunk/src/slide.c (revision 894)
@@ -386,7 +386,6 @@
386386 {
387387 unsigned int i, c;
388388 unsigned int dicsiz1, adjust;
389- unsigned char *dtext;
390389 unsigned int crc;
391390
392391 #ifdef DEBUG
--- lha/trunk/src/larc.c (revision 893)
+++ lha/trunk/src/larc.c (revision 894)
@@ -82,11 +82,11 @@
8282
8383 flagcnt = 0;
8484 for (i = 0; i < 256; i++)
85- memset(&text[i * 13 + 18], i, 13);
85+ memset(&dtext[i * 13 + 18], i, 13);
8686 for (i = 0; i < 256; i++)
87- text[256 * 13 + 18 + i] = i;
87+ dtext[256 * 13 + 18 + i] = i;
8888 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);
9292 }
旧リポジトリブラウザで表示