Changeset 1674 for trunk/src/emx/testcase

Timestamp:

Dec 1, 2004, 2:37:40 AM (21 years ago)

Author:

bird

Message:

Bugfixing LIBC 0.6 beta1.

File:

• trunk/src/emx/testcase/libc/miscinnotek/fsinternals.c (modified) (2 diffs, 1 prop)

trunk/src/emx/testcase/libc/miscinnotek/fsinternals.c

@@ -2 +2 @@
 #include <string.h>
 #include <errno.h>
-
-int __libc_back_fsResolve(const char *pszUserPath, unsigned fFlags, char *pszNativePath, int *pfInUnixTree);
-
-/** __libc_back_fsResolve() flags.
- * @{ */
-/** Resolves the path up to but not including the last component. */
-#define BACKFS_FLAGS_RESOLVE_PARENT     0x1
-/** Resolves and verfies the entire path. */
-#define BACKFS_FLAGS_RESOLVE_FULL       0x2
-/** Resolves and verfies the entire path but it's ok if the last component doesn't exist. */
-#define BACKFS_FLAGS_RESOLVE_FULL_MAYBE 0x3
-/** @} */
+#include "../../../src/lib/sys/b_fs.h"
 
 
-int main (int argc, char *argv[])
+/**
+ * Do one call, check and report the result.
+ */
+static int testit(const char *pszPath, unsigned fFlags, int rcCorrect)
 {
     char    szNativePath[300];
@@ -22 +14 @@
 
     memset(szNativePath, 0xAA, sizeof(szNativePath));
+    szNativePath[sizeof(szNativePath) - 1] = '\0';
     errno = 0;
-    rc = __libc_back_fsResolve(".", BACKFS_FLAGS_RESOLVE_FULL, szNativePath, NULL);
-    printf("+ '.' -> rc=%d errno=%d szNativePath=%s\n", rc, errno, szNativePath);
+    rc = __libc_back_fsResolve(pszPath, fFlags, szNativePath, NULL);
+    if (errno != 0)
+        printf("FAILURE: flags=%#02x path='%s' -> rc=%d errno=%d szNativePath='%s' ERRNO CHANGED!\n", fFlags, pszPath, rc, errno, szNativePath);
+    else if (!rcCorrect)
+    {
+        /*
+         * Positive test.
+         */
+        if (!rc)
+        {
+            if (!strchr(szNativePath, 0xAA))
+            {
+                printf("SUCCESS: flags=%#02x path='%s' -> szNativePath='%s'\n", fFlags, pszPath, szNativePath);
+                return 0;
+            }
+            else
+                printf("FAILURE: flags=%#02x path='%s' -> rc=%d szNativePath='%s' PADDING!\n", fFlags, pszPath, rc, szNativePath);
+        }
+        else
+            printf("FAILURE: flags=%#02x path='%s' -> rc=%d szNativePath='%s' (failed)\n", fFlags, pszPath, rc, szNativePath);
+    }
+    else
+    {
+        /*
+         * Negative test.
+         */
+        if (rc == rcCorrect)
+        {
+            printf("SUCCESS: flags=%#02x path='%s' -> rc=%d (negative)\n", fFlags, pszPath, rc);
+            return 0;
+        }
+        else
+            printf("FAILURE: flags=%#02x path='%s' -> rc=%d not %d! (negative)\n", fFlags, pszPath, rc, rcCorrect);
+    }
+    return 1;
+}
 
-    memset(szNativePath, 0xAA, sizeof(szNativePath));
-    errno = 0;
-    rc = __libc_back_fsResolve("/", BACKFS_FLAGS_RESOLVE_FULL, szNativePath, NULL);
-    printf("+ '/' -> rc=%d errno=%d szNativePath=%s\n", rc, errno, szNativePath);
 
-    memset(szNativePath, 0xAA, sizeof(szNativePath));
-    errno = 0;
-    rc = __libc_back_fsResolve("/tmp", BACKFS_FLAGS_RESOLVE_FULL, szNativePath, NULL);
-    printf("+ '/tmp' -> rc=%d errno=%d szNativePath=%s\n", rc, errno, szNativePath);
+int main (int argc, char *argv[])
+{
+    int     rcRet = 0;
 
-    memset(szNativePath, 0xAA, sizeof(szNativePath));
-    errno = 0;
-    rc = __libc_back_fsResolve("/tmp", BACKFS_FLAGS_RESOLVE_PARENT, szNativePath, NULL);
-    printf("+ '/tmp' (parent) -> rc=%d errno=%d szNativePath=%s\n", rc, errno, szNativePath);
 
-    memset(szNativePath, 0xAA, sizeof(szNativePath));
-    errno = 0;
-    rc = __libc_back_fsResolve("/nosuchdir", BACKFS_FLAGS_RESOLVE_PARENT, szNativePath, NULL);
-    printf("+ '/nosuchdir' (parent) -> rc=%d errno=%d szNativePath=%s\n", rc, errno, szNativePath);
-
-    memset(szNativePath, 0xAA, sizeof(szNativePath));
-    errno = 0;
-    rc = __libc_back_fsResolve("/nosuchdir/nosuchsubdir", BACKFS_FLAGS_RESOLVE_PARENT, szNativePath, NULL);
-    printf("- '/nosuchdir/nosuchsubdir' (parent) -> rc=%d errno=%d szNativePath=%s\n", rc, errno, szNativePath);
-
+    rcRet += testit(".", BACKFS_FLAGS_RESOLVE_FULL, 0);
+    rcRet += testit("/", BACKFS_FLAGS_RESOLVE_FULL, 0);
+    rcRet += testit("/tmp", BACKFS_FLAGS_RESOLVE_FULL, 0);
+    rcRet += testit("/tmp/", BACKFS_FLAGS_RESOLVE_FULL, -ENOENT);
+    rcRet += testit("/tmp/", BACKFS_FLAGS_RESOLVE_FULL | BACKFS_FLAGS_RESOLVE_DIR, 0);
+    rcRet += testit("/tmp", BACKFS_FLAGS_RESOLVE_PARENT, 0);
+    rcRet += testit("/tmp/", BACKFS_FLAGS_RESOLVE_PARENT, -ENOENT);
+    rcRet += testit("/tmp/", BACKFS_FLAGS_RESOLVE_PARENT | BACKFS_FLAGS_RESOLVE_DIR, 0);
+    rcRet += testit("/tmp/NoSuchSubDir", BACKFS_FLAGS_RESOLVE_PARENT, 0);
+    rcRet += testit("/tmp/NoSuchSubDir/", BACKFS_FLAGS_RESOLVE_PARENT, -ENOENT);
+    rcRet += testit("/tmp/NoSuchSubDir/", BACKFS_FLAGS_RESOLVE_PARENT | BACKFS_FLAGS_RESOLVE_DIR, 0);
+    rcRet += testit("/nosuchdir", BACKFS_FLAGS_RESOLVE_PARENT, 0);
+    rcRet += testit("/nosuchdir/nosuchsubdir", BACKFS_FLAGS_RESOLVE_PARENT, -ENOENT);
 
     return 0;