Port quotearg fixes from tar 1.13.24.

* lib/quotearg.c: BSD/OS 4.1 wchar.h requires FILE and struct
tm to be declared.
(HAVE_MBSINIT): Undef if !HAVE_MBRTOWC.
(mbsinit): Define to 1 if !defined mbsinit && !HAVE_MBSINIT.
* m4/Makefile.am (EXTRA_DIST): Add mbrtowc.m4.
* m4/mbrtowc.m4: New file.
* m4/prereq.m4 (jm_PREREQ_QUOTEARG): Check for mbsinit and stddef.h.
Use jm_FUNC_MBRTOWC instead of AC_CHECK_FUNCS(mbrtowc).

diff --git a/ChangeLog b/ChangeLog
index de23e6f836739d9b11e31adc7a48216bbd5d3046..d27cbe4f654407d25caa5fdbefa68822ff6751cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2001-09-27  Paul Eggert  <eggert@twinsun.com>
+
+       Port quotearg fixes from tar 1.13.24.
+
+       * lib/quotearg.c: BSD/OS 4.1 wchar.h requires FILE and struct
+       tm to be declared.
+       (HAVE_MBSINIT): Undef if !HAVE_MBRTOWC.
+       (mbsinit): Define to 1 if !defined mbsinit && !HAVE_MBSINIT.
+
+       * m4/Makefile.am (EXTRA_DIST): Add mbrtowc.m4.
+       * m4/mbrtowc.m4: New file.
+       * m4/prereq.m4 (jm_PREREQ_QUOTEARG): Check for mbsinit and stddef.h.
+       Use jm_FUNC_MBRTOWC instead of AC_CHECK_FUNCS(mbrtowc).
+
 2001-09-27  Akim Demaille  <akim@epita.fr>
 
        Bump to 1.29c.

diff --git a/Makefile.in b/Makefile.in
index e053875a849ed753533e1af60dc9f33ed6c33ea9..a98b28f2837a0478006445c01e2c4c475194d2f1 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -153,7 +153,7 @@ $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 $(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
        cd $(srcdir) && $(AUTOCONF)
 
-$(ACLOCAL_M4):  configure.in m4/c-bs-a.m4 m4/codeset.m4 m4/dmalloc.m4 m4/error.m4 m4/gettext.m4 m4/glibc21.m4 m4/iconv.m4 m4/isc-posix.m4 m4/lcmessage.m4 m4/m4.m4 m4/malloc.m4 m4/mbstate_t.m4 m4/prereq.m4 m4/progtest.m4 m4/realloc.m4 m4/strerror_r.m4 m4/warning.m4
+$(ACLOCAL_M4):  configure.in m4/c-bs-a.m4 m4/codeset.m4 m4/dmalloc.m4 m4/error.m4 m4/gettext.m4 m4/glibc21.m4 m4/iconv.m4 m4/isc-posix.m4 m4/lcmessage.m4 m4/m4.m4 m4/malloc.m4 m4/mbrtowc.m4 m4/mbstate_t.m4 m4/prereq.m4 m4/progtest.m4 m4/realloc.m4 m4/strerror_r.m4 m4/warning.m4
        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 config.h: stamp-h
        @if test ! -f $@; then \

diff --git a/aclocal.m4 b/aclocal.m4
index 01cda9d2f8832bd2f19d2fc2be97bc72ec6e6446..b525a5e7129f2921b8c0ef8497d5909404fb7219 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -788,21 +788,41 @@ AC_DEFUN(jm_FUNC_REALLOC,
   fi
 ])
 
-#serial 1
+#serial 2
 
 dnl These are the prerequisite macros for files in the lib/
 dnl directories of Bison.
 
 AC_DEFUN([jm_PREREQ_QUOTEARG],
 [
-  AC_CHECK_FUNCS(isascii iswprint mbrtowc)
-  AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h wctype.h)
+  AC_CHECK_FUNCS(isascii iswprint mbsinit)
+  jm_FUNC_MBRTOWC
+  AC_CHECK_HEADERS(limits.h stddef.h stdlib.h string.h wchar.h wctype.h)
   AC_HEADER_STDC
   AC_C_BACKSLASH_A
   AC_MBSTATE_T
   AM_C_PROTOTYPES
 ])
 
+#serial 4
+
+dnl From Paul Eggert
+
+AC_DEFUN([jm_FUNC_MBRTOWC],
+[
+  AC_CACHE_CHECK([whether mbrtowc and mbstate_t are properly declared],
+    jm_cv_func_mbrtowc,
+    [AC_TRY_LINK(
+       [#include <wchar.h>],
+       [mbstate_t state; return ! (sizeof state && mbrtowc);],
+       jm_cv_func_mbrtowc=yes,
+       jm_cv_func_mbrtowc=no)])
+  if test $jm_cv_func_mbrtowc = yes; then
+    AC_DEFINE(HAVE_MBRTOWC, 1,
+      [Define to 1 if mbrtowc and mbstate_t are properly declared.])
+  fi
+])
+
 #serial 3
 
 dnl From Paul Eggert.

diff --git a/config.hin b/config.hin
index b38aa38701889a50f21c98ff24b8d203abf9b561..5181d21f88c288d3d17be38532edd2267b892dcb 100644 (file)
--- a/config.hin
+++ b/config.hin
@@ -113,9 +113,12 @@
 /* Define if you have the <malloc.h> header file. */
 #undef HAVE_MALLOC_H
 
-/* Define if you have the `mbrtowc' function. */
+/* Define to 1 if mbrtowc and mbstate_t are properly declared. */
 #undef HAVE_MBRTOWC
 
+/* Define if you have the `mbsinit' function. */
+#undef HAVE_MBSINIT
+
 /* Define if you have the `memchr' function. */
 #undef HAVE_MEMCHR
 

diff --git a/configure b/configure
index 395fa0eb84d79895e1dbdfc316305acef76dc585..0f854ecbf1addf80b909227a9b27859fc07c1ad3 100755 (executable)
--- a/configure
+++ b/configure
@@ -5245,7 +5245,7 @@ _ACEOF
 
   fi
 
-for ac_func in isascii iswprint mbrtowc
+for ac_func in isascii iswprint mbsinit
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -5320,7 +5320,60 @@ _ACEOF
 fi
 done
 
-for ac_header in limits.h stdlib.h string.h wchar.h wctype.h
+  echo "$as_me:$LINENO: checking whether mbrtowc and mbstate_t are properly declared" >&5
+echo $ECHO_N "checking whether mbrtowc and mbstate_t are properly declared... $ECHO_C" >&6
+if test "${jm_cv_func_mbrtowc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+#include <wchar.h>
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
+int
+main ()
+{
+mbstate_t state; return ! (sizeof state && mbrtowc);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  jm_cv_func_mbrtowc=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+jm_cv_func_mbrtowc=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $jm_cv_func_mbrtowc" >&5
+echo "${ECHO_T}$jm_cv_func_mbrtowc" >&6
+  if test $jm_cv_func_mbrtowc = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_MBRTOWC 1
+_ACEOF
+
+  fi
+
+for ac_header in limits.h stddef.h stdlib.h string.h wchar.h wctype.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then

diff --git a/lib/quotearg.c b/lib/quotearg.c
index 2a7ba4c445ba42b8aaf913e810c41ce8e5be8c18..ca42365e5da09601f6c931c32116069302e9c7e4 100644 (file)
--- a/lib/quotearg.c
+++ b/lib/quotearg.c
@@ -63,6 +63,11 @@
 #endif
 
 #if HAVE_WCHAR_H
+
+/* BSD/OS 4.1 wchar.h requires FILE and struct tm to be declared.  */
+# include <stdio.h>
+# include <time.h>
+
 # include <wchar.h>
 #endif
 
@@ -73,8 +78,12 @@
 # undef MB_CUR_MAX
 # define MB_CUR_MAX 1
 # define mbrtowc(pwc, s, n, ps) ((*(pwc) = *(s)) != 0)
-# define mbsinit(ps) 1
 # define iswprint(wc) ISPRINT ((unsigned char) (wc))
+# undef HAVE_MBSINIT
+#endif
+
+#if !defined mbsinit && !HAVE_MBSINIT
+# define mbsinit(ps) 1
 #endif
 
 #ifndef iswprint

diff --git a/m4/Makefile.am b/m4/Makefile.am
index a476511cf08d04388b090e36d2a962de728980fd..261cc7d80290be471c40d0086c007264c3a96121 100644 (file)
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -11,6 +11,7 @@ isc-posix.m4                                  \
 lcmessage.m4                                   \
 m4.m4                                          \
 malloc.m4                                      \
+mbrtowc.m4                                     \
 mbstate_t.m4                                   \
 prereq.m4                                      \
 progtest.m4                                    \

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 479108ffe2d9e954cf0b22151694f6b5f5ce095b..2a84be774ff2ea2cfcf3f2b08d3f07f17260391e 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -108,6 +108,7 @@ isc-posix.m4                                        \
 lcmessage.m4                                   \
 m4.m4                                          \
 malloc.m4                                      \
+mbrtowc.m4                                     \
 mbstate_t.m4                                   \
 prereq.m4                                      \
 progtest.m4                                    \

diff --git a/m4/prereq.m4 b/m4/prereq.m4
index f7114268c1639a5af228c826b6830d4b16afdf9c..9595967a9afa6c61498bdde98b6179be56fd06bc 100644 (file)
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -1,12 +1,13 @@
-#serial 1
+#serial 2
 
 dnl These are the prerequisite macros for files in the lib/
 dnl directories of Bison.
 
 AC_DEFUN([jm_PREREQ_QUOTEARG],
 [
-  AC_CHECK_FUNCS(isascii iswprint mbrtowc)
-  AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h wctype.h)
+  AC_CHECK_FUNCS(isascii iswprint mbsinit)
+  jm_FUNC_MBRTOWC
+  AC_CHECK_HEADERS(limits.h stddef.h stdlib.h string.h wchar.h wctype.h)
   AC_HEADER_STDC
   AC_C_BACKSLASH_A
   AC_MBSTATE_T

diff --git a/po/de.gmo b/po/de.gmo
index d5d8f4120b7091a677a7fd065af1c5f5da085805..8922daef3a597e7138fbdf2ab78b97c343085763 100644 (file)
Binary files a/po/de.gmo and b/po/de.gmo differ

diff --git a/po/de.po b/po/de.po
index 4858515272a55337f77b8bb71103c6ecb2cbcdbc..e1e2fb780980c66c6eb52e4cb593cdccdc2c84cd 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
-"POT-Creation-Date: 2001-09-27 10:55+0200\n"
+"POT-Creation-Date: 2001-09-27 16:21+0200\n"
 "PO-Revision-Date: 1996-10-10 17:54 MET DST\n"
 "Last-Translator: Ulrich Drepper <drepper@gnu.ai.mit.edu>\n"
 "Language-Team: German <de@li.org>\n"
@@ -794,11 +794,11 @@ msgstr "%s: Hauptspeicher ersch
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:268
 msgid "`"
 msgstr ""
 
-#: lib/quotearg.c:260
+#: lib/quotearg.c:269
 msgid "'"
 msgstr ""
 

diff --git a/po/es.po b/po/es.po
index ba35da29ba2555fe2ff8cd8c096a543759ea2c89..846b001ab40165c49eb96ad1fb5a3d2aff5f4b6c 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -30,7 +30,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.25\n"
-"POT-Creation-Date: 2001-09-27 10:55+0200\n"
+"POT-Creation-Date: 2001-09-27 16:21+0200\n"
 "PO-Revision-Date: 1998-09-21 10:19+0200\n"
 "Last-Translator: Nicolás García-Pedrajas <ngarcia-pedrajas@acm.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -924,11 +924,11 @@ msgstr "%s: memoria agotada\n"
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:268
 msgid "`"
 msgstr ""
 
-#: lib/quotearg.c:260
+#: lib/quotearg.c:269
 msgid "'"
 msgstr ""
 

diff --git a/po/et.gmo b/po/et.gmo
index 16b93061cf915571920267bb071afbd96129a3bf..bd412685493ba6c44aad3e27c6fe43cca0202695 100644 (file)
Binary files a/po/et.gmo and b/po/et.gmo differ

diff --git a/po/et.po b/po/et.po
index befa9b98b9796bf49f89ce6171b89bec715aaa71..8151749d3e73e5372a58c61dc77a23090feec828 100644 (file)
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.28d\n"
-"POT-Creation-Date: 2001-09-27 10:55+0200\n"
+"POT-Creation-Date: 2001-09-27 16:21+0200\n"
 "PO-Revision-Date: 2001-08-29 17:06+02:00\n"
 "Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -783,11 +783,11 @@ msgstr "m
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:268
 msgid "`"
 msgstr "`"
 
-#: lib/quotearg.c:260
+#: lib/quotearg.c:269
 msgid "'"
 msgstr "'"
 

diff --git a/po/fr.gmo b/po/fr.gmo
index cbe95f01b8691772d41e46c101d3f0fc0ef5152a..8fa1d0ca7b56ff92909b060723e2e5de4e4a941b 100644 (file)
Binary files a/po/fr.gmo and b/po/fr.gmo differ

diff --git a/po/fr.po b/po/fr.po
index 96739e0d02585121c8ddf2ec5a662212c38e9dac..3a0e3ed22474390a39809da2ccdee18701980144 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.28d\n"
-"POT-Creation-Date: 2001-09-27 10:55+0200\n"
+"POT-Creation-Date: 2001-09-27 16:21+0200\n"
 "PO-Revision-Date: 2001-08-29 20:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -790,11 +790,11 @@ msgstr "m
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:268
 msgid "`"
 msgstr "`"
 
-#: lib/quotearg.c:260
+#: lib/quotearg.c:269
 msgid "'"
 msgstr "'"
 

diff --git a/po/ja.gmo b/po/ja.gmo
index 9c38262816011da1b6666756c871c0877cbe0659..9d766919eb05973392924b94d055175f3c6051e0 100644 (file)
Binary files a/po/ja.gmo and b/po/ja.gmo differ

diff --git a/po/ja.po b/po/ja.po
index 6d44de885f065a4ff405955e2ad0e2470a7a403a..c11c77d672ca58e7b851aa8ad07e506f67ef2f8e 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.28\n"
-"POT-Creation-Date: 2001-09-27 10:55+0200\n"
+"POT-Creation-Date: 2001-09-27 16:21+0200\n"
 "PO-Revision-Date: 1999-09-28 21:10+0900\n"
 "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -796,11 +796,11 @@ msgstr "%s: 
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:268
 msgid "`"
 msgstr ""
 
-#: lib/quotearg.c:260
+#: lib/quotearg.c:269
 msgid "'"
 msgstr ""
 

diff --git a/po/nl.gmo b/po/nl.gmo
index 5ae5ceccfa7ea0a07e76784ea0fc8fbf63b3dd54..6487849b099c84512f16ff9b39622fc48ede9b03 100644 (file)
Binary files a/po/nl.gmo and b/po/nl.gmo differ

diff --git a/po/nl.po b/po/nl.po
index 93c16288269108adab4d04e2184d6aea31ed4079..b8a6b6ba9bb0bea537939779668804a66d02ef32 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
-"POT-Creation-Date: 2001-09-27 10:55+0200\n"
+"POT-Creation-Date: 2001-09-27 16:21+0200\n"
 "PO-Revision-Date: 1996-08-27 15:34 MET DST\n"
 "Last-Translator: Erick Branderhorst <branderh@debian.org>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -799,11 +799,11 @@ msgstr "%s: geen geheugen meer beschikbaar\n"
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:268
 msgid "`"
 msgstr ""
 
-#: lib/quotearg.c:260
+#: lib/quotearg.c:269
 msgid "'"
 msgstr ""
 

diff --git a/po/ru.gmo b/po/ru.gmo
index 7d6bee60b289732379e25899508e0d1ec627a69a..3e5cb023796e2413ba4c6bd6444b78f3b29a6ef0 100644 (file)
Binary files a/po/ru.gmo and b/po/ru.gmo differ

diff --git a/po/ru.po b/po/ru.po
index ea3116d3708a2c7e0b827562d78beb43409b847c..e763cebad30bd0a725ec36cfeacc760c257cd882 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.29\n"
-"POT-Creation-Date: 2001-09-27 10:55+0200\n"
+"POT-Creation-Date: 2001-09-27 16:21+0200\n"
 "PO-Revision-Date: 2001-09-09 13:49+04:00\n"
 "Last-Translator: Dmitry S. Sivachenko <dima@Chg.RU>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -787,11 +787,11 @@ msgstr "
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:268
 msgid "`"
 msgstr "`"
 
-#: lib/quotearg.c:260
+#: lib/quotearg.c:269
 msgid "'"
 msgstr "'"
 

diff --git a/po/tr.po b/po/tr.po
index fc9d0f77b0116ee6a9d528e90398c47c2f3d0767..56505f844b8bce3c3f7286ce59eca5ba1df3de1d 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.28c\n"
-"POT-Creation-Date: 2001-09-27 10:55+0200\n"
+"POT-Creation-Date: 2001-09-27 16:21+0200\n"
 "PO-Revision-Date: 2001-09-10 10:54GMT\n"
 "Last-Translator: Altug Bayram <altugbayram_2000@yahoo.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -789,11 +789,11 @@ msgstr "bellek t
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:268
 msgid "`"
 msgstr "`"
 
-#: lib/quotearg.c:260
+#: lib/quotearg.c:269
 msgid "'"
 msgstr "'"