WebSVN – HelenOS – Diff – /trunk/uspace/srv/vfs/vfs_lookup.c

 #include "vfs.h"
 #define min(a, b)   ((a) < (b) ? (a) : (b))
 /* Forward static declarations. */
-static char *canonify(char *path);
+static char *canonify(char *path, size_t *lenp);
 atomic_t plb_futex = FUTEX_INITIALIZER;
 link_t plb_head;    /**< PLB entry ring buffer. */
 uint8_t *plb = NULL;
 /** Perform a path lookup.
+ *
- * @param path      Path to be resolved; it needn't be an ASCIIZ string.
+ * @param path      Path to be resolved; it must be a NULL-terminated
- * @param len       Number of path characters pointed by path.
+ *          string.
  * @param lflag     Flags to be used during lookup.
  * @param result    Empty structure where the lookup result will be stored.
  *          Can be NULL.
  * @param altroot   If non-empty, will be used instead of rootfs as the root
  *          of the whole VFS tree.
+ *
  * @return      EOK on success or an error code from errno.h.
  */
-int vfs_lookup_internal(char *path, size_t len, int lflag,
+int vfs_lookup_internal(char *path, int lflag, vfs_lookup_res_t *result,
-    vfs_lookup_res_t *result, vfs_pair_t *altroot)
+    vfs_pair_t *altroot)
+{
     vfs_pair_t *root;
-    if (!len)
-        return EINVAL;
     if (altroot)
         root = altroot;
     else
         root = (vfs_pair_t *) &rootfs;
     if (!root->fs_handle)
         return ENOENT;
+    size_t len;
+    path = canonify(path, &len);
+    if (!path)
+        return EINVAL;
     futex_down(&plb_futex);
     plb_entry_t entry;
     link_initialize(&entry.plb_link);
     entry.len = len;
+{
     *tlcomp = *t;
+}
 static void terminate_slash(token_t *t, token_t *tfsl, token_t *tlcomp)
+{
+    if (tfsl->stop[1])  /* avoid writing to a well-formatted path */
-    tfsl->stop[1] = '\0';
+        tfsl->stop[1] = '\0';
+}
 static void remove_trailing_slash(token_t *t, token_t *tfsl, token_t *tlcomp)
+{
     t->start[-1] = '\0';
+}
  * 5) there is no '..' component in the path (i.e. /a/b/../c is not canonical)
+ *
  * This function makes a potentially non-canonical file system path canonical.
  * 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;
     token_t t;
     token_t tfsl;       /* first slash */
     token_t tlcomp;     /* last component */
         return NULL;
     tfsl = slash_token(path);
 restart:
     state = S_INI;
     t = tfsl;
+    tlcomp = tfsl;
     while (state != S_ACCEPT && state != S_RESTART && state != S_REJECT) {
         if (trans[state][t.kind].f)
             trans[state][t.kind].f(&t, &tfsl, &tlcomp);
         state = trans[state][t.kind].s;
         t = next_token(&t);
     case S_RESTART:
         goto restart;
     case S_REJECT:
         return NULL;
     case S_ACCEPT:
+        if (lenp)
+            *lenp = (size_t)((tlcomp.stop - tfsl.start) + 1);
         return tfsl.start;
     default:
         abort();
+    }
+}

Subversion Repositories HelenOS

(root)/trunk/uspace/srv/vfs/vfs_lookup.c – Rev 2751 → 2752