From: Bruno Haible Date: Tue, 10 Jun 2008 19:01:45 +0000 (+0000) Subject: Update following some changes in gnulib. X-Git-Tag: v0.18~399 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6b61a6616a60a57be82356e0c720578c0b7bb8a;p=thirdparty%2Fgettext.git Update following some changes in gnulib. --- diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog index 0a26be40d..53fbd6010 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,18 @@ +2008-06-10 Bruno Haible + + * msgexec.c (process_string): Update for changed signature of + wait_subprocess(). + * msgfilter.c (generic_filter): Likewise. + * msginit.c (project_id, project_id_version, get_user_email, + language_team_address): Likewise. + * read-csharp.c (execute_and_read_po_output): Likewise. + * read-java.c (execute_and_read_po_output): Likewise. + * read-resources.c (execute_and_read_po_output): Likewise. + * read-tcl.c (msgdomain_read_tcl): Likewise. + * write-resources.c (execute_writing_input): Likewise. + * urlget.c (execute_it, fetch): Update for changed signature of + execute(). + 2008-05-26 Bruno Haible * msginit.c (get_field, put_field): Recognize a field also if there is diff --git a/gettext-tools/src/msgexec.c b/gettext-tools/src/msgexec.c index 5f14f4e0e..345044dfc 100644 --- a/gettext-tools/src/msgexec.c +++ b/gettext-tools/src/msgexec.c @@ -1,5 +1,5 @@ /* Pass translations to a subprocess. - Copyright (C) 2001-2007 Free Software Foundation, Inc. + Copyright (C) 2001-2008 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify @@ -359,7 +359,8 @@ process_string (const message_ty *mp, const char *str, size_t len) /* Remove zombie process from process list, and retrieve exit status. */ /* FIXME: Should ignore_sigpipe be set to true here? It depends on the semantics of the subprogram... */ - exitstatus = wait_subprocess (child, sub_name, false, false, true, true); + exitstatus = + wait_subprocess (child, sub_name, false, false, true, true, NULL); if (exitcode < exitstatus) exitcode = exitstatus; } diff --git a/gettext-tools/src/msgfilter.c b/gettext-tools/src/msgfilter.c index 2f6fc760a..1177361f8 100644 --- a/gettext-tools/src/msgfilter.c +++ b/gettext-tools/src/msgfilter.c @@ -1,5 +1,5 @@ /* Edit translations using a subprocess. - Copyright (C) 2001-2007 Free Software Foundation, Inc. + Copyright (C) 2001-2008 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify @@ -706,7 +706,8 @@ generic_filter (const char *str, size_t len, char **resultp, size_t *lengthp) close (fd[0]); /* Remove zombie process from process list. */ - exitstatus = wait_subprocess (child, sub_name, false, false, true, true); + exitstatus = + wait_subprocess (child, sub_name, false, false, true, true, NULL); if (exitstatus != 0) error (EXIT_FAILURE, 0, _("%s subprocess terminated with exit code %d"), sub_name, exitstatus); diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c index 6e211badc..13182dc8e 100644 --- a/gettext-tools/src/msginit.c +++ b/gettext-tools/src/msginit.c @@ -855,7 +855,7 @@ project_id () fclose (fp); /* Remove zombie process from process list, and retrieve exit status. */ - exitstatus = wait_subprocess (child, prog, false, false, true, false); + exitstatus = wait_subprocess (child, prog, false, false, true, false, NULL); if (exitstatus != 0) { error (0, 0, _("%s subprocess failed with exit code %d"), @@ -930,7 +930,7 @@ project_id_version (const char *header) fclose (fp); /* Remove zombie process from process list, and retrieve exit status. */ - exitstatus = wait_subprocess (child, prog, false, false, true, false); + exitstatus = wait_subprocess (child, prog, false, false, true, false, NULL); if (exitstatus != 0) { error (0, 0, _("%s subprocess failed with exit code %d"), @@ -1090,7 +1090,7 @@ you in case of unexpected technical problems.\n"); fclose (fp); /* Remove zombie process from process list, and retrieve exit status. */ - exitstatus = wait_subprocess (child, prog, false, false, true, false); + exitstatus = wait_subprocess (child, prog, false, false, true, false, NULL); if (exitstatus != 0) { error (0, 0, _("%s subprocess failed with exit code %d"), @@ -1185,7 +1185,7 @@ language_team_address () fclose (fp); /* Remove zombie process from process list, and retrieve exit status. */ - exitstatus = wait_subprocess (child, prog, false, false, true, false); + exitstatus = wait_subprocess (child, prog, false, false, true, false, NULL); if (exitstatus != 0) { error (0, 0, _("%s subprocess failed with exit code %d"), diff --git a/gettext-tools/src/read-csharp.c b/gettext-tools/src/read-csharp.c index 1f2309588..14197c540 100644 --- 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-2007 Free Software Foundation, Inc. + Copyright (C) 2003-2004, 2006-2008 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software: you can redistribute it and/or modify @@ -77,7 +77,8 @@ execute_and_read_po_output (const char *progname, fclose (fp); /* Remove zombie process from process list, and retrieve exit status. */ - exitstatus = wait_subprocess (child, progname, false, false, true, true); + exitstatus = + wait_subprocess (child, progname, false, false, true, true, NULL); if (exitstatus != 0) error (EXIT_FAILURE, 0, _("%s subprocess failed with exit code %d"), progname, exitstatus); diff --git a/gettext-tools/src/read-java.c b/gettext-tools/src/read-java.c index 6aa44ccc4..c43910b99 100644 --- 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-2007 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2006-2008 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify @@ -75,7 +75,8 @@ execute_and_read_po_output (const char *progname, fclose (fp); /* Remove zombie process from process list, and retrieve exit status. */ - exitstatus = wait_subprocess (child, progname, false, false, true, true); + exitstatus = + wait_subprocess (child, progname, false, false, true, true, NULL); if (exitstatus != 0) error (EXIT_FAILURE, 0, _("%s subprocess failed with exit code %d"), progname, exitstatus); diff --git a/gettext-tools/src/read-resources.c b/gettext-tools/src/read-resources.c index 032ca724b..559a90e40 100644 --- 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, 2006-2007 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2008 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software: you can redistribute it and/or modify @@ -78,7 +78,8 @@ execute_and_read_po_output (const char *progname, fclose (fp); /* Remove zombie process from process list, and retrieve exit status. */ - exitstatus = wait_subprocess (child, progname, false, false, true, true); + exitstatus = + wait_subprocess (child, progname, false, false, true, true, NULL); if (exitstatus != 0) error (EXIT_FAILURE, 0, _("%s subprocess failed with exit code %d"), progname, exitstatus); diff --git a/gettext-tools/src/read-tcl.c b/gettext-tools/src/read-tcl.c index 1acbc3fcc..53485a5d5 100644 --- 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-2007 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2008 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify @@ -115,7 +115,8 @@ msgdomain_read_tcl (const char *locale_name, const char *directory) fclose (fp); /* Remove zombie process from process list, and retrieve exit status. */ - exitstatus = wait_subprocess (child, "tclsh", false, false, true, true); + exitstatus = + wait_subprocess (child, "tclsh", false, false, true, true, NULL); if (exitstatus != 0) { if (exitstatus == 2) diff --git a/gettext-tools/src/urlget.c b/gettext-tools/src/urlget.c index e5df76b79..cf1545ac7 100644 --- a/gettext-tools/src/urlget.c +++ b/gettext-tools/src/urlget.c @@ -233,7 +233,7 @@ execute_it (const char *progname, (void) private_data; return execute (progname, prog_path, prog_argv, true, true, false, false, - true, false) + true, false, NULL) != 0; } @@ -291,7 +291,7 @@ fetch (const char *url, const char *file) argv[1] = "--version"; argv[2] = NULL; exitstatus = execute ("wget", "wget", argv, false, false, true, true, - true, false); + true, false, NULL); wget_present = (exitstatus == 0); wget_tested = true; } @@ -308,7 +308,7 @@ fetch (const char *url, const char *file) argv[6] = (char *) url; argv[7] = NULL; exitstatus = execute ("wget", "wget", argv, true, false, false, false, - true, false); + true, false, NULL); if (exitstatus != 127) { if (exitstatus != 0) @@ -334,7 +334,7 @@ fetch (const char *url, const char *file) argv[1] = "--version"; argv[2] = NULL; exitstatus = execute ("lynx", "lynx", argv, false, false, true, true, - true, false); + true, false, NULL); lynx_present = (exitstatus == 0); lynx_tested = true; } @@ -349,7 +349,7 @@ fetch (const char *url, const char *file) argv[2] = (char *) url; argv[3] = NULL; exitstatus = execute ("lynx", "lynx", argv, true, false, false, false, - true, false); + true, false, NULL); if (exitstatus != 127) { if (exitstatus != 0) @@ -375,7 +375,7 @@ fetch (const char *url, const char *file) argv[1] = "--version"; argv[2] = NULL; exitstatus = execute ("curl", "curl", argv, false, false, true, true, - true, false); + true, false, NULL); curl_present = (exitstatus == 0 || exitstatus == 2); curl_tested = true; } @@ -390,7 +390,7 @@ fetch (const char *url, const char *file) argv[2] = (char *) url; argv[3] = NULL; exitstatus = execute ("curl", "curl", argv, true, false, false, false, - true, 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 2f20201e5..3b9fdabbd 100644 --- 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 Free Software Foundation, Inc. + Copyright (C) 2003, 2005, 2007-2008 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software: you can redistribute it and/or modify @@ -98,7 +98,8 @@ execute_writing_input (const char *progname, /* He we can ignore SIGPIPE because WriteResource either writes to a file - then it never gets SIGPIPE - or to standard output, and in the latter case it has no side effects other than writing to standard output. */ - exitstatus = wait_subprocess (child, progname, true, false, true, true); + exitstatus = + wait_subprocess (child, progname, true, false, true, true, NULL); if (exitstatus != 0) error (EXIT_FAILURE, 0, _("%s subprocess failed with exit code %d"), progname, exitstatus);