mingw-cvs Mailing List for MinGW - Minimalist GNU for Windows

Update of /cvsroot/mingw/msys/rt/src/winsup/cygwin
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv31668

Modified Files:
	ChangeLog.MSYS dir.cc fhandler.cc path.cc sec_acl.cc spawn.cc 
	syscalls.cc winsup.h 
Log Message:
2006.07.26  Earnie Boyd <ea...@us...>

	* dir.cc (opendir): Revert PC_SYM_NOFOLLOW change.
	* fhandler.cc (fhandler_disk_file::open): Ditto.
	* path.cc (chdir): Ditto.
	(cygwin_conv_to_full_win32_path): Ditto.
	(realpath): Ditto.
	* sec_acl.cc (acl_worker): Ditto.
	* spawn.cc (perhaps_suffix): Ditto.
	* syscalls.cc (chown): Ditto.
	(fchown): Ditto.
	(stat_worker): Ditto.  Also revert nofollow change.
	(_stat): Revert nofollow change.
	(_lstat): Ditto.
	(pathconf): Revert PC_SYM_NOFOLLOW change.
	(statfs): Ditto.
	(chroot): Ditto.
	* winsup.h (stat_worker): Revert nofollow change.
	



Index: ChangeLog.MSYS
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/ChangeLog.MSYS,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** ChangeLog.MSYS	27 Apr 2006 15:40:26 -0000	1.83
--- ChangeLog.MSYS	26 Jul 2006 15:01:37 -0000	1.84
***************
*** 1,2 ****
--- 1,21 ----
+ 2006.07.26  Earnie Boyd <ea...@us...>
+ 
+ 	* dir.cc (opendir): Revert PC_SYM_NOFOLLOW change.
+ 	* fhandler.cc (fhandler_disk_file::open): Ditto.
+ 	* path.cc (chdir): Ditto.
+ 	(cygwin_conv_to_full_win32_path): Ditto.
+ 	(realpath): Ditto.
+ 	* sec_acl.cc (acl_worker): Ditto.
+ 	* spawn.cc (perhaps_suffix): Ditto.
+ 	* syscalls.cc (chown): Ditto.
+ 	(fchown): Ditto.
+ 	(stat_worker): Ditto.  Also revert nofollow change.
+ 	(_stat): Revert nofollow change.
+ 	(_lstat): Ditto.
+ 	(pathconf): Revert PC_SYM_NOFOLLOW change.
+ 	(statfs): Ditto.
+ 	(chroot): Ditto.
+ 	* winsup.h (stat_worker): Revert nofollow change.
+ 	
  2006.04.27  Earnie Boyd <ea...@us...>
  

Index: spawn.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/spawn.cc,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** spawn.cc	23 Apr 2006 13:01:56 -0000	1.26
--- spawn.cc	26 Jul 2006 15:01:37 -0000	1.27
***************
*** 62,66 ****
  
    debug_printf ("prog '%s'", prog);
!   buf.check (prog, PC_SYM_NOFOLLOW | PC_FULL, std_suffixes);
  
    if (buf.file_attributes () & FILE_ATTRIBUTE_DIRECTORY)
--- 62,66 ----
  
    debug_printf ("prog '%s'", prog);
!   buf.check (prog, PC_SYM_FOLLOW | PC_FULL, std_suffixes);
  
    if (buf.file_attributes () & FILE_ATTRIBUTE_DIRECTORY)

Index: sec_acl.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/sec_acl.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sec_acl.cc	30 Mar 2004 02:29:20 -0000	1.3
--- sec_acl.cc	26 Jul 2006 15:01:37 -0000	1.4
***************
*** 465,469 ****
  {
    extern suffix_info stat_suffixes[];
!   path_conv real_path (path, PC_SYM_NOFOLLOW | PC_FULL, stat_suffixes);
    if (real_path.error)
      {
--- 465,469 ----
  {
    extern suffix_info stat_suffixes[];
!   path_conv real_path (path, (nofollow ? PC_SYM_NOFOLLOW : PC_SYM_FOLLOW) | PC_FULL, stat_suffixes);
    if (real_path.error)
      {

Index: winsup.h
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/winsup.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** winsup.h	13 May 2005 11:55:03 -0000	1.17
--- winsup.h	26 Jul 2006 15:01:37 -0000	1.18
***************
*** 251,255 ****
  
  class path_conv;
! int __stdcall stat_worker (const char *name, struct __stat64 *buf,
  			   path_conv *pc = NULL) __attribute__ ((regparm (3)));
  int __stdcall low_priority_sleep (DWORD) __attribute__ ((regparm (1)));
--- 251,255 ----
  
  class path_conv;
! int __stdcall stat_worker (const char *name, struct __stat64 *buf, int nofollow,
  			   path_conv *pc = NULL) __attribute__ ((regparm (3)));
  int __stdcall low_priority_sleep (DWORD) __attribute__ ((regparm (1)));

Index: syscalls.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/syscalls.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** syscalls.cc	23 Apr 2006 13:01:56 -0000	1.13
--- syscalls.cc	26 Jul 2006 15:01:37 -0000	1.14
***************
*** 796,800 ****
  {
    sigframe thisframe (mainthread);
!   return chown_worker (name, PC_SYM_NOFOLLOW, uid, gid);
  }
  
--- 796,800 ----
  {
    sigframe thisframe (mainthread);
!   return chown_worker (name, PC_SYM_FOLLOW, uid, gid);
  }
  
***************
*** 828,832 ****
    syscall_printf ("fchown (%d,...): calling chown_worker (%s,FOLLOW,...)",
  		  fd, path);
!   return chown_worker (path, PC_SYM_NOFOLLOW, uid, gid);
  }
  
--- 828,832 ----
    syscall_printf ("fchown (%d,...): calling chown_worker (%s,FOLLOW,...)",
  		  fd, path);
!   return chown_worker (path, PC_SYM_FOLLOW, uid, gid);
  }
  
***************
*** 1059,1063 ****
  /* Cygwin internal */
  static int
! stat_worker (const char *caller, const char *name, struct stat *buf)
  {
    int res = -1;
--- 1059,1063 ----
  /* Cygwin internal */
  static int
! stat_worker (const char *caller, const char *name, struct stat *buf, int nofollow)
  {
    int res = -1;
***************
*** 1074,1080 ****
    MALLOC_CHECK;
  
!   debug_printf ("stat_worker (%s (%s, %p) %s)", caller, name, buf, buf);
  
!   path_conv real_path (name, PC_SYM_NOFOLLOW | PC_FULL, stat_suffixes);
  
    if (real_path.error)
--- 1074,1080 ----
    MALLOC_CHECK;
  
!   debug_printf ("stat_worker (%s (%s, %p) %s)", caller, name, buf, buf, nofollow);
  
!   path_conv real_path (name, (nofollow ? PC_SYM_NOFOLLOW : PC_SYM_FOLLOW) | PC_FULL, stat_suffixes);
  
    if (real_path.error)
***************
*** 1104,1108 ****
  	&& dtype != DRIVE_UNKNOWN)))
      {
!       oret = fh.open (real_path, O_RDONLY | O_BINARY | O_DIROPEN | O_NOSYMLINK, 0);
        /* If we couldn't open the file, try a "query open" with no permissions.
  	 This will allow us to determine *some* things about the file, at least. */
--- 1104,1109 ----
  	&& dtype != DRIVE_UNKNOWN)))
      {
!       oret = fh.open (real_path, O_RDONLY | O_BINARY | O_DIROPEN | 
! 				(nofollow ? O_NOSYMLINK : 0), 0);
        /* If we couldn't open the file, try a "query open" with no permissions.
  	 This will allow us to determine *some* things about the file, at least. */
***************
*** 1110,1114 ****
  	{
  	  fh.set_query_open (TRUE);
! 	  oret = fh.open (real_path, O_RDONLY | O_BINARY | O_DIROPEN | O_NOSYMLINK, 0);
  	}
        /* Check a special case here. If ntsec is ON it happens
--- 1111,1116 ----
  	{
  	  fh.set_query_open (TRUE);
! 	  oret = fh.open (real_path, O_RDONLY | O_BINARY | O_DIROPEN | 
! 				(nofollow ? O_NOSYMLINK : 0), 0);
  	}
        /* Check a special case here. If ntsec is ON it happens
***************
*** 1122,1126 ****
  	{
  	  set_file_attribute (TRUE, real_path, 0400);
! 	  oret = fh.open (real_path, O_RDONLY | O_BINARY | O_DIROPEN | O_NOSYMLINK, 0);
  	  set_file_attribute (TRUE, real_path.get_win32 (), 0);
  	}
--- 1124,1129 ----
  	{
  	  set_file_attribute (TRUE, real_path, 0400);
! 	  oret = fh.open (real_path, O_RDONLY | O_BINARY | O_DIROPEN | 
! 				(nofollow ? O_NOSYMLINK : 0), 0);
  	  set_file_attribute (TRUE, real_path.get_win32 (), 0);
  	}
***************
*** 1204,1208 ****
    TRACE_IN;
    sigframe thisframe (mainthread);
!   return stat_worker ("stat", name, buf);
  }
  
--- 1207,1211 ----
    TRACE_IN;
    sigframe thisframe (mainthread);
!   return stat_worker ("stat", name, buf, 0);
  }
  
***************
*** 1213,1217 ****
    TRACE_IN;
    sigframe thisframe (mainthread);
!   return stat_worker ("lstat", name, buf);
  }
  
--- 1216,1220 ----
    TRACE_IN;
    sigframe thisframe (mainthread);
!   return stat_worker ("lstat", name, buf, 1);
  }
  
***************
*** 1601,1605 ****
      case _PC_POSIX_SECURITY:
        {
! 	path_conv full_path (file, PC_SYM_NOFOLLOW | PC_FULL);
  	if (full_path.error)
  	  {
--- 1604,1608 ----
      case _PC_POSIX_SECURITY:
        {
! 	path_conv full_path (file, PC_SYM_FOLLOW | PC_FULL);
  	if (full_path.error)
  	  {
***************
*** 1863,1867 ****
      }
  
!   path_conv full_path (fname, PC_SYM_NOFOLLOW | PC_FULL);
    char *root = rootdir (full_path);
  
--- 1866,1870 ----
      }
  
!   path_conv full_path (fname, PC_SYM_FOLLOW | PC_FULL);
    char *root = rootdir (full_path);
  
***************
*** 2333,2337 ****
    sigframe thisframe (mainthread);
    int ret = -1;
!   path_conv path (newroot, PC_SYM_NOFOLLOW | PC_FULL);
  
    if (path.error)
--- 2336,2340 ----
    sigframe thisframe (mainthread);
    int ret = -1;
!   path_conv path (newroot, PC_SYM_FOLLOW | PC_FULL);
  
    if (path.error)

Index: path.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/path.cc,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** path.cc	23 Apr 2006 13:01:56 -0000	1.47
--- path.cc	26 Jul 2006 15:01:37 -0000	1.48
***************
*** 2806,2810 ****
    /* Convert path.  First argument ensures that we don't check for NULL/empty/invalid
       again. */
!   path_conv path (PC_NONULLEMPTY, dir, PC_FULL | PC_SYM_NOFOLLOW);
    if (path.error)
      {
--- 2806,2810 ----
    /* Convert path.  First argument ensures that we don't check for NULL/empty/invalid
       again. */
!   path_conv path (PC_NONULLEMPTY, dir, PC_FULL | PC_SYM_FOLLOW);
    if (path.error)
      {
***************
*** 3385,3389 ****
  {
    TRACE_IN;
!   path_conv p (path, PC_SYM_NOFOLLOW | PC_FULL);
    if (p.error)
      {
--- 3385,3389 ----
  {
    TRACE_IN;
!   path_conv p (path, PC_SYM_FOLLOW | PC_FULL);
    if (p.error)
      {
***************
*** 3429,3433 ****
    int err;
  
!   path_conv real_path (path, PC_SYM_NOFOLLOW | PC_FULL);
  
    if (real_path.error)
--- 3429,3433 ----
    int err;
  
!   path_conv real_path (path, PC_SYM_FOLLOW | PC_FULL);
  
    if (real_path.error)

Index: dir.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/dir.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** dir.cc	30 Mar 2004 02:29:20 -0000	1.6
--- dir.cc	26 Jul 2006 15:01:37 -0000	1.7
***************
*** 84,88 ****
    struct stat statbuf;
  
!   path_conv real_dirname (dirname, PC_SYM_NOFOLLOW | PC_FULL);
  
    if (real_dirname.error)
--- 84,88 ----
    struct stat statbuf;
  
!   path_conv real_dirname (dirname, PC_SYM_FOLLOW | PC_FULL);
  
    if (real_dirname.error)

Index: fhandler.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/fhandler.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** fhandler.cc	27 Apr 2006 15:40:27 -0000	1.10
--- fhandler.cc	26 Jul 2006 15:01:37 -0000	1.11
***************
*** 1231,1238 ****
    syscall_printf ("(%s, %p)", path, flags);
  
!   path_conv real_path (path, PC_SYM_NOFOLLOW);
  
    if (real_path.error &&
!       (real_path.error != ENOENT
         || !(flags & O_CREAT) || real_path.case_clash))
      {
--- 1231,1238 ----
    syscall_printf ("(%s, %p)", path, flags);
  
!   path_conv real_path (path, (flags & O_NOSYMLINK) ? PC_SYM_NOFOLLOW : PC_SYM_FOLLOW);
  
    if (real_path.error &&
!       (flags & O_NOSYMLINK || real_path.error != ENOENT
         || !(flags & O_CREAT) || real_path.case_clash))
      {