OSSP CVS Repository

ossp - Check-in [1327]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 1327
Date: 2001-Nov-14 11:47:17 (local)
2001-Nov-14 10:47:17 (UTC)
User:ms
Branch:
Comment: Expanded tabs.
Tickets:
Inspections:
Files:
ossp-pkg/var/var_test.c      1.7 -> 1.8     93 inserted, 93 deleted

ossp-pkg/var/var_test.c 1.7 -> 1.8

--- var_test.c   2001/11/13 14:42:57     1.7
+++ var_test.c   2001/11/14 10:47:17     1.8
@@ -4,23 +4,23 @@
 #include "var.h"
 
 static int env_lookup(void *context,
-                      const char *varname, size_t name_len,
-                      const char **data, size_t * data_len,
-                      size_t * buffer_size)
+              const char *varname, size_t name_len,
+              const char **data, size_t * data_len,
+              size_t * buffer_size)
 {
     char tmp[256];
 
     if (name_len > sizeof(tmp) - 1) {
-        /* Callback can't expand variable names longer than
-           sizeof(tmp) characters. */
+    /* Callback can't expand variable names longer than
+       sizeof(tmp) characters. */
 
-        return VAR_CALLBACK_ERROR;
+    return VAR_CALLBACK_ERROR;
     }
     memcpy(tmp, varname, name_len);
     tmp[name_len] = '\0';
     *data = getenv(tmp);
     if (*data == NULL)
-        return 0;
+    return 0;
     *data_len = strlen(*data);
     *buffer_size = 0;
     return 1;
@@ -34,59 +34,59 @@
 int main(int argc, char **argv)
 {
     const struct test_case tests[] = {
-        {"$HOME", "/home/regression-tests"},
-        {"${FOO}", "os"},
-        {"${BAR}", "type"},
-        {"${${FOO:u}${BAR:u}:l:u}", "REGRESSION-OS"},
-        {"${UNDEFINED}", "${UNDEFINED}"},
-        {"${OSTYPE:#}", "13"},
-        {"${EMPTY:-test${FOO}test}", "testostest"},
-        {"${EMPTY:-test${FOO:u}test}", "testOStest"},
-        {"${TERM:-test${FOO}test}", "regression-term"},
-        {"${EMPTY:+FOO}", ""},
-        {"${HOME:+test${FOO}test}", "testostest"},
-        {"${HOME:+${OS${BAR:u}}}", "regression-os"},
-        {"${HOME:+OS${UNDEFINED:u}}", "OS${UNDEFINED:u}"},
-        {"${UNDEFINED:+OS${BAR:u}}", "${UNDEFINED:+OS${BAR:u}}"},
-        {"${HOME:*heinz}", ""},
-        {"${EMPTY:*claus}", "claus"},
-        {"${TERM}", "regression-term"},
-        {"${HOME:s/reg/bla/}", "/home/blaression-tests"},
-        {"${HOME:s/e/bla/}", "/hombla/regression-tests"},
-        {"${HOME:s/e/bla/g}", "/hombla/rblagrblassion-tblasts"},
-        {"${HOME:s/\\//_/g}", "_home_regression-tests"},
-        {"${HOME:s/[eso]/_/g}", "/h_m_/r_gr___i_n-t__t_"},
-        {"${HOME:s/[esO]/_/g}", "/hom_/r_gr___ion-t__t_"},
-        {"${HOME:s/[esO]/_/gi}", "/h_m_/r_gr___i_n-t__t_"},
-        {"${OSTYPE:s/^[re]/_/g}", "_egression-os"},
-        {"${EMPTY:s/^[re]/_/g}", ""},
-        {"${HOME:s/.*/heinz/}", "heinz"},
-        {"${HOME:s/e/bla/t}", "/hombla/regression-tests"},
-        {"${HOME:s/E/bla/t}", "/home/regression-tests"},
-        {"${HOME:s/E/bla/ti}", "/hombla/regression-tests"},
-        {"${HOME:s/E/bla/tig}", "/hombla/rblagrblassion-tblasts"},
-        {"${HOME:o1-5}", "home/"},
-        {"${HOME:o1,5}", "home"},
-        {"${HOME:o5,}", "/regression-tests"},
-        {"${HOME:o5-}", "/regression-tests"},
-        {"${HOME:o7,13}", "egress"},
-        {"${HOME:y/a-z/A-YZ/}", "/HOME/REGRESSION-TESTS"},
-        {"${HOME:y/e-g/a-c/}", "/homa/racrassion-tasts"},
-        {"${FOO:p/15/../l}", "os............."},
-        {"${FOO:p/15/12345/l}", "os1234512345123"},
-        {"${FOO:p/15/../r}", ".............os"},
-        {"${FOO:p/15/12345/r}", "1234512345123os"},
-        {"${FOO:p/15/../c}", "......os......."},
-        {"${FOO:p/15/12345/c}", "123451os1234512"},
-        {"${FOO:s/os/\\x{4F}\\123/g}", "OS"},
-        {"${FOO:s/os/\\1\\x4F\\123/t}", "\\1OS"},
-        {"${HOME:s/g(res)s/x\\1x/g}", "/home/rexresxion-tests"},
-        {"${HOME:s/(s+)/_\\1_/g}", "/home/regre_ss_ion-te_s_t_s_"},
-        {"${HOME:s/\\x65/\\x45/g}", "/homE/rEgrEssion-tEsts"},
-        {"${HOME:s/(s*)/x\\1X/g}",
-         "xXxXxXxXxXxXxXxXxXxXxXxssXxXxXxXxXxXxXxsXxXxsX"},
-        {"${HOME:s/./\\\\/g}",
-         "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"}
+    {"$HOME", "/home/regression-tests"},
+    {"${FOO}", "os"},
+    {"${BAR}", "type"},
+    {"${${FOO:u}${BAR:u}:l:u}", "REGRESSION-OS"},
+    {"${UNDEFINED}", "${UNDEFINED}"},
+    {"${OSTYPE:#}", "13"},
+    {"${EMPTY:-test${FOO}test}", "testostest"},
+    {"${EMPTY:-test${FOO:u}test}", "testOStest"},
+    {"${TERM:-test${FOO}test}", "regression-term"},
+    {"${EMPTY:+FOO}", ""},
+    {"${HOME:+test${FOO}test}", "testostest"},
+    {"${HOME:+${OS${BAR:u}}}", "regression-os"},
+    {"${HOME:+OS${UNDEFINED:u}}", "OS${UNDEFINED:u}"},
+    {"${UNDEFINED:+OS${BAR:u}}", "${UNDEFINED:+OS${BAR:u}}"},
+    {"${HOME:*heinz}", ""},
+    {"${EMPTY:*claus}", "claus"},
+    {"${TERM}", "regression-term"},
+    {"${HOME:s/reg/bla/}", "/home/blaression-tests"},
+    {"${HOME:s/e/bla/}", "/hombla/regression-tests"},
+    {"${HOME:s/e/bla/g}", "/hombla/rblagrblassion-tblasts"},
+    {"${HOME:s/\\//_/g}", "_home_regression-tests"},
+    {"${HOME:s/[eso]/_/g}", "/h_m_/r_gr___i_n-t__t_"},
+    {"${HOME:s/[esO]/_/g}", "/hom_/r_gr___ion-t__t_"},
+    {"${HOME:s/[esO]/_/gi}", "/h_m_/r_gr___i_n-t__t_"},
+    {"${OSTYPE:s/^[re]/_/g}", "_egression-os"},
+    {"${EMPTY:s/^[re]/_/g}", ""},
+    {"${HOME:s/.*/heinz/}", "heinz"},
+    {"${HOME:s/e/bla/t}", "/hombla/regression-tests"},
+    {"${HOME:s/E/bla/t}", "/home/regression-tests"},
+    {"${HOME:s/E/bla/ti}", "/hombla/regression-tests"},
+    {"${HOME:s/E/bla/tig}", "/hombla/rblagrblassion-tblasts"},
+    {"${HOME:o1-5}", "home/"},
+    {"${HOME:o1,5}", "home"},
+    {"${HOME:o5,}", "/regression-tests"},
+    {"${HOME:o5-}", "/regression-tests"},
+    {"${HOME:o7,13}", "egress"},
+    {"${HOME:y/a-z/A-YZ/}", "/HOME/REGRESSION-TESTS"},
+    {"${HOME:y/e-g/a-c/}", "/homa/racrassion-tasts"},
+    {"${FOO:p/15/../l}", "os............."},
+    {"${FOO:p/15/12345/l}", "os1234512345123"},
+    {"${FOO:p/15/../r}", ".............os"},
+    {"${FOO:p/15/12345/r}", "1234512345123os"},
+    {"${FOO:p/15/../c}", "......os......."},
+    {"${FOO:p/15/12345/c}", "123451os1234512"},
+    {"${FOO:s/os/\\x{4F}\\123/g}", "OS"},
+    {"${FOO:s/os/\\1\\x4F\\123/t}", "\\1OS"},
+    {"${HOME:s/g(res)s/x\\1x/g}", "/home/rexresxion-tests"},
+    {"${HOME:s/(s+)/_\\1_/g}", "/home/regre_ss_ion-te_s_t_s_"},
+    {"${HOME:s/\\x65/\\x45/g}", "/homE/rEgrEssion-tEsts"},
+    {"${HOME:s/(s*)/x\\1X/g}",
+     "xXxXxXxXxXxXxXxXxXxXxXxssXxXxXxXxXxXxXxsXxXxsX"},
+    {"${HOME:s/./\\\\/g}",
+     "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"}
     };
     char *tmp;
     size_t tmp_len;
@@ -95,49 +95,49 @@
     char buffer[1024];
 
     if (setenv("HOME", "/home/regression-tests", 1) != 0 ||
-        setenv("OSTYPE", "regression-os", 1) != 0 ||
-        setenv("TERM", "regression-term", 1) != 0 ||
-        setenv("FOO", "os", 1) != 0 ||
-        setenv("BAR", "type", 1) != 0 || setenv("EMPTY", "", 1) != 0) {
-        printf("Failed to set the environment: %s.\n", strerror(errno));
-        return 1;
+    setenv("OSTYPE", "regression-os", 1) != 0 ||
+    setenv("TERM", "regression-term", 1) != 0 ||
+    setenv("FOO", "os", 1) != 0 ||
+    setenv("BAR", "type", 1) != 0 || setenv("EMPTY", "", 1) != 0) {
+    printf("Failed to set the environment: %s.\n", strerror(errno));
+    return 1;
     }
     unsetenv("UNDEFINED");
 
     for (i = 0; i < sizeof(tests) / sizeof(struct test_case); ++i) {
 #ifdef DEBUG
-        printf("Test case #%02d: Original input is '%s'.\n", i,
-               tests[i].input);
+    printf("Test case #%02d: Original input is '%s'.\n", i,
+           tests[i].input);
 #endif
-        rc = var_unescape(tests[i].input, strlen(tests[i].input), buffer,
-                          0);
-        if (rc != VAR_OK) {
-            printf
-                ("Test case #%d: First var_unescape() failed with return code %d.\n",
-                 i, rc);
-            return 1;
-        }
+    rc = var_unescape(tests[i].input, strlen(tests[i].input), buffer,
+              0);
+    if (rc != VAR_OK) {
+        printf
+        ("Test case #%d: First var_unescape() failed with return code %d.\n",
+         i, rc);
+        return 1;
+    }
 #ifdef DEBUG
-        printf("Test case #%02d: Unescaped input is '%s'.\n", i, buffer);
+    printf("Test case #%02d: Unescaped input is '%s'.\n", i, buffer);
 #endif
-        rc = var_expand(buffer, strlen(buffer), &tmp, &tmp_len,
-                        &env_lookup, NULL, NULL, 0);
-        if (rc != VAR_OK) {
-            printf
-                ("Test case #%d: var_expand() failed with return code %d.\n",
-                 i, rc);
-            return 1;
-        }
+    rc = var_expand(buffer, strlen(buffer), &tmp, &tmp_len,
+            &env_lookup, NULL, NULL, 0);
+    if (rc != VAR_OK) {
+        printf
+        ("Test case #%d: var_expand() failed with return code %d.\n",
+         i, rc);
+        return 1;
+    }
 #ifdef DEBUG
-        printf("Test case #%02d: Expanded output is '%s'.\n", i, tmp);
+    printf("Test case #%02d: Expanded output is '%s'.\n", i, tmp);
 #endif
-        if (tmp_len != strlen(tests[i].expected) || tmp == NULL
-            || memcmp(tests[i].expected, tmp, tmp_len) != 0) {
-            printf("Test case #%d: Expected result '%s' but got '%s'.\n",
-                   i, tests[i].expected, tmp);
-            return 1;
-        }
-        free(tmp);
+    if (tmp_len != strlen(tests[i].expected) || tmp == NULL
+        || memcmp(tests[i].expected, tmp, tmp_len) != 0) {
+        printf("Test case #%d: Expected result '%s' but got '%s'.\n",
+           i, tests[i].expected, tmp);
+        return 1;
+    }
+    free(tmp);
     }
 
     return 0;

CVSTrac 2.0.1