Changeset 829 in openpam

Timestamp:

Oct 23, 2014, 8:26:17 AM (7 years ago)

Author:

Dag-Erling Smørgrav

Message:

merge r828: additional tests for line continuation

Location:

branches/nooath

Files:

• . (modified) (1 prop)
• t/t_openpam_readword.c (modified) (4 diffs)

branches/nooath/t/t_openpam_readword.c

@@ -171 +171 @@
 }
 
-T_FUNC(line_continuation_in_whitespace, "line continuation in whitespace")
-{
-        struct t_file *tf;
-        int ret;
-
-        tf = t_fopen(NULL);
-        t_fprintf(tf, " \\\n \n");
-        t_frewind(tf);
-        ret = orw_expect(tf, NULL, 1 /*lines*/, 0 /*eof*/, 1 /*eol*/);
-        t_fclose(tf);
-        return (ret);
-}
-
 T_FUNC(comment, "comment")
 {
@@ -900 +887 @@
         t_frewind(tf);
         ret = orw_expect(tf, "\"", 0 /*lines*/, 0 /*eof*/, 1 /*eol*/);
+        t_fclose(tf);
+        return (ret);
+}
+
+
+
+/***************************************************************************
+ * Line continuation
+ */
+
+T_FUNC(line_continuation_within_whitespace, "line continuation within whitespace")
+{
+        struct t_file *tf;
+        int ret;
+
+        tf = t_fopen(NULL);
+        t_fprintf(tf, " \\\n \n");
+        t_frewind(tf);
+        ret = orw_expect(tf, NULL, 1 /*lines*/, 0 /*eof*/, 1 /*eol*/);
+        t_fclose(tf);
+        return (ret);
+}
+
+T_FUNC(line_continuation_before_whitespace, "line continuation before whitespace")
+{
+        struct t_file *tf;
+        int ret;
+
+        tf = t_fopen(NULL);
+        t_fprintf(tf, "xyzzy\\\n \n");
+        t_frewind(tf);
+        ret = orw_expect(tf, "xyzzy", 1 /*lines*/, 0 /*eof*/, 0 /*eol*/) &&
+            orw_expect(tf, NULL, 0 /*lines*/, 0 /*eof*/, 1 /*eol*/);
+        t_fclose(tf);
+        return (ret);
+}
+
+T_FUNC(line_continuation_after_whitespace, "line continuation after whitespace")
+{
+        struct t_file *tf;
+        int ret;
+
+        tf = t_fopen(NULL);
+        t_fprintf(tf, " \\\nxyzzy\n");
+        t_frewind(tf);
+        ret = orw_expect(tf, "xyzzy", 1 /*lines*/, 0 /*eof*/, 1 /*eol*/);
+        t_fclose(tf);
+        return (ret);
+}
+
+T_FUNC(line_continuation_within_word, "line continuation within word")
+{
+        struct t_file *tf;
+        int ret;
+
+        tf = t_fopen(NULL);
+        t_fprintf(tf, "xyz\\\nzy\n");
+        t_frewind(tf);
+        ret = orw_expect(tf, "xyzzy", 1 /*lines*/, 0 /*eof*/, 1 /*eol*/);
         t_fclose(tf);
         return (ret);
@@ -916 +962 @@
         T(single_whitespace),
         T(multiple_whitespace),
-        T(line_continuation_in_whitespace),
         T(comment),
         T(whitespace_before_comment),
@@ -973 +1018 @@
         T(escaped_double_quote_within_double_quotes),
 
+        T(line_continuation_within_whitespace),
+        T(line_continuation_before_whitespace),
+        T(line_continuation_after_whitespace),
+        T(line_continuation_within_word),
+
         NULL
 };