use the length modifier `ll' (%llu) for printing 64bit value.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/lha/lha/trunk@874 6a8cc165-1e22-0410-a132-eb4e3f353aba

diff --git a/00readme.autoconf b/00readme.autoconf
index 891c9d6..255b0c5 100644 (file)
--- a/00readme.autoconf
+++ b/00readme.autoconf
@@ -1,22 +1,35 @@
-# $Id$
 # -*- Mode: text ; Coding: euc-japan -*-
 
-autoconfiscated for LHa for UNIX version 1.14i
+LHa for UNIX with Autoconf
                                         Koji Arai <arai@users.sourceforge.jp>
 
-¤³¤Î¥Õ¥¡¥¤¥ë¤Ï LHa for UNIX version 1.14i ¤ò autoconf¡¢automake ²½¤·¤¿
-(autoconfiscate ¤È¸À¤¦¤½¤¦¤Ç¤¹¡£Jargon »²¾È)¤È¤­¤Î¥á¥â¤Ç¤¹¡£
-
-LHa for UNIX ¤Ë´Ø¤·¤Æ¤Ï²¬ËÜ·ÑÃˤµ¤ó¤Î¥Ú¡¼¥¸
-  <http://www2m.biglobe.ne.jp/~dolphin/lha/lha.htm>
-¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-
-¡¦¥³¥ó¥Ñ¥¤¥ë¤Î¼ê½ç
+¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢Autoconf ÈÇ LHa for UNIX ¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
+
+1. ¥³¥ó¥Ñ¥¤¥ë¤Î¼ê½ç
+2. ¥ª¥ê¥¸¥Ê¥ë¤«¤é¤ÎÊѹ¹ÅÀ
+   ¡¦-lh6-, -lh7- ¥á¥½¥Ã¥É¤Î¥¢¡¼¥«¥¤¥ÖºîÀ®
+   ¡¦¥¢¡¼¥«¥¤¥ÖÃæ¤Î´Á»ú¥Õ¥¡¥¤¥ë̾
+   ¡¦É¸½àÆþÎϤ«¤é¤ÎŸ³«¥Õ¥¡¥¤¥ë¤Î»ØÄê
+   ¡¦³ÈÄ¥¥Ø¥Ã¥À(¥æ¡¼¥¶Ì¾/¥°¥ë¡¼¥×̾)¤Î¥µ¥Ý¡¼¥È
+   ¡¦¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ëºîÀ®¤ÎÍÞ»ß
+   ¡¦header.c ¤Î½ñ¤­´¹¤¨
+   ¡¦level 3 header
+   ¡¦¥Ø¥Ã¥À¤Î¥À¥ó¥×
+   ¡¦¥Ç¥Õ¥©¥ë¥È¥Ø¥Ã¥À¥ì¥Ù¥ë
+   ¡¦³ÈÄ¥¥Ø¥Ã¥À
+   ¡¦-x ¥ª¥×¥·¥ç¥ó
+   ¡¦Cygwin ¤Ç¤Î²òÅà
+   ¡¦large files Âбþ
+3. ¥Ð¥°
+4. ºÆÇÛÉۤˤĤ¤¤Æ
+
+1. ¥³¥ó¥Ñ¥¤¥ë¤Î¼ê½ç
+====================
 
   ¥³¥ó¥Ñ¥¤¥ë¤Î¼ê½ç¤Ï°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
 
-    gzip -dc lha-114i.autoconf-xxxx.tar.gz | tar xvf -
-    cd lha-114i.autoconf-xxx
+    gzip -dc lha-1.14i-acXXXXXXXX.tar.gz | tar xvf -
+    cd lha-114i-acXXXXXXXX
 
     sh ./configure
     make
@@ -50,32 +63,30 @@ LHa for UNIX 
   ¤¹¡£autoconf/automake ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ï¤½¤ì¤¾¤ì autoconf 2.5x, automake
   1.6.x °Ê¹ß¤Ç¤ÎÍøÍѤòÁ°Äó¤È¤·¤Æ¤¤¤Þ¤¹¡£
 
-    gzip -dc lha-114i.autoconf-xxxx.tar.gz | tar xvf -
-    cd lha-114i.autoconf-xxxx
+    gzip -dc lha-1.14i-acXXXXXXXX.tar.gz | tar xvf -
+    cd lha-114i-acXXXXXXXX
 
     aclocal
     automake -a
     autoheader
     autoconf
+
+    # aclocal ¤«¤é autoconf ¼Â¹Ô¤Þ¤Ç¤Î¼ê½ç¤Ï¡¢ºÇ¶á¤Ç¤Ï¡¢autoreconf -is
+    # ¤Ç¤¤¤±¤ë¤è¤¦¤Ç¤¹¡£
+
     sh ./configure
     make
     make check
     make install
 
-¡¦¥Þ¥¯¥í¤ÎÃÖ¤­´¹¤¨
+2. ¥ª¥ê¥¸¥Ê¥ë¤«¤é¤ÎÊѹ¹ÅÀ
+=========================
 
-  ¥ª¥ê¥¸¥Ê¥ë¤Î LHa for UNIX 1.14i ¤Ç»È¤ï¤ì¤Æ¤¤¤¿¥Þ¥¯¥í¤Ï autoconf ɸ½à
-  ¤Î¥Þ¥¯¥í̾¤ËÃÖ¤­´¹¤¨¤é¤ì¤Þ¤·¤¿¡£(olddoc/IFNAMES ¥Õ¥¡¥¤¥ë¤Ë¾ÜºÙ¤¬½ñ¤«
-  ¤ì¤Æ¤¤¤Þ¤¹)
+Autoconf ÈÇ LHa for UNIX ¤Ï¡¢
+LHa for UNIX ver1.14i <http://www2m.biglobe.ne.jp/~dolphin/lha/lha.htm>
+¤ò¸µ¤Ë²þÊѤµ¤ì¤Þ¤·¤¿¡£
 
-  IFNAMES¥Õ¥¡¥¤¥ë¤Ï¡¢
-     ¥Þ¥¯¥í̾ ÄêµÁ¤Î¤¢¤ë¥Õ¥¡¥¤¥ë...  ¥³¥á¥ó¥È
-  ¤È¤¤¤¦¹½À®¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ïautoconf¤È°ì½ï¤ËÇÛÉÛ¤µ¤ì¤ë
-  ifnames¥³¥Þ¥ó¥É¤Î½ÐÎϤò¸µ¤Ë¤·¤Þ¤·¤¿¡£
-  IFNAMES¥Õ¥¡¥¤¥ë¤Î# ¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤ë¹Ô¤Ï³ºÅö¤Î¥Þ¥¯¥í¤¬ÃÖ¤­´¹¤¨¤é¤ì¤¿¤ê¡¢
-  configure ¥³¥Þ¥ó¥É¤Î¥³¥Þ¥ó¥É¥ª¥×¥·¥ç¥ó¤Ç»ØÄꤵ¤ì¤ë¤è¤¦¤Ë¤Ê¤Ã¤¿¤³¤È¤ò
-  ¼¨¤·¤Þ¤¹¡£¤½¤Î¤Þ¤Þ¤Î¹Ô¤Ïautoconf¤ÇȽÃǤ¹¤ëɬÍפ¬¤Ê¤¤¤«¤Þ¤¿¤Ï»ä¤¬È½ÃÇ
-  ¤Ç¤­¤Ê¤¤¤¿¤á¡¢¤½¤Î¤Þ¤ÞÊüÃÖ¤·¤¿¤³¤È¤ò¼¨¤·¤Þ¤¹¡£
+¼ç¤ÊÊѹ¹ÅÀ¤ò²¼µ­¤Ëµó¤²¤Þ¤¹¡£
 
 ¡¦-lh6-, -lh7- ¥á¥½¥Ã¥É¤Î¥¢¡¼¥«¥¤¥ÖºîÀ®
 
@@ -164,6 +175,15 @@ LHa for UNIX 
   Mac OS X ÍѤΠutf8 <-> sjis ÊÑ´¹¤Ï¡¢2002/6 ¤Ëºä°æ¹À¿Í¤µ¤ó¤ËºîÀ®¤·¤Æ
   ¤¤¤¿¤À¤­¤Þ¤·¤¿¡£¤¢¤ê¤¬¤È¤¦¤´¤¶¤¤¤Þ¤¹¡£
 
+  ¤Þ¤¿¡¢Mac OS X °Ê³°¤Ç¤â¡¢iconv ¥é¥¤¥Ö¥é¥ê¤ò»ÈÍѤ¹¤ì¤Ð¡¢UTF-8 ¤ò»ÈÍѤ¹
+  ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¿¤À¤·¡¢¸½ºß¤Î¤È¤³¤í iconv ¥é¥¤¥Ö¥é¥ê¤Î¸ºß¤ò¼«Æ°Åª
+  ¤Ë¸¡½Ð¤·¤Ê¤¤¤Î¤Ç¡¢libc ¤Ë iconv() ´Ø¿ô¤¬¤Ê¤¯¡¢libiconv ¤¬Â¸ºß¤¹¤ë
+  (iconv¥é¥¤¥Ö¥é¥ê¤ò¥ê¥ó¥¯¤¹¤ëɬÍפ¬¤¢¤ë)´Ä¶­¤Ç¤Ï¡¢¥³¥ó¥Ñ¥¤¥ë»þ¤Ë
+
+     sh ./configure LIBS=-liconv
+
+  ¤Ê¤É¤È¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
+
 ¡¦É¸½àÆþÎϤ«¤é¤ÎŸ³«¥Õ¥¡¥¤¥ë¤Î»ØÄê
 
   ¥ª¥ê¥¸¥Ê¥ë¤Î LHa for UNIX 1.14i ¤Ï¡¢
@@ -304,7 +324,7 @@ LHa for UNIX 
     lha vvv foo.lzh
   ¤È¤¹¤ë¤È¡¢¥¢¡¼¥«¥¤¥Ö¤ÎÆâÍÆ°ìÍ÷¤Ë¤Þ¤¶¤Ã¤Æ¥À¥ó¥×¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£
 
-¡¦¥Ø¥Ã¥À¥ì¥Ù¥ë
+¡¦¥Ç¥Õ¥©¥ë¥È¥Ø¥Ã¥À¥ì¥Ù¥ë
 
   ¥¢¡¼¥«¥¤¥Ö¤òºîÀ®¤¹¤ë¤È¤­¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥Ø¥Ã¥À¥ì¥Ù¥ë¤ò 2 ¤Ë¤·¤Þ¤·¤¿¡£
   (¥ª¥ê¥¸¥Ê¥ë¤Î LHa for UNIX 1.14i ¤Ç¤Ï¥ì¥Ù¥ë 1 ¤¬¥Ç¥Õ¥©¥ë¥È)
@@ -364,8 +384,18 @@ LHa for UNIX 
 
   ¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£
 
-  ¤Ê¤ª¡¢level 0, 1, 2 ¥Ø¥Ã¥À¤Î»ÅÍ;å 4G ̤Ëþ¤Î¥Õ¥¡¥¤¥ë¤·¤«½ñ¸Ë¤Ë³ÊǼ¤Ç
-  ¤­¤Þ¤»¤ó¡£
+  ¤Ê¤ª¡¢Àµµ¬¤Î LHA ¤Ç¤Ï¡¢level 0, 1, 2 ¥Ø¥Ã¥À¤Î»ÅÍ;å 4G ̤Ëþ¤Î¥Õ¥¡¥¤¥ë
+  ¤·¤«½ñ¸Ë¤Ë³ÊǼ¤Ç¤­¤Þ¤»¤ó(¥Õ¥¡¥¤¥ë¥µ¥¤¥º¤ò³ÊǼ¤¹¤ëÎΰ褬 4 bytes ¤·¤«¤Ê¤¤)¡£
+
+  ¤·¤«¤·¡¢UNLHA32.DLL ¤Ê¤É¤Ï¡¢³ÈÄ¥¥Ø¥Ã¥À(0x42)¤Ë¤è¤ê¡¢4G over ¤Ê¥Õ¥¡¥¤
+  ¥ë¤â°·¤¨¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£autoconf ÈǤǤϡ¢º£¤Î¤È¤³¤íŸ³«¤Î¤È¤­¤Î
+  ¤ß¤³¤Î³ÈÄ¥¥Ø¥Ã¥À¤ò»²¾È¤·¤Æ¡¢4G over¥Õ¥¡¥¤¥ë¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£
+
+  (ºîÀ®¤ËÂбþ¤·¤Æ¤¤¤Ê¤¤¤Î¤Ï¡¢°Â°×¤ËUNLHA32.DLL¤Ë½¾¤¦¤³¤È¤¬Àµ¤·¤¤¤Î¤«¤è
+  ¤¯¤ï¤«¤é¤Ê¤«¤Ã¤¿¤«¤é¤Ç¤¹¡£)
+
+3. ¥Ð¥°
+=======
 
 ¡¦²õ¤ì¤¿¥¢¡¼¥«¥¤¥Ö¤ÎŸ³« (--extract-broken-archive)
 
@@ -389,7 +419,8 @@ LHa for UNIX 
   for UNIX (autoconfÈÇ)¤ÇºîÀ®¤µ¤ì¤¿¤â¤Î¤Ç¤¢¤ë¾ì¹ç¤Ë¤Ï)¤³¤Î¥ª¥×¥·¥ç¥ó¤ò
   »î¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£
 
-¡¦ºÆÇÛÉۤˤĤ¤¤Æ
+4. ºÆÇÛÉۤˤĤ¤¤Æ
+=================
 
   »ä¤Ï¡¢src/header.c ¤Ë¤Ï¤â¤Ï¤ä¸µ¤Î lha 1.14i ¤Ë¤¢¤Ã¤¿¥³¡¼¥É¤Ï´Þ¤Þ¤ì¤Æ
   ¤¤¤Ê¤¤¤È¹Í¤¨¤Æ¤¤¤Þ¤¹¡£src/header.c ¤Ï»ä¤ÎÃøºîʪ¤Ç¤¹¡£¤¿¤À¤·¡¢lha

diff --git a/config.h.in b/config.h.in
index 98ef370..bd501f6 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -241,6 +241,9 @@
 /* The size of `long', as computed by sizeof. */
 #undef SIZEOF_LONG
 
+/* The size of `off_t', as computed by sizeof. */
+#undef SIZEOF_OFF_T
+
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 

diff --git a/configure.ac b/configure.ac
index d9503e1..00e907d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT([LHa for UNIX], 1.14i-ac20070224, arai@users.sourceforge.jp, lha)
+AC_INIT([LHa for UNIX], 1.14i-ac20070904, arai@users.sourceforge.jp, lha)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
@@ -35,6 +35,7 @@ AC_STRUCT_TM
 AC_STRUCT_TIMEZONE
 
 AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(off_t)
 AC_CHECK_TYPES([uid_t, gid_t, long long, uint64_t, ssize_t])
 AC_CHECK_MEMBERS([struct tm.tm_gmtoff, struct stat.st_ino],,,
 [

diff --git a/src/lhlist.c b/src/lhlist.c
index a9ce07b..5367603 100644 (file)
--- a/src/lhlist.c
+++ b/src/lhlist.c
@@ -19,14 +19,19 @@
 /* ------------------------------------------------------------------------ */
 /* need 14 or 22 (when verbose_listing is TRUE) column spaces */
 static void
-print_size(packed_size, original_size)
-    long packed_size, original_size;
+print_size(off_t packed_size, off_t original_size)
 {
+#if SIZEOF_OFF_T == 8
+    if (verbose_listing)
+        printf("%7llu ", packed_size);
+
+    printf("%7llu ", original_size);
+#else
     if (verbose_listing)
         printf("%7lu ", packed_size);
 
     printf("%7lu ", original_size);
-
+#endif
     if (original_size == 0L)
         printf("******");
     else    /* Changed N.Watazaki */