From 7535f6533cf76770bc3cc3fc86554e7c18b36c95 Mon Sep 17 00:00:00 2001
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Wed, 9 Mar 2011 22:50:15 +0000
Subject: [PATCH] Pass descriptor number to write(2), now that it is possible.

---
 tools/regression/pjdfstest/pjdfstest.c      | 4 ++--
 tools/regression/pjdfstest/tests/chmod/12.t | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/regression/pjdfstest/pjdfstest.c b/tools/regression/pjdfstest/pjdfstest.c
index 9c4ec1de866..db3bc553b23 100644
--- a/tools/regression/pjdfstest/pjdfstest.c
+++ b/tools/regression/pjdfstest/pjdfstest.c
@@ -163,7 +163,7 @@ static struct syscall_desc syscalls[] = {
 	{ "prependacl", ACTION_PREPENDACL, { TYPE_STRING, TYPE_STRING, TYPE_NONE } },
 	{ "readacl", ACTION_READACL, { TYPE_STRING, TYPE_NONE } },
 #endif
-	{ "write", ACTION_WRITE, { TYPE_NUMBER, TYPE_NONE } },
+	{ "write", ACTION_WRITE, { TYPE_NUMBER, TYPE_STRING, TYPE_NONE } },
 	{ NULL, -1, { TYPE_NONE } }
 };
 
@@ -745,7 +745,7 @@ call_syscall(struct syscall_desc *scall, char *argv[])
 		break;
 #endif
 	case ACTION_WRITE:
-		rval = write(DESC(0), "x", 1);
+		rval = write(DESC(0), STR(1), strlen(STR(1)));
 		break;
 	default:
 		fprintf(stderr, "unsupported syscall\n");
diff --git a/tools/regression/pjdfstest/tests/chmod/12.t b/tools/regression/pjdfstest/tests/chmod/12.t
index 0c72bd76f75..4b5c58cd527 100644
--- a/tools/regression/pjdfstest/tests/chmod/12.t
+++ b/tools/regression/pjdfstest/tests/chmod/12.t
@@ -18,13 +18,13 @@ cd ${n2}
 
 # Check whether writing to the file by non-owner clears the SUID.
 expect 0 create ${n0} 04777
-expect 0 -u 65534 -g 65534 write ${n0} x
+expect 0 -u 65534 -g 65534 open ${n0} O_WRONLY : write 0 x
 expect 0777 stat ${n0} mode
 expect 0 unlink ${n0}
 
 # Check whether writing to the file by non-owner clears the SGID.
 expect 0 create ${n0} 02777
-expect 0 -u 65534 -g 65534 write ${n0} x
+expect 0 -u 65534 -g 65534 open ${n0} O_RDWR : write 0 x
 expect 0777 stat ${n0} mode
 expect 0 unlink ${n0}