2001-09-04 Andrew Choi <akochoi@cse.cuhk.edu.hk>

	* src/mac.c (stat): Don't fail for aliases.
	(sys_open) [__MRC__]: Set file creator and type for newly-created
	files.

diff --git a/mac/ChangeLog b/mac/ChangeLog
index 4030043afc906b421b8f9ef119140ee6a61f222f..8de7ed99e00a986c4504cfbf5607ea5d0d456904 100644 (file)
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-04  Andrew Choi  <akochoi@cse.cuhk.edu.hk>
+
+       * src/mac.c (stat): Don't fail for aliases.
+       (sys_open) [__MRC__]: Set file creator and type for newly-created
+       files.
+
 2001-08-24  Andrew Choi  <akochoi@cse.cuhk.edu.hk>
 
        * src/macterm.c (init_font_name_table): Add an additional entry to

diff --git a/mac/src/mac.c b/mac/src/mac.c
index e588fd38fb92bbcaaebb6761c1b94abc28a1e4ff..0aaad884f6d52e49a4d2e196823421c67059b24d 100644 (file)
--- a/mac/src/mac.c
+++ b/mac/src/mac.c
@@ -330,8 +330,8 @@ stat_noalias (const char *path, struct stat *buf)
   if (cipb.hFileInfo.ioFlFndrInfo.fdFlags & 0x8000)
     {
       /* identify alias files as symlinks */
-      buf->st_mode |= S_IFLNK;
       buf->st_mode &= ~S_IFREG;
+      buf->st_mode |= S_IFLNK;
     }
 
   buf->st_nlink = 1;
@@ -367,7 +367,8 @@ stat (const char *path, struct stat *sb)
   char true_pathname[MAXPATHLEN+1], fully_resolved_name[MAXPATHLEN+1];  
   int len;
   
-  if ((result = stat_noalias (path, sb)) >= 0)
+  if ((result = stat_noalias (path, sb)) >= 0 &&
+      ! (sb->st_mode & S_IFLNK))
     return result;
 
   if (find_true_pathname (path, true_pathname, MAXPATHLEN+1) == -1)
@@ -605,10 +606,14 @@ sys_open (const char *path, int oflag)
   else
     {
 #ifdef __MRC__
-      if (oflag == O_WRONLY || oflag == O_RDWR)
+      int res = open (mac_pathname, oflag);
+      /* if (oflag == O_WRONLY || oflag == O_RDWR) */
+      if (oflag & O_CREAT)
         fsetfileinfo (mac_pathname, 'EMAx', 'TEXT');
-#endif
+      return res;
+#else
       return open (mac_pathname, oflag);
+#endif
     }
 }