Changeset d6084ef in mainline for uspace/srv/vfs/vfs_lookup.c

Timestamp:

2008-03-02T15:05:26Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

dadcec1

Parents:

9bb85f3

Message:

Make VFS canonify path names on lookup.

File:

• uspace/srv/vfs/vfs_lookup.c (modified) (8 diffs)

uspace/srv/vfs/vfs_lookup.c

@@ -50 +50 @@
 
 /* Forward static declarations. */
-static char *canonify(char *path);
+static char *canonify(char *path, size_t *lenp);
 
 atomic_t plb_futex = FUTEX_INITIALIZER;
@@ -58 +58 @@
 /** Perform a path lookup.
  *
- * @param path          Path to be resolved; it needn't be an ASCIIZ string.
- * @param len           Number of path characters pointed by path.
+ * @param path          Path to be resolved; it must be a NULL-terminated
+ *                      string.
  * @param lflag         Flags to be used during lookup.
  * @param result        Empty structure where the lookup result will be stored.
@@ -68 +68 @@
  * @return              EOK on success or an error code from errno.h.
  */
-int vfs_lookup_internal(char *path, size_t len, int lflag,
-    vfs_lookup_res_t *result, vfs_pair_t *altroot)
+int vfs_lookup_internal(char *path, int lflag, vfs_lookup_res_t *result,
+    vfs_pair_t *altroot)
 {
         vfs_pair_t *root;
-
-        if (!len)
-                return EINVAL;
 
         if (altroot)
@@ -83 +80 @@
         if (!root->fs_handle)
                 return ENOENT;
+        
+        size_t len;
+        path = canonify(path, &len);
+        if (!path)
+                return EINVAL;
         
         futex_down(&plb_futex);
@@ -274 +276 @@
 static void terminate_slash(token_t *t, token_t *tfsl, token_t *tlcomp)
 {
-        tfsl->stop[1] = '\0';
+        if (tfsl->stop[1])      /* avoid writing to a well-formatted path */
+                tfsl->stop[1] = '\0';
 }
 static void remove_trailing_slash(token_t *t, token_t *tfsl, token_t *tlcomp)
@@ -435 +438 @@
  * It works in-place and requires a NULL-terminated input string.
  *
- * @param               Path to be canonified.
+ * @param path          Path to be canonified.
+ * @param lenp          Pointer where the length of the final path will be
+ *                      stored. Can be NULL.
  *
  * @return              Canonified path or NULL on failure.
  */
-char *canonify(char *path)
+char *canonify(char *path, size_t *lenp)
 {
         state_t state;
@@ -451 +456 @@
         state = S_INI;
         t = tfsl;
+        tlcomp = tfsl;
         while (state != S_ACCEPT && state != S_RESTART && state != S_REJECT) {
                 if (trans[state][t.kind].f)
@@ -464 +470 @@
                 return NULL;
         case S_ACCEPT:
+                if (lenp)
+                        *lenp = (size_t)((tlcomp.stop - tfsl.start) + 1);
                 return tfsl.start; 
         default: