[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: CVS Feature Branch - Windows Build Broken - run_add_arg, run_piped
From: |
Conrad T. Pino |
Subject: |
RE: CVS Feature Branch - Windows Build Broken - run_add_arg, run_piped |
Date: |
Mon, 21 Feb 2005 13:42:43 -0800 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
The following patch fixes all build errors.
I don't claim it works and I don't claim it doesn't work.
It's a good guess and I'd appreciate feedback before committing.
Index: windows-NT/run.c
===================================================================
RCS file: /cvs/ccvs/windows-NT/run.c,v
retrieving revision 1.18
diff -u -p -r1.18 run.c
- --- windows-NT/run.c 22 Mar 2004 15:37:37 -0000 1.18
+++ windows-NT/run.c 21 Feb 2005 21:35:53 -0000
@@ -22,11 +22,6 @@
#include <io.h>
#include <fcntl.h>
- -static void run_add_arg( const char *s );
- -static void run_init_prog( void );
- -
- -extern char *strtok ();
- -
/*
* To exec a program under CVS, first call run_setup() to setup any initial
* arguments. The options to run_setup are essentially like printf(). The
@@ -72,13 +67,6 @@ run_setup (const char *prog)
free (run_prog);
}
- -void
- -run_arg (s)
- - const char *s;
- -{
- - run_add_arg (s);
- -}
- -
/* Return a malloc'd copy of s, with double quotes around it. */
static char *
quote (const char *s)
@@ -108,7 +96,7 @@ quote (const char *s)
return copy;
}
- -static void
+void
run_add_arg (s)
const char *s;
{
@@ -697,6 +685,15 @@ filter_stream_through_program (oldfd, di
}
+int
+run_piped (int *tofdp, int *fromfdp)
+{
+ run_add_arg (NULL);
+ return piped_child (run_argv, tofdp, fromfdp);
+}
+
+
+
/* Arrange for the file descriptor FD to not be inherited by child
processes. At the moment, CVS uses this function only on pipes
returned by piped_child, and our implementation of piped_child
-----BEGIN PGP SIGNATURE-----
Version: PGP 7.0.4
iQA/AwUBQhpV0rNM28ubzTo9EQJtCwCggQQBdckEYxiD59AJv5rFiJN6VG4AoL1S
0Hjqrccd7gIa/IrUfFLLU6RZ
=zCTd
-----END PGP SIGNATURE-----