Version 1.3.92

10 files changed, 19 insertions, 12 deletions

diff --git a/NEWS b/NEWS
index f5be6dd..f4afcd4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,13 +1,13 @@
-GNU Pies NEWS -- history of user-visible changes. 2019-06-07
+GNU Pies NEWS -- history of user-visible changes. 2019-06-12
 See the end of file for copying conditions.
 
 Please send Pies bug reports to <bug-pies@gnu.org> or
 <bug-pies@gnu.org.ua>
 
-Version 1.3.91 (git)
+Version 1.3.92 (git)
 
 * New option --no-init
 
 The --no-init option instructs pies not to switch to init mode if its
 PID is 1.  Use this option if you run pies as a process manager in a
 docker container.
@@ -90,12 +90,14 @@ X to have the value "foo bar":
 * New environment variable available for commands started from return-code
 
 Programs started via "exec" statement in the "return-code" block
 obtain the PID of the master pies process in environment variable
 PIES_MASTER_PID.
 
+* Improved testsuite
+
 
 Version 1.3, 2016-10-01
 
 * SysV-style Init 
 
 GNU Pies can now be used as init process daemon - the first process
diff --git a/configure.ac b/configure.ac
index 814ac00..ae3a9c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,13 +12,13 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with GNU Pies.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.63])
-AC_INIT([GNU Pies], [1.3.91], [bug-pies@gnu.org.ua])
+AC_INIT([GNU Pies], [1.3.92], [bug-pies@gnu.org.ua])
 AC_CONFIG_SRCDIR([src/pies.h])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([1.11 gnits tar-ustar dist-bzip2 std-options silent-rules])
 
 # Enable silent rules by default:
diff --git a/lib/urlconn.c b/lib/urlconn.c
index 5994626..acf42d0 100644
--- a/lib/urlconn.c
+++ b/lib/urlconn.c
@@ -101,13 +101,14 @@ url_connect (struct pies_url *url, struct grecs_sockaddr *source_addr)
 	case EAI_SYSTEM:
 	  grecs_error (NULL, errno, "%s", _("cannot parse address"));
 	  return -1;
 	  
 	case EAI_BADFLAGS:
 	case EAI_SOCKTYPE:
-	  grecs_error (NULL, 0, _("%s:%d: internal error converting address"),
+	  grecs_error (NULL, 0,
+		       _("%s:%d: internal error while converting network address"),
 		       __FILE__,__LINE__);
 	  return -1;
 	  
 	case EAI_MEMORY:
 	  grecs_alloc_die ();
 	  
diff --git a/lib/wildmatch.c b/lib/wildmatch.c
index 2b4d7c8..cf359bd 100644
--- a/lib/wildmatch.c
+++ b/lib/wildmatch.c
@@ -15,12 +15,13 @@
    along with GNU Pies.  If not, see <http://www.gnu.org/licenses/>. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 #include <stdlib.h>
+#include <wordsplit.h>
 
 enum
   {
     WILD_FALSE = 0,
     WILD_TRUE,
     WILD_ABORT
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 764dd28..307e775 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -34,18 +34,21 @@ src/utmp.c
 src/cmdline.h
 src/piesctl-cl.h
 
 lib/grecsasrt.c
 lib/netrc.c
 lib/pp.c
+lib/urlconn.c
 
+grecs/src/assert.c
 grecs/src/cidr.c
 grecs/src/format.c
 grecs/src/grecs-gram.y
 grecs/src/grecs-lex.l
 grecs/src/json-gram.y
+grecs/src/lineacc.c
 grecs/src/meta1-gram.y
 grecs/src/meta1-lex.l
 grecs/src/opthelp.c
 grecs/src/path-parser.c
 grecs/src/preproc.c
 grecs/src/sockaddr.c
diff --git a/src/cmdline.opt b/src/cmdline.opt
index ff560be..d2aaf6d 100644
--- a/src/cmdline.opt
+++ b/src/cmdline.opt
@@ -34,13 +34,13 @@ OPTION(config-help,,,
 BEGIN
   config_help ();
   exit (0);
 END
 
 OPTION(,E,,
-       [<preprocess config and exit>])
+       [<preprocess configuration file and exit>])
 BEGIN
   preprocess_only = 1;
 END       
 
 OPTION(force,,,
        [<force startup even if another instance may be running>])
diff --git a/src/pies.c b/src/pies.c
index ff36269..bdd8ae2 100644
--- a/src/pies.c
+++ b/src/pies.c
@@ -971,13 +971,13 @@ _cb_redir (enum grecs_callback_command cmd,
 
     case GRECS_TYPE_ARRAY:
       if (grecs_assert_value_type (value->v.arg.v[0], GRECS_TYPE_STRING,
 				   locus))
 	return 1;
       if (strtotok (redirtab, value->v.arg.v[0]->v.string, &res))
-	grecs_error (locus, 0, _("%s: unrecognised redirector type"),
+	grecs_error (locus, 0, _("%s: unrecognized redirector type"),
 		     value->v.arg.v[0]->v.string);
       else
 	{
 	  if (res != redir_null)
 	    {
 	      if (value->v.arg.c != 2)
@@ -1096,13 +1096,13 @@ _cb_mode (enum grecs_callback_command cmd,
   grecs_value_t *value = node->v.value;
   int res;
 
   if (grecs_assert_node_value_type (cmd, node, GRECS_TYPE_STRING))
     return 1;
   if (strtotok (modetab, value->v.string, &res))
-    grecs_error (locus, 0, _("%s: unrecognised mode"), value->v.string);
+    grecs_error (locus, 0, _("%s: unrecognized mode"), value->v.string);
   else
     *(enum pies_comp_mode *) varptr = res;
   return 0;
 }
 
 static int
@@ -1171,13 +1171,13 @@ _cb_flags (enum grecs_callback_command cmd,
 
   switch (value->type)
     {
     case GRECS_TYPE_STRING:
       if (str_to_cf (value->v.string, flags))
 	{
-	  grecs_error (locus, 0, _("%s: unrecognised flag"), value->v.string);
+	  grecs_error (locus, 0, _("%s: unrecognized flag"), value->v.string);
 	  return 1;
 	}
       break;
 
     case GRECS_TYPE_LIST:
       {
@@ -1187,13 +1187,13 @@ _cb_flags (enum grecs_callback_command cmd,
 	  {
 	    const grecs_value_t *vp = ep->data;
 	    if (grecs_assert_value_type (vp, GRECS_TYPE_STRING, locus))
 	      return 1;
 	    if (str_to_cf (vp->v.string, flags))
 	      {
-		grecs_error (locus, 0, _("%s: unrecognised flag"),
+		grecs_error (locus, 0, _("%s: unrecognized flag"),
 			     vp->v.string);
 		return 1;
 	      }
 	  }
       }
       break;
diff --git a/src/piesctl.c b/src/piesctl.c
index aa983ee..ed30b65 100644
--- a/src/piesctl.c
+++ b/src/piesctl.c
@@ -1271,13 +1271,13 @@ pcond_parse_unary (struct cmdline_parser_state *state, struct json_value **ret)
     }
   else if (term[0] == '(')
     {
       pcond_parse_or (state, ret);
       term = next_token (state);
       if (!term || term[0] != ')')
-	parse_error ("%s", _("unbalanced parentesis"));
+	parse_error ("%s", _("unbalanced parenthesis"));
     }
   else
     parse_error (_("parse error at %s"), term);
 }
 
 static int
diff --git a/src/progman.c b/src/progman.c
index a6dc418..88f9afa 100644
--- a/src/progman.c
+++ b/src/progman.c
@@ -1399,13 +1399,13 @@ static void
 check_stopping (struct prog *prog, time_t now)
 {
   if (now - prog->v.p.timestamp >= shutdown_timeout)
     {
       if (prog->pid == 0)
 	logmsg (LOG_EMERG,
-		_("INTERNAL ERROR: attempting to kill unexisting process %s"),
+		_("INTERNAL ERROR: attempting to kill nonexistent process %s"),
 		prog_tag (prog));
       else if (prog->v.p.comp->flags & CF_SIGGROUP)
 	kill (-prog->pid, SIGKILL);
       else
 	kill (prog->pid, SIGKILL);
     }
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 5c3f785..6921b2b 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -37,13 +37,13 @@ control {
     socket "$PIES_CTLSOCK";
 }   
 _EOT
 ])
 
 m4_define([PIES_STOP],[
-piesctl --url "$PIES_CTLSOCK" shutdown
+piesctl --no-netrc --url "$PIES_CTLSOCK" shutdown
 pies_stop_spinner=0
 while test -f $PIES_PIDFILE 
 do
     sleep 1
     pies_stop_spinner=$(($pies_stop_spinner + 1))
     if test $pies_stop_spinner -gt 3; then