WebSVN – HelenOS – Diff – /branches/fs/uspace/fs/path.c

 /* This file contains the procedures that look up path names in the directory
 * system and determine the inode number that goes with a given path name.
 */
+/*
+ * Copyright (c) 1987,1997, Prentice Hall
+ * All rights reserved.
+ *
+ * Redistribution and use of the MINIX operating system in source and
+ * binary forms, with or without modification, are permitted provided
+ * that the following conditions are met:
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following
+ *   disclaimer in the documentation and/or other materials provided
+ *   with the distribution.
+ * - Neither the name of Prentice Hall nor the names of the software
+ *   authors or contributors may be used to endorse or promote
+ *   products derived from this software without specific prior
+ *   written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS, AUTHORS, AND
+ * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL PRENTICE HALL OR ANY AUTHORS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 /* Methods:
  * eat_path:        the 'main' routine of the path-to-inode conversion mechanism
  * last_dir:        find the final directory on a given path
  * advance:     parse one component of a path name
         return NIL_INODE;
     if (sp->s_extend) {
         name_len = NAME_MAX_EX;
+    }
     /* First open the path down to the final directory. */
     if ( (ldip = last_dir(path, string, name_len)) == NIL_INODE)
         return NIL_INODE;      /* we couldn't open final directory */
     /* The path consisting only of "/" is a special case, check for it. */
     if (string[0] == '\0')
         return ldip;
     /* Get final component of the path. */
     rip = advance(ldip, string, name_len);
     put_inode(ldip);
     return rip;
+}
 inode_t *last_dir(char *path, char *string, int string_length)
+{
     /* Scan the path component by component. */
     while (TRUE) {
         /* Extract one component. */
         if ( (new_name = get_name(path, string, string_length)) == (char*) 0) {
             put_inode(rip); /* bad path in user space */
             return NIL_INODE;
+            }
         if (*new_name == '\0')
+        {
             if ( (rip->i_mode & I_TYPE) == I_DIRECTORY)
     offset_t pos;
     unsigned old_slots;
     block_num_t b;
     /* If 'ldir_ptr' is not a pointer to a dir inode, error. */
-    if ((ldir_ptr->i_mode & I_TYPE) != I_DIRECTORY)
+    if ((ldir_ptr->i_mode & I_TYPE) != I_DIRECTORY) {
         return FS_ENOTDIR;
+    }
     r = OK;
     /* Step through the directory one block at a time. */
     old_slots = (unsigned)(ldir_ptr->i_size/DIR_ENTRY_SIZE);
     match = 0;                    /* set when a string match occurs */
                     if (strcmp(dp->d_name, "." ) != 0 &&
                         strcmp(dp->d_name, "..") != 0)
                         match = 1;
+                            }
                 else {
-                    if (fs_strncmp(dp->d_name, string, NAME_MAX) == 0)
+                    if (fs_strncmp(dp->d_name, string, NAME_MAX) == 0) {
                         match = 1;
+                    }
+                }
+            }
             if (match) {
                 /* LOOK_UP or DELETE found what it wanted. */
     offset_t pos;
     unsigned old_slots;
     block_num_t b;
     /* If 'ldir_ptr' is not a pointer to a dir inode, error. */
-    if ( (ldir_ptr->i_mode & I_TYPE) != I_DIRECTORY)
+    if ( (ldir_ptr->i_mode & I_TYPE) != I_DIRECTORY) {
         return FS_ENOTDIR;
+    }
     r = OK;
     /* Step through the directory one block at a time. */
     old_slots = (unsigned)(ldir_ptr->i_size/DIR_ENTRY_SIZE_EX);
     match = 0;                    /* set when a string match occurs */
                 /* If this test succeeds, dir is not empty. */
                     if (strcmp(dp->d_name, "." ) != 0 &&
                         strcmp(dp->d_name, "..") != 0) match = 1;
+                            }
                 else {
-                    if (fs_strncmp(dp->d_name, string, NAME_MAX_EX) == 0)
+                    if (fs_strncmp(dp->d_name, string, NAME_MAX_EX) == 0) {
                         match = 1;
+                    }
+                }
+            }
             if (match) {
                 /* LOOK_UP or DELETE found what it wanted. */

Subversion Repositories HelenOS

(root)/branches/fs/uspace/fs/path.c – Rev 2376 → 2404