Handle missing wchar.h, wcwidth.

diff --git a/ChangeLog b/ChangeLog
index 0bbbb06ce1d5e67678caa3f4377f6071caca3af5..ae985fba3bc95fa10a01c0b18b2d3de4772d550f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-03  Micah Cowan  <micah@cowan.name>
+
+       * configure.in: Add checks for wchar.h, wcwidth function (to
+       support column-counting in progress.c).
+
 2008-01-31  Micah Cowan  <micah@cowan.name>
 
        * util/README, util/dist-wget, util/download-netscape.html,

diff --git a/configure.ac b/configure.ac
index e98e6b328976752ff948e9e12795416ab9822d90..5e7e7a2f9939c82382a7bc2c7776046bc8e2ea86 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -159,7 +159,7 @@ dnl
 AC_HEADER_STDBOOL
 AC_CHECK_HEADERS(unistd.h sys/time.h)
 AC_CHECK_HEADERS(termios.h sys/ioctl.h sys/select.h utime.h sys/utime.h)
-AC_CHECK_HEADERS(stdint.h inttypes.h pwd.h)
+AC_CHECK_HEADERS(stdint.h inttypes.h pwd.h wchar.h)
 
 dnl
 dnl Check sizes of integer types.  These are used to find n-bit
@@ -197,7 +197,7 @@ AC_FUNC_ALLOCA
 AC_FUNC_MMAP
 AC_FUNC_FSEEKO
 AC_CHECK_FUNCS(strptime timegm snprintf vsnprintf vasprintf drand48)
-AC_CHECK_FUNCS(strtoll usleep ftello sigblock sigsetjmp memrchr)
+AC_CHECK_FUNCS(strtoll usleep ftello sigblock sigsetjmp memrchr wcwidth)
 
 if test x"$ENABLE_OPIE" = xyes; then
   AC_LIBOBJ([ftp-opie])

diff --git a/src/progress.c b/src/progress.c
index a06f73d39c0b66ab8c3d218e6299307597683e9d..d77f99b6951d12b7c63360704c86a21e2ac2f413 100644 (file)
--- a/src/progress.c
+++ b/src/progress.c
@@ -38,6 +38,9 @@ as that of the covered work.  */
 # include <unistd.h>
 #endif
 #include <signal.h>
+#ifdef HAVE_WCHAR_H
+# include <wchar.h>
+#endif
 
 #include "progress.h"
 #include "utils.h"
@@ -764,6 +767,10 @@ update_speed_ring (struct bar_progress *bp, wgint howmuch, double dltime)
 #endif
 }
 
+#if ! HAVE_WCWIDTH
+#define wcwidth(wc) (1)
+#endif
+
 int
 count_cols (const char *mbs)
 {