Support `range' operator, as promised by the spec. Closes:#686449. Bug and analysis...

diff --git a/debian/changelog b/debian/changelog
index 4783d886279ae9a26c8f90d905932b7b78f6a990..eca804d5e6b98ccd54e705bd6022a80da039b712 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ userv (1.1.2~~iwj1) unstable; urgency=low
   Bugfixes:
   * Support `stdin', `stdout' and `stderr' in fd ranges, as promised
     by the spec.  Closes:#813005.
+  * Support `range' operator, as promised by the spec.  Closes:#686449.
+    Bug and analysis from Mark Wooding.
   * Do not ignore errors from readdir.  Closes:#827408 [Peter Benie].
   * Correct docs for errors-push, which takes no filename.
     Closes:#775852.

diff --git a/parser.c b/parser.c
index 257eb3e4ed808816d3ee8ca1f0ee8cc4aac48f40..1bdf56d3441188e25a958b715100685fcfd6a860 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -591,9 +591,7 @@ int pcf_range(int ctoken, char *const *pv, int *rtrue) {
   char *ep;
   unsigned long v;
 
-  r= pa_mwsp(); if (r) return r;
   mintoken= pa_numberdollar(&min); if (mintoken == tokv_error) return mintoken;
-  r= pa_mwsp(); if (r) return r;
   maxtoken= pa_numberdollar(&max); if (maxtoken == tokv_error) return maxtoken;
   r= pa_mnl(); if (r) return r;
   for (pp= pv; *pp; pp++) {