Message-ID: <39A42E75.27997F34@softhome.net>
Date: Wed, 23 Aug 2000 22:05:09 +0200
From: Laurynas Biveinis <lauras AT softhome DOT net>
X-Mailer: Mozilla 4.74 [en] (Win98; U)
X-Accept-Language: lt,en
MIME-Version: 1.0
To: DJGPP Workers <djgpp-workers AT delorie DOT com>
Subject: Patch: symlinks in remove()
Content-Type: text/plain; charset=iso-8859-4
Content-Transfer-Encoding: 7bit
Reply-To: djgpp-workers AT delorie DOT com

Relinked rm with this patch works as Eli
thinks it should. Of course, it depends,
on earlier not-yet-commit __solve_dir_symlinks()
patch.

Any comments?

Laurynas

Index: remove.c
===================================================================
RCS file: /cvs/djgpp/djgpp/src/libc/ansi/stdio/remove.c,v
retrieving revision 1.4
diff -u -p -r1.4 remove.c
--- remove.c	2000/04/25 14:06:20	1.4
+++ remove.c	2000/08/23 19:56:25
@@ -1,7 +1,9 @@
+/* Copyright (C) 2000 DJ Delorie, see COPYING.DJ for details */
 /* Copyright (C) 1998 DJ Delorie, see COPYING.DJ for details */
 /* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */
 /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
 #include <libc/stubs.h>
+#include <libc/symlink.h>
 #include <io.h>
 #include <stdio.h>
 #include <fcntl.h>
@@ -18,14 +20,19 @@ remove(const char *fn)
   unsigned attr;
   int directory_p;
   int use_lfn = _USE_LFN;
+  char real_name[FILENAME_MAX];
   int rv;
 
   /* see if a file system extension wants to handle this */
   if (__FSEXT_call_open_handlers(__FSEXT_unlink, &rv, &fn))
     return rv;
 
+  /* Handle symlinks */
+  if (!__solve_dir_symlinks(fn, real_name))
+    return -1;
+
   /* Get the file attribute byte.  */
-  attr = _chmod(fn, 0);
+  attr = _chmod(real_name, 0);
 
   /* The above _chmod will return -1 if the file
      does not exist.  If it doesn't, don't bother
@@ -41,7 +48,7 @@ remove(const char *fn)
  
   /* Now, make the file writable.  We must reset Vol, Dir, Sys and Hidden bits 
      in addition to the Read-Only bit, or else 214301 will fail.  */
-  _chmod(fn, 1, attr & 0xffe0);
+  _chmod(real_name, 1, attr & 0xffe0);
 
   /* Now delete it.  Note, _chmod leaves dir name in transfer buffer. */
   if (directory_p)
@@ -67,7 +74,7 @@ remove(const char *fn)
     if(e == ENOENT)
       e = EACCES;
  
-    _chmod(fn, 1, attr & 0xffe7);
+    _chmod(real_name, 1, attr & 0xffe7);
     errno = e;
     return -1;
   }