[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02-fyi-minor-cleanups.patch
From: |
Akim Demaille |
Subject: |
02-fyi-minor-cleanups.patch |
Date: |
Sun, 30 Dec 2001 22:05:09 +0100 |
Index: ChangeLog
from Akim Demaille <address@hidden>
* src/system.h: We don't need nor want bcopy.
Throw away MS-DOS crap: we don't need getpid.
* configure.in: We don't need strndup. It was even causing
problems: because Flex includes the headers *before* us,
_GNU_SOURCE is not defined by config.h, and therefore strndup was
not visible.
* lib/xstrndup.c: New.
* src/scan-skel.l: Use it.
Be sure to initialize yylval.muscle member when scanning a MUSCLE.
* src/parse-skel.y: Use %directives instead of #defines.
Index: configure.in
--- configure.in Sun, 30 Dec 2001 18:57:29 +0100 akim
+++ configure.in Sun, 30 Dec 2001 21:31:50 +0100 akim
@@ -87,8 +87,8 @@
AC_FUNC_OBSTACK
AC_FUNC_ERROR_AT_LINE
AC_CHECK_FUNCS(mkstemp setlocale)
-AC_CHECK_DECLS([stpcpy, strchr, strndup, strspn, strnlen, memchr])
-AC_REPLACE_FUNCS(stpcpy strchr strndup strnlen strspn memchr)
+AC_CHECK_DECLS([stpcpy, strchr, strspn, strnlen, memchr])
+AC_REPLACE_FUNCS(stpcpy strchr strnlen strspn memchr)
jm_FUNC_MALLOC
jm_FUNC_REALLOC
jm_PREREQ_QUOTEARG
Index: lib/Makefile.am
--- lib/Makefile.am Sun, 16 Dec 2001 11:40:41 +0100 akim
+++ lib/Makefile.am Sun, 30 Dec 2001 21:31:31 +0100 akim
@@ -38,7 +38,7 @@
getopt.h getopt.c getopt1.c \
hash.h hash.c \
quote.h quote.c quotearg.h quotearg.c \
- xalloc.h xmalloc.c xstrdup.c
+ xalloc.h xmalloc.c xstrdup.c xstrndup.c
libbison_a_LIBADD = @LIBOBJS@ @ALLOCA@
libbison_a_DEPENDENCIES = $(libbison_a_LIBADD)
Index: src/parse-skel.y
--- src/parse-skel.y Sun, 30 Dec 2001 21:07:37 +0100 akim
+++ src/parse-skel.y Sun, 30 Dec 2001 21:11:41 +0100 akim
@@ -21,6 +21,7 @@
%debug
%defines
+%verbose
%error-verbose
%{
@@ -47,8 +48,8 @@
%union
{
- char* muscle;
- char* string;
+ char *muscle;
+ char *string;
char character;
int yacc;
}
Index: src/scan-skel.l
--- src/scan-skel.l Sun, 30 Dec 2001 21:07:37 +0100 akim
+++ src/scan-skel.l Sun, 30 Dec 2001 21:37:28 +0100 akim
@@ -20,11 +20,9 @@
02111-1307, USA. */
%{
-
#include "system.h"
#include "skeleton.h"
#include "parse-skel.h"
-
%}
%option nounput
@@ -49,31 +47,25 @@
"%%{actions}" { return ACTIONS; }
"%%{tokendef}" { return TOKENS; }
-"%%{"[a-zA-Z][0-9a-zA-Z_-]+"}" { /* Muscle. */
- size_t len = strlen (yytext);
- yylval.string = (char*) malloc (len - 3);
- strncpy (yylval.string, yytext + 3, len - 4);
- yylval.string[len - 4] = 0;
+ /* Muscle. */
+"%%{"[a-zA-Z][0-9a-zA-Z_-]+"}" {
+ yylval.muscle = xstrndup (yytext + 3, yyleng - 4);
return MUSCLE;
}
-"%%\"".*"\"" { /* String. */
- size_t len = strlen (yytext);
- yylval.string = (char*) malloc (len - 3);
- strncpy (yylval.string, yytext + 3, len - 4);
- yylval.string[len - 4] = 0;
+ /* String. */
+"%%\"".*"\"" {
+ yylval.string = xstrndup (yytext + 3, yyleng - 4);
return STRING;
}
-<<EOF>> { /* End of file. */
- return 0;
-}
-
-"\n" { /* End of line. */
+ /* End of line. */
+"\n" {
return '\n';
}
-. { /* Character. */
+ /* Plain Character. */
+. {
yylval.character = *yytext;
return CHARACTER;
}
Index: src/system.h
--- src/system.h Thu, 27 Dec 2001 12:01:10 +0100 akim
+++ src/system.h Sun, 30 Dec 2001 21:35:32 +0100 akim
@@ -26,16 +26,6 @@
#include <assert.h>
-#ifdef MSDOS
-# include <io.h>
-#endif
-
-#ifdef _MSC_VER
-# include <stdlib.h>
-# include <process.h>
-# define getpid _getpid
-#endif
-
#if HAVE_STDLIB_H
# include <stdlib.h>
#endif
@@ -62,9 +52,6 @@
# if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H)
# include <memory.h>
# endif /* not STDC_HEADERS and HAVE_MEMORY_H */
-# ifndef bcopy
-# define bcopy(src, dst, num) memcpy((dst), (src), (num))
-# endif
#else /* not STDC_HEADERS and not HAVE_STRING_H */
# include <strings.h>
/* memory.h and strings.h conflict on some systems. */
@@ -102,6 +89,9 @@
# include "xalloc.h"
+/* From xstrndup.c. */
+char *xstrndup PARAMS ((const char *s, size_t n));
+
/*---------------------.
| Missing prototypes. |
`---------------------*/
@@ -319,4 +309,4 @@
# include <dmalloc.h>
# endif /* WITH_DMALLOC */
-#endif /* BISON_SYSTEM_H */
+#endif /* ! BISON_SYSTEM_H */
Index: lib/xstrndup.c
--- lib/xstrndup.c Sun, 30 Dec 2001 21:39:04 +0100 akim
+++ lib/xstrndup.c Sun, 30 Dec 2001 21:36:57 +0100 akim
@@ -0,0 +1,51 @@
+/* Copyright (C) 2001 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 the
+ Free Software Foundation; either version 2, or (at your option) any
+ later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if STDC_HEADERS || HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+
+#include <sys/types.h>
+
+#include "xalloc.h"
+
+#ifndef HAVE_DECL_STRNLEN
+"this configure-time declaration test was not run"
+#endif
+#if !HAVE_DECL_STRNLEN
+size_t strnlen ();
+#endif
+
+char *xstrndup (const char *s, size_t n);
+
+char *
+xstrndup (const char *s, size_t n)
+{
+ size_t len = strnlen (s, n);
+ char *new = xmalloc (len + 1);
+
+ if (new == NULL)
+ return NULL;
+
+ new[len] = '\0';
+ return (char *) memcpy (new, s, len);
+}
Index: lib/strndup.c
--- lib/strndup.c Wed, 15 Aug 2001 18:38:02 +0200 akim
+++ lib/strndup.c Sun, 30 Dec 2001 21:39:04 +0100 akim
@@ -1,62 +0,0 @@
-/* Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
-
- NOTE: The canonical source of this file is maintained with the GNU C
Library.
- Bugs can be reported to address@hidden
-
- 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 the
- Free Software Foundation; either version 2, or (at your option) any
- later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-#include <sys/types.h>
-
-#if defined _LIBC || defined STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-#else
-char *malloc ();
-#endif
-
-#ifndef HAVE_DECL_STRNLEN
-"this configure-time declaration test was not run"
-#endif
-#if !HAVE_DECL_STRNLEN
-size_t strnlen ();
-#endif
-
-#undef __strndup
-#undef strndup
-
-#ifndef weak_alias
-# define __strndup strndup
-#endif
-
-char *
-__strndup (const char *s, size_t n)
-{
- size_t len = strnlen (s, n);
- char *new = malloc (len + 1);
-
- if (new == NULL)
- return NULL;
-
- new[len] = '\0';
- return (char *) memcpy (new, s, len);
-}
-#ifdef weak_alias
-weak_alias (__strndup, strndup)
-#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- 02-fyi-minor-cleanups.patch,
Akim Demaille <=