* eval.c (eval_init): Registered open-command and open-process

intrinsics. open-pipe is now deprecated but stays for backward
compatibility as a synonym for open-command.

* stream.c (open_pipe): Renamed to open_command.
(open_pipevp): Renamed to open_process.

* stream.h (open_pipe, open_pipevp): Declarations updated.

* txr.1: Documentation headings updated.

5 files changed, 25 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index b9b8889c..6cfc7aef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2012-05-18  Kaz Kylheku  <kaz@kylheku.com>
 
+	* eval.c (eval_init): Registered open-command and open-process
+	intrinsics. open-pipe is now deprecated but stays for backward
+	compatibility as a synonym for open-command.
+
+	* stream.c (open_pipe): Renamed to open_command.
+	(open_pipevp): Renamed to open_process.
+
+	* stream.h (open_pipe, open_pipevp): Declarations updated.
+
+	* txr.1: Documentation headings updated.
+
+2012-05-18  Kaz Kylheku  <kaz@kylheku.com>
+
 	* stream.c (open_pipev): Bugfix: program name is included
 	as first element of argv.
 
diff --git a/eval.c b/eval.c
index af8841ac..fea2ed7a 100644
--- a/eval.c
+++ b/eval.c
@@ -2290,8 +2290,9 @@ void eval_init(void)
   reg_fun(intern(lit("flush-stream"), user_package), func_n1(flush_stream));
   reg_fun(intern(lit("open-directory"), user_package), func_n1(open_directory));
   reg_fun(intern(lit("open-file"), user_package), func_n2(open_file));
-  reg_fun(intern(lit("open-pipe"), user_package), func_n2(open_pipe));
-  reg_fun(intern(lit("open-pipe-args"), user_package), func_n3o(open_pipevp, 2));
+  reg_fun(intern(lit("open-command"), user_package), func_n2(open_command));
+  reg_fun(intern(lit("open-pipe"), user_package), func_n2(open_command));
+  reg_fun(intern(lit("open-process"), user_package), func_n3o(open_process, 2));
 
   reg_var(intern(lit("*user-package*"), user_package), &user_package);
   reg_var(intern(lit("*keyword-package*"), user_package), &keyword_package);
diff --git a/stream.c b/stream.c
index 7175d59a..dce01c15 100644
--- a/stream.c
+++ b/stream.c
@@ -1515,7 +1515,7 @@ val open_file(val path, val mode_str)
   return make_stdio_stream(f, path, input, output);
 }
 
-val open_pipe(val path, val mode_str)
+val open_command(val path, val mode_str)
 {
   FILE *f = w_popen(c_str(path), c_str(mode_str));
   val input = nil, output = nil;
@@ -1537,7 +1537,7 @@ val open_pipe(val path, val mode_str)
 }
 
 #if HAVE_FORK_STUFF
-val open_pipevp(val name, val mode_str, val args)
+val open_process(val name, val mode_str, val args)
 {
   int input = equal(mode_str, lit("r")) || equal(mode_str, lit("rb"));
   int fd[2];
@@ -1658,10 +1658,10 @@ static val win_make_cmdline(val args)
   return out;
 }
 
-val open_pipevp(val name, val mode_str, val args)
+val open_process(val name, val mode_str, val args)
 {
   val win_cmdline = win_make_cmdline(cons(name, args));
-  return open_pipe(win_cmdline, mode_str);
+  return open_command(win_cmdline, mode_str);
 }
 #endif
 
diff --git a/stream.h b/stream.h
index 06862594..38b10eda 100644
--- a/stream.h
+++ b/stream.h
@@ -52,7 +52,7 @@ val put_byte(val byte, val stream);
 val flush_stream(val stream);
 val open_directory(val path);
 val open_file(val path, val mode_str);
-val open_pipe(val path, val mode_str);
-val open_pipevp(val path, val mode_str, val args);
+val open_command(val path, val mode_str);
+val open_process(val path, val mode_str, val args);
 
 void stream_init(void);
diff --git a/txr.1 b/txr.1
index 3de6196b..8d74b759 100644
--- a/txr.1
+++ b/txr.1
@@ -7483,7 +7483,9 @@ Examples:
 
 .SS Function open-directory
 
-.SS Functions open-file, open-pipe, open-pipe-args
+.SS Functions open-file
+
+.SS Functions open-command, open-process
 
 .SS Variables *user-package*, *keyword-package*, *system-package*