Changeset 584 in openpam

Timestamp:

04/07/12 22:47:16 (14 months ago)

Author:

des

Message:

Add test cases for escaped whitespace within single- and double-quoted
strings. This reveals a bug relating to line continuations within
double-quoted strings.

File:

• trunk/t/t_openpam_readword.c (modified) (3 diffs)

trunk/t/t_openpam_readword.c

@@ -400 +400 @@
 
         orw_open();
-        orw_output("\\  \\\t \\\r\n");
+        orw_output("\\  \\\t \\\r \\\n\n");
         orw_rewind();
         ret = orw_expect(" ", 0 /*lines*/, 0 /*eof*/, 0 /*eol*/) &&
             orw_expect("\t", 0 /*lines*/, 0 /*eof*/, 0 /*eol*/) &&
-            orw_expect("\r", 0 /*lines*/, 0 /*eof*/, 1 /*eol*/);
+            orw_expect("\r", 0 /*lines*/, 0 /*eof*/, 0 /*eol*/) &&
+            /* this last one is a line continuation */
+            orw_expect(NULL, 1 /*lines*/, 0 /*eof*/, 1 /*eol*/);
         orw_close();
         return (ret);
@@ -617 +619 @@
         orw_rewind();
         ret = orw_expect("\"", 0 /*lines*/, 0 /*eof*/, 1 /*eol*/);
+        orw_close();
+        return (ret);
+}
+
+T_FUNC(escaped_whitespace_within_single_quotes,
+    "escaped whitespace within single quotes")
+{
+        int ret;
+
+        orw_open();
+        orw_output("'\\ ' '\\\t' '\\\r' '\\\n'\n");
+        orw_rewind();
+        ret = orw_expect("\\ ", 0 /*lines*/, 0 /*eof*/, 0 /*eol*/) &&
+            orw_expect("\\\t", 0 /*lines*/, 0 /*eof*/, 0 /*eol*/) &&
+            orw_expect("\\\r", 0 /*lines*/, 0 /*eof*/, 0 /*eol*/) &&
+            orw_expect("\\\n", 1 /*lines*/, 0 /*eof*/, 1 /*eol*/);
+        orw_close();
+        return (ret);
+}
+
+T_FUNC(escaped_whitespace_within_double_quotes,
+    "escaped whitespace within double quotes")
+{
+        int ret;
+
+        orw_open();
+        orw_output("\"\\ \" \"\\\t\" \"\\\r\" \"\\\n\"\n");
+        orw_rewind();
+        ret = orw_expect("\\ ", 0 /*lines*/, 0 /*eof*/, 0 /*eol*/) &&
+            orw_expect("\\\t", 0 /*lines*/, 0 /*eof*/, 0 /*eol*/) &&
+            orw_expect("\\\r", 0 /*lines*/, 0 /*eof*/, 0 /*eol*/) &&
+            /* this last one is a line continuation */
+            orw_expect("", 1 /*lines*/, 0 /*eof*/, 1 /*eol*/);
         orw_close();
         return (ret);
@@ -769 +804 @@
         T(escaped_single_quote),
         T(escaped_double_quote),
+        T(escaped_whitespace_within_single_quotes),
+        T(escaped_whitespace_within_double_quotes),
         T(escaped_letter_within_single_quotes),
         T(escaped_letter_within_double_quotes),