multibyte update

[pkg/abook.git] / misc.c

diff --git a/misc.c b/misc.c
index 7bf2f8fc1380f9a6b6c55f2059725c2da0afb6b2..a44c9d2f96a7bfafe721d95120c8c64acfb2cc76 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -19,6 +19,10 @@
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
 #endif
+#ifdef HANDLE_MULTIBYTE
+#      include <wchar.h>
+#      include "mbswidth.h"
+#endif
 #include "misc.h"
 #ifdef ABOOK_SRC
 #      include "abook.h"
@@ -32,38 +36,6 @@
 
 #include <assert.h>
 
-char *
-revstr(char *str)
-{
-       char *s, *s2;
-
-       assert(str != NULL);
-
-       s = s2 = strdup(str);
-
-       while( *str )
-               str++;
-
-       while( *s )
-               *--str = *s++;
-
-       free(s2);
-       return str;
-}
-
-char *
-strupper(char *str)
-{
-       char *tmp = str;
-
-       assert(str != NULL);
-
-       while( ( *str = toupper( *str ) ) )
-               str++;
-       
-       return tmp;
-}
-
 char *
 strlower(char *str)
 {
@@ -117,12 +89,12 @@ char *
 mkstr (const char *format, ... )
 {
        MY_VA_LOCAL_DECL;
-       int size = 100;
+       size_t size = 100;
        char *buffer =
 #ifdef ABOOK_SRC
                (char *) abook_malloc (size);
 #else
-               (char *) malloc (size);
+               (char *) xmalloc (size);
 #endif
        
        assert(format != NULL);
@@ -146,7 +118,7 @@ mkstr (const char *format, ... )
 #ifdef ABOOK_SRC
                        (char *) abook_realloc (buffer, size);
 #else
-                       (char *) realloc (buffer, size);
+                       (char *) xrealloc (buffer, size);
 #endif
        }
 }
@@ -155,7 +127,7 @@ mkstr (const char *format, ... )
 char*
 strconcat (const char *str, ...)
 {
-       int   l;
+       unsigned long l;
        MY_VA_LOCAL_DECL;
        char *s, *concat;
 
@@ -174,8 +146,10 @@ strconcat (const char *str, ...)
 #ifdef ABOOK_SRC
        abook_malloc(l);
 #else
-       malloc(l);
+       xmalloc(l);
 #endif
+       if(concat == NULL)
+               return NULL;
 
        strcpy (concat, str);
        MY_VA_START(str);
@@ -218,10 +192,12 @@ char *
 my_getcwd()
 {
        char *dir = NULL;
-       int size = 100;
+       size_t size = 100;
 
        if( (dir = (char *)malloc(size)) == NULL)
                return NULL;
+
+       *dir = 0;
        
        while( getcwd(dir, size) == NULL && errno == ERANGE )
                if( (dir = (char *)realloc(dir, size *=2)) == NULL)
@@ -232,8 +208,8 @@ my_getcwd()
 
 #define INITIAL_SIZE   128
 #ifndef ABOOK_SRC
-#      define abook_malloc(X) malloc(X)
-#      define abook_realloc(X, XX) realloc(X, XX)
+#      define abook_malloc(X) xmalloc(X)
+#      define abook_realloc(X, XX) xrealloc(X, XX)
 #endif
 
 char *
@@ -293,6 +269,28 @@ getaline(FILE *f)
        return buf;
 }
 
+int
+strwidth(const char *s)
+{
+       assert(s);
+#ifdef HANDLE_MULTIBYTE
+       return (int)mbswidth(s, 0);
+#else
+       return strlen(s);
+#endif
+}
+
+int
+bytes2width(const char *s, int width)
+{
+       assert(s);
+#ifdef HANDLE_MULTIBYTE
+       return mbsnbytes(s, strlen(s), width, 0);
+#else
+       return width;
+#endif
+}
+
 /**************************************************************
  * Original:
  * Patrick Powell Tue Apr 11 09:48:21 PDT 1995