[brlcad-commits] SF.net SVN: brlcad:[54967] brlcad/trunk/src/libtclcad/tclcad_obj.c

[bob1961]

Revision: 54967
          http://brlcad.svn.sourceforge.net/brlcad/?rev=54967&view=rev
Author:   bob1961
Date:     2013-03-29 15:42:26 +0000 (Fri, 29 Mar 2013)
Log Message:
-----------
Update libtclcad's to_more_args_func() to protect any special characters that 
may be in the prompt strings.

Modified Paths:
--------------
    brlcad/trunk/src/libtclcad/tclcad_obj.c

Modified: brlcad/trunk/src/libtclcad/tclcad_obj.c
===================================================================
--- brlcad/trunk/src/libtclcad/tclcad_obj.c     2013-03-29 15:19:57 UTC (rev 
54966)
+++ brlcad/trunk/src/libtclcad/tclcad_obj.c     2013-03-29 15:42:26 UTC (rev 
54967)
@@ -1042,7 +1042,7 @@
     {"make_name",      (char *)0, TO_UNLIMITED, to_pass_through_func, 
ged_make_name},
     {"make_pnts",      (char *)0, TO_UNLIMITED, to_more_args_func, 
ged_make_pnts},
     {"match",  (char *)0, TO_UNLIMITED, to_pass_through_func, ged_match},
-    {"mater",  (char *)0, TO_UNLIMITED, to_pass_through_func, ged_mater},
+    {"mater",  (char *)0, TO_UNLIMITED, to_more_args_func, ged_mater},
     {"mirror", (char *)0, TO_UNLIMITED, to_mirror, GED_FUNC_PTR_NULL},
     {"model2view",     "vname", 2, to_view_func, ged_model2view},
     {"model_axes",     "???", TO_UNLIMITED, to_model_axes, GED_FUNC_PTR_NULL},
@@ -12305,7 +12305,7 @@
 
        if (0 < bu_vls_strlen(&current_top->to_gop->go_more_args_callback)) {
            bu_vls_trunc(&callback_cmd, 0);
-           bu_vls_printf(&callback_cmd, "%s \"%s\"",
+           bu_vls_printf(&callback_cmd, "%s [string range {%s} 0 end]",
                          
bu_vls_addr(&current_top->to_gop->go_more_args_callback),
                          bu_vls_addr(gedp->ged_result_str));
 
@@ -12360,8 +12360,11 @@
     bu_vls_free(&callback_cmd);
     bu_vls_free(&temp);
 
-    for (i = 0; i < ac; ++i)
+    bu_vls_printf(gedp->ged_result_str, "BUILT_BY_MORE_ARGS");
+    for (i = 0; i < ac; ++i) {
+       bu_vls_printf(gedp->ged_result_str, "%s ", av[i]);
        bu_free((void *)av[i], "to_more_args_func");
+    }
 
     return ret;
 }

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Own the Future-Intel(R) Level Up Game Demo Contest 2013
Rise to greatness in Intel's independent game demo contest. Compete 
for recognition, cash, and the chance to get your game on Steam. 
$5K grand prize plus 10 genre and skill prizes. Submit your demo 
by 6/6/13. http://altfarm.mediaplex.com/ad/ck/12124-176961-30367-2
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits