diff options
authorSergey Poznyakoff <gray@gnu.org>2016-07-16 12:48:47 +0300
committerSergey Poznyakoff <gray@gnu.org>2016-07-16 12:48:47 +0300
commitbf877250e396171b78a04d5c18fc1df3e6946299 (patch)
parentb1401baf175eaea316afa773a9971c1ed7ce10d7 (diff)
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.
5 files changed, 12 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 55cead2..78d2ff2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-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.
@@ -40,6 +40,12 @@ 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
diff --git a/doc/pies.texi b/doc/pies.texi
index 0e8af70..7428d2b 100644
--- a/doc/pies.texi
+++ b/doc/pies.texi
@@ -476,6 +476,7 @@ physical lines, e.g.:
If the character following a backslash is not one of those specified
above, the backslash is ignored and a warning is issued.
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
@@ -487,7 +488,7 @@ example above:
" split over several lines"
@end group
@end example
+@end ignore
@item Here-document
@cindex here-document
diff --git a/grecs b/grecs
-Subproject 8241dc04501f62b613f17f5c165f915a216ba30
+Subproject 1c1e7a987f643aae50bf8b45928650bb384e5c6
diff --git a/src/pies.h b/src/pies.h
index b0cc746..851a8ff 100644
--- a/src/pies.h
+++ b/src/pies.h
@@ -56,7 +56,7 @@
#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]))
diff --git a/src/piesctl.c b/src/piesctl.c
index aa6150a..9391d4b 100644
--- a/src/piesctl.c
+++ b/src/piesctl.c
@@ -27,8 +27,8 @@
#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>

Return to:

Send suggestions and report system problems to the System administrator.