some more brace protected filenames in C tcl calls

This commit is contained in:
Stefan Frederik 2021-12-03 23:59:46 +01:00
parent 954979e200
commit a7277acfda
4 changed files with 30 additions and 30 deletions

View File

@ -150,7 +150,7 @@ void set_grid(double newgrid)
int set_netlist_dir(int force, char *dir)
{
char cmd[PATH_MAX+200];
if(dir) my_snprintf(cmd, S(cmd), "select_netlist_dir %d %s", force, dir);
if(dir) my_snprintf(cmd, S(cmd), "select_netlist_dir %d {%s}", force, dir);
else my_snprintf(cmd, S(cmd), "select_netlist_dir %d", force);
tcleval(cmd);
if(!strcmp("", tclresult()) ) {

View File

@ -32,44 +32,44 @@ char *cad_icon[] = {
"+ c None",
/* pixels */
"++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
"+++++++++++++++++++++oooo+++++++++++++++++oooo++++++++++",
"+++++++++++++++++++++ooo++++++++++++++++++ooo+++++++++++",
"++++++++++++++++++++++o++++++++++++++++++++o++++++++++++",
"++++++++++++++++++++++o++++++++++++++++++++o++++++++++++",
"++++++++++++++++++++++O +++++++++++++++++++O +++++++++++",
"++++++++++++++++++++++O +++++++++++++++++++O +++++++++++",
"++++++++++++++++++++++O++++++++++++++++++++O++++++++++++",
"++++++++++++++++++++++O +++++++++++++++++++O +++++++++++",
"++++++++++++++++++++o+OOOOOOOO+++++++++++o+OOOOOOOO+++++",
"++++++++++++++++++++++O++++++++++++++++++++O++++++++++++",
"++++++++++++++++++++++O++++++++++++++++++++O++++++++++++",
"++++++++++++++++++++++ +++++++++++++++++++ +++++++++++",
"++++++++++++++++++++o+ OOOOOOO+++++++++++o+ OOOOOOO+++++",
"++++++++++++++++++++o+o++++++O+++++++++++o+o++++++O+++++",
"++++++++++++++++++o+ooo++++++O+++++++++o+ooo++++++O+++++",
"++++++++++++++++++o+o++++++++O+++++++++o+o++++++++O+++++",
"+++++++++++++++++oo+o++++++++O++++++++oo+o++++++++O+++++",
"++++++++++++OOOO oo+ooOOOOOOOO+++OOOO oo+ooOOOOOOOO+++++",
"++++++++++++OOOO oo+oo OOOOOOO+++OOOO oo+oo OOOOOOO+++++",
"++++++++++++O++ oo+o+ +++++++++O++ oo+o+ +++++++++++",
"++++++++++++O+++++o+o++++++++++++O+++++o+o++++++++++++++",
"++++++++++++O+++++o+o++++++++++++O+++++o+o++++++++++++++",
"++++++++++++O+++++++ooo++++++++++O+++++++ooo++++++++++++",
"++++++++++++O+++++++o+O +++++++++O+++++++o+O +++++++++++",
"++ +++++++O+++++++++O +++++++++O+++++++++O +++++++ +",
".+ OOOOOOOO+++++++++OOOOOOOOOOOO+++++++++OOOOOOOOOO ",
"X+ +++++++O+++++++++O +++++++++O+++++++++O +++++++ +",
"++ OOOOOOO+++++++++OOOOOOOOOOOO+++++++++OOOOOOOOO ",
"++ +++++++O+++++++++O +++++++++O+++++++++O +++++++ +",
"++++++++++++O+++++++o+O +++++++++O+++++++o+O +++++++++++",
"++++++++++++O+++++++o+o++++++++++O+++++++o+o++++++++++++",
"++++++++++++O+++++o+ooo++++++++++O+++++o+ooo++++++++++++",
"++++++++++++O+++++o+o++++++++++++O+++++o+o++++++++++++++",
"++++++++++++O+++++o+o++++++++++++O+++++o+o++++++++++++++",
"++++++++++++OOOO oo+ooOOOOOOOO+++OOOO oo+ooOOOOOOOO+++++",
"++++++++++++OOOO oo+oo OOOOOOO+++OOOO oo+oo OOOOOOO+++++",
"+++++++++++++++ +o+o+ +++++O++++++ +o+o+ +++++O+++++",
"++++++++++++++++++o+o++++++++O+++++++++o+o++++++++O+++++",
"++++++++++++++++++o+o++++++++O+++++++++o+o++++++++O+++++",
"++++++++++++++++++++ooo++++++O+++++++++++ooo++++++O+++++",
"++++++++++++++++++++o+OOOOOOOO+++++++++++o+OOOOOOOO+++++",
"++++++++++++++++++++++O +++++++++++++++++++O +++++++++++",
"++++++++++++++++++++o+ OOOOOOO+++++++++++o+ OOOOOOO+++++",
"++++++++++++++++++++++ +++++++++++++++++++ +++++++++++",
"++++++++++++++++++++++O++++++++++++++++++++O++++++++++++",
"++++++++++++++++++++++O++++++++++++++++++++O++++++++++++",
"++++++++++++++++++++++O +++++++++++++++++++O +++++++++++",
"++++++++++++++++++++++O +++++++++++++++++++O +++++++++++",
"++++++++++++++++++++++o++++++++++++++++++++o++++++++++++",
"+++++++++++++++++++++ooo+++++++++++++++++++oo+++++++++++",
"++++++++++++++++++++++o++++++++++++++++++++o++++++++++++",
"+++++++++++++++++++++ooo++++++++++++++++++ooo+++++++++++",
"++++++++++++++++++++++o++++++++++++++++++++o++++++++++++",
"++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
"++++++++++++++++++++++++++++++++++++++++++++++++++++++++"

View File

@ -10,44 +10,44 @@ static char *icon[] = {
"+ c None",
/* pixels */
"++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
"+++++++++++++++++++++oooo+++++++++++++++++oooo++++++++++",
"+++++++++++++++++++++ooo++++++++++++++++++ooo+++++++++++",
"++++++++++++++++++++++o++++++++++++++++++++o++++++++++++",
"++++++++++++++++++++++o++++++++++++++++++++o++++++++++++",
"++++++++++++++++++++++O +++++++++++++++++++O +++++++++++",
"++++++++++++++++++++++O +++++++++++++++++++O +++++++++++",
"++++++++++++++++++++++O++++++++++++++++++++O++++++++++++",
"++++++++++++++++++++++O +++++++++++++++++++O +++++++++++",
"++++++++++++++++++++o+OOOOOOOO+++++++++++o+OOOOOOOO+++++",
"++++++++++++++++++++++O++++++++++++++++++++O++++++++++++",
"++++++++++++++++++++++O++++++++++++++++++++O++++++++++++",
"++++++++++++++++++++++ +++++++++++++++++++ +++++++++++",
"++++++++++++++++++++o+ OOOOOOO+++++++++++o+ OOOOOOO+++++",
"++++++++++++++++++++o+o++++++O+++++++++++o+o++++++O+++++",
"++++++++++++++++++o+ooo++++++O+++++++++o+ooo++++++O+++++",
"++++++++++++++++++o+o++++++++O+++++++++o+o++++++++O+++++",
"+++++++++++++++++oo+o++++++++O++++++++oo+o++++++++O+++++",
"++++++++++++OOOO oo+ooOOOOOOOO+++OOOO oo+ooOOOOOOOO+++++",
"++++++++++++OOOO oo+oo OOOOOOO+++OOOO oo+oo OOOOOOO+++++",
"++++++++++++O++ oo+o+ +++++++++O++ oo+o+ +++++++++++",
"++++++++++++O+++++o+o++++++++++++O+++++o+o++++++++++++++",
"++++++++++++O+++++o+o++++++++++++O+++++o+o++++++++++++++",
"++++++++++++O+++++++ooo++++++++++O+++++++ooo++++++++++++",
"++++++++++++O+++++++o+O +++++++++O+++++++o+O +++++++++++",
"++ +++++++O+++++++++O +++++++++O+++++++++O +++++++ +",
".+ OOOOOOOO+++++++++OOOOOOOOOOOO+++++++++OOOOOOOOOO ",
"X+ +++++++O+++++++++O +++++++++O+++++++++O +++++++ +",
"++ OOOOOOO+++++++++OOOOOOOOOOOO+++++++++OOOOOOOOO ",
"++ +++++++O+++++++++O +++++++++O+++++++++O +++++++ +",
"++++++++++++O+++++++o+O +++++++++O+++++++o+O +++++++++++",
"++++++++++++O+++++++o+o++++++++++O+++++++o+o++++++++++++",
"++++++++++++O+++++o+ooo++++++++++O+++++o+ooo++++++++++++",
"++++++++++++O+++++o+o++++++++++++O+++++o+o++++++++++++++",
"++++++++++++O+++++o+o++++++++++++O+++++o+o++++++++++++++",
"++++++++++++OOOO oo+ooOOOOOOOO+++OOOO oo+ooOOOOOOOO+++++",
"++++++++++++OOOO oo+oo OOOOOOO+++OOOO oo+oo OOOOOOO+++++",
"+++++++++++++++ +o+o+ +++++O++++++ +o+o+ +++++O+++++",
"++++++++++++++++++o+o++++++++O+++++++++o+o++++++++O+++++",
"++++++++++++++++++o+o++++++++O+++++++++o+o++++++++O+++++",
"++++++++++++++++++++ooo++++++O+++++++++++ooo++++++O+++++",
"++++++++++++++++++++o+OOOOOOOO+++++++++++o+OOOOOOOO+++++",
"++++++++++++++++++++++O +++++++++++++++++++O +++++++++++",
"++++++++++++++++++++o+ OOOOOOO+++++++++++o+ OOOOOOO+++++",
"++++++++++++++++++++++ +++++++++++++++++++ +++++++++++",
"++++++++++++++++++++++O++++++++++++++++++++O++++++++++++",
"++++++++++++++++++++++O++++++++++++++++++++O++++++++++++",
"++++++++++++++++++++++O +++++++++++++++++++O +++++++++++",
"++++++++++++++++++++++O +++++++++++++++++++O +++++++++++",
"++++++++++++++++++++++o++++++++++++++++++++o++++++++++++",
"+++++++++++++++++++++ooo+++++++++++++++++++oo+++++++++++",
"++++++++++++++++++++++o++++++++++++++++++++o++++++++++++",
"+++++++++++++++++++++ooo++++++++++++++++++ooo+++++++++++",
"++++++++++++++++++++++o++++++++++++++++++++o++++++++++++",
"++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
"++++++++++++++++++++++++++++++++++++++++++++++++++++++++"

View File

@ -1378,7 +1378,7 @@ int Tcl_AppInit(Tcl_Interp *inter)
my_strcat(416, &win_xschem_library_path, "\;");
my_strcat(431, &win_xschem_library_path, tmp);
}
my_snprintf(tmp, S(tmp), "set tmp2 \"%s\"; "
my_snprintf(tmp, S(tmp), "set tmp2 {%s}; "
"while {[regsub {([^/]*\\.*[^./]+[^/]*)/\\.\\./?} $tmp2 {} tmp2]} {}; ", win_xschem_library_path);
const char *result2 = tcleval(tmp);
const char *win_xschem_library_path_clean = tclgetvar("tmp2");