Changes to gnats/libiberty/argv.c

[Milan Zamazal]

Index: gnats/libiberty/argv.c
diff -c gnats/libiberty/argv.c:1.2 gnats/libiberty/argv.c:1.3
*** gnats/libiberty/argv.c:1.2  Tue Oct 26 03:10:16 1999
--- gnats/libiberty/argv.c      Mon Dec 10 18:03:27 2001
***************
*** 25,46 ****
  #include "ansidecl.h"
  #include "libiberty.h"
  
! #ifdef isspace
! #undef isspace
! #endif
! #define isspace(ch) ((ch) == ' ' || (ch) == '\t')
  
  /*  Routines imported from standard C runtime libraries. */
  
  #ifdef __STDC__
  
  #include <stddef.h>
! extern void *memcpy (void *s1, const void *s2, size_t n);     /* 4.11.2.1 */
! extern size_t strlen (const char *s);                         /* 4.11.6.3 */
! extern void *malloc (size_t size);                            /* 4.10.3.3 */
! extern void *realloc (void *ptr, size_t size);                        /* 
4.10.3.4 */
! extern void free (void *ptr);                                 /* 4.10.3.2 */
! extern char *strdup (const char *s);                          /* Non-ANSI */
  
  #else /* !__STDC__ */
  
--- 25,39 ----
  #include "ansidecl.h"
  #include "libiberty.h"
  
! #define ISBLANK(ch) ((ch) == ' ' || (ch) == '\t')
  
  /*  Routines imported from standard C runtime libraries. */
  
  #ifdef __STDC__
  
  #include <stddef.h>
! #include <string.h>
! #include <stdlib.h>
  
  #else /* !__STDC__ */
  
***************
*** 231,237 ****
        do
        {
          /* Pick off argv[argc] */
!         while (isspace (*input))
            {
              input++;
            }
--- 224,230 ----
        do
        {
          /* Pick off argv[argc] */
!         while (ISBLANK (*input))
            {
              input++;
            }
***************
*** 264,270 ****
          arg = copybuf;
          while (*input != EOS)
            {
!             if (isspace (*input) && !squote && !dquote && !bsquote)
                {
                  break;
                }
--- 257,263 ----
          arg = copybuf;
          while (*input != EOS)
            {
!             if (ISBLANK (*input) && !squote && !dquote && !bsquote)
                {
                  break;
                }
***************
*** 330,336 ****
          argc++;
          argv[argc] = NULL;
  
!         while (isspace (*input))
            {
              input++;
            }
--- 323,329 ----
          argc++;
          argv[argc] = NULL;
  
!         while (ISBLANK (*input))
            {
              input++;
            }