Revert "spawn: Expose spawn functions."

This reverts commit 43c1e85fe29a52a9debc068d97c5860a4694b821.

--

It's a bit early to expose these functions.

GnuPG-bug-id: 6249
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>

5 files changed, 27 insertions, 19 deletions

diff --git a/src/gpg-error.def.in b/src/gpg-error.def.in
index f94c6f4..c431e8b 100644
--- a/src/gpg-error.def.in
+++ b/src/gpg-error.def.in
@@ -193,14 +193,16 @@ EXPORTS
  gpgrt_chdir                  @150
  gpgrt_getcwd                 @151
 
- gpgrt_make_pipe              @152
- gpgrt_spawn_process          @153
- gpgrt_spawn_process_fd       @154
- gpgrt_spawn_process_detached @155
- gpgrt_wait_process           @156
- gpgrt_wait_processes         @157
- gpgrt_kill_process           @158
- gpgrt_release_process        @159
+;; API not yet finished for:
+;; gpgrt_make_pipe              @152
+;; gpgrt_spawn_process          @153
+;; gpgrt_spawn_process_fd       @154
+;; gpgrt_spawn_process_detached @155
+;; gpgrt_wait_process           @156
+;; gpgrt_wait_processes         @157
+;; gpgrt_kill_process           @158
+;; gpgrt_release_process        @159
+;; gpgrt_close_all_fds          @188
 
  gpgrt_argparse               @160
  gpgrt_usage                  @161
@@ -242,6 +244,5 @@ EXPORTS
  gpgrt_utf8_to_wchar          @186
  gpgrt_wchar_to_utf8          @187
 
- gpgrt_close_all_fds          @188
 
 ;; end of file with public symbols for Windows.
diff --git a/src/gpg-error.h.in b/src/gpg-error.h.in
index d9b2365..8e22dde 100644
--- a/src/gpg-error.h.in
+++ b/src/gpg-error.h.in
@@ -1082,7 +1082,7 @@ void _gpgrt_log_assert (const char *expr, const char *file, int line,
 
 
 /*
- * Spawn functions
+ * Spawn functions  (Not yet available)
  */
 /* Internal flag to ihnerit file descriptor/handle */
 #define GPGRT_SPAWN_INHERIT_FILE  1
@@ -1094,6 +1094,7 @@ void _gpgrt_log_assert (const char *expr, const char *file, int line,
 #define GPGRT_SPAWN_KEEP_STDOUT  512
 #define GPGRT_SPAWN_KEEP_STDERR 1024
 
+#if 0
 /* Function and convenience macros to create pipes.  */
 gpg_err_code_t gpgrt_make_pipe (int filedes[2], gpgrt_stream_t *r_fp,
                                 int direction, int nonblock);
@@ -1140,6 +1141,7 @@ void gpgrt_release_process (gpgrt_process_t process_id);
 
 /* Close all file resources (descriptors), except KEEP_FDS. */
 void gpgrt_close_all_fds (int from, int *keep_fds);
+#endif /*0*/
 
 /*
  * Option parsing.
diff --git a/src/gpg-error.vers b/src/gpg-error.vers
index 8884e47..57df10e 100644
--- a/src/gpg-error.vers
+++ b/src/gpg-error.vers
@@ -171,15 +171,16 @@ GPG_ERROR_1.0 {
     gpgrt_chdir;
     gpgrt_getcwd;
 
-    gpgrt_make_pipe;
-    gpgrt_spawn_process;
-    gpgrt_spawn_process_fd;
-    gpgrt_spawn_process_detached;
-    gpgrt_wait_process;
-    gpgrt_wait_processes;
-    gpgrt_kill_process;
-    gpgrt_release_process;
-    gpgrt_close_all_fds;
+## API not yet finished for:
+#    gpgrt_make_pipe;
+#    gpgrt_spawn_process;
+#    gpgrt_spawn_process_fd;
+#    gpgrt_spawn_process_detached;
+#    gpgrt_wait_process;
+#    gpgrt_wait_processes;
+#    gpgrt_kill_process;
+#    gpgrt_release_process;
+#    gpgrt_close_all_fds;
 
     gpgrt_argparse;
     gpgrt_argparser;
diff --git a/src/visibility.c b/src/visibility.c
index dd1a6a8..0a058d2 100644
--- a/src/visibility.c
+++ b/src/visibility.c
@@ -1093,6 +1093,7 @@ _gpgrt_log_assert (const char *expr, const char *file,
 }
 
 
+#if 0
 gpg_err_code_t
 gpgrt_make_pipe (int filedes[2], estream_t *r_fp, int direction, int nonblock)
 {
@@ -1158,6 +1159,7 @@ gpgrt_close_all_fds (int from, int *keep_fds)
 {
   _gpgrt_close_all_fds (from, keep_fds);
 }
+#endif /*0*/
 
 
 int
diff --git a/src/visibility.h b/src/visibility.h
index a3ed6fc..dfdcad1 100644
--- a/src/visibility.h
+++ b/src/visibility.h
@@ -199,6 +199,7 @@ MARK_VISIBLE (gpgrt_log_clock)
 MARK_VISIBLE (gpgrt_log_flush)
 MARK_VISIBLE (_gpgrt_log_assert)
 
+#if 0
 MARK_VISIBLE (gpgrt_make_pipe)
 MARK_VISIBLE (gpgrt_spawn_process)
 MARK_VISIBLE (gpgrt_spawn_process_fd)
@@ -208,6 +209,7 @@ MARK_VISIBLE (gpgrt_wait_processes)
 MARK_VISIBLE (gpgrt_kill_process)
 MARK_VISIBLE (gpgrt_release_process)
 MARK_VISIBLE (gpgrt_close_all_fds)
+#endif
 
 MARK_VISIBLE (gpgrt_argparse)
 MARK_VISIBLE (gpgrt_argparser)