diff -Naur -x '*~' -x '*.orig' ../../../cygwin-cvs.orig/winsup/cygwin/dir.cc ./dir.cc
--- ../../../cygwin-cvs.orig/winsup/cygwin/dir.cc	2003-11-18 12:55:06.108352000 -0600
+++ ./dir.cc	2003-11-18 12:59:50.907873600 -0600
@@ -283,8 +283,8 @@
   if (CreateDirectoryA (real_dir.get_win32 (), &sa))
     {
       if (!allow_ntsec && allow_ntea)
-	set_file_attribute (real_dir.has_acls (), real_dir.get_win32 (),
-			    S_IFDIR | ((mode & 07777) & ~cygheap->umask));
+	set_file_permissions (real_dir.has_acls (), real_dir.get_win32 (),
+			      S_IFDIR | ((mode & 07777) & ~cygheap->umask));
 #ifdef HIDDEN_DOT_FILES
       char *c = strrchr (real_dir.get_win32 (), '\\');
       if ((c && c[1] == '.') || *real_dir.get_win32 () == '.')
diff -Naur -x '*~' -x '*.orig' ../../../cygwin-cvs.orig/winsup/cygwin/fhandler_disk_file.cc ./fhandler_disk_file.cc
--- ../../../cygwin-cvs.orig/winsup/cygwin/fhandler_disk_file.cc	2003-11-18 12:55:07.490339200 -0600
+++ ./fhandler_disk_file.cc	2003-11-18 12:59:50.947931200 -0600
@@ -291,15 +291,15 @@
     {
       /* symlinks are everything for everyone! */
       buf->st_mode = S_IFLNK | S_IRWXU | S_IRWXG | S_IRWXO;
-      get_file_attribute (pc.has_acls (), get_win32_name (), NULL,
-			  &buf->st_uid, &buf->st_gid);
+      get_file_permissions (pc.has_acls (), get_win32_name (), NULL,
+			    &buf->st_uid, &buf->st_gid);
       goto done;
     }
   else if (pc.issocket ())
     buf->st_mode = S_IFSOCK;
 
-  if (get_file_attribute (pc.has_acls (), get_win32_name (), &buf->st_mode,
-			  &buf->st_uid, &buf->st_gid) == 0)
+  if (get_file_permissions (pc.has_acls (), get_win32_name (), &buf->st_mode,
+			    &buf->st_uid, &buf->st_gid) == 0)
     {
       /* If read-only attribute is set, modify ntsec return value */
       if (pc.has_attribute (FILE_ATTRIBUTE_READONLY) && !get_symlink_p ())
@@ -422,7 +422,7 @@
   if (flags & O_CREAT
       && GetLastError () != ERROR_ALREADY_EXISTS
       && !allow_ntsec && allow_ntea)
-    set_file_attribute (has_acls (), get_win32_name (), mode);
+    set_file_permissions (has_acls (), get_win32_name (), mode);
 
   set_fs_flags (pc.fs_flags ());
   set_symlink_p (pc.issymlink ());
diff -Naur -x '*~' -x '*.orig' ../../../cygwin-cvs.orig/winsup/cygwin/path.cc ./path.cc
--- ../../../cygwin-cvs.orig/winsup/cygwin/path.cc	2003-11-18 12:55:16.212881600 -0600
+++ ./path.cc	2003-11-18 12:59:51.028046400 -0600
@@ -2611,9 +2611,9 @@
 	{
 	  CloseHandle (h);
 	  if (!allow_ntsec && allow_ntea)
-	    set_file_attribute (win32_path.has_acls (),
-				win32_path.get_win32 (),
-				S_IFLNK | S_IRWXU | S_IRWXG | S_IRWXO);
+	    set_file_permissions (win32_path.has_acls (),
+				  win32_path.get_win32 (),
+				  S_IFLNK | S_IRWXU | S_IRWXG | S_IRWXO);
 
 	  DWORD attr = use_winsym ? FILE_ATTRIBUTE_READONLY
 	    			  : FILE_ATTRIBUTE_SYSTEM;
diff -Naur -x '*~' -x '*.orig' ../../../cygwin-cvs.orig/winsup/cygwin/security.cc ./security.cc
--- ../../../cygwin-cvs.orig/winsup/cygwin/security.cc	2003-11-18 12:55:19.217201600 -0600
+++ ./security.cc	2003-11-18 12:59:51.058089600 -0600
@@ -1377,8 +1377,8 @@
 }
 
 int
-get_file_attribute (int use_ntsec, const char *file,
-		    mode_t *attribute, __uid32_t *uidret, __gid32_t *gidret)
+get_file_permissions (int use_ntsec, const char *file,
+		      mode_t *attribute, __uid32_t *uidret, __gid32_t *gidret)
 {
   int res;
   syscall_printf ("file: %s", file);
@@ -1843,8 +1843,8 @@
 }
 
 int
-set_file_attribute (int use_ntsec, const char *file,
-		    __uid32_t uid, __gid32_t gid, int attribute)
+set_file_permissions (int use_ntsec, const char *file,
+		      __uid32_t uid, __gid32_t gid, int attribute)
 {
   int ret = 0;
 
@@ -1856,16 +1856,16 @@
       __seterrno ();
       ret = -1;
     }
-  syscall_printf ("%d = set_file_attribute (%s, %d, %d, %p)",
+  syscall_printf ("%d = set_file_permissions (%s, %d, %d, %p)",
 		  ret, file, uid, gid, attribute);
   return ret;
 }
 
 int
-set_file_attribute (int use_ntsec, const char *file, int attribute)
+set_file_permissions (int use_ntsec, const char *file, int attribute)
 {
-  return set_file_attribute (use_ntsec, file,
-			     myself->uid, myself->gid, attribute);
+  return set_file_permissions (use_ntsec, file,
+			       myself->uid, myself->gid, attribute);
 }
 
 int
diff -Naur -x '*~' -x '*.orig' ../../../cygwin-cvs.orig/winsup/cygwin/security.h ./security.h
--- ../../../cygwin-cvs.orig/winsup/cygwin/security.h	2003-11-18 12:55:19.257259200 -0600
+++ ./security.h	2003-11-18 12:59:51.458665600 -0600
@@ -218,10 +218,10 @@
 
 /* File manipulation */
 int __stdcall set_process_privileges ();
-int __stdcall get_file_attribute (int, const char *, mode_t *,
+int __stdcall get_file_permissions (int, const char *, mode_t *,
 				  __uid32_t * = NULL, __gid32_t * = NULL);
-int __stdcall set_file_attribute (int, const char *, int);
-int __stdcall set_file_attribute (int, const char *, __uid32_t, __gid32_t, int);
+int __stdcall set_file_permissions (int, const char *, int);
+int __stdcall set_file_permissions (int, const char *, __uid32_t, __gid32_t, int);
 int __stdcall get_object_attribute (HANDLE handle, SE_OBJECT_TYPE object_type, mode_t *,
 				  __uid32_t * = NULL, __gid32_t * = NULL);
 LONG __stdcall read_sd(const char *file, PSECURITY_DESCRIPTOR sd_buf, LPDWORD sd_size);
diff -Naur -x '*~' -x '*.orig' ../../../cygwin-cvs.orig/winsup/cygwin/syscalls.cc ./syscalls.cc
--- ../../../cygwin-cvs.orig/winsup/cygwin/syscalls.cc	2003-11-18 12:55:20.348828800 -0600
+++ ./syscalls.cc	2003-11-18 12:59:51.478694400 -0600
@@ -842,12 +842,12 @@
       mode_t attrib = 0;
       if (win32_path.isdir ())
 	attrib |= S_IFDIR;
-      res = get_file_attribute (win32_path.has_acls (),
-				win32_path.get_win32 (),
-				&attrib);
+      res = get_file_permissions (win32_path.has_acls (),
+				  win32_path.get_win32 (),
+				  &attrib);
       if (!res)
-	 res = set_file_attribute (win32_path.has_acls (), win32_path, uid,
-				   gid, attrib);
+	 res = set_file_permissions (win32_path.has_acls (), win32_path, uid,
+				     gid, attrib);
       if (res != 0 && (!win32_path.has_acls () || !allow_ntsec))
 	{
 	  /* fake - if not supported, pretend we're like win95
@@ -977,8 +977,8 @@
 
       if (win32_path.isdir ())
 	mode |= S_IFDIR;
-      if (!set_file_attribute (win32_path.has_acls (), win32_path,
-			       ILLEGAL_UID, ILLEGAL_GID, mode)
+      if (!set_file_permissions (win32_path.has_acls (), win32_path,
+				 ILLEGAL_UID, ILLEGAL_GID, mode)
 	  && allow_ntsec)
 	res = 0;