summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--stream.c164
-rw-r--r--stream.h3
-rw-r--r--utf8.c12
-rw-r--r--utf8.h3
4 files changed, 8 insertions, 174 deletions
diff --git a/stream.c b/stream.c
index e3ba0510..388020c9 100644
--- a/stream.c
+++ b/stream.c
@@ -521,8 +521,6 @@ struct stdio_handle {
char *buf;
#if HAVE_FORK_STUFF
pid_t pid;
-#else
- int pid;
#endif
val mode; /* used by tail */
unsigned is_rotated : 8; /* used by tail */
@@ -1362,15 +1360,6 @@ static int pipevp_close(FILE *f, pid_t pid)
sig_restore_enable;
return status;
}
-#else
-static int se_pclose(FILE *f)
-{
- int ret;
- sig_save_enable;
- ret = pclose(f);
- sig_restore_enable;
- return ret;
-}
#endif
val pipe_close_status_helper(val stream, val throw_on_error,
@@ -1419,8 +1408,6 @@ static val pipe_close(val stream, val throw_on_error)
if (h->f != 0) {
#if HAVE_FORK_STUFF
int status = pipevp_close(h->f, h->pid);
-#else
- int status = se_pclose(h->f);
#endif
h->f = 0;
@@ -1760,13 +1747,6 @@ val make_tail_stream(FILE *f, val descr)
return stream;
}
-#if !HAVE_FORK_STUFF
-val make_pipe_stream(FILE *f, val descr)
-{
- return make_stdio_stream_common(f, descr, &pipe_ops.cobj_ops);
-}
-#endif
-
#if HAVE_SOCKETS
val make_sock_stream(FILE *f, val family, val type)
{
@@ -4387,7 +4367,7 @@ static int fds_getfd(val stream, val self)
return fd_sub;
}
-#if !HAVE_FORK_STUFF || HAVE_WSPAWN || HAVE_SPAWN
+#if HAVE_WSPAWN || HAVE_SPAWN
static int fds_subst(int fd_sub, int fd_std, val self)
{
if (fd_sub == fd_std)
@@ -4426,7 +4406,7 @@ static void fds_prepare(struct save_fds *fds, int flags, val self)
fds->suberr = fds_getfd(std_error, self);
}
-#if !HAVE_FORK_STUFF || HAVE_WSPAWN || HAVE_SPAWN
+#if HAVE_WSPAWN || HAVE_SPAWN
static void fds_swizzle(struct save_fds *fds, int flags, val self)
{
if ((flags & FDS_IN) != 0)
@@ -4677,138 +4657,6 @@ val open_command(val command, val mode_str)
return open_process(interp, mode_str, list(opt, command, nao));
}
-#else
-
-val open_command(val path, val mode_str)
-{
- val self = lit("open-command");
- struct stdio_mode m, m_r = stdio_mode_init_r;
- val mode = normalize_mode_no_bin(&m, mode_str, m_r);
- int input = m.read != 0;
- struct save_fds sfds;
- FILE *f = 0;
- int fds_flags = (input ? FDS_IN : FDS_OUT) | FDS_ERR;
-
- if (!input)
- flush_stream(std_output);
-
- fds_init(&sfds);
-
- uw_simple_catch_begin;
-
- fds_prepare(&sfds, fds_flags, self);
-
- fds_swizzle(&sfds, fds_flags, self);
-
- f = w_popen(c_str(path, self), c_str(mode, self));
-
- if (!f) {
- int eno = errno;
- uw_ethrowf(errno_to_file_error(eno), lit("~a: error opening pipe ~s: ~d/~s"),
- self, path, num(eno), errno_to_str(eno), nao);
- }
-
- uw_unwind {
- fds_restore(&sfds);
- }
-
- uw_catch_end;
-
- return set_mode_props(m, make_pipe_stream(f, path));
-}
-
-
-static void string_extend_count(int count, val out, val tail)
-{
- int i;
- for (i = 0; i < count; i++)
- string_extend(out, tail);
-}
-
-static val win_escape_cmd(val str)
-{
- const wchar_t *s;
- val out = string(L"");
-
- for (s = c_str(str, nil); *s; s++) {
- switch (*s) {
- case ' ': case '\t':
- string_extend(out, lit("\""));
- string_extend(out, chr(*s));
- string_extend(out, lit("\""));
- break;
- default:
- string_extend(out, chr(*s));
- }
- }
-
- return out;
-}
-
-static val win_escape_arg(val str)
-{
- int bscount = 0, i;
- const wchar_t *s;
- val out = string(L"");
-
- for (s = c_str(str, nil); *s; s++) {
- switch (*s) {
- case '"':
- string_extend_count(bscount, out, lit("\\\\"));
- string_extend(out, lit("\\^\""));
- bscount = 0;
- break;
- case '\\':
- bscount++;
- break;
- case '^': case '%': case '!':
- case '\n': case '&': case '|':
- case '<': case '>':
- case '(': case ')':
- for (i = 0; i < bscount; i++)
- string_extend_count(bscount, out, lit("\\"));
- string_extend(out, chr('^'));
- string_extend(out, chr(*s));
- break;
- default:
- for (i = 0; i < bscount; i++)
- string_extend_count(bscount, out, lit("\\"));
- string_extend(out, chr(*s));
- bscount = 0;
- break;
- }
- }
-
- for (i = 0; i < bscount; i++)
- string_extend(out, lit("\\"));
-
- return out;
-}
-
-static val win_make_cmdline(val args)
-{
- val out = string(L"");
-
- string_extend(out, win_escape_cmd(pop(&args)));
- string_extend(out, chr(' '));
-
- while (args) {
- string_extend(out, lit("^\""));
- string_extend(out, win_escape_arg(pop(&args)));
- if (args)
- string_extend(out, lit("^\" "));
- else
- string_extend(out, lit("^\""));
- }
-
- return out;
-}
-
-val open_process(val name, val mode_str, val args)
-{
- val win_cmdline = win_make_cmdline(cons(name, default_null_arg(args)));
- return open_command(win_cmdline, mode_str);
-}
#endif
#if HAVE_WSPAWN || HAVE_SPAWN
@@ -4968,15 +4816,17 @@ out:
return ret;
}
-#else
-#error port me!
#endif
+#if HAVE_WSPAWN || HAVE_SPAWN || HAVE_FORK_STUFF
+
static val sh(val command)
{
return run(shell, list(shell_arg, command, nao));
}
+#endif
+
val remove_path(val path, val throw_on_error)
{
val self = lit("remove-path");
@@ -5689,8 +5539,10 @@ void stream_init(void)
#if HAVE_FORK_STUFF
reg_fun(intern(lit("open-subprocess"), user_package), func_n4o(open_subprocess, 2));
#endif
+#if HAVE_WSPAWN || HAVE_SPAWN || HAVE_FORK_STUFF
reg_fun(intern(lit("sh"), user_package), func_n1(sh));
reg_fun(intern(lit("run"), user_package), func_n2o(run, 1));
+#endif
reg_fun(intern(lit("remove-path"), user_package), func_n2o(remove_path, 1));
reg_fun(intern(lit("rename-path"), user_package), func_n2(rename_path));
reg_fun(intern(lit("open-files"), user_package), func_n3o(open_files, 1));
diff --git a/stream.h b/stream.h
index d54da38c..4d73bac1 100644
--- a/stream.h
+++ b/stream.h
@@ -179,9 +179,6 @@ val errno_to_string(val err);
val make_null_stream(void);
val make_stdio_stream(FILE *, val descr);
val make_tail_stream(FILE *, val descr);
-#if !HAVE_FORK_STUFF
-val make_pipe_stream(FILE *, val descr);
-#endif
val pipe_close_status_helper(val stream, val throw_on_error,
int status, val self);
val stream_fd(val stream);
diff --git a/utf8.c b/utf8.c
index 9ec6aed9..a3468ae3 100644
--- a/utf8.c
+++ b/utf8.c
@@ -385,18 +385,6 @@ FILE *w_fopen(const wchar_t *wname, const wchar_t *wmode)
return f;
}
-#if !HAVE_FORK_STUFF
-FILE *w_popen(const wchar_t *wcmd, const wchar_t *wmode)
-{
- char *cmd = utf8_dup_to(wcmd);
- char *mode = utf8_dup_to(wmode);
- FILE *f = popen(cmd, mode);
- free(cmd);
- free(mode);
- return f;
-}
-#endif
-
FILE *w_fdopen(int fd, const wchar_t *wmode)
{
char *mode = utf8_dup_to(wmode);
diff --git a/utf8.h b/utf8.h
index ce8b7916..692cb330 100644
--- a/utf8.h
+++ b/utf8.h
@@ -52,9 +52,6 @@ void utf8_decoder_init(utf8_decoder_t *);
wint_t utf8_decode(utf8_decoder_t *,int (*get)(mem_t *ctx), mem_t *ctx);
FILE *w_fopen(const wchar_t *, const wchar_t *);
-#if !HAVE_FORK_STUFF
-FILE *w_popen(const wchar_t *, const wchar_t *);
-#endif
FILE *w_freopen(const wchar_t *, const wchar_t *, FILE *);
FILE *w_fdopen(int, const wchar_t *);
int w_remove(const wchar_t *);
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-21 05:48:31 +0000