Update after gnulib changed.

* gettext-tools/src/urlget.c (execute_it, fetch): Update 'execute' invocations.
* 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/msgexec.c (process_string): Update create_pipe_out
invocation.
* gettext-tools/src/write-resources.c (execute_writing_input): Likewise.

diff --git a/gettext-tools/src/msgexec.c b/gettext-tools/src/msgexec.c
index 811e0fa09ed05c2807bea395f24a07060fde90d4..c4ff14da2366f6526a56fbf4a699ba6a3751ed00 100644 (file)
--- a/gettext-tools/src/msgexec.c
+++ b/gettext-tools/src/msgexec.c
@@ -406,8 +406,8 @@ 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, false, true,
-                               true, fd);
+      child = create_pipe_out (sub_name, sub_path, sub_argv, NULL,
+                               NULL, false, true, true, fd);
 
       /* Ignore SIGPIPE here.  We don't care if the subprocesses terminates
          successfully without having read all of the input that we feed it.  */

diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c
index 9a227ba5688c6c7021e71ff62ea9c7e52cf09d6d..bd17a08a7132dd233604834634a0a3740e73fb5e 100644 (file)
--- a/gettext-tools/src/msginit.c
+++ b/gettext-tools/src/msginit.c
@@ -943,8 +943,8 @@ project_id (const char *header)
     argv[0] = BOURNE_SHELL;
     argv[1] = prog;
     argv[2] = NULL;
-    child = create_pipe_in (prog, BOURNE_SHELL, argv, DEV_NULL, false, true,
-                            false, fd);
+    child = create_pipe_in (prog, BOURNE_SHELL, argv, NULL,
+                            DEV_NULL, false, true, false, fd);
     if (child == -1)
       goto failed;
 
@@ -1026,8 +1026,8 @@ project_id_version (const char *header)
     argv[1] = prog;
     argv[2] = "yes";
     argv[3] = NULL;
-    child = create_pipe_in (prog, BOURNE_SHELL, argv, DEV_NULL, false, true,
-                            false, fd);
+    child = create_pipe_in (prog, BOURNE_SHELL, argv, NULL,
+                            DEV_NULL, false, true, false, fd);
     if (child == -1)
       goto failed;
 
@@ -1195,8 +1195,8 @@ 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, DEV_NULL, false, true,
-                            false, fd);
+    child = create_pipe_in (prog, BOURNE_SHELL, argv, NULL,
+                            DEV_NULL, false, true, false, fd);
     if (child == -1)
       goto failed;
 
@@ -1301,8 +1301,8 @@ language_team_address ()
     argv[4] = (char *) catalogname;
     argv[5] = (char *) language;
     argv[6] = NULL;
-    child = create_pipe_in (prog, BOURNE_SHELL, argv, DEV_NULL, false, true,
-                            false, fd);
+    child = create_pipe_in (prog, BOURNE_SHELL, argv, NULL,
+                            DEV_NULL, false, true, false, fd);
     if (child == -1)
       goto failed;
 
@@ -1469,9 +1469,8 @@ plural_forms ()
       argv[1] = (char *) language;
       argv[2] = last_dir;
       argv[3] = NULL;
-      child = create_pipe_in (prog, prog, argv, DEV_NULL,
-                              false, true, false,
-                              fd);
+      child = create_pipe_in (prog, prog, argv, NULL,
+                              DEV_NULL, false, true, false, fd);
       free (last_dir);
       if (child == -1)
         goto failed;

diff --git a/gettext-tools/src/read-csharp.c b/gettext-tools/src/read-csharp.c
index 4c9f70ffed19960073f4ebca66cf88d7b0d8148e..2db0602fc1921e6f75bd8a3264907244c0a453dc 100644 (file)
--- a/gettext-tools/src/read-csharp.c
+++ b/gettext-tools/src/read-csharp.c
@@ -1,5 +1,5 @@
 /* Reading C# satellite assemblies.
-   Copyright (C) 2003-2004, 2006-2008, 2010-2011 Free Software Foundation, Inc.
+   Copyright (C) 2003-2004, 2006-2008, 2010-2011, 2020 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -64,8 +64,8 @@ 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, DEV_NULL, false,
-                          true, true, fd);
+  child = create_pipe_in (progname, prog_path, prog_argv, NULL,
+                          DEV_NULL, false, true, true, fd);
 
   fp = fdopen (fd[0], "r");
   if (fp == NULL)

diff --git a/gettext-tools/src/read-java.c b/gettext-tools/src/read-java.c
index 78391058d409fda61851e3976404e544022a7518..5af0501071b665e11e979bb08ded3820e2353044 100644 (file)
--- a/gettext-tools/src/read-java.c
+++ b/gettext-tools/src/read-java.c
@@ -1,5 +1,5 @@
 /* Reading Java ResourceBundles.
-   Copyright (C) 2001-2003, 2006-2008, 2010-2011, 2017, 2019 Free Software
+   Copyright (C) 2001-2003, 2006-2008, 2010-2011, 2017, 2019-2020 Free Software
    Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
@@ -63,8 +63,8 @@ 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, DEV_NULL, false,
-                          true, true, fd);
+  child = create_pipe_in (progname, prog_path, prog_argv, NULL,
+                          DEV_NULL, false, true, true, fd);
 
   fp = fdopen (fd[0], "r");
   if (fp == NULL)

diff --git a/gettext-tools/src/read-resources.c b/gettext-tools/src/read-resources.c
index 822fc5dbbd97e56685d9cf4adb492ddbeeab4b00..c0c5e360b36ca0ce28665f5abd44af655d8fde69 100644 (file)
--- a/gettext-tools/src/read-resources.c
+++ b/gettext-tools/src/read-resources.c
@@ -1,5 +1,5 @@
 /* Reading C# .resources files.
-   Copyright (C) 2003-2004, 2006-2008, 2010-2011 Free Software Foundation, Inc.
+   Copyright (C) 2003-2004, 2006-2008, 2010-2011, 2020 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -65,8 +65,8 @@ 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, false,
-                          true, true, fd);
+  child = create_pipe_in (progname, prog_path, prog_argv, NULL,
+                          NULL, false, true, true, fd);
 
   fp = fdopen (fd[0], "r");
   if (fp == NULL)

diff --git a/gettext-tools/src/read-tcl.c b/gettext-tools/src/read-tcl.c
index 921fbc6d42ebe55a2ca8f38be0779ced26ffe45c..0cb95044e69e1e9b3b6ea22f4130877bc50a9161 100644 (file)
--- a/gettext-tools/src/read-tcl.c
+++ b/gettext-tools/src/read-tcl.c
@@ -1,5 +1,5 @@
 /* Reading tcl/msgcat .msg files.
-   Copyright (C) 2002-2003, 2005-2008, 2010-2011, 2018 Free Software
+   Copyright (C) 2002-2003, 2005-2008, 2010-2011, 2018, 2020 Free Software
    Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
@@ -103,8 +103,8 @@ msgdomain_read_tcl (const char *locale_name, const char *directory)
     }
 
   /* Open a pipe to the Tcl interpreter.  */
-  child = create_pipe_in ("tclsh", "tclsh", argv, DEV_NULL, false, true, true,
-                          fd);
+  child = create_pipe_in ("tclsh", "tclsh", argv, NULL,
+                          DEV_NULL, false, true, true, fd);
 
   fp = fdopen (fd[0], "r");
   if (fp == NULL)

diff --git a/gettext-tools/src/urlget.c b/gettext-tools/src/urlget.c
index 84e20043d3b384f8fd56a26bcddaa3b2ecbde1fd..e8c03c179c5a43012ea95d6a0e23b5666965fee8 100644 (file)
--- a/gettext-tools/src/urlget.c
+++ b/gettext-tools/src/urlget.c
@@ -252,8 +252,8 @@ execute_it (const char *progname,
   (void) private_data;
 
   java_exitcode =
-    execute (progname, prog_path, prog_argv, true, true, false, false, true,
-             false, NULL);
+    execute (progname, prog_path, prog_argv, NULL,
+             true, true, false, false, true, false, NULL);
   /* Exit code 0 means success, 2 means timed out.  */
   return !(java_exitcode == 0 || java_exitcode == 2);
 }
@@ -320,8 +320,8 @@ fetch (const char *url, const char *file)
         argv[0] = "wget";
         argv[1] = "--version";
         argv[2] = NULL;
-        exitstatus = execute ("wget", "wget", argv, false, false, true, true,
-                              true, false, NULL);
+        exitstatus = execute ("wget", "wget", argv, NULL,
+                              false, false, true, true, true, false, NULL);
         wget_present = (exitstatus == 0);
         wget_tested = true;
       }
@@ -338,8 +338,8 @@ fetch (const char *url, const char *file)
         argv[6] = "--user-agent"; argv[7] = "urlget";
         argv[8] = (char *) url;
         argv[9] = NULL;
-        exitstatus = execute ("wget", "wget", argv, true, false, false, false,
-                              true, false, NULL);
+        exitstatus = execute ("wget", "wget", argv, NULL,
+                              true, false, false, false, true, false, NULL);
         if (exitstatus != 127)
           {
             if (exitstatus != 0)
@@ -365,8 +365,8 @@ fetch (const char *url, const char *file)
         argv[0] = "lynx";
         argv[1] = "--version";
         argv[2] = NULL;
-        exitstatus = execute ("lynx", "lynx", argv, false, false, true, true,
-                              true, false, NULL);
+        exitstatus = execute ("lynx", "lynx", argv, NULL,
+                              false, false, true, true, true, false, NULL);
         lynx_present = (exitstatus == 0);
         lynx_tested = true;
       }
@@ -381,8 +381,8 @@ fetch (const char *url, const char *file)
         argv[2] = "-source";
         argv[3] = (char *) url;
         argv[4] = NULL;
-        exitstatus = execute ("lynx", "lynx", argv, true, false, false, false,
-                              true, false, NULL);
+        exitstatus = execute ("lynx", "lynx", argv, NULL,
+                              true, false, false, false, true, false, NULL);
         if (exitstatus != 127)
           {
             if (exitstatus != 0)
@@ -408,8 +408,8 @@ fetch (const char *url, const char *file)
         argv[0] = "curl";
         argv[1] = "--version";
         argv[2] = NULL;
-        exitstatus = execute ("curl", "curl", argv, false, false, true, true,
-                              true, false, NULL);
+        exitstatus = execute ("curl", "curl", argv, NULL,
+                              false, false, true, true, true, false, NULL);
         curl_present = (exitstatus == 0 || exitstatus == 2);
         curl_tested = true;
       }
@@ -424,8 +424,8 @@ fetch (const char *url, const char *file)
         argv[2] = "--user-agent"; argv[3] = "urlget";
         argv[4] = (char *) url;
         argv[5] = NULL;
-        exitstatus = execute ("curl", "curl", argv, true, false, false, false,
-                              true, false, NULL);
+        exitstatus = execute ("curl", "curl", argv, NULL,
+                              true, false, false, false, true, false, NULL);
         if (exitstatus != 127)
           {
             if (exitstatus != 0)

diff --git a/gettext-tools/src/write-resources.c b/gettext-tools/src/write-resources.c
index 55c3e769b6a4e6cf642a0eb6468aa30369aa9ab5..3a0c3c3ff95cce0cc9a192448b1bfd6289a6ad94 100644 (file)
--- a/gettext-tools/src/write-resources.c
+++ b/gettext-tools/src/write-resources.c
@@ -1,5 +1,5 @@
 /* Writing C# .resources files.
-   Copyright (C) 2003-2005, 2007-2009, 2010-2011, 2016 Free Software
+   Copyright (C) 2003-2005, 2007-2009, 2010-2011, 2016, 2020 Free Software
    Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
@@ -71,8 +71,8 @@ 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, false,
-                           true, true, fd);
+  child = create_pipe_out (progname, prog_path, prog_argv, NULL,
+                           NULL, false, true, true, fd);
 
   fp = fdopen (fd[0], "wb");
   if (fp == NULL)

diff --git a/gettext-tools/src/x-ruby.c b/gettext-tools/src/x-ruby.c
index e3714390ad02163b9fd052e57ca42b4019ad0bf9..12a1a8e259b36df236f55dd2d7279387cb99f54b 100644 (file)
--- a/gettext-tools/src/x-ruby.c
+++ b/gettext-tools/src/x-ruby.c
@@ -126,7 +126,7 @@ extract_ruby (const char *real_filename, const char *logical_filename,
           free (command);
         }
 
-      child = create_pipe_in (progname, progname, argv,
+      child = create_pipe_in (progname, progname, argv, NULL,
                               DEV_NULL, false, true, true, fd);
 
       fp = fdopen (fd[0], "r");