mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-10 12:53:03 +00:00
* lib/basename.c, lib/dirname.h, lib/dirname.c, lib/memrchr.c,
* lib/xstrndup.c, lib/strchr.c: New, stolen from the Fileutils 4.1. * lib/Makefile.am (libbison_a_SOURCES): Adjust. * configure.in: Check for the presence of memrchr, strchr, strnlen, and of their prototypes. Don't check for strndup: we no longer use it. * src/system.h: Adjust the prototypes.
This commit is contained in:
@@ -384,7 +384,7 @@ compute_base_names (void)
|
||||
/* If the initial segment of extension contains a 'y' or a 'Y', I assume
|
||||
that it is a yacc or bison grammar file. */
|
||||
if (ext_index)
|
||||
ext_index = (strspn (infile + ext_index + 1, "yY")) ? ext_index : 0;
|
||||
ext_index = strspn (infile + ext_index + 1, "yY") ? ext_index : 0;
|
||||
if (ext_index)
|
||||
compute_exts_from_gf (infile + ext_index);
|
||||
|
||||
@@ -407,7 +407,7 @@ compute_base_names (void)
|
||||
/* If the initial segment of extension contains a 'y' or a 'Y', I assume
|
||||
that it is a yacc or bison grammar file. */
|
||||
if (ext_index)
|
||||
ext_index = (strspn (name_base + ext_index + 1, "yY")) ? ext_index : 0;
|
||||
ext_index = strspn (name_base + ext_index + 1, "yY") ? ext_index : 0;
|
||||
if (ext_index)
|
||||
{
|
||||
base_length -= strlen (name_base + ext_index);
|
||||
|
||||
16
src/system.h
16
src/system.h
@@ -110,14 +110,26 @@ char *alloca ();
|
||||
char *stpcpy PARAMS ((char *dest, const char *src));
|
||||
#endif
|
||||
|
||||
#if !HAVE_DECL_STRNDUP
|
||||
char *strndup PARAMS ((const char *s, size_t size));
|
||||
#if !HAVE_DECL_STRCHR
|
||||
char *strchr(const char *s, int c);
|
||||
#endif
|
||||
|
||||
#if !HAVE_DECL_STRSPN
|
||||
size_t strspn(const char *s, const char *accept);
|
||||
#endif
|
||||
|
||||
#if !HAVE_DECL_STRNLEN
|
||||
size_t strnlen PARAMS ((const char *s, size_t maxlen));
|
||||
#endif
|
||||
|
||||
#if !HAVE_DECL_MEMCHR
|
||||
void *memchr PARAMS ((const void *s, int c, size_t n));
|
||||
#endif
|
||||
|
||||
#if !HAVE_DECL_MEMRCHR
|
||||
void *memrchr PARAMS ((const void *s, int c, size_t n));
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
/*-----------------.
|
||||
|
||||
Reference in New Issue
Block a user