Formerly dir-unlink.c.~2~

1 files changed, 81 insertions, 0 deletions

diff --git a/libdiskfs/dir-unlink.c b/libdiskfs/dir-unlink.c
new file mode 100644
index 00000000..76526832
--- /dev/null
+++ b/libdiskfs/dir-unlink.c
@@ -0,0 +1,81 @@
+/* libdiskfs implementation of fs.defs: dir_unlink
+   Copyright (C) 1992, 1993, 1994 Free Software Foundation
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2, or (at
+   your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+
+#include "priv.h"
+
+/* Implement dir_unlink as described in <hurd/fs.defs>. */
+error_t
+diskfs_S_dir_unlink (struct protid *dircred,
+		     char *name)
+{
+  struct node *dnp;
+  struct node *np;
+  struct dirstat *ds = alloca (diskfs_dirstat_size);
+  error_t error;
+
+  if (!dircred)
+    return EOPNOTSUPP;
+  
+  dnp = dircred->po->np;
+  if (readonly)
+    return EROFS;
+
+  mutex_lock (&dnp->lock);
+
+  error = diskfs_lookup (dnp, name, REMOVE, &np, ds, dircred);
+  if (error == EAGAIN)
+    error = EISDIR;
+  if (error)
+    {
+      diskfs_drop_dirstat (ds);
+      mutex_unlock (&dnp->lock);
+      return error;
+    }
+  
+  /* This isn't the BSD behavior, but it is Posix compliant and saves
+     us on several race conditions.*/
+  if (S_ISDIR(np->dn_stat.st_mode))
+    {
+      if (np == dnp)		/* gotta catch '.' */
+	diskfs_nrele (np);
+      else
+	diskfs_nput (np);
+      diskfs_drop_dirstat (ds);
+      mutex_unlock (&dnp->lock);
+      return EISDIR;
+    }
+
+  error = diskfs_dirremove (dnp, ds);
+  if (error)
+    {
+      diskfs_nput (np);
+      mutex_unlock (&dnp->lock);
+      return error;
+    }
+      
+  np->dn_stat.st_nlink--;
+  np->dn_set_ctime = 1;
+
+  /* This check is necessary because we might get here on an error while 
+     checking the mode on something which happens to be `.'. */
+  if (np == dnp)
+    diskfs_nrele (np);	
+  else
+    diskfs_nput (np);
+  mutex_unlock (&dnp->lock);
+  return error;
+}