* src/files.c (skeleton_find) [MSDOS]: Fix cp definition.

diff --git a/ChangeLog b/ChangeLog
index 522ebc29f1e386e71d547be01cd743f30934199a..352d07c4435ca726bfecdfff57851e9d383412c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
+2002-01-21  Kees Zeelenberg  <kzlg@users.sourceforge.net>
+
+       * src/files.c (skeleton_find) [MSDOS]: Fix cp definition.
+

 2002-01-20  Marc Autret  <marc@gnu.org>
 
 2002-01-20  Marc Autret  <marc@gnu.org>
 

-       * src/system.h: Need to define __attribute__ away for non-GCC 
+       * src/system.h: Need to define __attribute__ away for non-GCC

        compilers as well (i.e. the vendor C compiler).
        Suggested by Albert Chin-A-Young.
 
        compilers as well (i.e. the vendor C compiler).
        Suggested by Albert Chin-A-Young.
 

diff --git a/NEWS b/NEWS
index 7c26c75faf2538b8105d1f91b2050b6ce794b7a1..1443ebc24d6b98f4af7ee70d0a564d6e18b9b161 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,11 @@
 Bison News
 ----------
 
 Bison News
 ----------
 

-Changes in version 1.31a, 2002-01-19:
+Changes in version 1.31a:

 
 

-* Fix YACC option output file names.
+* Fix YACC option output file names

 
 

+* Portability fixes

 \f
 Changes in version 1.31, 2002-01-14:
 
 \f
 Changes in version 1.31, 2002-01-14:
 

diff --git a/THANKS b/THANKS
index c592a8f606ec7879d0b1ff59e619173380aa9842..e6424c84efdd7f84684fb932c4523eda0817882d 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -17,6 +17,7 @@ Hans Aberg              haberg@matematik.su.se
 Jesse Thilo             jthilo@gnu.org
 Jim Meyering            meyering@gnu.org
 Juan Manuel Guerrero    ST001906@HRZ1.HRZ.TU-Darmstadt.De
 Jesse Thilo             jthilo@gnu.org
 Jim Meyering            meyering@gnu.org
 Juan Manuel Guerrero    ST001906@HRZ1.HRZ.TU-Darmstadt.De

+Kees Zeelenberg         kzlg@users.sourceforge.net

 Keith Browne            kbrowne@legato.com
 Laurent Mascherpa       laurent.mascherpa@epita.fr
 Marc Autret             autret_m@epita.fr
 Keith Browne            kbrowne@legato.com
 Laurent Mascherpa       laurent.mascherpa@epita.fr
 Marc Autret             autret_m@epita.fr

diff --git a/src/files.c b/src/files.c
index 2629dfbb2b3c2f363e206539e36ffad0e3fd6a03..a0cd662279fa88438db5cbbf0b31fc582bafb231 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -215,6 +215,7 @@ skeleton_find (const char *envvar, const char *skeleton_name)
   const char *res = getenv (envvar);
 
 #if defined (MSDOS) || defined (_WIN32)
   const char *res = getenv (envvar);
 
 #if defined (MSDOS) || defined (_WIN32)

+  const char *cp = getenv ("INIT");

   if (!res)
     {
       /* Skeleton file name without path */
   if (!res)
     {
       /* Skeleton file name without path */


@@ -227,7 +228,6 @@ skeleton_find (const char *envvar, const char *skeleton_name)
         ++skel_name;
 
       /* File doesn't exist in current directory; try in INIT directory.  */
         ++skel_name;
 
       /* File doesn't exist in current directory; try in INIT directory.  */

-      const char *cp = getenv ("INIT");

       if (cp)
        {
          res = XMALLOC (char, strlen (cp) + strlen (skel_name) + 2);
       if (cp)
        {
          res = XMALLOC (char, strlen (cp) + strlen (skel_name) + 2);