From 9f1241665104d0512ea2aaf18e39d04d203676aa Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 22 Oct 2024 22:24:44 +0200 Subject: [PATCH] Update after gnulib changed. * gettext-tools/src/msgexec.c (process_string): Update create_pipe_out invocation. * gettext-tools/src/write-resources.c (execute_writing_input): Likewise. * gettext-tools/src/msginit.c (project_id, project_id_version, get_user_email, language_team_address, plural_forms): Update create_pipe_in invocations. * gettext-tools/src/read-csharp.c (execute_and_read_po_output): Likewise. * gettext-tools/src/read-java.c (execute_and_read_po_output): Likewise. * gettext-tools/src/read-resources.c (execute_and_read_po_output): Likewise. * gettext-tools/src/read-tcl.c (msgdomain_read_tcl): Likewise. * gettext-tools/src/x-ruby.c (extract_ruby): Likewise. * gettext-tools/src/urlget.c (execute_it, fetch): Update execute invocations. --- gettext-tools/src/msgexec.c | 2 +- gettext-tools/src/msginit.c | 10 +++++----- gettext-tools/src/read-csharp.c | 2 +- gettext-tools/src/read-java.c | 2 +- gettext-tools/src/read-resources.c | 2 +- gettext-tools/src/read-tcl.c | 2 +- gettext-tools/src/urlget.c | 14 +++++++------- gettext-tools/src/write-resources.c | 2 +- gettext-tools/src/x-ruby.c | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gettext-tools/src/msgexec.c b/gettext-tools/src/msgexec.c index 762edecd4..a262a64f6 100644 --- a/gettext-tools/src/msgexec.c +++ b/gettext-tools/src/msgexec.c @@ -407,7 +407,7 @@ process_string (const message_ty *mp, const char *str, size_t len) unsetenv ("MSGEXEC_PREV_MSGID_PLURAL"); /* Open a pipe to a subprocess. */ - child = create_pipe_out (sub_name, sub_path, sub_argv, NULL, + child = create_pipe_out (sub_name, sub_path, sub_argv, NULL, NULL, NULL, false, true, true, fd); /* Ignore SIGPIPE here. We don't care if the subprocesses terminates diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c index 02adc5f63..d4f57e1b8 100644 --- a/gettext-tools/src/msginit.c +++ b/gettext-tools/src/msginit.c @@ -937,7 +937,7 @@ project_id (const char *header) argv[0] = BOURNE_SHELL; argv[1] = prog; argv[2] = NULL; - child = create_pipe_in (prog, BOURNE_SHELL, argv, NULL, + child = create_pipe_in (prog, BOURNE_SHELL, argv, NULL, NULL, DEV_NULL, false, true, false, fd); if (child == -1) goto failed; @@ -1020,7 +1020,7 @@ project_id_version (const char *header) argv[1] = prog; argv[2] = "yes"; argv[3] = NULL; - child = create_pipe_in (prog, BOURNE_SHELL, argv, NULL, + child = create_pipe_in (prog, BOURNE_SHELL, argv, NULL, NULL, DEV_NULL, false, true, false, fd); if (child == -1) goto failed; @@ -1189,7 +1189,7 @@ The new message catalog should contain your email address, so that users can\n\ give you feedback about the translations, and so that maintainers can contact\n\ you in case of unexpected technical problems.\n"); argv[3] = NULL; - child = create_pipe_in (prog, BOURNE_SHELL, argv, NULL, + child = create_pipe_in (prog, BOURNE_SHELL, argv, NULL, NULL, DEV_NULL, false, true, false, fd); if (child == -1) goto failed; @@ -1296,7 +1296,7 @@ language_team_address () argv[4] = catalogname; argv[5] = language; argv[6] = NULL; - child = create_pipe_in (prog, BOURNE_SHELL, argv, NULL, + child = create_pipe_in (prog, BOURNE_SHELL, argv, NULL, NULL, DEV_NULL, false, true, false, fd); if (child == -1) goto failed; @@ -1469,7 +1469,7 @@ plural_forms () argv[1] = language; argv[2] = last_dir; argv[3] = NULL; - child = create_pipe_in (prog, prog, argv, NULL, + child = create_pipe_in (prog, prog, argv, NULL, NULL, DEV_NULL, false, true, false, fd); free (last_dir); if (child == -1) diff --git a/gettext-tools/src/read-csharp.c b/gettext-tools/src/read-csharp.c index 6e2d64e1e..bc02dd64b 100644 --- a/gettext-tools/src/read-csharp.c +++ b/gettext-tools/src/read-csharp.c @@ -67,7 +67,7 @@ execute_and_read_po_output (const char *progname, int exitstatus; /* Open a pipe to the C# execution engine. */ - child = create_pipe_in (progname, prog_path, prog_argv, NULL, + child = create_pipe_in (progname, prog_path, prog_argv, NULL, NULL, DEV_NULL, false, true, true, fd); fp = fdopen (fd[0], "r"); diff --git a/gettext-tools/src/read-java.c b/gettext-tools/src/read-java.c index f417e501e..c9da864d7 100644 --- a/gettext-tools/src/read-java.c +++ b/gettext-tools/src/read-java.c @@ -64,7 +64,7 @@ execute_and_read_po_output (const char *progname, int exitstatus; /* Open a pipe to the JVM. */ - child = create_pipe_in (progname, prog_path, prog_argv, NULL, + child = create_pipe_in (progname, prog_path, prog_argv, NULL, NULL, DEV_NULL, false, true, true, fd); fp = fdopen (fd[0], "r"); diff --git a/gettext-tools/src/read-resources.c b/gettext-tools/src/read-resources.c index 9c6dd3f84..0e72d5029 100644 --- a/gettext-tools/src/read-resources.c +++ b/gettext-tools/src/read-resources.c @@ -68,7 +68,7 @@ execute_and_read_po_output (const char *progname, int exitstatus; /* Open a pipe to the C# execution engine. */ - child = create_pipe_in (progname, prog_path, prog_argv, NULL, + child = create_pipe_in (progname, prog_path, prog_argv, NULL, NULL, NULL, false, true, true, fd); fp = fdopen (fd[0], "r"); diff --git a/gettext-tools/src/read-tcl.c b/gettext-tools/src/read-tcl.c index 625b2ecb7..7fc5aeee9 100644 --- a/gettext-tools/src/read-tcl.c +++ b/gettext-tools/src/read-tcl.c @@ -103,7 +103,7 @@ msgdomain_read_tcl (const char *locale_name, const char *directory) } /* Open a pipe to the Tcl interpreter. */ - child = create_pipe_in ("tclsh", "tclsh", argv, NULL, + child = create_pipe_in ("tclsh", "tclsh", argv, NULL, NULL, DEV_NULL, false, true, true, fd); fp = fdopen (fd[0], "r"); diff --git a/gettext-tools/src/urlget.c b/gettext-tools/src/urlget.c index 361f877dd..57f799621 100644 --- a/gettext-tools/src/urlget.c +++ b/gettext-tools/src/urlget.c @@ -251,7 +251,7 @@ execute_it (const char *progname, (void) private_data; java_exitcode = - execute (progname, prog_path, prog_argv, NULL, + execute (progname, prog_path, prog_argv, NULL, NULL, true, true, false, false, true, false, NULL); /* Exit code 0 means success, 2 means timed out. */ return !(java_exitcode == 0 || java_exitcode == 2); @@ -319,7 +319,7 @@ fetch (const char *url, const char *file) argv[0] = "wget"; argv[1] = "--version"; argv[2] = NULL; - exitstatus = execute ("wget", "wget", argv, NULL, + exitstatus = execute ("wget", "wget", argv, NULL, NULL, false, false, true, true, true, false, NULL); wget_present = (exitstatus == 0); wget_tested = true; @@ -337,7 +337,7 @@ fetch (const char *url, const char *file) argv[6] = "--user-agent"; argv[7] = "urlget"; argv[8] = url; argv[9] = NULL; - exitstatus = execute ("wget", "wget", argv, NULL, + exitstatus = execute ("wget", "wget", argv, NULL, NULL, true, false, false, false, true, false, NULL); if (exitstatus != 127) { @@ -364,7 +364,7 @@ fetch (const char *url, const char *file) argv[0] = "lynx"; argv[1] = "--version"; argv[2] = NULL; - exitstatus = execute ("lynx", "lynx", argv, NULL, + exitstatus = execute ("lynx", "lynx", argv, NULL, NULL, false, false, true, true, true, false, NULL); lynx_present = (exitstatus == 0); lynx_tested = true; @@ -380,7 +380,7 @@ fetch (const char *url, const char *file) argv[2] = "-source"; argv[3] = url; argv[4] = NULL; - exitstatus = execute ("lynx", "lynx", argv, NULL, + exitstatus = execute ("lynx", "lynx", argv, NULL, NULL, true, false, false, false, true, false, NULL); if (exitstatus != 127) { @@ -407,7 +407,7 @@ fetch (const char *url, const char *file) argv[0] = "curl"; argv[1] = "--version"; argv[2] = NULL; - exitstatus = execute ("curl", "curl", argv, NULL, + exitstatus = execute ("curl", "curl", argv, NULL, NULL, false, false, true, true, true, false, NULL); curl_present = (exitstatus == 0 || exitstatus == 2); curl_tested = true; @@ -423,7 +423,7 @@ fetch (const char *url, const char *file) argv[2] = "--user-agent"; argv[3] = "urlget"; argv[4] = url; argv[5] = NULL; - exitstatus = execute ("curl", "curl", argv, NULL, + exitstatus = execute ("curl", "curl", argv, NULL, NULL, true, false, false, false, true, false, NULL); if (exitstatus != 127) { diff --git a/gettext-tools/src/write-resources.c b/gettext-tools/src/write-resources.c index f520c63d4..903ff4d9b 100644 --- a/gettext-tools/src/write-resources.c +++ b/gettext-tools/src/write-resources.c @@ -72,7 +72,7 @@ execute_writing_input (const char *progname, int exitstatus; /* Open a pipe to the C# execution engine. */ - child = create_pipe_out (progname, prog_path, prog_argv, NULL, + child = create_pipe_out (progname, prog_path, prog_argv, NULL, NULL, NULL, false, true, true, fd); fp = fdopen (fd[0], "wb"); diff --git a/gettext-tools/src/x-ruby.c b/gettext-tools/src/x-ruby.c index 72b94e6ee..7fadc4d04 100644 --- a/gettext-tools/src/x-ruby.c +++ b/gettext-tools/src/x-ruby.c @@ -134,7 +134,7 @@ extract_ruby (const char *found_in_dir, const char *real_filename, free (command); } - child = create_pipe_in (progname, progname, argv, found_in_dir, + child = create_pipe_in (progname, progname, argv, NULL, found_in_dir, DEV_NULL, false, true, true, fd); fp = fdopen (fd[0], "r"); -- 2.47.2