Fix dependencies in Kconfig
[yaffs2.git] / direct / yaffsfs.c
index 956df2c..a096190 100644 (file)
@@ -1,17 +1,16 @@
 /*
- * YAFFS: Yet another FFS. A NAND-flash specific file system.
- * yaffsfs.c  The interface functions for using YAFFS via a "direct" interface.
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002 Aleph One Ltd.
+ * Copyright (C) 2002-2007 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- *
  */
+
 #include "yaffsfs.h"
 #include "yaffs_guts.h"
 #include "yaffscfg.h"
 #endif
 
 
-const char *yaffsfs_c_version="$Id: yaffsfs.c,v 1.6 2005-09-20 05:05:40 charles Exp $";
+const char *yaffsfs_c_version="$Id: yaffsfs.c,v 1.24 2008-11-11 01:47:46 charles Exp $";
 
 // configurationList is the list of devices that are supported
 static yaffsfs_DeviceConfiguration *yaffsfs_configurationList;
 
 
 /* Some forward references */
-static yaffs_Object *yaffsfs_FindObject(yaffs_Object *relativeDirectory, const char *path, int symDepth);
+static yaffs_Object *yaffsfs_FindObject(yaffs_Object *relativeDirectory, const YCHAR *path, int symDepth);
 static void yaffsfs_RemoveObjectCallback(yaffs_Object *obj);
 
 
 // Handle management.
-// 
+//
+
+
+unsigned int yaffs_wr_attempts;
 
 typedef struct
 {
@@ -72,7 +74,7 @@ yaffsfs_Handle *yaffsfs_GetHandlePointer(int h)
        {
                return NULL;
        }
-       
+
        return &yaffsfs_handle[h];
 }
 
@@ -84,7 +86,7 @@ yaffs_Object *yaffsfs_GetHandleObject(int handle)
        {
                return h->obj;
        }
-       
+
        return NULL;
 }
 
@@ -97,7 +99,7 @@ static int yaffsfs_GetHandle(void)
 {
        int i;
        yaffsfs_Handle *h;
-       
+
        for(i = 0; i < YAFFSFS_N_HANDLES; i++)
        {
                h = yaffsfs_GetHandlePointer(i);
@@ -121,7 +123,7 @@ static int yaffsfs_GetHandle(void)
 static int yaffsfs_PutHandle(int handle)
 {
        yaffsfs_Handle *h = yaffsfs_GetHandlePointer(handle);
-       
+
        if(h)
        {
                h->inUse = 0;
@@ -135,46 +137,142 @@ static int yaffsfs_PutHandle(int handle)
 // Stuff to search for a directory from a path
 
 
-int yaffsfs_Match(char a, char b)
+int yaffsfs_Match(YCHAR a, YCHAR b)
 {
        // case sensitive
        return (a == b);
 }
 
+int yaffsfs_IsPathDivider(YCHAR ch)
+{
+       YCHAR *str = YAFFS_PATH_DIVIDERS;
+
+       while(*str){
+               if(*str == ch)
+                       return 1;
+               str++;
+       }
+
+       return 0;
+}
+
 // yaffsfs_FindDevice
 // yaffsfs_FindRoot
 // Scan the configuration list to find the root.
-static yaffs_Device *yaffsfs_FindDevice(const char *path, char **restOfPath)
+// 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)
 {
        yaffsfs_DeviceConfiguration *cfg = yaffsfs_configurationList;
-       const char *leftOver;
-       const char *p;
-       
+       const YCHAR *leftOver;
+       const YCHAR *p;
+       yaffs_Device *retval = NULL;
+       int thisMatchLength;
+       int longestMatch = -1;
+       int matching;
+
+       // 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;
+               matching = 1;
+
+
+               while(matching && *p && *leftOver){
+                       // Skip over any /s
+                       while(yaffsfs_IsPathDivider(*p))
+                             p++;
+
+                       // Skip over any /s
+                       while(yaffsfs_IsPathDivider(*leftOver))
+                             leftOver++;
+
+                       // Now match the text part
+                       while(matching &&
+                             *p && !yaffsfs_IsPathDivider(*p) &&
+                             *leftOver && !yaffsfs_IsPathDivider(*leftOver)){
+                               if(yaffsfs_Match(*p,*leftOver)){
+                                       p++;
+                                       leftOver++;
+                                       thisMatchLength++;
+                               } else {
+                                       matching = 0;
+                               }
+                       }
+               }
+
+               // Skip over any /s in leftOver
+               while(yaffsfs_IsPathDivider(*leftOver))
+                     leftOver++;
+               
+
+               if( matching && (thisMatchLength > longestMatch))
+               {
+                       // Matched prefix
+                       *restOfPath = (YCHAR *)leftOver;
+                       retval = cfg->dev;
+                       longestMatch = thisMatchLength;
+               }
+
+               cfg++;
+       }
+       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;
-               while(*p && *leftOver && yaffsfs_Match(*p,*leftOver))
+               thisMatchLength = 0;
+
+               while(*p &&  //unmatched part of prefix
+                     !(yaffsfs_IsPathDivider(*p) && (p[1] == 0)) && // the rest of the prefix is not / (to catch / at end)
+                     *leftOver &&
+                     yaffsfs_Match(*p,*leftOver))
                {
                        p++;
                        leftOver++;
+                       thisMatchLength++;
                }
-               if(!*p && (!*leftOver || *leftOver == '/'))
+
+
+               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 = (char *)leftOver;
-                       return cfg->dev;
+                       *restOfPath = (YCHAR *)leftOver;
+                       retval = cfg->dev;
+                       longestMatch = thisMatchLength;
                }
                cfg++;
        }
-       return NULL;
+       return retval;
 }
+#endif
 
-static yaffs_Object *yaffsfs_FindRoot(const char *path, char **restOfPath)
+static yaffs_Object *yaffsfs_FindRoot(const YCHAR *path, YCHAR **restOfPath)
 {
 
        yaffs_Device *dev;
-       
+
        dev= yaffsfs_FindDevice(path,restOfPath);
        if(dev && dev->isMounted)
        {
@@ -188,9 +286,9 @@ static yaffs_Object *yaffsfs_FollowLink(yaffs_Object *obj,int symDepth)
 
        while(obj && obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
        {
-               char *alias = obj->variant.symLinkVariant.alias;
-                                               
-               if(*alias == '/')
+               YCHAR *alias = obj->variant.symLinkVariant.alias;
+
+               if(yaffsfs_IsPathDivider(*alias))
                {
                        // Starts with a /, need to scan from root up
                        obj = yaffsfs_FindObject(NULL,alias,symDepth++);
@@ -209,42 +307,42 @@ static yaffs_Object *yaffsfs_FollowLink(yaffs_Object *obj,int symDepth)
 // Parse a path to determine the directory and the name within the directory.
 //
 // eg. "/data/xx/ff" --> puts name="ff" and returns the directory "/data/xx"
-static yaffs_Object *yaffsfs_DoFindDirectory(yaffs_Object *startDir,const char *path,char **name,int symDepth)
+static yaffs_Object *yaffsfs_DoFindDirectory(yaffs_Object *startDir,const YCHAR *path,YCHAR **name,int symDepth)
 {
        yaffs_Object *dir;
-       char *restOfPath;
-       char str[YAFFS_MAX_NAME_LENGTH+1];
+       YCHAR *restOfPath;
+       YCHAR str[YAFFS_MAX_NAME_LENGTH+1];
        int i;
-       
+
        if(symDepth > YAFFSFS_MAX_SYMLINK_DEREFERENCES)
        {
                return NULL;
        }
-       
+
        if(startDir)
        {
                dir = startDir;
-               restOfPath = (char *)path;
+               restOfPath = (YCHAR *)path;
        }
        else
        {
                dir = yaffsfs_FindRoot(path,&restOfPath);
        }
-       
+
        while(dir)
-       {       
+       {
                // parse off /.
-               // curve ball: also throw away surplus '/' 
+               // curve ball: also throw away surplus '/'
                // eg. "/ram/x////ff" gets treated the same as "/ram/x/ff"
-               while(*restOfPath == '/')
+               while(yaffsfs_IsPathDivider(*restOfPath))
                {
                        restOfPath++; // get rid of '/'
                }
-               
+
                *name = restOfPath;
                i = 0;
-               
-               while(*restOfPath && *restOfPath != '/')
+
+               while(*restOfPath && !yaffsfs_IsPathDivider(*restOfPath))
                {
                        if (i < YAFFS_MAX_NAME_LENGTH)
                        {
@@ -254,7 +352,7 @@ static yaffs_Object *yaffsfs_DoFindDirectory(yaffs_Object *startDir,const char *
                        }
                        restOfPath++;
                }
-               
+
                if(!*restOfPath)
                {
                        // got to the end of the string
@@ -262,25 +360,25 @@ static yaffs_Object *yaffsfs_DoFindDirectory(yaffs_Object *startDir,const char *
                }
                else
                {
-                       if(strcmp(str,".") == 0)
+                       if(yaffs_strcmp(str,_Y(".")) == 0)
                        {
                                // Do nothing
                        }
-                       else if(strcmp(str,"..") == 0)
+                       else if(yaffs_strcmp(str,_Y("..")) == 0)
                        {
                                dir = dir->parent;
                        }
                        else
                        {
                                dir = yaffs_FindObjectByName(dir,str);
-                               
+
                                while(dir && dir->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
                                {
-                               
+
                                        dir = yaffsfs_FollowLink(dir,symDepth);
-               
+
                                }
-                               
+
                                if(dir && dir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
                                {
                                        dir = NULL;
@@ -292,35 +390,62 @@ static yaffs_Object *yaffsfs_DoFindDirectory(yaffs_Object *startDir,const char *
        return NULL;
 }
 
-static yaffs_Object *yaffsfs_FindDirectory(yaffs_Object *relativeDirectory,const char *path,char **name,int symDepth)
+static yaffs_Object *yaffsfs_FindDirectory(yaffs_Object *relativeDirectory,const YCHAR *path,YCHAR **name,int symDepth)
 {
        return yaffsfs_DoFindDirectory(relativeDirectory,path,name,symDepth);
 }
 
 // yaffsfs_FindObject turns a path for an existing object into the object
-// 
-static yaffs_Object *yaffsfs_FindObject(yaffs_Object *relativeDirectory, const char *path,int symDepth)
+//
+static yaffs_Object *yaffsfs_FindObject(yaffs_Object *relativeDirectory, const YCHAR *path,int symDepth)
 {
        yaffs_Object *dir;
-       char *name;
-       
+       YCHAR *name;
+
        dir = yaffsfs_FindDirectory(relativeDirectory,path,&name,symDepth);
-       
+
        if(dir && *name)
        {
                return yaffs_FindObjectByName(dir,name);
        }
-       
+
        return dir;
 }
 
 
+int yaffs_dup(int fd)
+{
+       int newHandle = -1;
+       yaffsfs_Handle *oldPtr = NULL;
+       yaffsfs_Handle *newPtr = NULL;
+
+       yaffsfs_Lock();
+
+       oldPtr = yaffsfs_GetHandlePointer(fd);
+       if(oldPtr && oldPtr->inUse)
+               newHandle = yaffsfs_GetHandle();
+       if(newHandle >= 0)
+               newPtr = yaffsfs_GetHandlePointer(newHandle);
+
+       if(newPtr){
+               *newPtr = *oldPtr;
+               return newHandle;
+       }
+
+       if(!oldPtr)
+               yaffsfs_SetError(-EBADF);
+       else
+               yaffsfs_SetError(-ENOMEM);
+
+       return -1;
+
+}
 
-int yaffs_open(const char *path, int oflag, int mode)
+int yaffs_open(const YCHAR *path, int oflag, int mode)
 {
        yaffs_Object *obj = NULL;
        yaffs_Object *dir = NULL;
-       char *name;
+       YCHAR *name;
        int handle = -1;
        yaffsfs_Handle *h = NULL;
        int alreadyOpen = 0;
@@ -328,40 +453,45 @@ int yaffs_open(const char *path, int oflag, int mode)
        int openDenied = 0;
        int symDepth = 0;
        int errorReported = 0;
-       
+
        int i;
-       
-       
+
+
        // todo sanity check oflag (eg. can't have O_TRUNC without WRONLY or RDWR
-       
-       
+
+
        yaffsfs_Lock();
-       
+
        handle = yaffsfs_GetHandle();
-       
+
        if(handle >= 0)
        {
 
                h = yaffsfs_GetHandlePointer(handle);
-       
-       
+
+
                // try to find the exisiting object
                obj = yaffsfs_FindObject(NULL,path,0);
-               
+
                if(obj && obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
                {
-               
+
                        obj = yaffsfs_FollowLink(obj,symDepth++);
                }
 
+               if(obj && obj->variantType != YAFFS_OBJECT_TYPE_FILE)
+               {
+                       obj = NULL;
+               }
+
                if(obj)
                {
                        // Check if the object is already in use
                        alreadyOpen = alreadyExclusive = 0;
-                       
-                       for(i = 0; i <= YAFFSFS_N_HANDLES; i++)
+
+                       for(i = 0; i < YAFFSFS_N_HANDLES; i++)
                        {
-                               
+
                                if(i != handle &&
                                   yaffsfs_handle[i].inUse &&
                                    obj == yaffsfs_handle[i].obj)
@@ -378,7 +508,7 @@ int yaffs_open(const char *path, int oflag, int mode)
                        {
                                openDenied = 1;
                        }
-                       
+
                        // Open should fail if O_CREAT and O_EXCL are specified
                        if((oflag & O_EXCL) && (oflag & O_CREAT))
                        {
@@ -386,7 +516,7 @@ int yaffs_open(const char *path, int oflag, int mode)
                                yaffsfs_SetError(-EEXIST);
                                errorReported = 1;
                        }
-                       
+
                        // Check file permissions
                        if( (oflag & (O_RDWR | O_WRONLY)) == 0 &&     // ie O_RDONLY
                           !(obj->yst_mode & S_IREAD))
@@ -394,34 +524,35 @@ int yaffs_open(const char *path, int oflag, int mode)
                                openDenied = 1;
                        }
 
-                       if( (oflag & O_RDWR) && 
+                       if( (oflag & O_RDWR) &&
                           !(obj->yst_mode & S_IREAD))
                        {
                                openDenied = 1;
                        }
 
-                       if( (oflag & (O_RDWR | O_WRONLY)) && 
+                       if( (oflag & (O_RDWR | O_WRONLY)) &&
                           !(obj->yst_mode & S_IWRITE))
                        {
                                openDenied = 1;
                        }
-                       
+
                }
-               
+
                else if((oflag & O_CREAT))
                {
                        // Let's see if we can create this file
                        dir = yaffsfs_FindDirectory(NULL,path,&name,0);
                        if(dir)
                        {
-                               obj = yaffs_MknodFile(dir,name,mode,0,0);       
+                               obj = yaffs_MknodFile(dir,name,mode,0,0);
                        }
                        else
                        {
                                yaffsfs_SetError(-ENOTDIR);
+                               errorReported = 1;
                        }
                }
-               
+
                if(obj && !openDenied)
                {
                        h->obj = obj;
@@ -430,42 +561,68 @@ int yaffs_open(const char *path, int oflag, int mode)
                        h->append =  (oflag & O_APPEND) ? 1 : 0;
                        h->exclusive = (oflag & O_EXCL) ? 1 : 0;
                        h->position = 0;
-                       
-                       obj->inUse++;
-                       if((oflag & O_TRUNC) && !h->readOnly)
-                       {
-                               //todo truncate
-                               yaffs_ResizeFile(obj,0);
-                       }
-                       
+
+                        obj->inUse++;
+                        if((oflag & O_TRUNC) && !h->readOnly)
+                        {
+                                yaffs_ResizeFile(obj,0);
+                        }
+
                }
                else
                {
                        yaffsfs_PutHandle(handle);
                        if(!errorReported)
                        {
-                               yaffsfs_SetError(-EACCESS);
+                               yaffsfs_SetError(-EACCES);
                                errorReported = 1;
                        }
                        handle = -1;
                }
-               
+
        }
-       
+
        yaffsfs_Unlock();
-       
-       return handle;          
+
+       return handle;
+}
+
+int yaffs_flush(int fd)
+{
+       yaffsfs_Handle *h = NULL;
+       int retVal = 0;
+
+       yaffsfs_Lock();
+
+       h = yaffsfs_GetHandlePointer(fd);
+
+       if(h && h->inUse)
+       {
+               // flush the file
+               yaffs_FlushFile(h->obj,1);
+       }
+       else
+       {
+               // bad handle
+               yaffsfs_SetError(-EBADF);
+               retVal = -1;
+       }
+
+       yaffsfs_Unlock();
+
+       return retVal;
 }
 
+
 int yaffs_close(int fd)
 {
        yaffsfs_Handle *h = NULL;
        int retVal = 0;
-       
+
        yaffsfs_Lock();
 
        h = yaffsfs_GetHandlePointer(fd);
-       
+
        if(h && h->inUse)
        {
                // clean up
@@ -481,12 +638,12 @@ int yaffs_close(int fd)
        else
        {
                // bad handle
-               yaffsfs_SetError(-EBADF);               
+               yaffsfs_SetError(-EBADF);
                retVal = -1;
        }
-       
+
        yaffsfs_Unlock();
-       
+
        return retVal;
 }
 
@@ -496,16 +653,16 @@ int yaffs_read(int fd, void *buf, unsigned int nbyte)
        yaffs_Object *obj = NULL;
        int pos = 0;
        int nRead = -1;
-       int maxRead;
-       
+       unsigned int maxRead;
+
        yaffsfs_Lock();
        h = yaffsfs_GetHandlePointer(fd);
        obj = yaffsfs_GetHandleObject(fd);
-       
+
        if(!h || !obj)
        {
                // bad handle
-               yaffsfs_SetError(-EBADF);               
+               yaffsfs_SetError(-EBADF);
        }
        else if( h && obj)
        {
@@ -524,7 +681,7 @@ int yaffs_read(int fd, void *buf, unsigned int nbyte)
                        nbyte = maxRead;
                }
 
-               
+
                if(nbyte > 0)
                {
                        nRead = yaffs_ReadDataFromFile(obj,buf,pos,nbyte);
@@ -541,14 +698,67 @@ int yaffs_read(int fd, void *buf, unsigned int nbyte)
                {
                        nRead = 0;
                }
-               
+
        }
-       
+
        yaffsfs_Unlock();
-       
-       
+
+
        return (nRead >= 0) ? nRead : -1;
-               
+
+}
+
+int yaffs_pread(int fd, void *buf, unsigned int nbyte, unsigned int offset)
+{
+       yaffsfs_Handle *h = NULL;
+       yaffs_Object *obj = NULL;
+       int pos = 0;
+       int nRead = -1;
+       unsigned int maxRead;
+
+       yaffsfs_Lock();
+       h = yaffsfs_GetHandlePointer(fd);
+       obj = yaffsfs_GetHandleObject(fd);
+
+       if(!h || !obj)
+       {
+               // bad handle
+               yaffsfs_SetError(-EBADF);
+       }
+       else if( h && obj)
+       {
+               pos= offset;
+               if(yaffs_GetObjectFileLength(obj) > pos)
+               {
+                       maxRead = yaffs_GetObjectFileLength(obj) - pos;
+               }
+               else
+               {
+                       maxRead = 0;
+               }
+
+               if(nbyte > maxRead)
+               {
+                       nbyte = maxRead;
+               }
+
+
+               if(nbyte > 0)
+               {
+                       nRead = yaffs_ReadDataFromFile(obj,buf,pos,nbyte);
+               }
+               else
+               {
+                       nRead = 0;
+               }
+
+       }
+
+       yaffsfs_Unlock();
+
+
+       return (nRead >= 0) ? nRead : -1;
+
 }
 
 int yaffs_write(int fd, const void *buf, unsigned int nbyte)
@@ -558,15 +768,15 @@ int yaffs_write(int fd, const void *buf, unsigned int nbyte)
        int pos = 0;
        int nWritten = -1;
        int writeThrough = 0;
-       
+
        yaffsfs_Lock();
        h = yaffsfs_GetHandlePointer(fd);
        obj = yaffsfs_GetHandleObject(fd);
-       
+
        if(!h || !obj)
        {
                // bad handle
-               yaffsfs_SetError(-EBADF);               
+               yaffsfs_SetError(-EBADF);
        }
        else if( h && obj && h->readOnly)
        {
@@ -582,9 +792,9 @@ int yaffs_write(int fd, const void *buf, unsigned int nbyte)
                {
                        pos = h->position;
                }
-               
+
                nWritten = yaffs_WriteDataToFile(obj,buf,pos,nbyte,writeThrough);
-               
+
                if(nWritten >= 0)
                {
                        h->position = pos + nWritten;
@@ -593,58 +803,128 @@ int yaffs_write(int fd, const void *buf, unsigned int nbyte)
                {
                        //todo error
                }
-               
+
        }
-       
+
        yaffsfs_Unlock();
-       
-       
+
+
        return (nWritten >= 0) ? nWritten : -1;
 
 }
 
-int yaffs_truncate(int fd, unsigned int newSize)
+int yaffs_pwrite(int fd, const void *buf, unsigned int nbyte, unsigned int offset)
 {
        yaffsfs_Handle *h = NULL;
        yaffs_Object *obj = NULL;
-       int result = 0;
-       
-       yaffsfs_Lock();
+       int pos = 0;
+       int nWritten = -1;
+       int writeThrough = 0;
+
+       yaffsfs_Lock();
        h = yaffsfs_GetHandlePointer(fd);
        obj = yaffsfs_GetHandleObject(fd);
-       
+
        if(!h || !obj)
        {
                // bad handle
-               yaffsfs_SetError(-EBADF);               
+               yaffsfs_SetError(-EBADF);
+       }
+       else if( h && obj && h->readOnly)
+       {
+               // todo error
+       }
+       else if( h && obj)
+       {
+               pos = offset;
+
+                nWritten = yaffs_WriteDataToFile(obj,buf,pos,nbyte,writeThrough);
+
+                if(nWritten < 0 || ((unsigned int)nWritten) < nbyte)
+                        yaffsfs_SetError(-ENOSPC);
+
+        }
+
+       yaffsfs_Unlock();
+
+
+       return (nWritten >= 0) ? nWritten : -1;
+
+}
+
+
+int yaffs_truncate(const YCHAR *path,off_t newSize)
+{
+       yaffs_Object *obj = NULL;
+       int result = YAFFS_FAIL;
+
+       yaffsfs_Lock();
+
+       obj = yaffsfs_FindObject(NULL,path,0);
+       if(obj)
+               obj = yaffs_GetEquivalentObject(obj);
+
+       if(!obj)
+       {
+               yaffsfs_SetError(-ENOENT);
+       }
+       else if(obj->variantType != YAFFS_OBJECT_TYPE_FILE)
+       {
+               yaffsfs_SetError(-EISDIR);
+       }
+       else
+       {
+               result = yaffs_ResizeFile(obj,newSize);
+       }
+
+       yaffsfs_Unlock();
+
+
+       return (result) ? 0 : -1;
+}
+
+int yaffs_ftruncate(int fd, off_t newSize)
+{
+       yaffsfs_Handle *h = NULL;
+       yaffs_Object *obj = NULL;
+       int result = 0;
+
+       yaffsfs_Lock();
+       h = yaffsfs_GetHandlePointer(fd);
+       obj = yaffsfs_GetHandleObject(fd);
+
+       if(!h || !obj)
+       {
+               // bad handle
+               yaffsfs_SetError(-EBADF);
        }
        else
        {
                // resize the file
                result = yaffs_ResizeFile(obj,newSize);
-       }       
+       }
        yaffsfs_Unlock();
-       
-       
+
+
        return (result) ? 0 : -1;
 
 }
 
-off_t yaffs_lseek(int fd, off_t offset, int whence) 
+off_t yaffs_lseek(int fd, off_t offset, int whence)
 {
        yaffsfs_Handle *h = NULL;
        yaffs_Object *obj = NULL;
        int pos = -1;
        int fSize = -1;
-       
+
        yaffsfs_Lock();
        h = yaffsfs_GetHandlePointer(fd);
        obj = yaffsfs_GetHandleObject(fd);
-       
+
        if(!h || !obj)
        {
                // bad handle
-               yaffsfs_SetError(-EBADF);               
+               yaffsfs_SetError(-EBADF);
        }
        else if(whence == SEEK_SET)
        {
@@ -668,7 +948,7 @@ off_t yaffs_lseek(int fd, off_t offset, int whence)
                        pos = fSize + offset;
                }
        }
-       
+
        if(pos >= 0)
        {
                h->position = pos;
@@ -678,20 +958,20 @@ off_t yaffs_lseek(int fd, off_t offset, int whence)
                // todo error
        }
 
-       
+
        yaffsfs_Unlock();
-       
+
        return pos;
 }
 
 
-int yaffsfs_DoUnlink(const char *path,int isDirectory) 
+int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory)
 {
        yaffs_Object *dir = NULL;
        yaffs_Object *obj = NULL;
-       char *name;
+       YCHAR *name;
        int result = YAFFS_FAIL;
-       
+
        yaffsfs_Lock();
 
        obj = yaffsfs_FindObject(NULL,path,0);
@@ -712,73 +992,71 @@ int yaffsfs_DoUnlink(const char *path,int isDirectory)
        {
                yaffsfs_SetError(-ENOTDIR);
        }
-       else if(isDirectory && obj->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-       {
-               yaffsfs_SetError(-ENOTDIR);
-       }
        else
        {
                result = yaffs_Unlink(dir,name);
-               
+
                if(result == YAFFS_FAIL && isDirectory)
                {
                        yaffsfs_SetError(-ENOTEMPTY);
                }
        }
-       
+
        yaffsfs_Unlock();
-       
+
        // todo error
-       
+
        return (result == YAFFS_FAIL) ? -1 : 0;
 }
-int yaffs_rmdir(const char *path) 
+
+
+int yaffs_rmdir(const YCHAR *path)
 {
        return yaffsfs_DoUnlink(path,1);
 }
 
-int yaffs_unlink(const char *path) 
+int yaffs_unlink(const YCHAR *path)
 {
        return yaffsfs_DoUnlink(path,0);
 }
 
-int yaffs_rename(const char *oldPath, const char *newPath)
+int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath)
 {
        yaffs_Object *olddir = NULL;
        yaffs_Object *newdir = NULL;
        yaffs_Object *obj = NULL;
-       char *oldname;
-       char *newname;
+       YCHAR *oldname;
+       YCHAR *newname;
        int result= YAFFS_FAIL;
        int renameAllowed = 1;
-       
+
        yaffsfs_Lock();
-       
+
        olddir = yaffsfs_FindDirectory(NULL,oldPath,&oldname,0);
        newdir = yaffsfs_FindDirectory(NULL,newPath,&newname,0);
        obj = yaffsfs_FindObject(NULL,oldPath,0);
-       
+
        if(!olddir || !newdir || !obj)
        {
                // bad file
-               yaffsfs_SetError(-EBADF);       
-               renameAllowed = 0;      
+               yaffsfs_SetError(-EBADF);
+               renameAllowed = 0;
        }
        else if(olddir->myDev != newdir->myDev)
        {
                // oops must be on same device
                // todo error
                yaffsfs_SetError(-EXDEV);
-               renameAllowed = 0;      
+               renameAllowed = 0;
        }
        else if(obj && obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY)
        {
-               // It is a directory, check that it is not being renamed to 
+               // 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;
-               
+
                while( renameAllowed && xx)
                {
                        if(xx == obj)
@@ -787,17 +1065,17 @@ int yaffs_rename(const char *oldPath, const char *newPath)
                        }
                        xx = xx->parent;
                }
-               if(!renameAllowed) yaffsfs_SetError(-EACCESS);
+               if(!renameAllowed) yaffsfs_SetError(-EACCES);
        }
-       
+
        if(renameAllowed)
        {
                result = yaffs_RenameObject(olddir,oldname,newdir,newname);
        }
-       
+
        yaffsfs_Unlock();
-       
-       return (result == YAFFS_FAIL) ? -1 : 0; 
+
+       return (result == YAFFS_FAIL) ? -1 : 0;
 }
 
 
@@ -815,12 +1093,12 @@ static int yaffsfs_DoStat(yaffs_Object *obj,struct yaffs_stat *buf)
        buf->st_dev = (int)obj->myDev->genericDevice;
        buf->st_ino = obj->objectId;
        buf->st_mode = obj->yst_mode & ~S_IFMT; // clear out file type bits
-       
-               if(obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) 
+
+               if(obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY)
                {
                        buf->st_mode |= S_IFDIR;
                }
-               else if(obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) 
+               else if(obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
                {
                        buf->st_mode |= S_IFLNK;
                }
@@ -828,36 +1106,45 @@ static int yaffsfs_DoStat(yaffs_Object *obj,struct yaffs_stat *buf)
                {
                        buf->st_mode |= S_IFREG;
                }
-               
+
        buf->st_nlink = yaffs_GetObjectLinkCount(obj);
-       buf->st_uid = 0;    
-       buf->st_gid = 0;;     
+       buf->st_uid = 0;
+       buf->st_gid = 0;;
        buf->st_rdev = obj->yst_rdev;
        buf->st_size = yaffs_GetObjectFileLength(obj);
-               buf->st_blksize = obj->myDev->nBytesPerChunk;
+               buf->st_blksize = obj->myDev->nDataBytesPerChunk;
        buf->st_blocks = (buf->st_size + buf->st_blksize -1)/buf->st_blksize;
-       buf->yst_atime = obj->yst_atime; 
-       buf->yst_ctime = obj->yst_ctime; 
-       buf->yst_mtime = obj->yst_mtime; 
+#if CONFIG_YAFFS_WINCE
+               buf->yst_wince_atime[0] = obj->win_atime[0];
+               buf->yst_wince_atime[1] = obj->win_atime[1];
+               buf->yst_wince_ctime[0] = obj->win_ctime[0];
+               buf->yst_wince_ctime[1] = obj->win_ctime[1];
+               buf->yst_wince_mtime[0] = obj->win_mtime[0];
+               buf->yst_wince_mtime[1] = obj->win_mtime[1];
+#else
+       buf->yst_atime = obj->yst_atime;
+       buf->yst_ctime = obj->yst_ctime;
+       buf->yst_mtime = obj->yst_mtime;
+#endif
                retVal = 0;
        }
        return retVal;
 }
 
-static int yaffsfs_DoStatOrLStat(const char *path, struct yaffs_stat *buf,int doLStat)
+static int yaffsfs_DoStatOrLStat(const YCHAR *path, struct yaffs_stat *buf,int doLStat)
 {
        yaffs_Object *obj;
-       
+
        int retVal = -1;
-       
+
        yaffsfs_Lock();
        obj = yaffsfs_FindObject(NULL,path,0);
-       
+
        if(!doLStat && obj)
        {
                obj = yaffsfs_FollowLink(obj,0);
        }
-       
+
        if(obj)
        {
                retVal = yaffsfs_DoStat(obj,buf);
@@ -867,19 +1154,19 @@ static int yaffsfs_DoStatOrLStat(const char *path, struct yaffs_stat *buf,int do
                // todo error not found
                yaffsfs_SetError(-ENOENT);
        }
-       
+
        yaffsfs_Unlock();
-       
+
        return retVal;
-       
+
 }
 
-int yaffs_stat(const char *path, struct yaffs_stat *buf)
+int yaffs_stat(const YCHAR *path, struct yaffs_stat *buf)
 {
        return yaffsfs_DoStatOrLStat(path,buf,0);
 }
 
-int yaffs_lstat(const char *path, struct yaffs_stat *buf)
+int yaffs_lstat(const YCHAR *path, struct yaffs_stat *buf)
 {
        return yaffsfs_DoStatOrLStat(path,buf,1);
 }
@@ -887,17 +1174,57 @@ int yaffs_lstat(const char *path, struct yaffs_stat *buf)
 int yaffs_fstat(int fd, struct yaffs_stat *buf)
 {
        yaffs_Object *obj;
-       
+
        int retVal = -1;
-       
+
        yaffsfs_Lock();
        obj = yaffsfs_GetHandleObject(fd);
-       
+
        if(obj)
        {
                retVal = yaffsfs_DoStat(obj,buf);
        }
        else
+       {
+               // bad handle
+               yaffsfs_SetError(-EBADF);
+       }
+
+       yaffsfs_Unlock();
+
+       return retVal;
+}
+
+#ifdef CONFIG_YAFFS_WINCE
+int yaffs_get_wince_times(int fd, unsigned *wctime, unsigned *watime, unsigned *wmtime)
+{
+       yaffs_Object *obj;
+
+       int retVal = -1;
+
+       yaffsfs_Lock();
+       obj = yaffsfs_GetHandleObject(fd);
+
+       if(obj)
+       {
+
+               if(wctime){
+                       wctime[0] = obj->win_ctime[0];
+                       wctime[1] = obj->win_ctime[1];
+               }
+               if(watime){
+                       watime[0] = obj->win_atime[0];
+                       watime[1] = obj->win_atime[1];
+               }
+               if(wmtime){
+                       wmtime[0] = obj->win_mtime[0];
+                       wmtime[1] = obj->win_mtime[1];
+               }
+
+
+               retVal = 0;
+       }
+       else
        {
                // bad handle
                yaffsfs_SetError(-EBADF);               
@@ -908,35 +1235,121 @@ int yaffs_fstat(int fd, struct yaffs_stat *buf)
        return retVal;
 }
 
+
+int yaffs_set_wince_times(int fd, 
+                                                 const unsigned *wctime, 
+                                                 const unsigned *watime, 
+                                                  const unsigned *wmtime)
+{
+        yaffs_Object *obj;
+        int result;
+        int retVal = -1;
+
+        yaffsfs_Lock();
+       obj = yaffsfs_GetHandleObject(fd);
+
+       if(obj)
+       {
+
+               if(wctime){
+                       obj->win_ctime[0] = wctime[0];
+                       obj->win_ctime[1] = wctime[1];
+               }
+               if(watime){
+                        obj->win_atime[0] = watime[0];
+                        obj->win_atime[1] = watime[1];
+                }
+                if(wmtime){
+                        obj->win_mtime[0] = wmtime[0];
+                        obj->win_mtime[1] = wmtime[1];
+                }
+
+                obj->dirty = 1;
+                result = yaffs_FlushFile(obj,0);
+                retVal = 0;
+        }
+        else
+       {
+               // bad handle
+               yaffsfs_SetError(-EBADF);
+       }
+
+       yaffsfs_Unlock();
+
+       return retVal;
+}
+
+#endif
+
+
 static int yaffsfs_DoChMod(yaffs_Object *obj,mode_t mode)
 {
-       int result;
+       int result = -1;
 
        if(obj)
        {
                obj = yaffs_GetEquivalentObject(obj);
        }
-       
+
        if(obj)
        {
                obj->yst_mode = mode;
                obj->dirty = 1;
                result = yaffs_FlushFile(obj,0);
        }
-       
+
        return result == YAFFS_OK ? 0 : -1;
 }
 
 
-int yaffs_chmod(const char *path, mode_t mode)
+int yaffs_access(const YCHAR *path, int amode)
 {
        yaffs_Object *obj;
-       
+
+       int retval = 0;
+
+       yaffsfs_Lock();
+       obj = yaffsfs_FindObject(NULL,path,0);
+
+       if(obj)
+       {
+               int access_ok = 1;
+
+               if((amode & R_OK) && !(obj->yst_mode & S_IREAD))
+                       access_ok = 0;
+               if((amode & W_OK) && !(obj->yst_mode & S_IWRITE))
+                       access_ok = 0;
+               if((amode & X_OK) && !(obj->yst_mode & S_IEXEC))
+                       access_ok = 0;
+
+               if(!access_ok) {
+                       yaffsfs_SetError(-EACCES);
+                       retval = -1;
+               }
+       }
+       else
+       {
+               // todo error not found
+               yaffsfs_SetError(-ENOENT);
+               retval = -1;
+       }
+
+       yaffsfs_Unlock();
+
+       return retval;
+
+}
+
+
+int yaffs_chmod(const YCHAR *path, mode_t mode)
+{
+       yaffs_Object *obj;
+
        int retVal = -1;
-       
+
        yaffsfs_Lock();
        obj = yaffsfs_FindObject(NULL,path,0);
-       
+
        if(obj)
        {
                retVal = yaffsfs_DoChMod(obj,mode);
@@ -946,23 +1359,23 @@ int yaffs_chmod(const char *path, mode_t mode)
                // todo error not found
                yaffsfs_SetError(-ENOENT);
        }
-       
+
        yaffsfs_Unlock();
-       
+
        return retVal;
-       
+
 }
 
 
 int yaffs_fchmod(int fd, mode_t mode)
 {
        yaffs_Object *obj;
-       
+
        int retVal = -1;
-       
+
        yaffsfs_Lock();
        obj = yaffsfs_GetHandleObject(fd);
-       
+
        if(obj)
        {
                retVal = yaffsfs_DoChMod(obj,mode);
@@ -970,49 +1383,57 @@ int yaffs_fchmod(int fd, mode_t mode)
        else
        {
                // bad handle
-               yaffsfs_SetError(-EBADF);               
+               yaffsfs_SetError(-EBADF);
        }
-       
+
        yaffsfs_Unlock();
-       
+
        return retVal;
 }
 
 
-int yaffs_mkdir(const char *path, mode_t mode)
+int yaffs_mkdir(const YCHAR *path, mode_t mode)
 {
        yaffs_Object *parent = NULL;
-       yaffs_Object *dir;
-       char *name;
+       yaffs_Object *dir = NULL;
+       YCHAR *name;
        int retVal= -1;
-       
+
        yaffsfs_Lock();
        parent = yaffsfs_FindDirectory(NULL,path,&name,0);
-       dir = yaffs_MknodDirectory(parent,name,mode,0,0);
+       if(parent)
+               dir = yaffs_MknodDirectory(parent,name,mode,0,0);
        if(dir)
        {
                retVal = 0;
        }
        else
        {
-               yaffsfs_SetError(-ENOSPC); // just assume no space for now
+               if(!parent){
+                       yaffsfs_SetError(-ENOENT); // missing path
+               }
+               else if (yaffs_FindObjectByName(parent,name)){
+                       yaffsfs_SetError(-EEXIST); // the name already exists
+               }
+               else
+                       yaffsfs_SetError(-ENOSPC); // just assume no space
                retVal = -1;
        }
-       
+
        yaffsfs_Unlock();
-       
+
        return retVal;
 }
 
-int yaffs_mount(const char *path)
+int yaffs_mount(const YCHAR *path)
 {
        int retVal=-1;
        int result=YAFFS_FAIL;
        yaffs_Device *dev=NULL;
-       char *dummy;
-       
-       T(YAFFS_TRACE_ALWAYS,("yaffs: Mounting %s\n",path));
-       
+       YCHAR *dummy;
+
+       T(YAFFS_TRACE_ALWAYS,(TSTR("yaffs: Mounting %s" TENDSTR),path));
+
        yaffsfs_Lock();
        dev = yaffsfs_FindDevice(path,&dummy);
        if(dev)
@@ -1026,7 +1447,7 @@ int yaffs_mount(const char *path)
                                yaffsfs_SetError(-ENOMEM);
                        }
                        retVal = result ? 0 : -1;
-                       
+
                }
                else
                {
@@ -1041,15 +1462,50 @@ int yaffs_mount(const char *path)
        }
        yaffsfs_Unlock();
        return retVal;
-       
+
 }
 
-int yaffs_unmount(const char *path)
+int yaffs_sync(const YCHAR *path)
 {
-       int retVal=-1;
+        int retVal=-1;
+        yaffs_Device *dev=NULL;
+        YCHAR *dummy;
+        
+        yaffsfs_Lock();
+        dev = yaffsfs_FindDevice(path,&dummy);
+        if(dev)
+        {
+                if(dev->isMounted)
+                {
+                        
+                        yaffs_FlushEntireDeviceCache(dev);
+                        yaffs_CheckpointSave(dev);
+                        
+                        
+                }
+                else
+                {
+                        //todo error - not mounted.
+                        yaffsfs_SetError(-EINVAL);
+                        
+                }
+        }
+        else
+        {
+                // todo error - no device
+                yaffsfs_SetError(-ENODEV);
+        }       
+        yaffsfs_Unlock();
+        return retVal;  
+}
+
+
+int yaffs_unmount(const YCHAR *path)
+{
+        int retVal=-1;
        yaffs_Device *dev=NULL;
-       char *dummy;
-       
+       YCHAR *dummy;
+
        yaffsfs_Lock();
        dev = yaffsfs_FindDevice(path,&dummy);
        if(dev)
@@ -1058,6 +1514,10 @@ int yaffs_unmount(const char *path)
                {
                        int i;
                        int inUse;
+
+                       yaffs_FlushEntireDeviceCache(dev);
+                       yaffs_CheckpointSave(dev);
+
                        for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse; i++)
                        {
                                if(yaffsfs_handle[i].inUse && yaffsfs_handle[i].obj->myDev == dev)
@@ -1065,11 +1525,11 @@ int yaffs_unmount(const char *path)
                                        inUse = 1; // the device is in use, can't unmount
                                }
                        }
-                       
+
                        if(!inUse)
                        {
                                yaffs_Deinitialise(dev);
-                                       
+
                                retVal = 0;
                        }
                        else
@@ -1077,43 +1537,89 @@ int yaffs_unmount(const char *path)
                                // todo error can't unmount as files are open
                                yaffsfs_SetError(-EBUSY);
                        }
-                       
+
                }
                else
                {
                        //todo error - not mounted.
                        yaffsfs_SetError(-EINVAL);
-                       
+
                }
        }
        else
        {
                // todo error - no device
                yaffsfs_SetError(-ENODEV);
-       }       
+       }
        yaffsfs_Unlock();
        return retVal;
-       
+
 }
 
-off_t yaffs_freespace(const char *path)
+loff_t yaffs_freespace(const YCHAR *path)
 {
-       off_t retVal=-1;
+       loff_t retVal=-1;
        yaffs_Device *dev=NULL;
-       char *dummy;
-       
+       YCHAR *dummy;
+
        yaffsfs_Lock();
        dev = yaffsfs_FindDevice(path,&dummy);
        if(dev  && dev->isMounted)
        {
                retVal = yaffs_GetNumberOfFreeChunks(dev);
-               retVal *= dev->nBytesPerChunk;
-               
+               retVal *= dev->nDataBytesPerChunk;
+
+       }
+       else
+       {
+               yaffsfs_SetError(-EINVAL);
+       }
+
+       yaffsfs_Unlock();
+       return retVal;
+}
+
+loff_t yaffs_totalspace(const YCHAR *path)
+{
+       loff_t retVal=-1;
+       yaffs_Device *dev=NULL;
+       YCHAR *dummy;
+
+       yaffsfs_Lock();
+       dev = yaffsfs_FindDevice(path,&dummy);
+       if(dev  && dev->isMounted)
+       {
+               retVal = (dev->endBlock - dev->startBlock + 1) - dev->nReservedBlocks;
+               retVal *= dev->nChunksPerBlock;
+               retVal *= dev->nDataBytesPerChunk;
+
        }
        else
        {
                yaffsfs_SetError(-EINVAL);
        }
+
+       yaffsfs_Unlock();
+       return retVal;
+}
+
+int yaffs_inodecount(const YCHAR *path)
+{
+       loff_t retVal= -1;
+       yaffs_Device *dev=NULL;
+       YCHAR *dummy;
+
+       yaffsfs_Lock();
+       dev = yaffsfs_FindDevice(path,&dummy);
+       if(dev  && dev->isMounted) {
+          int nObjects = dev->nObjectsCreated - dev->nFreeObjects;
+          if(nObjects > dev->nHardLinks)
+               retVal = nObjects - dev->nHardLinks;
+       }
+       
+       if(retVal < 0){
+               yaffsfs_SetError(-EINVAL);
+       }
        
        yaffsfs_Unlock();
        return retVal;  
@@ -1123,23 +1629,23 @@ off_t yaffs_freespace(const char *path)
 
 void yaffs_initialise(yaffsfs_DeviceConfiguration *cfgList)
 {
-       
+
        yaffsfs_DeviceConfiguration *cfg;
-       
+
        yaffsfs_configurationList = cfgList;
-       
+
        yaffsfs_InitHandles();
-       
+
        cfg = yaffsfs_configurationList;
-       
+
        while(cfg && cfg->prefix && cfg->dev)
        {
                cfg->dev->isMounted = 0;
                cfg->dev->removeObjectCallback = yaffsfs_RemoveObjectCallback;
                cfg++;
        }
-       
-       
+
+
 }
 
 
@@ -1156,16 +1662,16 @@ typedef struct
 {
        __u32 magic;
        yaffs_dirent de;                /* directory entry being used by this dsc */
-       char 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 */
-       int offset;
-       struct list_head others;        
+       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 */
+        int offset;
+        struct ylist_head others;       
 } yaffsfs_DirectorySearchContext;
 
 
 
-static struct list_head search_contexts;
+static struct ylist_head search_contexts;
 
 
 static void yaffsfs_SetDirRewound(yaffsfs_DirectorySearchContext *dsc)
@@ -1173,16 +1679,16 @@ static void yaffsfs_SetDirRewound(yaffsfs_DirectorySearchContext *dsc)
        if(dsc &&
           dsc->dirObj &&
           dsc->dirObj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){
-          
-          dsc->offset = 0;
-          
-          if( list_empty(&dsc->dirObj->variant.directoryVariant.children)){
-               dsc->nextReturn = NULL;
-          } else {
-               dsc->nextReturn = list_entry(dsc->dirObj->variant.directoryVariant.children.next,
-                                               yaffs_Object,siblings);
-          }
-       } else {
+
+           dsc->offset = 0;
+
+           if( ylist_empty(&dsc->dirObj->variant.directoryVariant.children)){
+                dsc->nextReturn = NULL;
+           } else {
+                dsc->nextReturn = ylist_entry(dsc->dirObj->variant.directoryVariant.children.next,
+                                                yaffs_Object,siblings);
+           }
+        } else {
                /* Hey someone isn't playing nice! */
        }
 }
@@ -1191,80 +1697,81 @@ static void yaffsfs_DirAdvance(yaffsfs_DirectorySearchContext *dsc)
 {
        if(dsc &&
           dsc->dirObj &&
-          dsc->dirObj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){
-          
-          if( dsc->nextReturn == NULL ||
-              list_empty(&dsc->dirObj->variant.directoryVariant.children)){
-               dsc->nextReturn = NULL;
-          } else {
-                  struct list_head *next = dsc->nextReturn->siblings.next;
-   
-                  if( next == &dsc->dirObj->variant.directoryVariant.children)
-                       dsc->nextReturn = NULL; /* end of list */
-                  else 
-                       dsc->nextReturn = list_entry(next,yaffs_Object,siblings);
-          }
-       } else {
-               /* Hey someone isn't playing nice! */
+           dsc->dirObj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){
+
+           if( dsc->nextReturn == NULL ||
+               ylist_empty(&dsc->dirObj->variant.directoryVariant.children)){
+                dsc->nextReturn = NULL;
+           } else {
+                   struct ylist_head *next = dsc->nextReturn->siblings.next;
+
+                   if( next == &dsc->dirObj->variant.directoryVariant.children)
+                        dsc->nextReturn = NULL; /* end of list */
+                   else
+                        dsc->nextReturn = ylist_entry(next,yaffs_Object,siblings);
+           }
+        } else {
+                /* Hey someone isn't playing nice! */
        }
 }
 
 static void yaffsfs_RemoveObjectCallback(yaffs_Object *obj)
 {
 
-       struct list_head *i;
-       yaffsfs_DirectorySearchContext *dsc;
-       
-       /* if search contexts not initilised then skip */
-       if(!search_contexts.next)
-               return;
-               
-       /* Iteratethrough the directory search contexts.
-        * If any are the one being removed, then advance the dsc to
-        * the next one to prevent a hanging ptr.
-        */
-        list_for_each(i, &search_contexts) {
-               if (i) {
-                       dsc = list_entry(i, yaffsfs_DirectorySearchContext,others);
-                       if(dsc->nextReturn == obj)
-                               yaffsfs_DirAdvance(dsc);
-               }
+        struct ylist_head *i;
+        yaffsfs_DirectorySearchContext *dsc;
+
+        /* if search contexts not initilised then skip */
+        if(!search_contexts.next)
+                return;
+
+        /* Iterate through the directory search contexts.
+         * 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) {
+                if (i) {
+                        dsc = ylist_entry(i, yaffsfs_DirectorySearchContext,others);
+                        if(dsc->nextReturn == obj)
+                                yaffsfs_DirAdvance(dsc);
+                }
        }
-                               
+
 }
 
-yaffs_DIR *yaffs_opendir(const char *dirname)
+yaffs_DIR *yaffs_opendir(const YCHAR *dirname)
 {
        yaffs_DIR *dir = NULL;
        yaffs_Object *obj = NULL;
        yaffsfs_DirectorySearchContext *dsc = NULL;
-       
+
        yaffsfs_Lock();
-       
+
        obj = yaffsfs_FindObject(NULL,dirname,0);
-       
+
        if(obj && obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY)
        {
-               
+
                dsc = YMALLOC(sizeof(yaffsfs_DirectorySearchContext));
                dir = (yaffs_DIR *)dsc;
                if(dsc)
                {
-                       dsc->magic = YAFFS_MAGIC;
-                       memset(dsc->name,0,NAME_MAX+1);
-                       strncpy(dsc->name,dirname,NAME_MAX);
-                       INIT_LIST_HEAD(&dsc->others);
-                       
-                       if(!search_contexts.next)
-                               INIT_LIST_HEAD(&search_contexts);
-                               
-                       list_add(&dsc->others,&search_contexts);        
-               }
-       
-       }
-       
+                       memset(dsc,0,sizeof(yaffsfs_DirectorySearchContext));
+                        dsc->magic = YAFFS_MAGIC;
+                        dsc->dirObj = obj;
+                        yaffs_strncpy(dsc->name,dirname,NAME_MAX);
+                        YINIT_LIST_HEAD(&dsc->others);
+
+                        if(!search_contexts.next)
+                                YINIT_LIST_HEAD(&search_contexts);
+
+                        ylist_add(&dsc->others,&search_contexts);       
+                        yaffsfs_SetDirRewound(dsc);             }
+
+        }
+
        yaffsfs_Unlock();
-       
+
        return dir;
 }
 
@@ -1272,15 +1779,21 @@ struct yaffs_dirent *yaffs_readdir(yaffs_DIR *dirp)
 {
        yaffsfs_DirectorySearchContext *dsc = (yaffsfs_DirectorySearchContext *)dirp;
        struct yaffs_dirent *retVal = NULL;
-               
+
        yaffsfs_Lock();
-       
+
        if(dsc && dsc->magic == YAFFS_MAGIC){
                yaffsfs_SetError(0);
                if(dsc->nextReturn){
                        dsc->de.d_ino = yaffs_GetEquivalentObject(dsc->nextReturn)->objectId;
+                       dsc->de.d_dont_use = (unsigned)dsc->nextReturn;
                        dsc->de.d_off = dsc->offset++;
-                       yaffs_GetObjectName(dsc->nextReturn,dsc->de.d_name,NAME_MAX+1);
+                       yaffs_GetObjectName(dsc->nextReturn,dsc->de.d_name,NAME_MAX);
+                       if(yaffs_strlen(dsc->de.d_name) == 0)
+                       {
+                               // this should not happen!
+                               yaffs_strcpy(dsc->de.d_name,_Y("zz"));
+                       }
                        dsc->de.d_reclen = sizeof(struct yaffs_dirent);
                        retVal = &dsc->de;
                        yaffsfs_DirAdvance(dsc);
@@ -1291,20 +1804,20 @@ struct yaffs_dirent *yaffs_readdir(yaffs_DIR *dirp)
        {
                yaffsfs_SetError(-EBADF);
        }
-       
+
        yaffsfs_Unlock();
-       
+
        return retVal;
-       
+
 }
 
 
 void yaffs_rewinddir(yaffs_DIR *dirp)
 {
        yaffsfs_DirectorySearchContext *dsc = (yaffsfs_DirectorySearchContext *)dirp;
-       
+
        yaffsfs_Lock();
-       
+
        yaffsfs_SetDirRewound(dsc);
 
        yaffsfs_Unlock();
@@ -1314,26 +1827,26 @@ void yaffs_rewinddir(yaffs_DIR *dirp)
 int yaffs_closedir(yaffs_DIR *dirp)
 {
        yaffsfs_DirectorySearchContext *dsc = (yaffsfs_DirectorySearchContext *)dirp;
-               
-       yaffsfs_Lock();
-       dsc->magic = 0;
-       list_del(&dsc->others); /* unhook from list */
-       YFREE(dsc);
-       yaffsfs_Unlock();
-       return 0;
+
+        yaffsfs_Lock();
+        dsc->magic = 0;
+        ylist_del(&dsc->others); /* unhook from list */
+        YFREE(dsc);
+        yaffsfs_Unlock();
+        return 0;
 }
 
 // end of directory stuff
 
 
-int yaffs_symlink(const char *oldpath, const char *newpath)
+int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath)
 {
        yaffs_Object *parent = NULL;
        yaffs_Object *obj;
-       char *name;
+       YCHAR *name;
        int retVal= -1;
        int mode = 0; // ignore for now
-       
+
        yaffsfs_Lock();
        parent = yaffsfs_FindDirectory(NULL,newpath,&name,0);
        obj = yaffs_MknodSymLink(parent,name,mode,0,0,oldpath);
@@ -1346,23 +1859,23 @@ int yaffs_symlink(const char *oldpath, const char *newpath)
                yaffsfs_SetError(-ENOSPC); // just assume no space for now
                retVal = -1;
        }
-       
+
        yaffsfs_Unlock();
-       
+
        return retVal;
-       
+
 }
 
-int yaffs_readlink(const char *path, char *buf, int bufsiz)
+int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz)
 {
        yaffs_Object *obj = NULL;
        int retVal;
 
-               
+
        yaffsfs_Lock();
-       
+
        obj = yaffsfs_FindObject(NULL,path,0);
-       
+
        if(!obj)
        {
                yaffsfs_SetError(-ENOENT);
@@ -1375,28 +1888,88 @@ int yaffs_readlink(const char *path, char *buf, int bufsiz)
        }
        else
        {
-               char *alias = obj->variant.symLinkVariant.alias;
+               YCHAR *alias = obj->variant.symLinkVariant.alias;
                memset(buf,0,bufsiz);
-               strncpy(buf,alias,bufsiz - 1);
+               yaffs_strncpy(buf,alias,bufsiz - 1);
                retVal = 0;
        }
        yaffsfs_Unlock();
        return retVal;
 }
 
-int yaffs_link(const char *oldpath, const char *newpath); 
-int yaffs_mknod(const char *pathname, mode_t mode, dev_t dev);
+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;
+       int retVal = 0;
+
+
+       yaffsfs_Lock();
+
+       obj = yaffsfs_FindObject(NULL,oldpath,0);
+       target = yaffsfs_FindObject(NULL,newpath,0);
 
-int yaffs_DumpDevStruct(const char *path)
+       if(!obj)
+       {
+               yaffsfs_SetError(-ENOENT);
+               retVal = -1;
+       }
+       else if(target)
+       {
+               yaffsfs_SetError(-EEXIST);
+               retVal = -1;
+       }
+       else
+       {
+               yaffs_Object *newdir = NULL;
+               yaffs_Object *link = NULL;
+
+               YCHAR *newname;
+
+               newdir = yaffsfs_FindDirectory(NULL,newpath,&newname,0);
+
+               if(!newdir)
+               {
+                       yaffsfs_SetError(-ENOTDIR);
+                       retVal = -1;
+               }
+               else if(newdir->myDev != obj->myDev)
+               {
+                       yaffsfs_SetError(-EXDEV);
+                       retVal = -1;
+               }
+               if(newdir && yaffs_strlen(newname) > 0)
+               {
+                       link = yaffs_Link(newdir,newname,obj);
+                       if(link)
+                               retVal = 0;
+                       else
+                       {
+                               yaffsfs_SetError(-ENOSPC);
+                               retVal = -1;
+                       }
+
+               }
+       }
+       yaffsfs_Unlock();
+
+       return retVal;
+}
+
+int yaffs_mknod(const YCHAR *pathname, mode_t mode, dev_t dev);
+
+int yaffs_DumpDevStruct(const YCHAR *path)
 {
-       char *rest;
-       
+#if 0
+       YCHAR *rest;
+
        yaffs_Object *obj = yaffsfs_FindRoot(path,&rest);
-       
+
        if(obj)
        {
                yaffs_Device *dev = obj->myDev;
-               
+
                printf("\n"
                           "nPageWrites.......... %d\n"
                           "nPageReads........... %d\n"
@@ -1412,8 +1985,10 @@ int yaffs_DumpDevStruct(const char *path)
                                dev->garbageCollections,
                                dev->passiveGarbageCollections
                );
-               
+
        }
+
+#endif
        return 0;
 }