Bruce/tomo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Fix shell escaping of paths

Browse Source
This commit is contained in:
Bruce Hill 2025-03-16 16:52:00 -04:00
parent b0b2504a94
commit b4a0fda409
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environment.c
View File

@ -581,7 +581,7 @@ env_t *new_compilation_unit(CORD libname)
{"Int$value_as_text", "func(i:Int -> Path)"});
ADD_CONSTRUCTORS("Shell",
{"Shell$escape_text", "func(text:Text -> Shell)"},
{"Shell$escape_text", "func(path:Path -> Shell)"},
{"Shell$escape_path", "func(path:Path -> Shell)"},
{"Shell$escape_text_array", "func(texts:[Text] -> Shell)"},
{"Shell$escape_text_array", "func(paths:[Path] -> Shell)"},
{"Int$value_as_text", "func(i:Int -> Shell)"});

6
stdlib/shell.c
View File

@ -6,6 +6,7 @@
#include "arrays.h"
#include "integers.h"
#include "paths.h"
#include "patterns.h"
#include "shell.h"
#include "text.h"
@ -17,6 +18,11 @@ public Shell_t Shell$escape_text(Text_t text)
return Texts(Text("'"), Text$replace(text, Text("'"), Text("'\"'\"'"), Text(""), false), Text("'"));
}
public Shell_t Shell$escape_path(Path_t path)
{
return Shell$escape_text(Path$as_text(&path, false, &Path$info));
}
public Shell_t Shell$escape_text_array(Array_t texts)
{
Array_t all_escaped = {};

1
stdlib/shell.h
View File

@ -18,6 +18,7 @@
OptionalClosure_t Shell$by_line(Shell_t command);
Shell_t Shell$escape_text(Text_t text);
Shell_t Shell$escape_path(Path_t path);
Shell_t Shell$escape_text_array(Array_t texts);
OptionalArray_t Shell$run_bytes(Shell_t command);
OptionalText_t Shell$run(Shell_t command);