Wed May 15 10:14:14 CDT 1996 Rob Tulloh <tulloh@tivoli.com>

	* dir.c: WIN32 does not support inode. For now, fully qualified
	pathname along with st_mtime will be keys for files.
	Fixed problem where vpath can be confused when files
	are added to a directory after the directory has already been
	read in. The code now attempts to reread the directory if it
	discovers that the datestamp on the directory has changed since
	it was cached by make. This problem only seems to occur on WIN32
	right now so it is lumped under port #ifdef WIN32.

	* function.c: WIN32: call subproc library (CreateProcess()) instead of
	fork/exec.

	* job.c: WIN32: Added the code to do fork/exec/waitpid style processing
	on WIN32 systems via calls to subproc library.

	* main.c: WIN32: Several things added here. First, there is code
	for dealing with PATH and SHELL defaults. Make tries to figure
	out if the user has %PATH% set in the environment and sets it to
	%Path% if it is not set already. Make also looks to see if sh.exe
	is anywhere to be found. Code path through job.c will change
	based on existence of a working Bourne shell. The checking for
	default shell is done twice: once before makefiles are read in
	and again after. Fall back to MSDOS style execution mode if no sh.exe
	is found. Also added some debug support that allows user to pause make
	with -D switch and attach a debugger. This is especially useful for
	debugging recursive calls to make where problems appear only in the
	sub-make.

	* make.h: WIN32: A few macros and header files for WIN32 support.

	* misc.c: WIN32: Added a function end_of_token_w32() to assist
	in parsing code in read.c.

	* read.c: WIN32: Fixes similar to MSDOS which allow colon to
	appear in filenames. Use of colon in filenames would otherwise
	confuse make.

	* remake.c: WIN32: Added include of io.h to eliminate compiler
	warnings. Added some code to default LIBDIR if it is not set
	on WIN32.

	* variable.c: WIN32: Added support for detecting Path/PATH
	and converting them to semicolon separated lists for make's
	internal use. New function sync_Path_environment()
	which is called in job.c and function.c before creating a new
	process. Caller must set Path in environment since we don't
	have fork() to do this for us.

	* vpath.c: WIN32: Added detection for filenames containing
	forward or backward slashes.

	* NMakefile: WIN32: Visual C compatible makefile for use with nmake.
	Use this to build GNU make the first time on Windows NT or Windows 95.

	* README.WIN32: WIN32: Contains some helpful notes.

	* build_w32.bat: WIN32: If you don't like nmake, use this the first
	time you build GNU make on Windows NT or Windows 95.

	* config.h.WIN32: WIN32 version of config.h

	* subproc.bat: WIN32: A bat file used to build the
	subproc library from the top-level NMakefile. Needed because
	WIndows 95 (nmake) doesn't allow you to cd in a make rule.

	* w32/include/dirent.h
	* w32/compat/dirent.c: WIN32: opendir, readdir, closedir, etc.

	* w32/include/pathstuff.h: WIN32: used by files needed functions
	defined in pathstuff.c (prototypes).

	* w32/include/sub_proc.h: WIN32: prototypes for subproc.lib functions.

	* w32/include/w32err.h: WIN32: prototypes for w32err.c.

	* w32/pathstuff.c: WIN32: File and Path/Path conversion functions.

	* w32/subproc/build.bat: WIN32: build script for subproc library
	if you don't wish to use nmake.

	* w32/subproc/NMakefile: WIN32: Visual C compatible makefile for use
	with nmake. Used to build subproc library.

	* w32/subproc/misc.c: WIN32: subproc library support code
	* w32/subproc/proc.h: WIN32: subproc library support code
	* w32/subproc/sub_proc.c: WIN32: subproc library source code
	* w32/subproc/w32err.c: WIN32: subproc library support code

1 files changed, 101 insertions, 1 deletions

diff --git a/dir.c b/dir.c
index 84a9a42..d997762 100644
--- a/dir.c
+++ b/dir.c
@@ -44,7 +44,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define NAMLEN(d) _D_NAMLEN(d)
 #endif
 
-#if defined (POSIX) && !defined (__GNU_LIBRARY__)
+#if (defined (POSIX) || defined (WIN32)) && !defined (__GNU_LIBRARY__)
 /* Posix does not require that the d_ino field be present, and some
    systems do not provide it. */
 #define REAL_DIR_ENTRY(dp) 1
@@ -97,6 +97,10 @@ dosify (filename)
 }
 #endif /* __MSDOS__ */
 
+#ifdef WIN32
+#include "pathstuff.h"
+#endif
+
 #ifdef _AMIGA
 #include <ctype.h>
 
@@ -193,11 +197,24 @@ struct directory_contents
     struct directory_contents *next;
 
     dev_t dev;			/* Device and inode numbers of this dir.  */
+#ifdef WIN32
+    /*
+     * Inode means nothing on WIN32. Even file key information is
+     * unreliable because it is random per file open and undefined
+     * for remote filesystems. The most unique attribute I can
+     * come up with is the fully qualified name of the directory. Beware
+     * though, this is also unreliable. I'm open to suggestion on a better
+     * way to emulate inode.
+     */
+    char *path_key;
+    int   mtime;        /* controls check for stale directory cache */
+#else
 #ifdef VMS
     ino_t ino[3];
 #else
     ino_t ino;
 #endif
+#endif /* WIN32 */
     struct dirfile **files;	/* Files in this directory.  */
     DIR *dirstream;		/* Stream reading this directory.  */
   };
@@ -253,6 +270,9 @@ find_directory (name)
   register unsigned int hash = 0;
   register char *p;
   register struct directory *dir;
+#ifdef WIN32
+  char* w32_path;
+#endif
 #ifdef VMS
   if ((*name == '.') && (*(name+1) == 0))
     name = "[]";
@@ -298,6 +318,10 @@ find_directory (name)
 
 	  struct directory_contents *dc;
 
+#ifdef WIN32
+          w32_path = w32ify(name, 1);
+          hash = ((unsigned int) st.st_dev << 16) | (unsigned int) st.st_ctime;
+#else
 #ifdef VMS
 	hash = ((unsigned int) st.st_dev << 16)
 		| ((unsigned int) st.st_ino[0]
@@ -306,9 +330,13 @@ find_directory (name)
 #else
 	  hash = ((unsigned int) st.st_dev << 16) | (unsigned int) st.st_ino;
 #endif
+#endif
 	  hash %= DIRECTORY_BUCKETS;
 
 	  for (dc = directories_contents[hash]; dc != 0; dc = dc->next)
+#ifdef WIN32
+            if (!strcmp(dc->path_key, w32_path))
+#else
 	    if (dc->dev == st.st_dev
 #ifdef VMS
 		&& dc->ino[0] == st.st_ino[0]
@@ -317,6 +345,7 @@ find_directory (name)
 #else
 		 && dc->ino == st.st_ino)
 #endif
+#endif /* WIN32 */
 	      break;
 
 	  if (dc == 0)
@@ -328,6 +357,10 @@ find_directory (name)
 
 	      /* Enter it in the contents hash table.  */
 	      dc->dev = st.st_dev;
+#ifdef WIN32
+              dc->path_key = strdup(w32_path);
+              dc->mtime = st.st_mtime;
+#else
 #ifdef VMS
 	      dc->ino[0] = st.st_ino[0];
 	      dc->ino[1] = st.st_ino[1];
@@ -335,6 +368,7 @@ find_directory (name)
 #else
 	      dc->ino = st.st_ino;
 #endif
+#endif /* WIN32 */
 	      dc->next = directories_contents[hash];
 	      directories_contents[hash] = dc;
 
@@ -382,6 +416,10 @@ dir_contents_file_exists_p (dir, filename)
   register char *p;
   register struct dirfile *df;
   register struct dirent *d;
+#ifdef WIN32
+  struct stat st;
+  int rehash = 0;
+#endif
 
   if (dir == 0 || dir->files == 0)
     {
@@ -429,6 +467,24 @@ dir_contents_file_exists_p (dir, filename)
 
   if (dir->dirstream == 0)
     {
+#ifdef WIN32
+      /* Check to see if directory has changed since last read */
+      if (dir->path_key &&
+          stat(dir->path_key, &st) == 0 &&
+          st.st_mtime > dir->mtime) {
+
+        /* reset date stamp to show most recent re-process */
+        dir->mtime = st.st_mtime;
+
+        /* make sure directory can still be opened */
+        dir->dirstream = opendir(dir->path_key);
+
+        if (dir->dirstream)
+          rehash = 1;
+        else
+          return 0; /* couldn't re-read - fail */
+      } else
+#endif
     /* The directory has been all read in.  */
       return 0;
     }
@@ -447,12 +503,33 @@ dir_contents_file_exists_p (dir, filename)
       for (i = 0; i < len; ++i)
 	HASHI (newhash, d->d_name[i]);
       newhash %= DIRFILE_BUCKETS;
+#ifdef WIN32
+      /*
+       * If re-reading a directory, check that this file isn't already
+       * in the cache.
+       */
+      if (rehash) {
+        for (df = dir->files[newhash]; df != 0; df = df->next)
+          if (streq(df->name, d->d_name))
+            break;
+      } else
+        df = 0;
+
+      /*
+       * If re-reading a directory, don't cache files that have
+       * already been discovered.
+       */
+      if (!df) {
+#endif
 
       df = (struct dirfile *) xmalloc (sizeof (struct dirfile));
       df->next = dir->files[newhash];
       dir->files[newhash] = df;
       df->name = savestring (d->d_name, len);
       df->impossible = 0;
+#ifdef WIN32
+      }
+#endif
       /* Check if the name matches the one we're searching for.  */
       if (filename != 0
 	  && newhash == hash && strieq (d->d_name, filename))
@@ -506,6 +583,10 @@ file_exists_p (name)
     return dir_file_exists_p ("[]", name);
 #else /* !VMS */
   dirend = rindex (name, '/');
+#ifdef WIN32
+  if (!dirend)
+    dirend = rindex(name, '\\');
+#endif /* WIN32 */
   if (dirend == 0)
     return dir_file_exists_p (".", name);
   if (dirend == 0)
@@ -569,6 +650,10 @@ file_impossible (filename)
 	 structure for it, but leave it out of the contents hash table.  */
       dir->contents = (struct directory_contents *)
 	xmalloc (sizeof (struct directory_contents));
+#ifdef WIN32
+      dir->contents->path_key = NULL;
+      dir->contents->mtime = 0;
+#else  /* WIN32 */
 #ifdef VMS
       dir->contents->dev = 0;
       dir->contents->ino[0] = dir->contents->ino[1] =
@@ -576,6 +661,7 @@ file_impossible (filename)
 #else
       dir->contents->dev = dir->contents->ino = 0;
 #endif
+#endif /* WIN32 */
       dir->contents->files = 0;
       dir->contents->dirstream = 0;
     }
@@ -616,6 +702,10 @@ file_impossible_p (filename)
     dir = find_directory ("[]")->contents;
 #else
   dirend = rindex (filename, '/');
+#ifdef WIN32
+  if (!dirend)
+    dirend = rindex (filename, '\\');
+#endif /* WIN32 */
   if (dirend == 0)
 #ifdef _AMIGA
     dir = find_directory ("")->contents;
@@ -685,6 +775,10 @@ print_dir_data_base ()
 	if (dir->contents == 0)
 	  printf ("# %s: could not be stat'd.\n", dir->name);
 	else if (dir->contents->files == 0)
+#ifdef WIN32
+          printf ("# %s (key %s, mtime %d): could not be opened.\n",
+                  dir->name, dir->contents->path_key,dir->contents->mtime);
+#else  /* WIN32 */
 #ifdef VMS
 	  printf ("# %s (device %d, inode [%d,%d,%d]): could not be opened.\n",
 		  dir->name, dir->contents->dev,
@@ -694,6 +788,7 @@ print_dir_data_base ()
 	  printf ("# %s (device %d, inode %d): could not be opened.\n",
 		  dir->name, dir->contents->dev, dir->contents->ino);
 #endif
+#endif /* WIN32 */
 	else
 	  {
 	    register unsigned int f = 0, im = 0;
@@ -705,6 +800,10 @@ print_dir_data_base ()
 		  ++im;
 		else
 		  ++f;
+#ifdef WIN32
+            printf ("# %s (key %s, mtime %d): ",
+                    dir->name, dir->contents->path_key, dir->contents->mtime);
+#else  /* WIN32 */
 #ifdef VMS
 	    printf ("# %s (device %d, inode [%d,%d,%d]): ",
 		    dir->name, dir->contents->dev,
@@ -714,6 +813,7 @@ print_dir_data_base ()
 	    printf ("# %s (device %d, inode %d): ",
 		    dir->name, dir->contents->dev, dir->contents->ino);
 #endif
+#endif /* WIN32 */
 	    if (f == 0)
 	      fputs ("No", stdout);
 	    else