Revision: 396
http://rpy.svn.sourceforge.net/rpy/?rev=396&view=rev
Author: warnes
Date: 2008-01-07 08:03:16 -0800 (Mon, 07 Jan 2008)
Log Message:
-----------
Add ability to pass command-line argumnents to init_embedded_win32
Modified Paths:
--------------
trunk/rpy/src/rpymodule.c
Modified: trunk/rpy/src/rpymodule.c
===================================================================
--- trunk/rpy/src/rpymodule.c 2008-01-07 16:01:22 UTC (rev 395)
+++ trunk/rpy/src/rpymodule.c 2008-01-07 16:03:16 UTC (rev 396)
@@ -82,6 +82,8 @@
static char RVERSION[BUFSIZ];
static char RVER[BUFSIZ];
static char RUSER[BUFSIZ];
+char *defaultargv[] = {"rpy", "-q", "--vanilla"};
+int defaultargc = sizeof(defaultargv) / sizeof(defaultargv[0]);
/* Global interpreter */
PyInterpreterState *my_interp;
@@ -1803,7 +1805,9 @@
/* initialise embedded R; based on rproxy_impl.c from the R distribution */
static void
-init_embedded_win32( void ) {
+init_embedded_win32(int argc,
+ char *argv[])
+{
structRstart rp;
Rstart Rp = &rp;
char Rversion[25];
@@ -1856,7 +1860,7 @@
Rp->CommandLineArgs = NULL;
Rp->NumCommandLineArgs = 0;
#else
- R_set_command_line_arguments(0, NULL);
+ R_set_command_line_arguments(argc, argv);
#endif
R_SetParams(Rp); /* so R_ShowMessage is set */
R_SizeFromEnv(Rp);
@@ -1875,7 +1879,6 @@
PyObject *m, *d;
PyOS_sighandler_t old_int;
#ifndef _WIN32
- char *defaultargv[] = {"rpy", "-q", "--vanilla"};
PyOS_sighandler_t old_usr1, old_usr2;
#endif
SEXP interact;
@@ -1925,10 +1928,11 @@
#endif
#ifdef _WIN32
- init_embedded_win32();
+ init_embedded_win32(defaultargc,
+ defaultargv);
#else
- Rf_initEmbeddedR( sizeof(defaultargv) / sizeof(defaultargv[0]),
- defaultargv);
+ Rf_initEmbeddedR(defaultargc,
+ defaultargv);
#endif
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
rpy-list mailing list
rpy-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rpy-list
