Revision: 57902
http://sourceforge.net/p/brlcad/code/57902
Author: bob1961
Date: 2013-09-26 10:48:05 +0000 (Thu, 26 Sep 2013)
Log Message:
-----------
This fixes a "path with spaces" issue on windows for rtwizard.
Modified Paths:
--------------
brlcad/trunk/src/libged/rtwizard.c
Modified: brlcad/trunk/src/libged/rtwizard.c
===================================================================
--- brlcad/trunk/src/libged/rtwizard.c 2013-09-26 00:12:54 UTC (rev 57901)
+++ brlcad/trunk/src/libged/rtwizard.c 2013-09-26 10:48:05 UTC (rev 57902)
@@ -231,6 +231,7 @@
const char *bin;
char rt[256] = {0};
+ char rtscript[256] = {0};
GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
GED_CHECK_DRAWABLE(gedp, GED_ERROR);
@@ -241,21 +242,21 @@
bu_vls_trunc(gedp->ged_result_str, 0);
if (gedp->ged_gvp->gv_perspective > 0)
- /* rtwizard --no_gui -perspective p -i db.g --viewsize size
--orientation "A B C D} --eye_pt "X Y Z" */
- args = argc + 1 + 1 + 2 + 2 + 2 + 2 + 2;
+ /* btclsh rtwizard --no_gui -perspective p -i db.g --viewsize size
--orientation "A B C D} --eye_pt "X Y Z" */
+ args = argc + 1 + 1 + 1 + 2 + 2 + 2 + 2 + 2;
else
- /* rtwizard --no_gui -i db.g --viewsize size --orientation "A B C D}
--eye_pt "X Y Z" */
- args = argc + 1 + 1 + 2 + 2 + 2 + 2;
+ /* btclsh rtwizard --no_gui -i db.g --viewsize size --orientation "A B
C D} --eye_pt "X Y Z" */
+ args = argc + 1 + 1 + 1 + 2 + 2 + 2 + 2;
gedp->ged_gdp->gd_rt_cmd = (char **)bu_calloc(args, sizeof(char *), "alloc
gd_rt_cmd");
bin = bu_brlcad_root("bin", 1);
if (bin) {
-#ifdef _WIN32
- snprintf(rt, 256, "%s/rtwizard.bat", bin);
-#else
- snprintf(rt, 256, "%s/rtwizard", bin);
-#endif
+ snprintf(rt, 256, "%s/btclsh", bin);
+ snprintf(rtscript, 256, "%s/rtwizard", bin);
+ } else {
+ snprintf(rt, 256, "btclsh");
+ snprintf(rtscript, 256, "rtwizard");
}
_ged_rt_set_eye_model(gedp, eye_model);
@@ -267,6 +268,7 @@
vp = &gedp->ged_gdp->gd_rt_cmd[0];
*vp++ = rt;
+ *vp++ = rtscript;
*vp++ = "--no-gui";
*vp++ = "--viewsize";
*vp++ = bu_vls_addr(&size_vls);
@@ -282,17 +284,7 @@
}
*vp++ = "-i";
- /* XXX why is this different for win32 only? */
-#ifdef _WIN32
- {
- char buf[512];
-
- snprintf(buf, 512, "\"%s\"", gedp->ged_wdbp->dbip->dbi_filename);
- *vp++ = buf;
- }
-#else
*vp++ = gedp->ged_wdbp->dbip->dbi_filename;
-#endif
/* Append all args */
for (i = 1; i < argc; i++)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60133471&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
