[MinGW-cvs] msys/rt/src/winsup/cygwin ChangeLog.MSYS,1.19,1.20 msys_symlink.cc,1.2,1.3

[<ea...@us...>]

Update of /cvsroot/mingw/msys/rt/src/winsup/cygwin
In directory usw-pr-cvs1:/tmp/cvs-serv13836

Modified Files:
	ChangeLog.MSYS msys_symlink.cc 
Log Message:

	* msys_symlink.cc: Don't recurse into created symlink directory.



Index: ChangeLog.MSYS
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/ChangeLog.MSYS,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ChangeLog.MSYS	17 Jul 2002 13:06:56 -0000	1.19
--- ChangeLog.MSYS	19 Jul 2002 16:13:25 -0000	1.20
***************
*** 1,2 ****
--- 1,6 ----
+ 2002-07-19  Earnie Boyd  <ea...@us...>
+ 
+ 	* msys_symlink.cc: Don't recurse into created symlink directory.
+ 
  2002-07-17  Earnie Boyd  <ea...@us...>
  

Index: msys_symlink.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/msys_symlink.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** msys_symlink.cc	17 Jul 2002 13:06:56 -0000	1.2
--- msys_symlink.cc	19 Jul 2002 16:13:25 -0000	1.3
***************
*** 16,19 ****
--- 16,20 ----
    char wtopath[MAX_PATH] = "\0";
    char wfrompath[MAX_PATH] = "\0";
+   static char dir_created[MAX_PATH];
    char *w_topath = wtopath;
    char *w_frompath = wfrompath;
***************
*** 109,112 ****
--- 110,115 ----
  	      return 1;
  	    }
+ 	  strcpy(dir_created, "./\0");
+ 	  strcat(dir_created, w_topath);
  	}
        else
***************
*** 132,141 ****
  		strcat(fromfile, "/");
  	    strcat(fromfile, dHfile->cFileName);
! 	    strcpy(tofile, w_topath);
! 	    //if (topath_needs_slash)
! 		strcat(tofile, "/");
! 	    strcat(tofile, dHfile->cFileName);
! 	    if (msys_symlink (tofile, fromfile))
! 		return 1;
  	    findfiles = FindNextFile (dH, dHfile);
  	    debug_printf("dHfile(4): %s", dHfile->cFileName);
--- 135,148 ----
  		strcat(fromfile, "/");
  	    strcat(fromfile, dHfile->cFileName);
! 	    debug_printf("%s <-> %s", fromfile, dir_created);
! 	    if (strcmp (fromfile, dir_created))
! 	      {
! 		strcpy(tofile, w_topath);
! 		//if (topath_needs_slash)
! 		    strcat(tofile, "/");
! 		strcat(tofile, dHfile->cFileName);
! 		if (msys_symlink (tofile, fromfile))
! 		    return 1;
! 	      }
  	    findfiles = FindNextFile (dH, dHfile);
  	    debug_printf("dHfile(4): %s", dHfile->cFileName);