[src/netbsd-7]: src/lib/libperfuse Pull up following revision(s) (requested b...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bc3285662d9c
branches:  netbsd-7
changeset: 798327:bc3285662d9c
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Sep 08 19:09:07 2014 +0000

description:
Pull up following revision(s) (requested by manu in ticket #78):
        lib/libperfuse/ops.c: revision 1.73
rmdir dir/.. must return an error. Use ENOTEMPTY like FFS does.

diffstat:

 lib/libperfuse/ops.c |  8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diffs (22 lines):

diff -r 7ff403e0e0a3 -r bc3285662d9c lib/libperfuse/ops.c
--- a/lib/libperfuse/ops.c      Mon Sep 08 19:06:35 2014 +0000
+++ b/lib/libperfuse/ops.c      Mon Sep 08 19:09:07 2014 +0000
@@ -1,4 +1,4 @@
-/*  $NetBSD: ops.c,v 1.66.2.2 2014/08/30 19:30:28 martin Exp $ */
+/*  $NetBSD: ops.c,v 1.66.2.3 2014/09/08 19:09:07 msaitoh Exp $ */
 
 /*-
  *  Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -2343,6 +2343,12 @@
            (PERFUSE_NODE_DATA(targ)->pnd_flags & PND_REMOVED))
                return ENOENT;
 
+       /*
+        * Attempt to rmdir dir/.. shoud raise ENOTEMPTY
+        */
+       if (PERFUSE_NODE_DATA(targ)->pnd_nodeid == pnd->pnd_parent_nodeid)
+               return ENOTEMPTY;
+
        node_ref(opc);
        node_ref(targ);