check unlink of non-empty directory

c88bf235 · rsc · bd39955e · c88bf235
--- a/usertests.c
+++ b/usertests.c
@@ -783,6 +783,11 @@ subdir(void)
  write(fd, "ff", 2);
  close(fd);
+  if(unlink("dd") >= 0){
+    printf(1, "unlink dd (non-empty dir) succeeded!\n");
+    exit();
+  }
  if(mkdir("/dd/dd") != 0){
    printf(1, "subdir mkdir dd/dd failed\n");
    exit();
@@ -817,6 +822,10 @@ subdir(void)
    printf(1, "unlink dd/dd/ff failed\n");
    exit();
  }
+  if(open("dd/dd/ff", O_RDONLY) >= 0){
+    printf(1, "open (unlinked) dd/dd/ff succeeded\n");
+    exit();
+  }
  if(chdir("dd") != 0){
    printf(1, "chdir dd failed\n");
@@ -826,6 +835,10 @@ subdir(void)
    printf(1, "chdir dd/../../dd failed\n");
    exit();
  }
+  if(chdir("dd/../../../dd") != 0){
+    printf(1, "chdir dd/../../dd failed\n");
+    exit();
+  }
  if(chdir("./..") != 0){
    printf(1, "chdir ./.. failed\n");
    exit();
@@ -842,8 +855,8 @@ subdir(void)
  }
  close(fd);
-  if(open("dd/dd/ff", 0) >= 0){
+  if(open("dd/dd/ff", O_RDONLY) >= 0){
-    printf(1, "open dd/dd/ff succeeded!\n");
+    printf(1, "open (unlinked) dd/dd/ff succeeded!\n");
    exit();
  }
@@ -916,9 +929,18 @@ subdir(void)
    printf(1, "unlink dd/ff failed\n");
    exit();
  }
+  if(unlink("dd") == 0){
-  // unlink dd/dd
+    printf(1, "unlink non-empty dd succeeded!\n");
-  // unlink dd
+    exit();
+  }
+  if(unlink("dd/dd") < 0){
+    printf(1, "unlink dd/dd failed\n");
+    exit();
+  }
+  if(unlink("dd") < 0){
+    printf(1, "unlink dd failed\n");
+    exit();
+  }
  printf(1, "subdir ok\n");
 }