Merge commit 'upstream/0.9.3'

1 files changed, 227 insertions, 234 deletions

diff --git a/tests/test-mbrtowc.c b/tests/test-mbrtowc.c
index 8f1f1be..5477677 100644
--- a/tests/test-mbrtowc.c
+++ b/tests/test-mbrtowc.c
@@ -1,5 +1,5 @@
 /* Test of conversion of multibyte character to wide character.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,22 +20,15 @@
 
 #include <wchar.h>
 
+#include "signature.h"
+SIGNATURE_CHECK (mbrtowc, size_t, (wchar_t *, char const *, size_t,
+                                   mbstate_t *));
+
 #include <locale.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do									     \
-    {									     \
-      if (!(expr))							     \
-        {								     \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);						     \
-          abort ();							     \
-        }								     \
-    }									     \
-  while (0)
+#include "macros.h"
 
 int
 main (int argc, char *argv[])
@@ -81,40 +74,40 @@ main (int argc, char *argv[])
     memset (&state, '\0', sizeof (mbstate_t));
     for (c = 0; c < 0x100; c++)
       switch (c)
-	{
-	case '\t': case '\v': case '\f':
-	case ' ': case '!': case '"': case '#': case '%':
-	case '&': case '\'': case '(': case ')': case '*':
-	case '+': case ',': case '-': case '.': case '/':
-	case '0': case '1': case '2': case '3': case '4':
-	case '5': case '6': case '7': case '8': case '9':
-	case ':': case ';': case '<': case '=': case '>':
-	case '?':
-	case 'A': case 'B': case 'C': case 'D': case 'E':
-	case 'F': case 'G': case 'H': case 'I': case 'J':
-	case 'K': case 'L': case 'M': case 'N': case 'O':
-	case 'P': case 'Q': case 'R': case 'S': case 'T':
-	case 'U': case 'V': case 'W': case 'X': case 'Y':
-	case 'Z':
-	case '[': case '\\': case ']': case '^': case '_':
-	case 'a': case 'b': case 'c': case 'd': case 'e':
-	case 'f': case 'g': case 'h': case 'i': case 'j':
-	case 'k': case 'l': case 'm': case 'n': case 'o':
-	case 'p': case 'q': case 'r': case 's': case 't':
-	case 'u': case 'v': case 'w': case 'x': case 'y':
-	case 'z': case '{': case '|': case '}': case '~':
-	  /* c is in the ISO C "basic character set".  */
-	  buf[0] = c;
-	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, buf, 1, &state);
-	  ASSERT (ret == 1);
-	  ASSERT (wc == c);
-	  ASSERT (mbsinit (&state));
-	  ret = mbrtowc (NULL, buf, 1, &state);
-	  ASSERT (ret == 1);
-	  ASSERT (mbsinit (&state));
-	  break;
-	}
+        {
+        case '\t': case '\v': case '\f':
+        case ' ': case '!': case '"': case '#': case '%':
+        case '&': case '\'': case '(': case ')': case '*':
+        case '+': case ',': case '-': case '.': case '/':
+        case '0': case '1': case '2': case '3': case '4':
+        case '5': case '6': case '7': case '8': case '9':
+        case ':': case ';': case '<': case '=': case '>':
+        case '?':
+        case 'A': case 'B': case 'C': case 'D': case 'E':
+        case 'F': case 'G': case 'H': case 'I': case 'J':
+        case 'K': case 'L': case 'M': case 'N': case 'O':
+        case 'P': case 'Q': case 'R': case 'S': case 'T':
+        case 'U': case 'V': case 'W': case 'X': case 'Y':
+        case 'Z':
+        case '[': case '\\': case ']': case '^': case '_':
+        case 'a': case 'b': case 'c': case 'd': case 'e':
+        case 'f': case 'g': case 'h': case 'i': case 'j':
+        case 'k': case 'l': case 'm': case 'n': case 'o':
+        case 'p': case 'q': case 'r': case 's': case 't':
+        case 'u': case 'v': case 'w': case 'x': case 'y':
+        case 'z': case '{': case '|': case '}': case '~':
+          /* c is in the ISO C "basic character set".  */
+          buf[0] = c;
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, buf, 1, &state);
+          ASSERT (ret == 1);
+          ASSERT (wc == c);
+          ASSERT (mbsinit (&state));
+          ret = mbrtowc (NULL, buf, 1, &state);
+          ASSERT (ret == 1);
+          ASSERT (mbsinit (&state));
+          break;
+        }
   }
 
   /* Test special calling convention, passing a NULL pointer.  */
@@ -131,199 +124,199 @@ main (int argc, char *argv[])
     switch (argv[1][0])
       {
       case '1':
-	/* Locale encoding is ISO-8859-1 or ISO-8859-15.  */
-	{
-	  char input[] = "B\374\337er"; /* "Büßer" */
-	  memset (&state, '\0', sizeof (mbstate_t));
-
-	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input, 1, &state);
-	  ASSERT (ret == 1);
-	  ASSERT (wc == 'B');
-	  ASSERT (mbsinit (&state));
-	  input[0] = '\0';
-
-	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 1, 1, &state);
-	  ASSERT (ret == 1);
-	  ASSERT (wctob (wc) == (unsigned char) '\374');
-	  ASSERT (mbsinit (&state));
-	  input[1] = '\0';
-
-	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 2, 3, &state);
-	  ASSERT (ret == 1);
-	  ASSERT (wctob (wc) == (unsigned char) '\337');
-	  ASSERT (mbsinit (&state));
-	  input[2] = '\0';
-
-	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 3, 2, &state);
-	  ASSERT (ret == 1);
-	  ASSERT (wc == 'e');
-	  ASSERT (mbsinit (&state));
-	  input[3] = '\0';
-
-	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 4, 1, &state);
-	  ASSERT (ret == 1);
-	  ASSERT (wc == 'r');
-	  ASSERT (mbsinit (&state));
-	}
-	return 0;
+        /* Locale encoding is ISO-8859-1 or ISO-8859-15.  */
+        {
+          char input[] = "B\374\337er"; /* "Büßer" */
+          memset (&state, '\0', sizeof (mbstate_t));
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input, 1, &state);
+          ASSERT (ret == 1);
+          ASSERT (wc == 'B');
+          ASSERT (mbsinit (&state));
+          input[0] = '\0';
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 1, 1, &state);
+          ASSERT (ret == 1);
+          ASSERT (wctob (wc) == (unsigned char) '\374');
+          ASSERT (mbsinit (&state));
+          input[1] = '\0';
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 2, 3, &state);
+          ASSERT (ret == 1);
+          ASSERT (wctob (wc) == (unsigned char) '\337');
+          ASSERT (mbsinit (&state));
+          input[2] = '\0';
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 3, 2, &state);
+          ASSERT (ret == 1);
+          ASSERT (wc == 'e');
+          ASSERT (mbsinit (&state));
+          input[3] = '\0';
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 4, 1, &state);
+          ASSERT (ret == 1);
+          ASSERT (wc == 'r');
+          ASSERT (mbsinit (&state));
+        }
+        return 0;
 
       case '2':
-	/* Locale encoding is UTF-8.  */
-	{
-	  char input[] = "B\303\274\303\237er"; /* "Büßer" */
-	  memset (&state, '\0', sizeof (mbstate_t));
-
-	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input, 1, &state);
-	  ASSERT (ret == 1);
-	  ASSERT (wc == 'B');
-	  ASSERT (mbsinit (&state));
-	  input[0] = '\0';
-
-	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 1, 1, &state);
-	  ASSERT (ret == (size_t)(-2));
-	  ASSERT (wc == (wchar_t) 0xBADFACE);
-	  ASSERT (!mbsinit (&state));
-	  input[1] = '\0';
-
-	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 2, 5, &state);
-	  ASSERT (ret == 1);
-	  ASSERT (wctob (wc) == EOF);
-	  ASSERT (mbsinit (&state));
-	  input[2] = '\0';
-
-	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 3, 4, &state);
-	  ASSERT (ret == 2);
-	  ASSERT (wctob (wc) == EOF);
-	  ASSERT (mbsinit (&state));
-	  input[3] = '\0';
-	  input[4] = '\0';
-
-	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 5, 2, &state);
-	  ASSERT (ret == 1);
-	  ASSERT (wc == 'e');
-	  ASSERT (mbsinit (&state));
-	  input[5] = '\0';
-
-	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 6, 1, &state);
-	  ASSERT (ret == 1);
-	  ASSERT (wc == 'r');
-	  ASSERT (mbsinit (&state));
-	}
-	return 0;
+        /* Locale encoding is UTF-8.  */
+        {
+          char input[] = "B\303\274\303\237er"; /* "Büßer" */
+          memset (&state, '\0', sizeof (mbstate_t));
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input, 1, &state);
+          ASSERT (ret == 1);
+          ASSERT (wc == 'B');
+          ASSERT (mbsinit (&state));
+          input[0] = '\0';
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 1, 1, &state);
+          ASSERT (ret == (size_t)(-2));
+          ASSERT (wc == (wchar_t) 0xBADFACE);
+          ASSERT (!mbsinit (&state));
+          input[1] = '\0';
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 2, 5, &state);
+          ASSERT (ret == 1);
+          ASSERT (wctob (wc) == EOF);
+          ASSERT (mbsinit (&state));
+          input[2] = '\0';
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 3, 4, &state);
+          ASSERT (ret == 2);
+          ASSERT (wctob (wc) == EOF);
+          ASSERT (mbsinit (&state));
+          input[3] = '\0';
+          input[4] = '\0';
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 5, 2, &state);
+          ASSERT (ret == 1);
+          ASSERT (wc == 'e');
+          ASSERT (mbsinit (&state));
+          input[5] = '\0';
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 6, 1, &state);
+          ASSERT (ret == 1);
+          ASSERT (wc == 'r');
+          ASSERT (mbsinit (&state));
+        }
+        return 0;
 
       case '3':
-	/* Locale encoding is EUC-JP.  */
-	{
-	  char input[] = "<\306\374\313\334\270\354>"; /* "<日本語>" */
-	  memset (&state, '\0', sizeof (mbstate_t));
-
-	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input, 1, &state);
-	  ASSERT (ret == 1);
-	  ASSERT (wc == '<');
-	  ASSERT (mbsinit (&state));
-	  input[0] = '\0';
-
-	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 1, 2, &state);
-	  ASSERT (ret == 2);
-	  ASSERT (wctob (wc) == EOF);
-	  ASSERT (mbsinit (&state));
-	  input[1] = '\0';
-	  input[2] = '\0';
-
-	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 3, 1, &state);
-	  ASSERT (ret == (size_t)(-2));
-	  ASSERT (wc == (wchar_t) 0xBADFACE);
-	  ASSERT (!mbsinit (&state));
-	  input[3] = '\0';
-
-	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 4, 4, &state);
-	  ASSERT (ret == 1);
-	  ASSERT (wctob (wc) == EOF);
-	  ASSERT (mbsinit (&state));
-	  input[4] = '\0';
-
-	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 5, 3, &state);
-	  ASSERT (ret == 2);
-	  ASSERT (wctob (wc) == EOF);
-	  ASSERT (mbsinit (&state));
-	  input[5] = '\0';
-	  input[6] = '\0';
-
-	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 7, 1, &state);
-	  ASSERT (ret == 1);
-	  ASSERT (wc == '>');
-	  ASSERT (mbsinit (&state));
-	}
-	return 0;
+        /* Locale encoding is EUC-JP.  */
+        {
+          char input[] = "<\306\374\313\334\270\354>"; /* "<日本語>" */
+          memset (&state, '\0', sizeof (mbstate_t));
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input, 1, &state);
+          ASSERT (ret == 1);
+          ASSERT (wc == '<');
+          ASSERT (mbsinit (&state));
+          input[0] = '\0';
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 1, 2, &state);
+          ASSERT (ret == 2);
+          ASSERT (wctob (wc) == EOF);
+          ASSERT (mbsinit (&state));
+          input[1] = '\0';
+          input[2] = '\0';
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 3, 1, &state);
+          ASSERT (ret == (size_t)(-2));
+          ASSERT (wc == (wchar_t) 0xBADFACE);
+          ASSERT (!mbsinit (&state));
+          input[3] = '\0';
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 4, 4, &state);
+          ASSERT (ret == 1);
+          ASSERT (wctob (wc) == EOF);
+          ASSERT (mbsinit (&state));
+          input[4] = '\0';
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 5, 3, &state);
+          ASSERT (ret == 2);
+          ASSERT (wctob (wc) == EOF);
+          ASSERT (mbsinit (&state));
+          input[5] = '\0';
+          input[6] = '\0';
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 7, 1, &state);
+          ASSERT (ret == 1);
+          ASSERT (wc == '>');
+          ASSERT (mbsinit (&state));
+        }
+        return 0;
 
       case '4':
-	/* Locale encoding is GB18030.  */
-	{
-	  char input[] = "B\250\271\201\060\211\070er"; /* "Büßer" */
-	  memset (&state, '\0', sizeof (mbstate_t));
-
-	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input, 1, &state);
-	  ASSERT (ret == 1);
-	  ASSERT (wc == 'B');
-	  ASSERT (mbsinit (&state));
-	  input[0] = '\0';
-
-	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 1, 1, &state);
-	  ASSERT (ret == (size_t)(-2));
-	  ASSERT (wc == (wchar_t) 0xBADFACE);
-	  ASSERT (!mbsinit (&state));
-	  input[1] = '\0';
-
-	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 2, 7, &state);
-	  ASSERT (ret == 1);
-	  ASSERT (wctob (wc) == EOF);
-	  ASSERT (mbsinit (&state));
-	  input[2] = '\0';
-
-	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 3, 6, &state);
-	  ASSERT (ret == 4);
-	  ASSERT (wctob (wc) == EOF);
-	  ASSERT (mbsinit (&state));
-	  input[3] = '\0';
-	  input[4] = '\0';
-	  input[5] = '\0';
-	  input[6] = '\0';
-
-	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 7, 2, &state);
-	  ASSERT (ret == 1);
-	  ASSERT (wc == 'e');
-	  ASSERT (mbsinit (&state));
-	  input[5] = '\0';
-
-	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 8, 1, &state);
-	  ASSERT (ret == 1);
-	  ASSERT (wc == 'r');
-	  ASSERT (mbsinit (&state));
-	}
-	return 0;
+        /* Locale encoding is GB18030.  */
+        {
+          char input[] = "B\250\271\201\060\211\070er"; /* "Büßer" */
+          memset (&state, '\0', sizeof (mbstate_t));
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input, 1, &state);
+          ASSERT (ret == 1);
+          ASSERT (wc == 'B');
+          ASSERT (mbsinit (&state));
+          input[0] = '\0';
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 1, 1, &state);
+          ASSERT (ret == (size_t)(-2));
+          ASSERT (wc == (wchar_t) 0xBADFACE);
+          ASSERT (!mbsinit (&state));
+          input[1] = '\0';
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 2, 7, &state);
+          ASSERT (ret == 1);
+          ASSERT (wctob (wc) == EOF);
+          ASSERT (mbsinit (&state));
+          input[2] = '\0';
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 3, 6, &state);
+          ASSERT (ret == 4);
+          ASSERT (wctob (wc) == EOF);
+          ASSERT (mbsinit (&state));
+          input[3] = '\0';
+          input[4] = '\0';
+          input[5] = '\0';
+          input[6] = '\0';
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 7, 2, &state);
+          ASSERT (ret == 1);
+          ASSERT (wc == 'e');
+          ASSERT (mbsinit (&state));
+          input[5] = '\0';
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 8, 1, &state);
+          ASSERT (ret == 1);
+          ASSERT (wc == 'r');
+          ASSERT (mbsinit (&state));
+        }
+        return 0;
       }
 
   return 1;