X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/8c165d891d5db7953b90142ed34cbbbc114e7f67..f7aed660541ed7b05c4d892334dfe64ba200a4a2:/src/files.c?ds=sidebyside diff --git a/src/files.c b/src/files.c index 1252aab0..c4c223d3 100644 --- a/src/files.c +++ b/src/files.c @@ -99,49 +99,6 @@ stringappend (const char *string1, const char *string2) return res; } - -/*-----------------------------------------------------------------. -| Computes the macro name used to avoid double inclusion in the | -| header of the parser and store it in header_macro_name. Be sure | -| to produce valid CPP names (don't start with digit, remain | -| alphanumerical + underscore). | -`-----------------------------------------------------------------*/ - -char * -compute_header_macro (void) -{ - const char *prefix = "BISON_"; - char *macro_name, *cp; - - if (spec_defines_file) - { - macro_name = XMALLOC (char, - strlen (prefix) + - strlen (spec_defines_file) + 1); - cp = stpcpy (macro_name, prefix); - cp = stpcpy (cp, spec_defines_file); - } - else - { - macro_name = XMALLOC (char, - strlen (prefix) + - strlen (full_base_name) + - strlen (header_extension) + 1); - cp = stpcpy (macro_name, prefix); - cp = stpcpy (cp, full_base_name); - cp = stpcpy (cp, header_extension); - } - - for (cp = macro_name; *cp; ++cp) - if (islower (*cp)) - *cp = toupper (*cp); - else if (!isalnum (*cp)) - *cp = '_'; - - return macro_name; -} - - /*-----------------------------------------------------------------. | Try to open file NAME with mode MODE, and print an error message | | if fails. | @@ -177,59 +134,6 @@ xfclose (FILE *ptr) return result; } - - -/*------------------------------------------------------------------. -| Return the path to the skeleton which locaction might be given in | -| ENVVAR, otherwise return SKELETON_NAME. | -`------------------------------------------------------------------*/ - -const char * -skeleton_find (const char *envvar, const char *skeleton_name) -{ - const char *res = getenv (envvar); - -#if defined (MSDOS) || defined (_WIN32) - const char *cp = getenv ("INIT"); - if (!res) - { - /* Skeleton file name without path */ - const char *skel_name = strrchr (skeleton_name, '/'); - if (!skel_name) - skel_name = strrchr (skeleton_name, '\\'); - if (!skel_name) - skel_name = skeleton_name; - else - ++skel_name; - - /* File doesn't exist in current directory; try in INIT directory. */ - if (cp) - { - res = XMALLOC (char, strlen (cp) + strlen (skel_name) + 2); - sprintf (res, "%s%c%s", cp, '\\', skel_name); - } - else if (access (skel_name, 4) == 0) /* Look in current dir. */ - res = skel_name; - else - { - /* Look in program locations dir. */ - extern char *program_name; - cp = strrchr(program_name, '\\'); - if (!cp) - return skeleton_name; - else - ++cp; - res = XMALLOC (char, cp - program_name + strlen (skel_name) + 1); - strncpy (res, program_name, cp - program_name); - strcpy (res + (cp - program_name), skel_name); - } - } -#endif /* defined (MSDOS) || defined (_WIN32) */ - if (!res) - res = skeleton_name; - - return res; -} /*----------------------------------------------------------------.