Revision: 6728
http://playerstage.svn.sourceforge.net/playerstage/?rev=6728&view=rev
Author: thjc
Date: 2008-07-01 21:31:56 -0700 (Tue, 01 Jul 2008)
Log Message:
-----------
merged acts fix [6726] from 2-1
Modified Paths:
--------------
code/player/trunk/server/drivers/blobfinder/acts/acts.cc
Modified: code/player/trunk/server/drivers/blobfinder/acts/acts.cc
===================================================================
--- code/player/trunk/server/drivers/blobfinder/acts/acts.cc 2008-07-02
03:58:53 UTC (rev 6727)
+++ code/player/trunk/server/drivers/blobfinder/acts/acts.cc 2008-07-02
04:31:56 UTC (rev 6728)
@@ -495,27 +495,26 @@
i = 0;
acts_args[i++] = acts_bin_name;
// build the argument list, based on version
+ // these are needed as execv expects a const array of char *'s not an array
of const char *'s
+ static char dash_d[] = "-d";
+ static char dash_i[] = "-i";
+ static char dash_n[] = "-n";
+ static char dash_p[] = "-p";
+ static char dash_s[] = "-s";
+ static char dash_t[] = "-t";
+ static char dash_w[] = "-w";
+ static char dash_x[] = "-x";
+
+ static char dash_B[] = "-B";
+ static char dash_C[] = "-C";
+ static char dash_G[] = "-G";
+ static char dash_H[] = "-H";
+ static char dash_R[] = "-R";
+ static char dash_V[] = "-V";
+ static char dash_W[] = "-W";
switch(acts_version)
{
- // these are needed as execv expects a const array of char *'s not an
array of const char *'s
- static char dash_d[3] = "-d";
- static char dash_i[3] = "-i";
- static char dash_n[3] = "-n";
- static char dash_p[3] = "-p";
- static char dash_s[3] = "-s";
- static char dash_t[3] = "-t";
- static char dash_w[3] = "-w";
- static char dash_x[3] = "-x";
-
- static char dash_B[3] = "-B";
- static char dash_C[3] = "-C";
- static char dash_G[3] = "-G";
- static char dash_H[3] = "-H";
- static char dash_R[3] = "-R";
- static char dash_V[3] = "-V";
- static char dash_W[3] = "-W";
-
- case ACTS_VERSION_1_0:
+ case ACTS_VERSION_1_0:
acts_args[i++] = dash_t;
acts_args[i++] = configfilepath;
if(strlen(portnumstring))
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
