diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2016-07-16 12:48:47 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2016-07-16 12:48:47 +0300 |
commit | bf877250e396171b78a04d5c18fc1df3e6946299 (patch) | |
tree | 9c8233f6c6fcb0d7735897d37bd4e9b2d7449429 | |
parent | b1401baf175eaea316afa773a9971c1ed7ce10d7 (diff) | |
download | pies-bf877250e396171b78a04d5c18fc1df3e6946299.tar.gz pies-bf877250e396171b78a04d5c18fc1df3e6946299.tar.bz2 |
Don't concatenate adjacent strings in configuration files.
* grecs: Upgrade.
* src/pies.h: Fix include paths.
* src/piesctl.c: Likewise.
* NEWS: Document changes.
* doc/pies.texi: Likewise.
-rw-r--r-- | NEWS | 8 | ||||
-rw-r--r-- | doc/pies.texi | 3 | ||||
m--------- | grecs | 0 | ||||
-rw-r--r-- | src/pies.h | 2 | ||||
-rw-r--r-- | src/piesctl.c | 4 |
5 files changed, 12 insertions, 5 deletions
@@ -1,7 +1,7 @@ -GNU Pies NEWS -- history of user-visible changes. 2016-03-15 +GNU Pies NEWS -- history of user-visible changes. 2016-07-16 Copyright (C) 2009-2016 Sergey Poznyakoff See the end of file for copying conditions. Please send Pies bug reports to <bug-pies@gnu.org> or <bug-pies@gnu.org.ua> @@ -37,12 +37,18 @@ group of the process being stopped. - nullinput Do not close standard input. Redirect it from /dev/null instead. Use this option with commands that require their standard input to be open (e.g. pppd nodetach). +** String concatenation + +The adjacent string concatenation feature proved to create more +problems than solutions (in particular, with the "env" statement) +and was removed. + Version 1.2, 2009-12-11 * First release as a GNU package. * Full inetd support diff --git a/doc/pies.texi b/doc/pies.texi index 0e8af70..7428d2b 100644 --- a/doc/pies.texi +++ b/doc/pies.texi @@ -473,24 +473,25 @@ physical lines, e.g.: @end group @end example If the character following a backslash is not one of those specified above, the backslash is ignored and a warning is issued. +@ignore Two or more adjacent quoted strings are concatenated, which gives another way to split long strings over several lines to improve readability. The following fragment produces the same result as in the example above: @example @group "a long string may be" " split over several lines" @end group @end example - +@end ignore @anchor{here-document} @item Here-document @cindex here-document @dfn{Here-document} is a special construct that allows to introduce strings of text containing embedded newlines. diff --git a/grecs b/grecs -Subproject 8241dc04501f62b613f17f5c165f915a216ba30 +Subproject 1c1e7a987f643aae50bf8b45928650bb384e5c6 @@ -53,13 +53,13 @@ #include "quotearg.h" #include "fprintftime.h" #include "identity.h" #include "acl.h" #include "libpies.h" -#include "json.h" +#include "grecs/json.h" #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) #define TESTTIME 2*60 #define SLEEPTIME 5*60 #define MAXSPAWN 10 diff --git a/src/piesctl.c b/src/piesctl.c index aa6150a..9391d4b 100644 --- a/src/piesctl.c +++ b/src/piesctl.c @@ -24,14 +24,14 @@ #include <locale.h> #include <errno.h> #include <fcntl.h> #include <assert.h> #include <configmake.h> #include <grecs.h> -#include <grecs-locus.h> -#include <json.h> +#include <grecs/locus.h> +#include <grecs/json.h> #include <wordsplit.h> #include <sysexits.h> #include <termios.h> #include "base64.h" #include "progname.h" #include "libpies.h" |