Author: mturk Date: Fri Jan 15 16:03:15 2010 New Revision: 899675 URL: http://svn.apache.org/viewvc?rev=899675&view=rev Log: Fix copy/paste typos
Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/pipe.c Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/pipe.c URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/pipe.c?rev=899675&r1=899674&r2=899675&view=diff ============================================================================== --- commons/sandbox/runtime/trunk/src/main/native/os/unix/pipe.c (original) +++ commons/sandbox/runtime/trunk/src/main/native/os/unix/pipe.c Fri Jan 15 16:03:15 2010 @@ -299,7 +299,7 @@ int pd; int mode = flags == ACR_PIPE_READ_BLOCK ? O_RDONLY : O_WRONLY; - pd = nullpipe(mode, NULL); + pd = nullpipe(mode, -1); if (pd == -1) return ACR_GET_OS_ERROR(); /* We have two handles created. @@ -310,7 +310,7 @@ rc = ACR_ENOMEM; goto finally; } - (*fd)->fd = hp; + (*fd)->fd = pd; (*fd)->name = ACR_strdup(_dev_null); (*fd)->flags = flags; (*fd)->type = ACR_FT_PIPE; @@ -320,12 +320,11 @@ return 0; finally: - CloseHandle(hp); + r_close(pd); return rc; } -static int do_popen(JNIEnv *_E, acr_file_t *fp, int flags, - jobject *fdo) +static int do_popen(JNIEnv *_E, acr_file_t *fp, jobject *fdo) { int rc = 0; int fo;