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

diff --git a/ChangeLog b/ChangeLog
index 98569cf6a201b047b521166466ff5fa4ee52b7d2..5d5d4a47c15f72a0fdfc3bd17dbae2a82e9d7827 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+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>
 
        * src/files.c (compute_output_file_names): Fix
 2002-01-20  Marc Autret  <marc@gnu.org>
 
        * src/files.c (compute_output_file_names): Fix

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 4f17352ad4a6813a0175e76fef15002d0f9ce013..22f29c1ed06c3f11a38a532900157a00b0e011ca 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -192,6 +192,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 */


@@ -204,7 +205,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);