The R Project SVN – R – Diff – /trunk/src/extra/intl/printf-parse.c

 /* Formatted output to strings.
-   Copyright (C) 1999-2000, 2002-2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2002-2003, 2006-2007 Free Software Foundation, Inc.
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
    by the Free Software Foundation; either version 2, or (at your option)
    any later version.
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
+/* This file can be parametrized with the following macros:
+     CHAR_T             The element type of the format string.
+     CHAR_T_ONLY_ASCII  Set to 1 to enable verification that all characters
+                        in the format string are ASCII.
+     DIRECTIVE          Structure denoting a format directive.
+                        Depends on CHAR_T.
+     DIRECTIVES         Structure denoting the set of format directives of a
+                        format string.  Depends on CHAR_T.
+     PRINTF_PARSE       Function that parses a format string.
+                        Depends on CHAR_T.
+     STATIC             Set to 'static' to declare the function static.
+     ENABLE_UNISTDIO    Set to 1 to enable the unistdio extensions.  */
-#ifdef HAVE_CONFIG_H
+#ifndef PRINTF_PARSE
 # include <config.h>
 #endif
 /* Specification.  */
-#if WIDE_CHAR_VERSION
+#ifndef PRINTF_PARSE
-# include "wprintf-parse.h"
-#else
 # include "printf-parse.h"
 #endif
+/* Default parameters.  */
+#ifndef PRINTF_PARSE
+# define PRINTF_PARSE printf_parse
+# define CHAR_T char
+# define DIRECTIVE char_directive
+# define DIRECTIVES char_directives
+#endif
 /* Get size_t, NULL.  */
 #include <stddef.h>
 /* Get intmax_t.  */
+#if defined IN_LIBINTL || defined IN_LIBASPRINTF
-#if HAVE_STDINT_H_WITH_UINTMAX
+# if HAVE_STDINT_H_WITH_UINTMAX
+#  include <stdint.h>
+# endif
+# if HAVE_INTTYPES_H_WITH_UINTMAX
+#  include <inttypes.h>
+# endif
+#else
 # include <stdint.h>
 #endif
-#if HAVE_INTTYPES_H_WITH_UINTMAX
-# include <inttypes.h>
-#endif
 /* malloc(), realloc(), free().  */
 #include <stdlib.h>
+/* errno.  */
+#include <errno.h>
 /* Checked size_t computations.  */
 #include "xsize.h"
-#if WIDE_CHAR_VERSION
+#if CHAR_T_ONLY_ASCII
-# define PRINTF_PARSE wprintf_parse
-# define CHAR_T wchar_t
+/* c_isascii().  */
-# define DIRECTIVE wchar_t_directive
-# define DIRECTIVES wchar_t_directives
-#else
-# define PRINTF_PARSE printf_parse
-# define CHAR_T char
+# include "c-ctype.h"
-# define DIRECTIVE char_directive
-# define DIRECTIVES char_directives
 #endif
 #ifdef STATIC
 STATIC
 #endif
   size_t max_width_length = 0;
   size_t max_precision_length = 0;
   d->count = 0;
   d_allocated = 1;
-  d->dir = malloc (d_allocated * sizeof (DIRECTIVE));
+  d->dir = (DIRECTIVE *) malloc (d_allocated * sizeof (DIRECTIVE));
   if (d->dir == NULL)
     /* Out of memory.  */
-    return -1;
+    goto out_of_memory_1;
   a->count = 0;
   a_allocated = 0;
   a->arg = NULL;
 	if (a_allocated <= n)						\
 	  a_allocated = xsum (n, 1);					\
 	memory_size = xtimes (a_allocated, sizeof (argument));		\
 	if (size_overflow_p (memory_size))				\
 	  /* Overflow, would lead to out of memory.  */			\
-	  goto error;							\
+	  goto out_of_memory;						\
-	memory = (a->arg						\
+	memory = (argument *) (a->arg					\
-		  ? realloc (a->arg, memory_size)			\
+			       ? realloc (a->arg, memory_size)		\
-		  : malloc (memory_size));				\
+			       : malloc (memory_size));			\
 	if (memory == NULL)						\
 	  /* Out of memory.  */						\
-	  goto error;							\
+	  goto out_of_memory;						\
 	a->arg = memory;						\
       }									\
     while (a->count <= n)						\
       a->arg[a->count++].type = TYPE_NONE;				\
     if (a->arg[n].type == TYPE_NONE)					\
+    {
       CHAR_T c = *cp++;
       if (c == '%')
+	{
 	  size_t arg_index = ARG_NONE;
-	  DIRECTIVE *dp = &d->dir[d->count];/* pointer to next directive */
+	  DIRECTIVE *dp = &d->dir[d->count]; /* pointer to next directive */
 	  /* Initialize the next directive.  */
 	  dp->dir_start = cp - 1;
 	  dp->flags = 0;
 	  dp->width_start = NULL;
 		  else if (*cp == 'l')
+		    {
 		      flags += 8;
 		      cp++;
+		    }
-#ifdef HAVE_INTMAX_T
 		  else if (*cp == 'j')
+		    {
 		      if (sizeof (intmax_t) > sizeof (long))
+			{
 			  /* intmax_t = long long */
 			  /* intmax_t = long */
 			  flags += 8;
+			}
 		      cp++;
+		    }
-#endif
 		  else if (*cp == 'z' || *cp == 'Z')
+		    {
 		      /* 'z' is standardized in ISO C 99, but glibc uses 'Z'
 			 because the warning facility in gcc-2.95.2 understands
 			 only 'Z' (see gcc-2.95.2/gcc/c-common.c:1784).  */
 	      /* Read the conversion character.  */
 	      c = *cp++;
 	      switch (c)
+		{
 		case 'd': case 'i':
-#ifdef HAVE_LONG_LONG_INT
+#if HAVE_LONG_LONG_INT
 		  /* If 'long long' exists and is larger than 'long':  */
 		  if (flags >= 16 || (flags & 4))
 		    type = TYPE_LONGLONGINT;
 		  else
 #endif
 		    type = TYPE_SHORT;
 		  else
 		    type = TYPE_INT;
 		  break;
 		case 'o': case 'u': case 'x': case 'X':
-#ifdef HAVE_LONG_LONG_INT
+#if HAVE_LONG_LONG_INT
 		  /* If 'long long' exists and is larger than 'long':  */
 		  if (flags >= 16 || (flags & 4))
 		    type = TYPE_ULONGLONGINT;
 		  else
 #endif
 		  else
 		    type = TYPE_UINT;
 		  break;
 		case 'f': case 'F': case 'e': case 'E': case 'g': case 'G':
 		case 'a': case 'A':
-#ifdef HAVE_LONG_DOUBLE
 		  if (flags >= 16 || (flags & 4))
 		    type = TYPE_LONGDOUBLE;
 		  else
-#endif
-		  type = TYPE_DOUBLE;
+		    type = TYPE_DOUBLE;
 		  break;
 		case 'c':
 		  if (flags >= 8)
-#ifdef HAVE_WINT_T
+#if HAVE_WINT_T
 		    type = TYPE_WIDE_CHAR;
 #else
 		    goto error;
 #endif
 		  else
 		    type = TYPE_CHAR;
 		  break;
-#ifdef HAVE_WINT_T
+#if HAVE_WINT_T
 		case 'C':
 		  type = TYPE_WIDE_CHAR;
 		  c = 'c';
 		  break;
 #endif
 		case 's':
 		  if (flags >= 8)
-#ifdef HAVE_WCHAR_T
+#if HAVE_WCHAR_T
 		    type = TYPE_WIDE_STRING;
 #else
 		    goto error;
 #endif
 		  else
 		    type = TYPE_STRING;
 		  break;
-#ifdef HAVE_WCHAR_T
+#if HAVE_WCHAR_T
 		case 'S':
 		  type = TYPE_WIDE_STRING;
 		  c = 's';
 		  break;
 #endif
 		case 'p':
 		  type = TYPE_POINTER;
 		  break;
 		case 'n':
-#ifdef HAVE_LONG_LONG_INT
+#if HAVE_LONG_LONG_INT
 		  /* If 'long long' exists and is larger than 'long':  */
 		  if (flags >= 16 || (flags & 4))
 		    type = TYPE_COUNT_LONGLONGINT_POINTER;
 		  else
 #endif
 		  else if (flags & 1)
 		    type = TYPE_COUNT_SHORT_POINTER;
 		  else
 		    type = TYPE_COUNT_INT_POINTER;
 		  break;
+#if ENABLE_UNISTDIO
+		/* The unistdio extensions.  */
+		case 'U':
+		  if (flags >= 16)
+		    type = TYPE_U32_STRING;
+		  else if (flags >= 8)
+		    type = TYPE_U16_STRING;
+		  else
+		    type = TYPE_U8_STRING;
+		  break;
+#endif
 		case '%':
 		  type = TYPE_NONE;
 		  break;
 		default:
 		  /* Unknown conversion character.  */
 	      d_allocated = xtimes (d_allocated, 2);
 	      memory_size = xtimes (d_allocated, sizeof (DIRECTIVE));
 	      if (size_overflow_p (memory_size))
 		/* Overflow, would lead to out of memory.  */
-		goto error;
+		goto out_of_memory;
-	      memory = realloc (d->dir, memory_size);
+	      memory = (DIRECTIVE *) realloc (d->dir, memory_size);
 	      if (memory == NULL)
 		/* Out of memory.  */
-		goto error;
+		goto out_of_memory;
 	      d->dir = memory;
+	    }
+	}
+#if CHAR_T_ONLY_ASCII
+      else if (!c_isascii (c))
+	{
+	  /* Non-ASCII character.  Not supported.  */
+	  goto error;
+	}
+#endif
+    }
   d->dir[d->count].dir_start = cp;
   d->max_width_length = max_width_length;
   d->max_precision_length = max_precision_length;
 error:
   if (a->arg)
     free (a->arg);
   if (d->dir)
     free (d->dir);
+  errno = EINVAL;
+  return -1;
+out_of_memory:
+  if (a->arg)
+    free (a->arg);
+  if (d->dir)
+    free (d->dir);
+out_of_memory_1:
+  errno = ENOMEM;
   return -1;
+}
+#undef PRINTF_PARSE
 #undef DIRECTIVES
 #undef DIRECTIVE
+#undef CHAR_T_ONLY_ASCII
 #undef CHAR_T
-#undef PRINTF_PARSE

The R Project SVN R

(root)/trunk/src/extra/intl/printf-parse.c @ 34412 – Rev 41539 → 43972