Include local.at, not input.at, fixing a typo in the 2003-08-25 patch.

[bison.git] / lib / quotearg.c

diff --git a/lib/quotearg.c b/lib/quotearg.c
index 2a7ba4c445ba42b8aaf913e810c41ce8e5be8c18..bffa14b7a0a7cc73796607e35e1dbc52d9c50c33 100644 (file)
--- a/lib/quotearg.c
+++ b/lib/quotearg.c
@@ -1,5 +1,5 @@
 /* quotearg.c - quote arguments for output
 /* quotearg.c - quote arguments for output

-   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002 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
 
    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


@@ -21,48 +21,26 @@
 # include <config.h>
 #endif
 
 # include <config.h>
 #endif
 

-#if HAVE_STDDEF_H
-# include <stddef.h>  /* For the definition of size_t on windows w/MSVC.  */
-#endif
-#include <sys/types.h>
-#include <quotearg.h>
-#include <xalloc.h>
+#include "quotearg.h"
+
+#include "xalloc.h"

 
 #include <ctype.h>
 
 #include <ctype.h>

+#include <errno.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>

 
 

-#if ENABLE_NLS
-# include <libintl.h>
-# define _(text) gettext (text)
-#else
-# define _(text) text
-#endif
-#define N_(text) text
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid

 
 

-#if HAVE_LIMITS_H
-# include <limits.h>
-#endif
-#ifndef CHAR_BIT
-# define CHAR_BIT 8
-#endif
-#ifndef UCHAR_MAX
-# define UCHAR_MAX ((unsigned char) -1)
-#endif
+#if HAVE_WCHAR_H

 
 

-#if HAVE_C_BACKSLASH_A
-# define ALERT_CHAR '\a'
-#else
-# define ALERT_CHAR '\7'
-#endif
+/* BSD/OS 4.1 wchar.h requires FILE and struct tm to be declared.  */
+# include <stdio.h>
+# include <time.h>

 
 

-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
-#if HAVE_STRING_H
-# include <string.h>
-#endif
-
-#if HAVE_WCHAR_H

 # include <wchar.h>
 #endif
 
 # include <wchar.h>
 #endif
 


@@ -73,8 +51,12 @@
 # undef MB_CUR_MAX
 # define MB_CUR_MAX 1
 # define mbrtowc(pwc, s, n, ps) ((*(pwc) = *(s)) != 0)
 # undef MB_CUR_MAX
 # define MB_CUR_MAX 1
 # define mbrtowc(pwc, s, n, ps) ((*(pwc) = *(s)) != 0)

+# define iswprint(wc) isprint ((unsigned char) (wc))
+# undef HAVE_MBSINIT
+#endif
+
+#if !defined mbsinit && !HAVE_MBSINIT

 # define mbsinit(ps) 1
 # define mbsinit(ps) 1

-# define iswprint(wc) ISPRINT ((unsigned char) (wc))

 #endif
 
 #ifndef iswprint
 #endif
 
 #ifndef iswprint


@@ -86,17 +68,11 @@
 # endif
 #endif
 
 # endif
 #endif
 

-#define INT_BITS (sizeof (int) * CHAR_BIT)
-
-#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
-# define IN_CTYPE_DOMAIN(c) 1
-#else
-# define IN_CTYPE_DOMAIN(c) isascii(c)
+#ifndef SIZE_MAX
+# define SIZE_MAX ((size_t) -1)

 #endif
 
 #endif
 

-/* Undefine to protect against the definition in wctype.h of solaris2.6.   */
-#undef ISPRINT
-#define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (c))
+#define INT_BITS (sizeof (int) * CHAR_BIT)

 
 struct quoting_options
 {
 
 struct quoting_options
 {


@@ -142,9 +118,10 @@ static struct quoting_options default_quoting_options;
 struct quoting_options *
 clone_quoting_options (struct quoting_options *o)
 {
 struct quoting_options *
 clone_quoting_options (struct quoting_options *o)
 {

-  struct quoting_options *p
-    = (struct quoting_options *) xmalloc (sizeof (struct quoting_options));
+  int e = errno;
+  struct quoting_options *p = xmalloc (sizeof *p);

   *p = *(o ? o : &default_quoting_options);
   *p = *(o ? o : &default_quoting_options);

+  errno = e;

   return p;
 }
 
   return p;
 }
 


@@ -276,7 +253,7 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize,
       break;
     }
 
       break;
     }
 

-  for (i = 0;  ! (argsize == (size_t) -1 ? arg[i] == '\0' : i == argsize);  i++)
+  for (i = 0;  ! (argsize == SIZE_MAX ? arg[i] == '\0' : i == argsize);  i++)

     {
       unsigned char c;
       unsigned char esc;
     {
       unsigned char c;
       unsigned char esc;


@@ -290,6 +267,16 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize,
       c = arg[i];
       switch (c)
        {
       c = arg[i];
       switch (c)
        {

+       case '\0':
+         if (backslash_escapes)
+           {
+             STORE ('\\');
+             STORE ('0');
+             STORE ('0');
+             c = '0';
+           }
+         break;
+

        case '?':
          switch (quoting_style)
            {
        case '?':
          switch (quoting_style)
            {


@@ -305,8 +292,8 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize,
                  case '<': case '=': case '>':
                    /* Escape the second '?' in what would otherwise be
                       a trigraph.  */
                  case '<': case '=': case '>':
                    /* Escape the second '?' in what would otherwise be
                       a trigraph.  */

-                   i += 2;

                    c = arg[i + 2];
                    c = arg[i + 2];

+                   i += 2;

                    STORE ('?');
                    STORE ('\\');
                    STORE ('?');
                    STORE ('?');
                    STORE ('\\');
                    STORE ('?');


@@ -319,7 +306,7 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize,
            }
          break;
 
            }
          break;
 

-       case ALERT_CHAR: esc = 'a'; goto c_escape;
+       case '\a': esc = 'a'; goto c_escape;

        case '\b': esc = 'b'; goto c_escape;
        case '\f': esc = 'f'; goto c_escape;
        case '\n': esc = 'n'; goto c_and_shell_escape;
        case '\b': esc = 'b'; goto c_escape;
        case '\f': esc = 'f'; goto c_escape;
        case '\n': esc = 'n'; goto c_and_shell_escape;


@@ -407,7 +394,7 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize,
            if (unibyte_locale)
              {
                m = 1;
            if (unibyte_locale)
              {
                m = 1;

-               printable = ISPRINT (c);
+               printable = isprint (c);

              }
            else
              {
              }
            else
              {


@@ -416,7 +403,7 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize,
 
                m = 0;
                printable = 1;
 
                m = 0;
                printable = 1;

-               if (argsize == (size_t) -1)
+               if (argsize == SIZE_MAX)

                  argsize = strlen (arg);
 
                do
                  argsize = strlen (arg);
 
                do


@@ -512,24 +499,31 @@ quotearg_buffer (char *buffer, size_t buffersize,
                 struct quoting_options const *o)
 {
   struct quoting_options const *p = o ? o : &default_quoting_options;
                 struct quoting_options const *o)
 {
   struct quoting_options const *p = o ? o : &default_quoting_options;

-  return quotearg_buffer_restyled (buffer, buffersize, arg, argsize,
-                                  p->style, p);
+  int e = errno;
+  size_t r = quotearg_buffer_restyled (buffer, buffersize, arg, argsize,
+                                      p->style, p);
+  errno = e;
+  return r;

 }
 
 }
 

-/* Use storage slot N to return a quoted version of the string ARG.
+/* Use storage slot N to return a quoted version of argument ARG.
+   ARG is of size ARGSIZE, but if that is -1, ARG is a null-terminated string.

    OPTIONS specifies the quoting options.
    The returned value points to static storage that can be
    reused by the next call to this function with the same value of N.
    N must be nonnegative.  N is deliberately declared with type "int"
    to allow for future extensions (using negative values).  */
 static char *
    OPTIONS specifies the quoting options.
    The returned value points to static storage that can be
    reused by the next call to this function with the same value of N.
    N must be nonnegative.  N is deliberately declared with type "int"
    to allow for future extensions (using negative values).  */
 static char *

-quotearg_n_options (int n, char const *arg,
+quotearg_n_options (int n, char const *arg, size_t argsize,

                    struct quoting_options const *options)
 {
                    struct quoting_options const *options)
 {

+  int e = errno;
+

   /* Preallocate a slot 0 buffer, so that the caller can always quote
      one small component of a "memory exhausted" message in slot 0.  */
   static char slot0[256];
   static unsigned int nslots = 1;
   /* Preallocate a slot 0 buffer, so that the caller can always quote
      one small component of a "memory exhausted" message in slot 0.  */
   static char slot0[256];
   static unsigned int nslots = 1;

+  unsigned int n0 = n;

   struct slotvec
     {
       size_t size;
   struct slotvec
     {
       size_t size;


@@ -538,42 +532,49 @@ quotearg_n_options (int n, char const *arg,
   static struct slotvec slotvec0 = {sizeof slot0, slot0};
   static struct slotvec *slotvec = &slotvec0;
 
   static struct slotvec slotvec0 = {sizeof slot0, slot0};
   static struct slotvec *slotvec = &slotvec0;
 

-  if (nslots <= n)
+  if (n < 0)
+    abort ();
+
+  if (nslots <= n0)

     {
     {

-      int n1 = n + 1;
-      size_t s = n1 * sizeof (struct slotvec);
-      if (! (0 < n1 && n1 == s / sizeof (struct slotvec)))
-       abort ();
+      unsigned int n1 = n0 + 1;
+      size_t s = n1 * sizeof *slotvec;
+
+      if (SIZE_MAX / UINT_MAX <= sizeof *slotvec
+         && n1 != s / sizeof *slotvec)
+       xalloc_die ();
+

       if (slotvec == &slotvec0)
        {
       if (slotvec == &slotvec0)
        {

-         slotvec = (struct slotvec *) xmalloc (sizeof (struct slotvec));
+         slotvec = xmalloc (sizeof *slotvec);

          *slotvec = slotvec0;
        }
          *slotvec = slotvec0;
        }

-      slotvec = (struct slotvec *) xrealloc (slotvec, s);
-      memset (slotvec + nslots, 0, (n1 - nslots) * sizeof (struct slotvec));
-      nslots = n;
+      slotvec = xrealloc (slotvec, s);
+      memset (slotvec + nslots, 0, (n1 - nslots) * sizeof *slotvec);
+      nslots = n1;

     }
 
   {
     size_t size = slotvec[n].size;
     char *val = slotvec[n].val;
     }
 
   {
     size_t size = slotvec[n].size;
     char *val = slotvec[n].val;

-    size_t qsize = quotearg_buffer (val, size, arg, (size_t) -1, options);
+    size_t qsize = quotearg_buffer (val, size, arg, argsize, options);

 
     if (size <= qsize)
       {
        slotvec[n].size = size = qsize + 1;
        slotvec[n].val = val = xrealloc (val == slot0 ? 0 : val, size);
 
     if (size <= qsize)
       {
        slotvec[n].size = size = qsize + 1;
        slotvec[n].val = val = xrealloc (val == slot0 ? 0 : val, size);

-       quotearg_buffer (val, size, arg, (size_t) -1, options);
+       quotearg_buffer (val, size, arg, argsize, options);

       }
 
       }
 

+    errno = e;

     return val;
   }
 }
 
 char *
     return val;
   }
 }
 
 char *

-quotearg_n (unsigned int n, char const *arg)
+quotearg_n (int n, char const *arg)

 {
 {

-  return quotearg_n_options (n, arg, &default_quoting_options);
+  return quotearg_n_options (n, arg, SIZE_MAX, &default_quoting_options);

 }
 
 char *
 }
 
 char *


@@ -582,13 +583,29 @@ quotearg (char const *arg)
   return quotearg_n (0, arg);
 }
 
   return quotearg_n (0, arg);
 }
 

-char *
-quotearg_n_style (unsigned int n, enum quoting_style s, char const *arg)
+/* Return quoting options for STYLE, with no extra quoting.  */
+static struct quoting_options
+quoting_options_from_style (enum quoting_style style)

 {
   struct quoting_options o;
 {
   struct quoting_options o;

-  o.style = s;
+  o.style = style;

   memset (o.quote_these_too, 0, sizeof o.quote_these_too);
   memset (o.quote_these_too, 0, sizeof o.quote_these_too);

-  return quotearg_n_options (n, arg, &o);
+  return o;
+}
+
+char *
+quotearg_n_style (int n, enum quoting_style s, char const *arg)
+{
+  struct quoting_options const o = quoting_options_from_style (s);
+  return quotearg_n_options (n, arg, SIZE_MAX, &o);
+}
+
+char *
+quotearg_n_style_mem (int n, enum quoting_style s,
+                     char const *arg, size_t argsize)
+{
+  struct quoting_options const o = quoting_options_from_style (s);
+  return quotearg_n_options (n, arg, argsize, &o);

 }
 
 char *
 }
 
 char *


@@ -603,7 +620,7 @@ quotearg_char (char const *arg, char ch)
   struct quoting_options options;
   options = default_quoting_options;
   set_char_quoting (&options, ch, 1);
   struct quoting_options options;
   options = default_quoting_options;
   set_char_quoting (&options, ch, 1);

-  return quotearg_n_options (0, arg, &options);
+  return quotearg_n_options (0, arg, SIZE_MAX, &options);

 }
 
 char *
 }
 
 char *