yaffs direct: Clean up and handle names that are to long
[yaffs2.git] / direct / yaffsfs.c
index 7a53aa7..3f18f7b 100644 (file)
@@ -31,8 +31,8 @@
 #define YAFFSFS_RW_SIZE  (1<<YAFFSFS_RW_SHIFT)
 
 /* Some forward references */
-static yaffs_Object *yaffsfs_FindObject(yaffs_Object *relativeDirectory, const YCHAR *path, int symDepth);
-static void yaffsfs_RemoveObjectCallback(yaffs_Object *obj);
+static struct yaffs_obj *yaffsfs_FindObject(struct yaffs_obj *relativeDirectory, const YCHAR *path, int symDepth, int getEquiv);
+static void yaffsfs_RemoveObjectCallback(struct yaffs_obj *obj);
 
 unsigned int yaffs_wr_attempts;
 
@@ -49,24 +49,36 @@ unsigned int yaffs_wr_attempts;
 
 typedef struct {
        int count;      /* Number of handles accessing this inode */
-       yaffs_Object *iObj;
+       struct yaffs_obj *iObj;
 } yaffsfs_Inode;
 
 typedef struct{
-       __u8    reading:1;
-       __u8    writing:1;
-       __u8    append:1;
-       __u8    shareRead:1;
-       __u8    shareWrite:1;
+       u8      reading:1;
+       u8      writing:1;
+       u8      append:1;
+       u8      shareRead:1;
+       u8      shareWrite:1;
        int     inodeId:12;     /* Index to corresponding yaffsfs_Inode */
        int     useCount:10;    /* Use count for this handle */
-       __u32 position;         /* current position in file */
+       u32 position;           /* current position in file */
 }yaffsfs_Handle;
 
 static yaffsfs_Inode yaffsfs_inode[YAFFSFS_N_HANDLES];
 static yaffsfs_Handle yaffsfs_handle[YAFFSFS_N_HANDLES];
 static int yaffsfs_handlesInitialised;
 
+unsigned int yaffs_trace_mask;
+
+int yaffs_set_trace(unsigned int tm) 
+{
+       return yaffs_trace_mask=tm;
+}
+
+unsigned int yaffs_get_trace(void)
+{
+       return yaffs_trace_mask;
+}
+
 /*
  * yaffsfs_InitHandle
  * Inilitalise handle management on start-up.
@@ -102,7 +114,7 @@ yaffsfs_Inode *yaffsfs_GetInodePointer(int handle)
        return NULL;
 }
 
-yaffs_Object *yaffsfs_GetHandleObject(int handle)
+struct yaffs_obj *yaffsfs_GetHandleObject(int handle)
 {
        yaffsfs_Inode *in = yaffsfs_GetInodePointer(handle);
 
@@ -117,7 +129,7 @@ yaffs_Object *yaffsfs_GetHandleObject(int handle)
  * Find the inode entry for an object, if it exists.
  */
 
-static int yaffsfs_FindInodeIdForObject(yaffs_Object *obj)
+static int yaffsfs_FindInodeIdForObject(struct yaffs_obj *obj)
 {
        int i;
        int ret = -1;
@@ -137,7 +149,7 @@ static int yaffsfs_FindInodeIdForObject(yaffs_Object *obj)
  * yaffsfs_GetInodeIdForObject
  * Grab an inode entry when opening a new inode.
  */
-static int yaffsfs_GetInodeIdForObject(yaffs_Object *obj)
+static int yaffsfs_GetInodeIdForObject(struct yaffs_obj *obj)
 {
        int i;
        int ret;
@@ -166,7 +178,7 @@ static int yaffsfs_GetInodeIdForObject(yaffs_Object *obj)
 }
 
 
-static int yaffsfs_CountHandles(yaffs_Object *obj)
+static int yaffsfs_CountHandles(struct yaffs_obj *obj)
 {
        int i = yaffsfs_FindInodeIdForObject(obj);
 
@@ -178,14 +190,14 @@ static int yaffsfs_CountHandles(yaffs_Object *obj)
 
 static void yaffsfs_ReleaseInode(yaffsfs_Inode *in)
 {
-       yaffs_Object *obj;
+       struct yaffs_obj *obj;
        
        obj = in->iObj;
 
        if(obj->unlinked)
                yaffs_del_obj(obj);
        
-       obj->myInode = NULL;
+       obj->my_inode = NULL;
        in->iObj = NULL;
 
 }
@@ -265,7 +277,7 @@ static int yaffsfs_PutHandle(int handle)
 
 
 /*
- *  Stuff to search for a directory from a path
+ *  Stuff to handle names.
  */
 
 
@@ -288,9 +300,24 @@ int yaffsfs_IsPathDivider(YCHAR ch)
        return 0;
 }
 
+int yaffsfs_CheckNameLength(const char *name)
+{
+       int retVal = 0;         
 
+       new_nameLength = yaffs_strnlen(newname,YAFFS_MAX_NAME_LENGTH+1);
+               
+       if(new_nameLength == 0){
+               yaffsfs_SetError(-ENOENT);
+               retVal = -1;
+       } else if (new_nameLength > YAFFS_MAX_NAME_LENGTH){
+               yaffsfs_SetError(-ENAMETOOLONG);
+               retVal = -1;
+       }
 
-YLIST_HEAD(yaffsfs_deviceList);
+       return retVal;  
+}
+
+LIST_HEAD(yaffsfs_deviceList);
 
 /*
  * yaffsfs_FindDevice
@@ -299,13 +326,13 @@ YLIST_HEAD(yaffsfs_deviceList);
  * Curveballs: Should match paths that end in '/' too
  * Curveball2 Might have "/x/ and "/x/y". Need to return the longest match
  */
-static yaffs_Device *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath)
+static struct yaffs_dev *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath)
 {
-       struct ylist_head *cfg;
+       struct list_head *cfg;
        const YCHAR *leftOver;
        const YCHAR *p;
-       yaffs_Device *retval = NULL;
-       yaffs_Device *dev = NULL;
+       struct yaffs_dev *retval = NULL;
+       struct yaffs_dev *dev = NULL;
        int thisMatchLength;
        int longestMatch = -1;
        int matching;
@@ -315,8 +342,8 @@ static yaffs_Device *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath)
         * 1) Actually matches a prefix (ie /a amd /abc will not match
         * 2) Matches the longest.
         */
-       ylist_for_each(cfg, &yaffsfs_deviceList){
-               dev = ylist_entry(cfg, yaffs_Device, devList);
+       list_for_each(cfg, &yaffsfs_deviceList){
+               dev = list_entry(cfg, struct yaffs_dev, dev_list);
                leftOver = path;
                p = dev->param.name;
                thisMatchLength = 0;
@@ -370,73 +397,34 @@ static yaffs_Device *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath)
        return retval;
 }
 
-#if 0
-static yaffs_Device *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath)
-{
-       yaffsfs_DeviceConfiguration *cfg = yaffsfs_configurationList;
-       const YCHAR *leftOver;
-       const YCHAR *p;
-       yaffs_Device *retval = NULL;
-       int thisMatchLength;
-       int longestMatch = -1;
-
-       /*
-        * Check all configs, choose the one that:
-        * 1) Actually matches a prefix (ie /a amd /abc will not match
-        * 2) Matches the longest.
-        */
-       while(cfg && cfg->prefix && cfg->dev){
-               leftOver = path;
-               p = cfg->prefix;
-               thisMatchLength = 0;
-
-               while(*p &&  /* unmatched part of prefix */
-                     !(yaffsfs_IsPathDivider(*p) && (p[1] == 0)) &&
-                     *leftOver && yaffsfs_Match(*p,*leftOver)){
-                       p++;
-                       leftOver++;
-                       thisMatchLength++;
-               }
-
-
-               if((!*p || (yaffsfs_IsPathDivider(*p) && (p[1] == 0))) &&  /* end of prefix */
-                  (!*leftOver || yaffsfs_IsPathDivider(*leftOver)) && /* no more in this path name part */
-                  (thisMatchLength > longestMatch)){
-                       /* Matched prefix */
-                       *restOfPath = (YCHAR *)leftOver;
-                       retval = cfg->dev;
-                       longestMatch = thisMatchLength;
-               }
-               cfg++;
-       }
-       return retval;
-}
-#endif
 
-static yaffs_Object *yaffsfs_FindRoot(const YCHAR *path, YCHAR **restOfPath)
+static struct yaffs_obj *yaffsfs_FindRoot(const YCHAR *path, YCHAR **restOfPath)
 {
 
-       yaffs_Device *dev;
+       struct yaffs_dev *dev;
 
        dev= yaffsfs_FindDevice(path,restOfPath);
-       if(dev && dev->isMounted){
-               return dev->rootDir;
+       if(dev && dev->is_mounted){
+               return dev->root_dir;
        }
        return NULL;
 }
 
-static yaffs_Object *yaffsfs_FollowLink(yaffs_Object *obj,int symDepth)
+static struct yaffs_obj *yaffsfs_FollowLink(struct yaffs_obj *obj,int symDepth)
 {
 
-       while(obj && obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK){
-               YCHAR *alias = obj->variant.symLinkVariant.alias;
+       if(obj)
+               obj = yaffs_get_equivalent_obj(obj);
+
+       while(obj && obj->variant_type == YAFFS_OBJECT_TYPE_SYMLINK){
+               YCHAR *alias = obj->variant.symlink_variant.alias;
 
                if(yaffsfs_IsPathDivider(*alias))
                        /* Starts with a /, need to scan from root up */
-                       obj = yaffsfs_FindObject(NULL,alias,symDepth++);
+                       obj = yaffsfs_FindObject(NULL,alias,symDepth++,1);
                else
                        /* Relative to here, so use the parent of the symlink as a start */
-                       obj = yaffsfs_FindObject(obj->parent,alias,symDepth++);
+                       obj = yaffsfs_FindObject(obj->parent,alias,symDepth++,1);
        }
        return obj;
 }
@@ -448,10 +436,10 @@ static yaffs_Object *yaffsfs_FollowLink(yaffs_Object *obj,int symDepth)
  *
  * eg. "/data/xx/ff" --> puts name="ff" and returns the directory "/data/xx"
  */
-static yaffs_Object *yaffsfs_DoFindDirectory(yaffs_Object *startDir,
+static struct yaffs_obj *yaffsfs_DoFindDirectory(struct yaffs_obj *startDir,
                                const YCHAR *path, YCHAR **name, int symDepth)
 {
-       yaffs_Object *dir;
+       struct yaffs_obj *dir;
        YCHAR *restOfPath;
        YCHAR str[YAFFS_MAX_NAME_LENGTH+1];
        int i;
@@ -500,11 +488,9 @@ static yaffs_Object *yaffsfs_DoFindDirectory(yaffs_Object *startDir,
                        else{
                                dir = yaffs_find_by_name(dir,str);
 
-                               while(dir && dir->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
-                                       dir = yaffsfs_FollowLink(dir,symDepth);
-
+                               dir = yaffsfs_FollowLink(dir,symDepth);
 
-                               if(dir && dir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
+                               if(dir && dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
                                        dir = NULL;
                        }
                }
@@ -513,7 +499,7 @@ static yaffs_Object *yaffsfs_DoFindDirectory(yaffs_Object *startDir,
        return NULL;
 }
 
-static yaffs_Object *yaffsfs_FindDirectory(yaffs_Object *relativeDirectory,
+static struct yaffs_obj *yaffsfs_FindDirectory(struct yaffs_obj *relativeDirectory,
                                        const YCHAR *path,YCHAR **name,int symDepth)
 {
        return yaffsfs_DoFindDirectory(relativeDirectory,path,name,symDepth);
@@ -522,17 +508,23 @@ static yaffs_Object *yaffsfs_FindDirectory(yaffs_Object *relativeDirectory,
 /*
  * yaffsfs_FindObject turns a path for an existing object into the object
  */
-static yaffs_Object *yaffsfs_FindObject(yaffs_Object *relativeDirectory, const YCHAR *path,int symDepth)
+static struct yaffs_obj *yaffsfs_FindObject(struct yaffs_obj *relativeDirectory, const YCHAR *path,int symDepth, int getEquiv)
 {
-       yaffs_Object *dir;
+       struct yaffs_obj *dir;
+       struct yaffs_obj *obj;
        YCHAR *name;
 
        dir = yaffsfs_FindDirectory(relativeDirectory,path,&name,symDepth);
 
        if(dir && *name)
-               return yaffs_find_by_name(dir,name);
+               obj = yaffs_find_by_name(dir,name);
+       else
+               obj = dir;
 
-       return dir;
+       if(getEquiv)
+               obj = yaffs_get_equivalent_obj(obj);
+
+       return obj;
 }
 
 
@@ -564,24 +556,27 @@ int yaffs_dup(int fd)
 
 }
 
+
+
 int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
 {
-       yaffs_Object *obj = NULL;
-       yaffs_Object *dir = NULL;
+       struct yaffs_obj *obj = NULL;
+       struct yaffs_obj *dir = NULL;
        YCHAR *name;
        int handle = -1;
-       yaffsfs_Handle *h = NULL;
+       yaffsfs_Handle *yh = NULL;
        int openDenied = 0;
        int symDepth = 0;
        int errorReported = 0;
-       __u8 shareRead = (sharing & YAFFS_SHARE_READ) ?  1 : 0;
-       __u8 shareWrite = (sharing & YAFFS_SHARE_WRITE) ? 1 : 0;
-       __u8 sharedReadAllowed;
-       __u8 sharedWriteAllowed;
-       __u8 alreadyReading;
-       __u8 alreadyWriting;
-       __u8 readRequested;
-       __u8 writeRequested;
+       int rwflags = oflag & ( O_RDWR | O_RDONLY | O_WRONLY);
+       u8 shareRead = (sharing & YAFFS_SHARE_READ) ?  1 : 0;
+       u8 shareWrite = (sharing & YAFFS_SHARE_WRITE) ? 1 : 0;
+       u8 sharedReadAllowed;
+       u8 sharedWriteAllowed;
+       u8 alreadyReading;
+       u8 alreadyWriting;
+       u8 readRequested;
+       u8 writeRequested;
 
        /* O_EXCL only has meaning if O_CREAT is specified */
        if(!(oflag & O_CREAT))
@@ -593,35 +588,39 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
 
        /* Todo: Are there any more flag combos to sanitise ? */
 
+       /* Figure out if reading or writing is requested */
+
+       readRequested = (rwflags == O_RDWR || rwflags == O_RDONLY) ? 1 : 0;
+       writeRequested = (rwflags == O_RDWR || rwflags == O_WRONLY) ? 1 : 0;
 
        yaffsfs_Lock();
 
        handle = yaffsfs_GetNewHandle();
 
-       if(handle >= 0){
+       if(handle < 0){
+               yaffsfs_SetError(-ENFILE);
+               errorReported = 1;
+       } else {
 
-               h = yaffsfs_GetHandlePointer(handle);
+               yh = yaffsfs_GetHandlePointer(handle);
 
                /* try to find the exisiting object */
-               obj = yaffsfs_FindObject(NULL,path,0);
+               obj = yaffsfs_FindObject(NULL,path,0,1);
 
-               if(obj && obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
-                       obj = yaffsfs_FollowLink(obj,symDepth++);
-
-               if(obj)
-                       obj = yaffs_get_equivalent_obj(obj);
+               obj = yaffsfs_FollowLink(obj,symDepth++);
 
                if(obj &&
-                       obj->variantType != YAFFS_OBJECT_TYPE_FILE &&
-                       obj->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
+                       obj->variant_type != YAFFS_OBJECT_TYPE_FILE &&
+                       obj->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
                        obj = NULL;
 
+
                if(obj){
 
                        /* The file already exists or it might be a directory */
 
                        /* If it is a directory then we can't open it as a file */
-                       if(obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){
+                       if(obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY){
                                openDenied = 1;
                                yaffsfs_SetError(-EISDIR);
                                errorReported = 1;
@@ -630,51 +629,50 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
                        /* Open should fail if O_CREAT and O_EXCL are specified since
                         * the file exists
                         */
-                       if((oflag & O_EXCL) && (oflag & O_CREAT)){
+                       if(!errorReported && (oflag & O_EXCL) && (oflag & O_CREAT)){
                                openDenied = 1;
                                yaffsfs_SetError(-EEXIST);
                                errorReported = 1;
                        }
 
                        /* Check file permissions */
-                       if( (oflag & (O_RDWR | O_WRONLY)) == 0 &&     /* ie O_RDONLY */
-                          !(obj->yst_mode & S_IREAD))
+                       if( readRequested && !(obj->yst_mode & S_IREAD))
                                openDenied = 1;
 
-                       if( (oflag & O_RDWR) &&
-                          !(obj->yst_mode & S_IREAD))
+                       if( writeRequested && !(obj->yst_mode & S_IWRITE))
                                openDenied = 1;
 
-                       if( (oflag & (O_RDWR | O_WRONLY)) &&
-                          !(obj->yst_mode & S_IWRITE))
-                               openDenied = 1;
+                       if(openDenied && !errorReported ) {
+                               /* Error if the file exists but permissions are refused. */
+                               yaffsfs_SetError(-EACCES);
+                               errorReported = 1;
+                       }
 
                        /* Check sharing of an existing object. */
-                       {
-                               yaffsfs_Handle *h;
+                       if(!openDenied){
+                               yaffsfs_Handle *hx;
                                int i;
                                sharedReadAllowed = 1;
                                sharedWriteAllowed = 1;
                                alreadyReading = 0;
                                alreadyWriting = 0;
                                for( i = 0; i < YAFFSFS_N_HANDLES; i++){
-                                       h = &yaffsfs_handle[i];
-                                       if(h->useCount > 0 &&
-                                               h->inodeId >= 0 &&
-                                               yaffsfs_inode[h->inodeId].iObj == obj){
-                                               if(!h->shareRead)
+                                       hx = &yaffsfs_handle[i];
+                                       if(hx->useCount > 0 &&
+                                               hx->inodeId >= 0 &&
+                                               yaffsfs_inode[hx->inodeId].iObj == obj){
+                                               if(!hx->shareRead)
                                                        sharedReadAllowed = 0;
-                                               if(!h->shareWrite)
+                                               if(!hx->shareWrite)
                                                        sharedWriteAllowed = 0;
-                                               if(h->reading)
+                                               if(hx->reading)
                                                        alreadyReading = 1;
-                                               if(h->writing)
-                                                       alreadyWriting = 0;
+                                               if(hx->writing)
+                                                       alreadyWriting = 1;
                                        }
                                }
 
-                               readRequested = (oflag & (O_RDWR | O_RDONLY)) ? 1 : 0;
-                               writeRequested = (oflag & (O_RDWR | O_WRONLY)) ? 1 : 0;
+
 
                                if((!sharedReadAllowed && readRequested)|| 
                                        (!shareRead  && alreadyReading) ||
@@ -686,20 +684,39 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
                                }
                        }
 
-               } else if((oflag & O_CREAT)) {
-                       /* Let's see if we can create this file */
+               }
+
+               /* If we could not open an existing object, then let's see if
+                * the directory exists. If not, error.
+                */
+               if(!obj && !errorReported){
                        dir = yaffsfs_FindDirectory(NULL,path,&name,0);
-                       if(dir  && dir->myDev->readOnly){
+                       if(!dir){
+                               yaffsfs_SetError(-ENOTDIR);
+                               errorReported = 1;
+                       }
+               }
+
+               if(!obj && dir && !errorReported && (oflag & O_CREAT)) {
+                       /* Let's see if we can create this file if it does not exist. */
+                       if(dir->my_dev->read_only){
                                yaffsfs_SetError(-EINVAL);
                                errorReported = 1;
-                       } else if(dir)
+                       } else
                                obj = yaffs_create_file(dir,name,mode,0,0);
-                       else {
-                               yaffsfs_SetError(-ENOTDIR);
+
+                       if(!obj && !errorReported){
+                               yaffsfs_SetError(-ENOSPC);
                                errorReported = 1;
                        }
                }
 
+               if(!obj && dir && !errorReported && !(oflag & O_CREAT)) {
+                       /* Error if the file does not exist and CREAT is not set. */
+                       yaffsfs_SetError(-ENOENT);
+                       errorReported = 1;
+               }
+
                if(obj && !openDenied) {
                        int inodeId = yaffsfs_GetInodeIdForObject(obj);
 
@@ -710,25 +727,23 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
                                 */
                        }
                        
-                       h->inodeId = inodeId;
-                       h->reading = (oflag & (O_RDONLY | O_RDWR)) ? 1 : 0;
-                       h->writing = (oflag & (O_WRONLY | O_RDWR)) ? 1 : 0;
-                       h->append =  (oflag & O_APPEND) ? 1 : 0;
-                       h->position = 0;
-                       h->shareRead = shareRead;
-                       h->shareWrite = shareWrite;
+                       yh->inodeId = inodeId;
+                       yh->reading = readRequested;
+                       yh->writing = writeRequested;
+                       yh->append =  (oflag & O_APPEND) ? 1 : 0;
+                       yh->position = 0;
+                       yh->shareRead = shareRead;
+                       yh->shareWrite = shareWrite;
 
                        /* Hook inode to object */
-                        obj->myInode = (void*) &yaffsfs_inode[inodeId];
+                        obj->my_inode = (void*) &yaffsfs_inode[inodeId];
 
-                        if((oflag & O_TRUNC) && h->writing)
+                        if((oflag & O_TRUNC) && yh->writing)
                                 yaffs_resize_file(obj,0);
                } else {
                        yaffsfs_PutHandle(handle);
-                       if(!errorReported) {
-                               yaffsfs_SetError(-EACCES);
-                               errorReported = 1;
-                       }
+                       if(!errorReported) 
+                               yaffsfs_SetError(0); /* Problem */
                        handle = -1;
                }
        }
@@ -811,14 +826,14 @@ int yaffs_close(int fd)
 int yaffsfs_do_read(int fd, void *vbuf, unsigned int nbyte, int isPread, int offset)
 {
        yaffsfs_Handle *h = NULL;
-       yaffs_Object *obj = NULL;
+       struct yaffs_obj *obj = NULL;
        int pos = 0;
        int startPos = 0;
        int nRead = 0;
        int nToRead = 0;
        int totalRead = 0;
        unsigned int maxRead;
-       __u8 *buf = (__u8 *)vbuf;
+       u8 *buf = (u8 *)vbuf;
 
        yaffsfs_Lock();
        h = yaffsfs_GetHandlePointer(fd);
@@ -828,7 +843,11 @@ int yaffsfs_do_read(int fd, void *vbuf, unsigned int nbyte, int isPread, int off
                /* bad handle */
                yaffsfs_SetError(-EBADF);
                totalRead = -1;
-       } else if( h && obj){
+       } else if(!h->reading){
+               /* Not a reading handle */
+               yaffsfs_SetError(-EINVAL);
+               totalRead = -1;
+       } else {
                if(isPread)
                        startPos = offset;
                else
@@ -903,14 +922,14 @@ int yaffs_pread(int fd, void *buf, unsigned int nbyte, unsigned int offset)
 int yaffsfs_do_write(int fd, const void *vbuf, unsigned int nbyte, int isPwrite, int offset)
 {
        yaffsfs_Handle *h = NULL;
-       yaffs_Object *obj = NULL;
+       struct yaffs_obj *obj = NULL;
        int pos = 0;
        int startPos = 0;
        int nWritten = 0;
        int totalWritten = 0;
-       int writeThrough = 0;
+       int write_trhrough = 0;
        int nToWrite = 0;
-       const __u8 *buf = (const __u8 *)vbuf;
+       const u8 *buf = (const u8 *)vbuf;
 
        yaffsfs_Lock();
        h = yaffsfs_GetHandlePointer(fd);
@@ -920,10 +939,10 @@ int yaffsfs_do_write(int fd, const void *vbuf, unsigned int nbyte, int isPwrite,
                /* bad handle */
                yaffsfs_SetError(-EBADF);
                totalWritten = -1;
-       } else if( h && obj && (!h->writing || obj->myDev->readOnly)){
+       } else if( h && obj && (!h->writing || obj->my_dev->read_only)){
                yaffsfs_SetError(-EINVAL);
                totalWritten=-1;
-       } else if( h && obj){
+       } else {
                if(h->append)
                        startPos = yaffs_get_obj_length(obj);
                else if(isPwrite)
@@ -938,7 +957,7 @@ int yaffsfs_do_write(int fd, const void *vbuf, unsigned int nbyte, int isPwrite,
                        if(nToWrite > nbyte)
                                nToWrite = nbyte;
 
-                       nWritten = yaffs_wr_file(obj,buf,pos,nToWrite,writeThrough);
+                       nWritten = yaffs_wr_file(obj,buf,pos,nToWrite,write_trhrough);
                        if(nWritten > 0){
                                totalWritten += nWritten;
                                pos += nWritten;
@@ -988,25 +1007,23 @@ int yaffs_pwrite(int fd, const void *buf, unsigned int nbyte, unsigned int offse
 }
 
 
-int yaffs_truncate(const YCHAR *path,off_t newSize)
+int yaffs_truncate(const YCHAR *path,off_t new_size)
 {
-       yaffs_Object *obj = NULL;
+       struct yaffs_obj *obj = NULL;
        int result = YAFFS_FAIL;
 
        yaffsfs_Lock();
 
-       obj = yaffsfs_FindObject(NULL,path,0);
-       if(obj)
-               obj = yaffs_get_equivalent_obj(obj);
+       obj = yaffsfs_FindObject(NULL,path,0,1);
 
        if(!obj)
                yaffsfs_SetError(-ENOENT);
-       else if(obj->variantType != YAFFS_OBJECT_TYPE_FILE)
+       else if(obj->variant_type != YAFFS_OBJECT_TYPE_FILE)
                yaffsfs_SetError(-EISDIR);
-       else if(obj->myDev->readOnly)
+       else if(obj->my_dev->read_only)
                yaffsfs_SetError(-EINVAL);
        else
-               result = yaffs_resize_file(obj,newSize);
+               result = yaffs_resize_file(obj,new_size);
 
        yaffsfs_Unlock();
 
@@ -1014,10 +1031,10 @@ int yaffs_truncate(const YCHAR *path,off_t newSize)
        return (result) ? 0 : -1;
 }
 
-int yaffs_ftruncate(int fd, off_t newSize)
+int yaffs_ftruncate(int fd, off_t new_size)
 {
        yaffsfs_Handle *h = NULL;
-       yaffs_Object *obj = NULL;
+       struct yaffs_obj *obj = NULL;
        int result = 0;
 
        yaffsfs_Lock();
@@ -1027,11 +1044,11 @@ int yaffs_ftruncate(int fd, off_t newSize)
        if(!h || !obj)
                /* bad handle */
                yaffsfs_SetError(-EBADF);
-       else if(obj->myDev->readOnly)
+       else if(obj->my_dev->read_only)
                yaffsfs_SetError(-EINVAL);
        else
                /* resize the file */
-               result = yaffs_resize_file(obj,newSize);
+               result = yaffs_resize_file(obj,new_size);
        yaffsfs_Unlock();
 
 
@@ -1042,7 +1059,7 @@ int yaffs_ftruncate(int fd, off_t newSize)
 off_t yaffs_lseek(int fd, off_t offset, int whence)
 {
        yaffsfs_Handle *h = NULL;
-       yaffs_Object *obj = NULL;
+       struct yaffs_obj *obj = NULL;
        int pos = -1;
        int fSize = -1;
 
@@ -1050,30 +1067,28 @@ off_t yaffs_lseek(int fd, off_t offset, int whence)
        h = yaffsfs_GetHandlePointer(fd);
        obj = yaffsfs_GetHandleObject(fd);
 
-       if(!h || !obj)
+       if(!h || !obj){
                /* bad handle */
                yaffsfs_SetError(-EBADF);
-       else if(whence == SEEK_SET){
-               if(offset >= 0)
-                       pos = offset;
-       }
-       else if(whence == SEEK_CUR) {
-               if( (h->position + offset) >= 0)
-                       pos = (h->position + offset);
-       }
-       else if(whence == SEEK_END) {
-               fSize = yaffs_get_obj_length(obj);
-               if(fSize >= 0 && (fSize + offset) >= 0)
-                       pos = fSize + offset;
-       }
-
-       if(pos >= 0)
-               h->position = pos;
-       else {
-               /* todo error */
+       } else {
+               if(whence == SEEK_SET){
+                       if(offset >= 0)
+                               pos = offset;
+               } else if(whence == SEEK_CUR) {
+                       if( (h->position + offset) >= 0)
+                               pos = (h->position + offset);
+               } else if(whence == SEEK_END) {
+                       fSize = yaffs_get_obj_length(obj);
+                       if(fSize >= 0 && (fSize + offset) >= 0)
+                               pos = fSize + offset;
+               } 
+
+               if(pos >= 0)
+                       h->position = pos;
+               else
+                       yaffsfs_SetError(-EINVAL);
        }
 
-
        yaffsfs_Unlock();
 
        return pos;
@@ -1082,27 +1097,27 @@ off_t yaffs_lseek(int fd, off_t offset, int whence)
 
 int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory)
 {
-       yaffs_Object *dir = NULL;
-       yaffs_Object *obj = NULL;
+       struct yaffs_obj *dir = NULL;
+       struct yaffs_obj *obj = NULL;
        YCHAR *name;
        int result = YAFFS_FAIL;
 
        yaffsfs_Lock();
 
-       obj = yaffsfs_FindObject(NULL,path,0);
+       obj = yaffsfs_FindObject(NULL,path,0,0);
        dir = yaffsfs_FindDirectory(NULL,path,&name,0);
        if(!dir)
                yaffsfs_SetError(-ENOTDIR);
        else if(!obj)
                yaffsfs_SetError(-ENOENT);
-       else if(obj->myDev->readOnly)
+       else if(obj->my_dev->read_only)
                yaffsfs_SetError(-EINVAL);
-       else if(!isDirectory && obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY)
+       else if(!isDirectory && obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY)
                yaffsfs_SetError(-EISDIR);
-       else if(isDirectory && obj->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
+       else if(isDirectory && obj->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
                yaffsfs_SetError(-ENOTDIR);
        else {
-               result = yaffs_Unlink(dir,name);
+               result = yaffs_unlinker(dir,name);
 
                if(result == YAFFS_FAIL && isDirectory)
                        yaffsfs_SetError(-ENOTEMPTY);
@@ -1128,51 +1143,51 @@ int yaffs_unlink(const YCHAR *path)
 
 int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath)
 {
-       yaffs_Object *olddir = NULL;
-       yaffs_Object *newdir = NULL;
-       yaffs_Object *obj = NULL;
+       struct yaffs_obj *olddir = NULL;
+       struct yaffs_obj *newdir = NULL;
+       struct yaffs_obj *obj = NULL;
        YCHAR *oldname;
        YCHAR *newname;
        int result= YAFFS_FAIL;
-       int renameAllowed = 1;
+       int rename_allowed = 1;
 
        yaffsfs_Lock();
 
        olddir = yaffsfs_FindDirectory(NULL,oldPath,&oldname,0);
        newdir = yaffsfs_FindDirectory(NULL,newPath,&newname,0);
-       obj = yaffsfs_FindObject(NULL,oldPath,0);
+       obj = yaffsfs_FindObject(NULL,oldPath,0,0);
 
        if(!olddir || !newdir || !obj) {
                /* bad file */
                yaffsfs_SetError(-EBADF);
-               renameAllowed = 0;
-       } else if(obj->myDev->readOnly){
+               rename_allowed = 0;
+       } else if(obj->my_dev->read_only){
                yaffsfs_SetError(-EINVAL);
-               renameAllowed = 0;
-       } else if(olddir->myDev != newdir->myDev) {
+               rename_allowed = 0;
+       } else if(olddir->my_dev != newdir->my_dev) {
                /* oops must be on same device */
                /* todo error */
                yaffsfs_SetError(-EXDEV);
-               renameAllowed = 0;
-       } else if(obj && obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) {
+               rename_allowed = 0;
+       } else if(obj && obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY) {
                /*
                 * It is a directory, check that it is not being renamed to
                 * being its own decendent.
                 * Do this by tracing from the new directory back to the root, checking for obj
                 */
 
-               yaffs_Object *xx = newdir;
+               struct yaffs_obj *xx = newdir;
 
-               while( renameAllowed && xx){
+               while( rename_allowed && xx){
                        if(xx == obj)
-                               renameAllowed = 0;
+                               rename_allowed = 0;
                        xx = xx->parent;
                }
-               if(!renameAllowed)
+               if(!rename_allowed)
                        yaffsfs_SetError(-EACCES);
        }
 
-       if(renameAllowed)
+       if(rename_allowed)
                result = yaffs_rename_obj(olddir,oldname,newdir,newname);
 
        yaffsfs_Unlock();
@@ -1181,23 +1196,22 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath)
 }
 
 
-static int yaffsfs_DoStat(yaffs_Object *obj,struct yaffs_stat *buf)
+static int yaffsfs_DoStat(struct yaffs_obj *obj,struct yaffs_stat *buf)
 {
        int retVal = -1;
 
-       if(obj)
-               obj = yaffs_get_equivalent_obj(obj);
+       obj = yaffs_get_equivalent_obj(obj);
 
        if(obj && buf){
-               buf->st_dev = (int)obj->myDev->osContext;
-               buf->st_ino = obj->objectId;
+               buf->st_dev = (int)obj->my_dev->os_context;
+               buf->st_ino = obj->obj_id;
                buf->st_mode = obj->yst_mode & ~S_IFMT; /* clear out file type bits */
 
-               if(obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY)
+               if(obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY)
                        buf->st_mode |= S_IFDIR;
-               else if(obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
+               else if(obj->variant_type == YAFFS_OBJECT_TYPE_SYMLINK)
                        buf->st_mode |= S_IFLNK;
-               else if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
+               else if(obj->variant_type == YAFFS_OBJECT_TYPE_FILE)
                        buf->st_mode |= S_IFREG;
 
                buf->st_nlink = yaffs_get_obj_link_count(obj);
@@ -1205,7 +1219,7 @@ static int yaffsfs_DoStat(yaffs_Object *obj,struct yaffs_stat *buf)
                buf->st_gid = 0;;
                buf->st_rdev = obj->yst_rdev;
                buf->st_size = yaffs_get_obj_length(obj);
-               buf->st_blksize = obj->myDev->nDataBytesPerChunk;
+               buf->st_blksize = obj->my_dev->data_bytes_per_chunk;
                buf->st_blocks = (buf->st_size + buf->st_blksize -1)/buf->st_blksize;
 #if CONFIG_YAFFS_WINCE
                buf->yst_wince_atime[0] = obj->win_atime[0];
@@ -1226,12 +1240,13 @@ static int yaffsfs_DoStat(yaffs_Object *obj,struct yaffs_stat *buf)
 
 static int yaffsfs_DoStatOrLStat(const YCHAR *path, struct yaffs_stat *buf,int doLStat)
 {
-       yaffs_Object *obj;
+       struct yaffs_obj *obj;
 
        int retVal = -1;
 
        yaffsfs_Lock();
-       obj = yaffsfs_FindObject(NULL,path,0);
+
+       obj = yaffsfs_FindObject(NULL,path,0,1);
 
        if(!doLStat && obj)
                obj = yaffsfs_FollowLink(obj,0);
@@ -1260,7 +1275,7 @@ int yaffs_lstat(const YCHAR *path, struct yaffs_stat *buf)
 
 int yaffs_fstat(int fd, struct yaffs_stat *buf)
 {
-       yaffs_Object *obj;
+       struct yaffs_obj *obj;
 
        int retVal = -1;
 
@@ -1284,12 +1299,13 @@ int yaffs_fstat(int fd, struct yaffs_stat *buf)
 
 static int yaffs_do_setxattr(const YCHAR *path, const char *name, const void *data, int size, int flags, int follow)
 {
-       yaffs_Object *obj;
+       struct yaffs_obj *obj;
 
        int retVal = -1;
 
        yaffsfs_Lock();
-       obj = yaffsfs_FindObject(NULL,path,0);
+
+       obj = yaffsfs_FindObject(NULL,path,0,1);
 
        if(follow)
                obj = yaffsfs_FollowLink(obj,0);
@@ -1324,7 +1340,7 @@ int yaffs_lsetxattr(const YCHAR *path, const char *name, const void *data, int s
 
 int yaffs_fsetxattr(int fd, const char *name, const void *data, int size, int flags)
 {
-       yaffs_Object *obj;
+       struct yaffs_obj *obj;
 
        int retVal = -1;
 
@@ -1348,12 +1364,13 @@ int yaffs_fsetxattr(int fd, const char *name, const void *data, int size, int fl
 
 static int yaffs_do_getxattr(const YCHAR *path, const char *name, void *data, int size, int follow)
 {
-       yaffs_Object *obj;
+       struct yaffs_obj *obj;
 
        int retVal = -1;
 
        yaffsfs_Lock();
-       obj = yaffsfs_FindObject(NULL,path,0);
+
+       obj = yaffsfs_FindObject(NULL,path,0,1);
 
        if(follow)
                obj = yaffsfs_FollowLink(obj,0);
@@ -1387,7 +1404,7 @@ int yaffs_lgetxattr(const YCHAR *path, const char *name, void *data, int size)
 
 int yaffs_fgetxattr(int fd, const char *name, void *data, int size)
 {
-       yaffs_Object *obj;
+       struct yaffs_obj *obj;
 
        int retVal = -1;
 
@@ -1411,12 +1428,13 @@ int yaffs_fgetxattr(int fd, const char *name, void *data, int size)
 
 static int yaffs_do_listxattr(const YCHAR *path, char *data, int size, int follow)
 {
-       yaffs_Object *obj;
+       struct yaffs_obj *obj;
 
        int retVal = -1;
 
        yaffsfs_Lock();
-       obj = yaffsfs_FindObject(NULL,path,0);
+
+       obj = yaffsfs_FindObject(NULL,path,0,1);
 
        if(follow)
                obj = yaffsfs_FollowLink(obj,0);
@@ -1449,7 +1467,7 @@ int yaffs_llistxattr(const YCHAR *path, char *data, int size)
 
 int yaffs_flistxattr(int fd, char *data, int size)
 {
-       yaffs_Object *obj;
+       struct yaffs_obj *obj;
 
        int retVal = -1;
 
@@ -1473,12 +1491,13 @@ int yaffs_flistxattr(int fd, char *data, int size)
 
 static int yaffs_do_removexattr(const YCHAR *path, const char *name, int follow)
 {
-       yaffs_Object *obj;
+       struct yaffs_obj *obj;
 
        int retVal = -1;
 
        yaffsfs_Lock();
-       obj = yaffsfs_FindObject(NULL,path,0);
+
+       obj = yaffsfs_FindObject(NULL,path,0,1);
 
        if(follow)
                obj = yaffsfs_FollowLink(obj,0);
@@ -1511,7 +1530,7 @@ int yaffs_lremovexattr(const YCHAR *path, const char *name)
 
 int yaffs_fremovexattr(int fd, const char *name)
 {
-       yaffs_Object *obj;
+       struct yaffs_obj *obj;
 
        int retVal = -1;
 
@@ -1537,7 +1556,7 @@ int yaffs_fremovexattr(int fd, const char *name)
 #ifdef CONFIG_YAFFS_WINCE
 int yaffs_get_wince_times(int fd, unsigned *wctime, unsigned *watime, unsigned *wmtime)
 {
-       yaffs_Object *obj;
+       struct yaffs_obj *obj;
 
        int retVal = -1;
 
@@ -1576,7 +1595,7 @@ int yaffs_set_wince_times(int fd,
                                                  const unsigned *watime, 
                                                   const unsigned *wmtime)
 {
-        yaffs_Object *obj;
+        struct yaffs_obj *obj;
         int result;
         int retVal = -1;
 
@@ -1613,7 +1632,7 @@ int yaffs_set_wince_times(int fd,
 #endif
 
 
-static int yaffsfs_DoChMod(yaffs_Object *obj,mode_t mode)
+static int yaffsfs_DoChMod(struct yaffs_obj *obj,mode_t mode)
 {
        int result = -1;
 
@@ -1632,12 +1651,13 @@ static int yaffsfs_DoChMod(yaffs_Object *obj,mode_t mode)
 
 int yaffs_access(const YCHAR *path, int amode)
 {
-       yaffs_Object *obj;
+       struct yaffs_obj *obj;
 
        int retval = 0;
 
        yaffsfs_Lock();
-       obj = yaffsfs_FindObject(NULL,path,0);
+
+       obj = yaffsfs_FindObject(NULL,path,0,1);
 
        if(obj) {
                int access_ok = 1;
@@ -1668,16 +1688,17 @@ int yaffs_access(const YCHAR *path, int amode)
 
 int yaffs_chmod(const YCHAR *path, mode_t mode)
 {
-       yaffs_Object *obj;
+       struct yaffs_obj *obj;
 
        int retVal = -1;
 
        yaffsfs_Lock();
-       obj = yaffsfs_FindObject(NULL,path,0);
+
+       obj = yaffsfs_FindObject(NULL,path,0,1);
 
        if(!obj)
                yaffsfs_SetError(-ENOENT);
-       else if(obj->myDev->readOnly)
+       else if(obj->my_dev->read_only)
                yaffsfs_SetError(-EINVAL);
        else
                retVal = yaffsfs_DoChMod(obj,mode);
@@ -1691,7 +1712,7 @@ int yaffs_chmod(const YCHAR *path, mode_t mode)
 
 int yaffs_fchmod(int fd, mode_t mode)
 {
-       yaffs_Object *obj;
+       struct yaffs_obj *obj;
 
        int retVal = -1;
 
@@ -1700,7 +1721,7 @@ int yaffs_fchmod(int fd, mode_t mode)
 
        if(!obj)
                yaffsfs_SetError(-ENOENT);
-       else if(obj->myDev->readOnly)
+       else if(obj->my_dev->read_only)
                yaffsfs_SetError(-EINVAL);
        else
                retVal = yaffsfs_DoChMod(obj,mode);
@@ -1713,17 +1734,49 @@ int yaffs_fchmod(int fd, mode_t mode)
 
 int yaffs_mkdir(const YCHAR *path, mode_t mode)
 {
-       yaffs_Object *parent = NULL;
-       yaffs_Object *dir = NULL;
+       struct yaffs_obj *parent = NULL;
+       struct yaffs_obj *dir = NULL;
        YCHAR *name;
+       YCHAR *use_path = NULL;
+       int path_length = 0;
        int retVal= -1;
+       int i;
 
+
+       /*
+        * We don't have a definition for max path length.
+        * We will use 3 * max name length instead.
+        */
+       
+       path_length = strnlen(path,(YAFFS_MAX_NAME_LENGTH+1)*3 +1);
+
+       /* If the last character is a path divider, then we need to
+        * trim it back so that the name look-up works properly.
+        * eg. /foo/new_dir/ -> /foo/newdir
+        * Curveball: Need to handle multiple path dividers:
+        * eg. /foof/sdfse///// -> /foo/sdfse
+        */
+       if(path_length > 0 && 
+               yaffsfs_IsPathDivider(path[path_length-1])){
+               use_path = YMALLOC(path_length + 1);
+               if(!use_path){
+                       yaffsfs_SetError(-ENOMEM);
+                       return -1;
+               }
+               strcpy(use_path, path);
+               for(i = path_length-1;
+                       i >= 0 && yaffsfs_IsPathDivider(use_path[i]);
+                       i--)
+                       use_path[i] = (YCHAR) 0;
+               path = use_path;
+       }
+       
        yaffsfs_Lock();
        parent = yaffsfs_FindDirectory(NULL,path,&name,0);
        if(parent && yaffs_strnlen(name,5) == 0){
                /* Trying to make the root itself */
                yaffsfs_SetError(-EEXIST);
-       } else if(parent && parent->myDev->readOnly){
+       } else if(parent && parent->my_dev->read_only){
                yaffsfs_SetError(-EINVAL);
        } else {
                if(parent)
@@ -1743,25 +1796,28 @@ int yaffs_mkdir(const YCHAR *path, mode_t mode)
 
        yaffsfs_Unlock();
 
+       if(use_path)
+               YFREE(use_path);
+
        return retVal;
 }
 
 void * yaffs_getdev(const YCHAR *path)
 {
-       yaffs_Device *dev=NULL;
+       struct yaffs_dev *dev=NULL;
        YCHAR *dummy;
        dev = yaffsfs_FindDevice(path,&dummy);
        return (void *)dev;
 }
 
-int yaffs_mount2(const YCHAR *path,int readOnly)
+int yaffs_mount2(const YCHAR *path,int read_only)
 {
        int retVal=-1;
        int result=YAFFS_FAIL;
-       yaffs_Device *dev=NULL;
+       struct yaffs_dev *dev=NULL;
        YCHAR *dummy;
 
-       T(YAFFS_TRACE_ALWAYS,(TSTR("yaffs: Mounting %s" TENDSTR),path));
+       T(YAFFS_TRACE_MOUNT,(TSTR("yaffs: Mounting %s" TENDSTR),path));
 
        yaffsfs_Lock();
 
@@ -1769,8 +1825,8 @@ int yaffs_mount2(const YCHAR *path,int readOnly)
 
        dev = yaffsfs_FindDevice(path,&dummy);
        if(dev){
-               if(!dev->isMounted){
-                       dev->readOnly = readOnly ? 1 : 0;
+               if(!dev->is_mounted){
+                       dev->read_only = read_only ? 1 : 0;
                        result = yaffs_guts_initialise(dev);
                        if(result == YAFFS_FAIL)
                                /* todo error - mount failed */
@@ -1798,13 +1854,13 @@ int yaffs_mount(const YCHAR *path)
 int yaffs_sync(const YCHAR *path)
 {
         int retVal=-1;
-        yaffs_Device *dev=NULL;
+        struct yaffs_dev *dev=NULL;
         YCHAR *dummy;
         
         yaffsfs_Lock();
         dev = yaffsfs_FindDevice(path,&dummy);
         if(dev){
-                if(dev->isMounted){
+                if(dev->is_mounted){
                         
                         yaffs_flush_whole_cache(dev);
                         yaffs_checkpoint_save(dev);
@@ -1823,30 +1879,30 @@ int yaffs_sync(const YCHAR *path)
 }
 
 
-int yaffs_remount(const YCHAR *path, int force, int readOnly)
+int yaffs_remount(const YCHAR *path, int force, int read_only)
 {
         int retVal=-1;
-       yaffs_Device *dev=NULL;
+       struct yaffs_dev *dev=NULL;
        YCHAR *dummy;
 
        yaffsfs_Lock();
        dev = yaffsfs_FindDevice(path,&dummy);
        if(dev){
-               if(dev->isMounted){
+               if(dev->is_mounted){
                        int i;
                        int inUse;
 
                        yaffs_flush_whole_cache(dev);
 
                        for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse && !force; i++){
-                               if(yaffsfs_handle[i].useCount>0 && yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj->myDev == dev)
+                               if(yaffsfs_handle[i].useCount>0 && yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj->my_dev == dev)
                                        inUse = 1; /* the device is in use, can't unmount */
                        }
 
                        if(!inUse || force){
-                               if(readOnly)
+                               if(read_only)
                                        yaffs_checkpoint_save(dev);
-                               dev->readOnly =  readOnly ? 1 : 0;
+                               dev->read_only =  read_only ? 1 : 0;
                                retVal = 0;
                        } else
                                yaffsfs_SetError(-EBUSY);
@@ -1866,13 +1922,13 @@ int yaffs_remount(const YCHAR *path, int force, int readOnly)
 int yaffs_unmount2(const YCHAR *path, int force)
 {
         int retVal=-1;
-       yaffs_Device *dev=NULL;
+       struct yaffs_dev *dev=NULL;
        YCHAR *dummy;
 
        yaffsfs_Lock();
        dev = yaffsfs_FindDevice(path,&dummy);
        if(dev){
-               if(dev->isMounted){
+               if(dev->is_mounted){
                        int i;
                        int inUse;
 
@@ -1880,7 +1936,7 @@ int yaffs_unmount2(const YCHAR *path, int force)
                        yaffs_checkpoint_save(dev);
 
                        for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse; i++){
-                               if(yaffsfs_handle[i].useCount > 0 && yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj->myDev == dev)
+                               if(yaffsfs_handle[i].useCount > 0 && yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj->my_dev == dev)
                                        inUse = 1; /* the device is in use, can't unmount */
                        }
 
@@ -1914,14 +1970,14 @@ int yaffs_unmount(const YCHAR *path)
 loff_t yaffs_freespace(const YCHAR *path)
 {
        loff_t retVal=-1;
-       yaffs_Device *dev=NULL;
+       struct yaffs_dev *dev=NULL;
        YCHAR *dummy;
 
        yaffsfs_Lock();
        dev = yaffsfs_FindDevice(path,&dummy);
-       if(dev  && dev->isMounted){
+       if(dev  && dev->is_mounted){
                retVal = yaffs_get_n_free_chunks(dev);
-               retVal *= dev->nDataBytesPerChunk;
+               retVal *= dev->data_bytes_per_chunk;
 
        } else
                yaffsfs_SetError(-EINVAL);
@@ -1933,15 +1989,15 @@ loff_t yaffs_freespace(const YCHAR *path)
 loff_t yaffs_totalspace(const YCHAR *path)
 {
        loff_t retVal=-1;
-       yaffs_Device *dev=NULL;
+       struct yaffs_dev *dev=NULL;
        YCHAR *dummy;
 
        yaffsfs_Lock();
        dev = yaffsfs_FindDevice(path,&dummy);
-       if(dev  && dev->isMounted){
-               retVal = (dev->param.endBlock - dev->param.startBlock + 1) - dev->param.nReservedBlocks;
-               retVal *= dev->param.nChunksPerBlock;
-               retVal *= dev->nDataBytesPerChunk;
+       if(dev  && dev->is_mounted){
+               retVal = (dev->param.end_block - dev->param.start_block + 1) - dev->param.n_reserved_blocks;
+               retVal *= dev->param.chunks_per_block;
+               retVal *= dev->data_bytes_per_chunk;
 
        } else
                yaffsfs_SetError(-EINVAL);
@@ -1953,15 +2009,15 @@ loff_t yaffs_totalspace(const YCHAR *path)
 int yaffs_inodecount(const YCHAR *path)
 {
        loff_t retVal= -1;
-       yaffs_Device *dev=NULL;
+       struct yaffs_dev *dev=NULL;
        YCHAR *dummy;
 
        yaffsfs_Lock();
        dev = yaffsfs_FindDevice(path,&dummy);
-       if(dev  && dev->isMounted) {
-          int nObjects = dev->nObjects;
-          if(nObjects > dev->nHardLinks)
-               retVal = nObjects - dev->nHardLinks;
+       if(dev  && dev->is_mounted) {
+          int n_obj = dev->n_obj;
+          if(n_obj > dev->n_hardlinks)
+               retVal = n_obj - dev->n_hardlinks;
        }
        
        if(retVal < 0)
@@ -1972,20 +2028,20 @@ int yaffs_inodecount(const YCHAR *path)
 }
 
 
-void yaffs_add_device(yaffs_Device *dev)
+void yaffs_add_device(struct yaffs_dev *dev)
 {
-       dev->isMounted = 0;
-       dev->param.removeObjectCallback = yaffsfs_RemoveObjectCallback;
+       dev->is_mounted = 0;
+       dev->param.remove_obj_fn = yaffsfs_RemoveObjectCallback;
 
-       if(!dev->devList.next)
-               YINIT_LIST_HEAD(&dev->devList);
+       if(!dev->dev_list.next)
+               INIT_LIST_HEAD(&dev->dev_list);
 
-       ylist_add(&dev->devList,&yaffsfs_deviceList);
+       list_add(&dev->dev_list,&yaffsfs_deviceList);
 }
 
-void yaffs_remove_device(yaffs_Device *dev)
+void yaffs_remove_device(struct yaffs_dev *dev)
 {
-       ylist_del_init(&dev->devList);
+       list_del_init(&dev->dev_list);
 }
 
 
@@ -2002,33 +2058,33 @@ void yaffs_remove_device(yaffs_Device *dev)
 
 typedef struct
 {
-       __u32 magic;
+       u32 magic;
        yaffs_dirent de;                /* directory entry being used by this dsc */
        YCHAR name[NAME_MAX+1];         /* name of directory being searched */
-        yaffs_Object *dirObj;           /* ptr to directory being searched */
-        yaffs_Object *nextReturn;       /* obj to be returned by next readddir */
+        struct yaffs_obj *dirObj;           /* ptr to directory being searched */
+        struct yaffs_obj *nextReturn;       /* obj to be returned by next readddir */
         int offset;
-        struct ylist_head others;       
+        struct list_head others;       
 } yaffsfs_DirectorySearchContext;
 
 
 
-static struct ylist_head search_contexts;
+static struct list_head search_contexts;
 
 
 static void yaffsfs_SetDirRewound(yaffsfs_DirectorySearchContext *dsc)
 {
        if(dsc &&
           dsc->dirObj &&
-          dsc->dirObj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){
+          dsc->dirObj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY){
 
            dsc->offset = 0;
 
-           if( ylist_empty(&dsc->dirObj->variant.directoryVariant.children))
+           if( list_empty(&dsc->dirObj->variant.dir_variant.children))
                 dsc->nextReturn = NULL;
            else
-                dsc->nextReturn = ylist_entry(dsc->dirObj->variant.directoryVariant.children.next,
-                                                yaffs_Object,siblings);
+                dsc->nextReturn = list_entry(dsc->dirObj->variant.dir_variant.children.next,
+                                                struct yaffs_obj,siblings);
         } else {
                /* Hey someone isn't playing nice! */
        }
@@ -2038,28 +2094,28 @@ static void yaffsfs_DirAdvance(yaffsfs_DirectorySearchContext *dsc)
 {
        if(dsc &&
           dsc->dirObj &&
-           dsc->dirObj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){
+           dsc->dirObj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY){
 
            if( dsc->nextReturn == NULL ||
-               ylist_empty(&dsc->dirObj->variant.directoryVariant.children))
+               list_empty(&dsc->dirObj->variant.dir_variant.children))
                 dsc->nextReturn = NULL;
            else {
-                   struct ylist_head *next = dsc->nextReturn->siblings.next;
+                   struct list_head *next = dsc->nextReturn->siblings.next;
 
-                   if( next == &dsc->dirObj->variant.directoryVariant.children)
+                   if( next == &dsc->dirObj->variant.dir_variant.children)
                         dsc->nextReturn = NULL; /* end of list */
                    else
-                        dsc->nextReturn = ylist_entry(next,yaffs_Object,siblings);
+                        dsc->nextReturn = list_entry(next,struct yaffs_obj,siblings);
            }
         } else {
                 /* Hey someone isn't playing nice! */
        }
 }
 
-static void yaffsfs_RemoveObjectCallback(yaffs_Object *obj)
+static void yaffsfs_RemoveObjectCallback(struct yaffs_obj *obj)
 {
 
-        struct ylist_head *i;
+        struct list_head *i;
         yaffsfs_DirectorySearchContext *dsc;
 
         /* if search contexts not initilised then skip */
@@ -2070,9 +2126,9 @@ static void yaffsfs_RemoveObjectCallback(yaffs_Object *obj)
          * If any are the one being removed, then advance the dsc to
          * the next one to prevent a hanging ptr.
          */
-         ylist_for_each(i, &search_contexts) {
+         list_for_each(i, &search_contexts) {
                 if (i) {
-                        dsc = ylist_entry(i, yaffsfs_DirectorySearchContext,others);
+                        dsc = list_entry(i, yaffsfs_DirectorySearchContext,others);
                         if(dsc->nextReturn == obj)
                                 yaffsfs_DirAdvance(dsc);
                 }
@@ -2083,14 +2139,14 @@ static void yaffsfs_RemoveObjectCallback(yaffs_Object *obj)
 yaffs_DIR *yaffs_opendir(const YCHAR *dirname)
 {
        yaffs_DIR *dir = NULL;
-       yaffs_Object *obj = NULL;
+       struct yaffs_obj *obj = NULL;
        yaffsfs_DirectorySearchContext *dsc = NULL;
 
        yaffsfs_Lock();
 
-       obj = yaffsfs_FindObject(NULL,dirname,0);
+       obj = yaffsfs_FindObject(NULL,dirname,0,1);
 
-       if(obj && obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){
+       if(obj && obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY){
 
                dsc = YMALLOC(sizeof(yaffsfs_DirectorySearchContext));
                dir = (yaffs_DIR *)dsc;
@@ -2100,12 +2156,12 @@ yaffs_DIR *yaffs_opendir(const YCHAR *dirname)
                         dsc->magic = YAFFS_MAGIC;
                         dsc->dirObj = obj;
                         yaffs_strncpy(dsc->name,dirname,NAME_MAX);
-                        YINIT_LIST_HEAD(&dsc->others);
+                        INIT_LIST_HEAD(&dsc->others);
 
                         if(!search_contexts.next)
-                                YINIT_LIST_HEAD(&search_contexts);
+                                INIT_LIST_HEAD(&search_contexts);
 
-                        ylist_add(&dsc->others,&search_contexts);       
+                        list_add(&dsc->others,&search_contexts);       
                         yaffsfs_SetDirRewound(dsc);
                }
 
@@ -2126,7 +2182,7 @@ struct yaffs_dirent *yaffs_readdir(yaffs_DIR *dirp)
        if(dsc && dsc->magic == YAFFS_MAGIC){
                yaffsfs_SetError(0);
                if(dsc->nextReturn){
-                       dsc->de.d_ino = yaffs_get_equivalent_obj(dsc->nextReturn)->objectId;
+                       dsc->de.d_ino = yaffs_get_equivalent_obj(dsc->nextReturn)->obj_id;
                        dsc->de.d_dont_use = (unsigned)dsc->nextReturn;
                        dsc->de.d_off = dsc->offset++;
                        yaffs_get_obj_name(dsc->nextReturn,dsc->de.d_name,NAME_MAX);
@@ -2168,7 +2224,7 @@ int yaffs_closedir(yaffs_DIR *dirp)
 
         yaffsfs_Lock();
         dsc->magic = 0;
-        ylist_del(&dsc->others); /* unhook from list */
+        list_del(&dsc->others); /* unhook from list */
         YFREE(dsc);
         yaffsfs_Unlock();
         return 0;
@@ -2179,15 +2235,15 @@ int yaffs_closedir(yaffs_DIR *dirp)
 
 int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath)
 {
-       yaffs_Object *parent = NULL;
-       yaffs_Object *obj;
+       struct yaffs_obj *parent = NULL;
+       struct yaffs_obj *obj;
        YCHAR *name;
        int retVal= -1;
        int mode = 0; /* ignore for now */
 
        yaffsfs_Lock();
        parent = yaffsfs_FindDirectory(NULL,newpath,&name,0);
-       if(parent && parent->myDev->readOnly)
+       if(parent && parent->my_dev->read_only)
                yaffsfs_SetError(-EINVAL);
        else if(parent){
                obj = yaffs_create_symlink(parent,name,mode,0,0,oldpath);
@@ -2210,22 +2266,22 @@ int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath)
 
 int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz)
 {
-       yaffs_Object *obj = NULL;
+       struct yaffs_obj *obj = NULL;
        int retVal;
 
 
        yaffsfs_Lock();
 
-       obj = yaffsfs_FindObject(NULL,path,0);
+       obj = yaffsfs_FindObject(NULL,path,0,1);
 
        if(!obj) {
                yaffsfs_SetError(-ENOENT);
                retVal = -1;
-       } else if(obj->variantType != YAFFS_OBJECT_TYPE_SYMLINK) {
+       } else if(obj->variant_type != YAFFS_OBJECT_TYPE_SYMLINK) {
                yaffsfs_SetError(-EINVAL);
                retVal = -1;
        } else {
-               YCHAR *alias = obj->variant.symLinkVariant.alias;
+               YCHAR *alias = obj->variant.symlink_variant.alias;
                memset(buf,0,bufsiz);
                yaffs_strncpy(buf,alias,bufsiz - 1);
                retVal = 0;
@@ -2237,29 +2293,29 @@ int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz)
 int yaffs_link(const YCHAR *oldpath, const YCHAR *newpath)
 {
        /* Creates a link called newpath to existing oldpath */
-       yaffs_Object *obj = NULL;
-       yaffs_Object *target = NULL;
+       struct yaffs_obj *obj = NULL;
+       struct yaffs_obj *target = NULL;
        int retVal = 0;
-       int newNameLength = 0;
+       int new_nameLength = 0;
 
 
        yaffsfs_Lock();
 
-       obj = yaffsfs_FindObject(NULL,oldpath,0);
-       target = yaffsfs_FindObject(NULL,newpath,0);
+       obj = yaffsfs_FindObject(NULL,oldpath,0,1);
+       target = yaffsfs_FindObject(NULL,newpath,0,0);
 
        if(!obj) {
                yaffsfs_SetError(-ENOENT);
                retVal = -1;
-       } else if(obj->myDev->readOnly){
+       } else if(obj->my_dev->read_only){
                yaffsfs_SetError(-EINVAL);
                retVal= -1;
        } else if(target) {
                yaffsfs_SetError(-EEXIST);
                retVal = -1;
        } else {
-               yaffs_Object *newdir = NULL;
-               yaffs_Object *link = NULL;
+               struct yaffs_obj *newdir = NULL;
+               struct yaffs_obj *link = NULL;
 
                YCHAR *newname;
 
@@ -2268,23 +2324,15 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *newpath)
                if(!newdir){
                        yaffsfs_SetError(-ENOTDIR);
                        retVal = -1;
-               }else if(newdir->myDev != obj->myDev){
+               }else if(newdir->my_dev != obj->my_dev){
                        yaffsfs_SetError(-EXDEV);
                        retVal = -1;
                }
                
-               newNameLength = yaffs_strnlen(newname,YAFFS_MAX_NAME_LENGTH+1);
-               
-               if(newNameLength == 0){
-                       yaffsfs_SetError(-ENOENT);
-                       retVal = -1;
-               } else if (newNameLength > YAFFS_MAX_NAME_LENGTH){
-                       yaffsfs_SetError(-ENAMETOOLONG);
-                       retVal = -1;
-               }
+               retVal = yaffsfs_CheckNameLength(newname);
                
                if(retVal == 0) {
-                       link = yaffs_Link(newdir,newname,obj);
+                       link = yaffs_link_obj(newdir,newname,obj);
                        if(link)
                                retVal = 0;
                        else{
@@ -2312,37 +2360,47 @@ int yaffs_mknod(const YCHAR *pathname, mode_t mode, dev_t dev)
  */
 int yaffs_n_handles(const YCHAR *path)
 {
-       yaffs_Object *obj;
+       struct yaffs_obj *obj;
 
-       obj = yaffsfs_FindObject(NULL,path,0);
-       if(obj)
-               obj = yaffs_get_equivalent_obj(obj);
+       obj = yaffsfs_FindObject(NULL,path,0,1);
 
        return yaffsfs_CountHandles(obj);
 }
 
+int yaffs_get_error(void)
+{
+       return yaffsfs_GetLastError();
+}
+
+int yaffs_set_error(int error)
+{
+       /*yaffsfs_SetError does not return. So the program is assumed to have worked. */
+       yaffsfs_SetError(error);
+       return 0;
+}
+
 int yaffs_dump_dev(const YCHAR *path)
 {
 #if 0
        YCHAR *rest;
 
-       yaffs_Object *obj = yaffsfs_FindRoot(path,&rest);
+       struct yaffs_obj *obj = yaffsfs_FindRoot(path,&rest);
 
        if(obj){
-               yaffs_Device *dev = obj->myDev;
+               struct yaffs_dev *dev = obj->my_dev;
 
                printf("\n"
-                          "nPageWrites.......... %d\n"
-                          "nPageReads........... %d\n"
-                          "nBlockErasures....... %d\n"
-                          "nGCCopies............ %d\n"
+                          "n_page_writes.......... %d\n"
+                          "n_page_reads........... %d\n"
+                          "n_erasures....... %d\n"
+                          "n_gc_copies............ %d\n"
                           "garbageCollections... %d\n"
                           "passiveGarbageColl'ns %d\n"
                           "\n",
-                               dev->nPageWrites,
-                               dev->nPageReads,
-                               dev->nBlockErasures,
-                               dev->nGCCopies,
+                               dev->n_page_writes,
+                               dev->n_page_reads,
+                               dev->n_erasures,
+                               dev->n_gc_copies,
                                dev->garbageCollections,
                                dev->passiveGarbageCollections
                );