X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffsfs.c;h=f0e1f45b3b781c27ab1ab6291d6dd5ff94f19498;hp=821848ec805a9344911cfd0e25ace4a72227e877;hb=772130e8c8c957916c1925edddf1e1c6bf6963e2;hpb=2cc385c407103563e3074d3664d5cad56812ace6 diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c index 821848e..f0e1f45 100644 --- a/direct/yaffsfs.c +++ b/direct/yaffsfs.c @@ -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 * * 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" @@ -25,39 +24,24 @@ #endif -const char *yaffsfs_c_version="$Id: yaffsfs.c,v 1.5 2005-07-18 23:12:00 charles Exp $"; +const char *yaffsfs_c_version="$Id: yaffsfs.c,v 1.28 2009-10-19 23:42:55 charles Exp $"; // configurationList is the list of devices that are supported static yaffsfs_DeviceConfiguration *yaffsfs_configurationList; -// -// Directory search context -// -// NB this is an opaque structure. - -struct yaffsfs_ObjectListEntry -{ - int objectId; - struct yaffsfs_ObjectListEntry *next; -}; +/* Some forward references */ +static yaffs_Object *yaffsfs_FindObject(yaffs_Object *relativeDirectory, const YCHAR *path, int symDepth); +static void yaffsfs_RemoveObjectCallback(yaffs_Object *obj); -typedef struct -{ - __u32 magic; - yaffs_dirent de; - struct yaffsfs_ObjectListEntry *list; - char name[NAME_MAX+1]; - -} yaffsfs_DirectorySearchContext; +// Handle management. +// -// Handle management. -// +unsigned int yaffs_wr_attempts; -typedef struct -{ +typedef struct{ __u8 inUse:1; // this handle is in use __u8 readOnly:1; // this handle is read only __u8 append:1; // append only @@ -67,10 +51,6 @@ typedef struct }yaffsfs_Handle; -static yaffs_Object *yaffsfs_FindObject(yaffs_Object *relativeDirectory, const char *path, int symDepth); - - - static yaffsfs_Handle yaffsfs_handle[YAFFSFS_N_HANDLES]; // yaffsfs_InitHandle @@ -79,8 +59,7 @@ static yaffsfs_Handle yaffsfs_handle[YAFFSFS_N_HANDLES]; static int yaffsfs_InitHandles(void) { int i; - for(i = 0; i < YAFFSFS_N_HANDLES; i++) - { + for(i = 0; i < YAFFSFS_N_HANDLES; i++){ yaffsfs_handle[i].inUse = 0; yaffsfs_handle[i].obj = NULL; } @@ -90,10 +69,8 @@ static int yaffsfs_InitHandles(void) yaffsfs_Handle *yaffsfs_GetHandlePointer(int h) { if(h < 0 || h >= YAFFSFS_N_HANDLES) - { return NULL; - } - + return &yaffsfs_handle[h]; } @@ -102,10 +79,8 @@ yaffs_Object *yaffsfs_GetHandleObject(int handle) yaffsfs_Handle *h = yaffsfs_GetHandlePointer(handle); if(h && h->inUse) - { return h->obj; - } - + return NULL; } @@ -118,16 +93,13 @@ static int yaffsfs_GetHandle(void) { int i; yaffsfs_Handle *h; - - for(i = 0; i < YAFFSFS_N_HANDLES; i++) - { + + for(i = 0; i < YAFFSFS_N_HANDLES; i++){ h = yaffsfs_GetHandlePointer(i); - if(!h) - { + if(!h){ // todo bug: should never happen } - if(!h->inUse) - { + if(!h->inUse){ memset(h,0,sizeof(yaffsfs_Handle)); h->inUse=1; return i; @@ -142,9 +114,8 @@ static int yaffsfs_GetHandle(void) static int yaffsfs_PutHandle(int handle) { yaffsfs_Handle *h = yaffsfs_GetHandlePointer(handle); - - if(h) - { + + if(h){ h->inUse = 0; h->obj = NULL; } @@ -156,49 +127,139 @@ 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; - - while(cfg && cfg->prefix && cfg->dev) - { + 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) - { + if(dev && dev->isMounted){ return dev->rootDir; } return NULL; @@ -207,20 +268,15 @@ static yaffs_Object *yaffsfs_FindRoot(const char *path, char **restOfPath) 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 == '/') - { + while(obj && obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK){ + 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++); - } else - { // Relative to here, so use the parent of the symlink as a start obj = yaffsfs_FindObject(obj->parent,alias,symDepth++); - } } return obj; } @@ -230,82 +286,61 @@ 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) - { + + if(startDir){ dir = startDir; - restOfPath = (char *)path; + restOfPath = (YCHAR *)path; } else - { dir = yaffsfs_FindRoot(path,&restOfPath); - } - - while(dir) - { + + 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 != '/') - { - if (i < YAFFS_MAX_NAME_LENGTH) - { + + while(*restOfPath && !yaffsfs_IsPathDivider(*restOfPath)){ + if (i < YAFFS_MAX_NAME_LENGTH){ str[i] = *restOfPath; str[i+1] = '\0'; i++; } restOfPath++; } - + if(!*restOfPath) - { // got to the end of the string return dir; - } - else - { - if(strcmp(str,".") == 0) + else{ + if(yaffs_strcmp(str,_Y(".")) == 0) { // Do nothing } - else if(strcmp(str,"..") == 0) - { + else if(yaffs_strcmp(str,_Y("..")) == 0) dir = dir->parent; - } - else - { + 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; - } } } } @@ -313,35 +348,60 @@ 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; @@ -349,165 +409,170 @@ 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) - { + + 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) - { + 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) - { + obj == yaffsfs_handle[i].obj){ alreadyOpen = 1; if(yaffsfs_handle[i].exclusive) - { alreadyExclusive = 1; - } } } if(((oflag & O_EXCL) && alreadyOpen) || alreadyExclusive) - { openDenied = 1; - } - + // Open should fail if O_CREAT and O_EXCL are specified - if((oflag & O_EXCL) && (oflag & O_CREAT)) - { + if((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)) - { 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)) - { + + } 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); - } - else - { + obj = yaffs_MknodFile(dir,name,mode,0,0); + else { yaffsfs_SetError(-ENOTDIR); + errorReported = 1; } } - - if(obj && !openDenied) - { + + if(obj && !openDenied) { h->obj = obj; h->inUse = 1; - h->readOnly = (oflag & (O_WRONLY | O_RDWR)) ? 0 : 1; + h->readOnly = (oflag & (O_WRONLY | O_RDWR)) ? 0 : 1; 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); - } - - } - else - { + + obj->inUse++; + if((oflag & O_TRUNC) && !h->readOnly) + yaffs_ResizeFile(obj,0); + } else { yaffsfs_PutHandle(handle); - if(!errorReported) - { - yaffsfs_SetError(-EACCESS); + if(!errorReported) { + yaffsfs_SetError(-EACCES); errorReported = 1; } handle = -1; } - } - + yaffsfs_Unlock(); - - return handle; + + return handle; } -int yaffs_close(int fd) +int yaffs_Dofsync(int fd,int datasync) { 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,datasync); + else { + // bad handle + yaffsfs_SetError(-EBADF); + retVal = -1; + } + + yaffsfs_Unlock(); + + return retVal; +} + +int yaffs_fsync(int fd) +{ + return yaffs_Dofsync(fd,0); +} + +int yaffs_flush(int fd) +{ + return yaffs_fsync(fd); +} + +int yaffs_fdatasync(int fd) +{ + return yaffs_Dofsync(fd,1); +} + +int yaffs_close(int fd) +{ + yaffsfs_Handle *h = NULL; + int retVal = 0; + + yaffsfs_Lock(); + + h = yaffsfs_GetHandlePointer(fd); + + if(h && h->inUse) { // clean up - yaffs_FlushFile(h->obj,1); + yaffs_FlushFile(h->obj,1,0); h->obj->inUse--; if(h->obj->inUse <= 0 && h->obj->unlinked) - { - yaffs_DeleteFile(h->obj); - } + yaffs_DeleteObject(h->obj); + yaffsfs_PutHandle(fd); retVal = 0; - } - else - { + } else { // bad handle - yaffsfs_SetError(-EBADF); + yaffsfs_SetError(-EBADF); retVal = -1; } - + yaffsfs_Unlock(); - + return retVal; } @@ -517,308 +582,340 @@ 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); - } - else if( h && obj) - { + yaffsfs_SetError(-EBADF); + + else if( h && obj){ pos= h->position; if(yaffs_GetObjectFileLength(obj) > pos) - { maxRead = yaffs_GetObjectFileLength(obj) - pos; - } else - { maxRead = 0; - } if(nbyte > maxRead) - { nbyte = maxRead; - } - - if(nbyte > 0) - { + + if(nbyte > 0) { nRead = yaffs_ReadDataFromFile(obj,buf,pos,nbyte); if(nRead >= 0) - { h->position = pos + nRead; - } - else - { + else { //todo error } - } - else - { + } else nRead = 0; - } - + } - + yaffsfs_Unlock(); - - + + return (nRead >= 0) ? nRead : -1; - + } -int yaffs_write(int fd, const void *buf, unsigned int nbyte) +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 nWritten = -1; - int writeThrough = 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 && h->readOnly) - { - // todo error + 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; } - else if( h && obj) - { + + yaffsfs_Unlock(); + + + return (nRead >= 0) ? nRead : -1; + +} + +int yaffs_write(int fd, const void *buf, unsigned int nbyte) +{ + yaffsfs_Handle *h = NULL; + yaffs_Object *obj = NULL; + 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); + else if( h && obj && h->readOnly){ + // todo error + } else if( h && obj){ if(h->append) - { pos = yaffs_GetObjectFileLength(obj); - } else - { pos = h->position; - } - + nWritten = yaffs_WriteDataToFile(obj,buf,pos,nbyte,writeThrough); - + if(nWritten >= 0) - { h->position = pos + nWritten; - } - else - { + else { //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; - + 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); - } - else if(whence == SEEK_SET) - { + yaffsfs_SetError(-EBADF); + else if(whence == SEEK_SET){ if(offset >= 0) - { pos = offset; - } } - else if(whence == SEEK_CUR) - { + else if(whence == SEEK_CUR) { if( (h->position + offset) >= 0) - { pos = (h->position + offset); - } } - else if(whence == SEEK_END) - { + else if(whence == SEEK_END) { fSize = yaffs_GetObjectFileLength(obj); if(fSize >= 0 && (fSize + offset) >= 0) - { pos = fSize + offset; - } } - + if(pos >= 0) - { h->position = pos; - } - else - { + else { // 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); dir = yaffsfs_FindDirectory(NULL,path,&name,0); if(!dir) - { yaffsfs_SetError(-ENOTDIR); - } else if(!obj) - { yaffsfs_SetError(-ENOENT); - } else if(!isDirectory && obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) - { yaffsfs_SetError(-EISDIR); - } - else if(isDirectory && obj->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) - { - yaffsfs_SetError(-ENOTDIR); - } else if(isDirectory && obj->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) - { yaffsfs_SetError(-ENOTDIR); - } - else - { + 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) - { + + if(!olddir || !newdir || !obj) { // bad file - yaffsfs_SetError(-EBADF); - renameAllowed = 0; - } - else if(olddir->myDev != newdir->myDev) - { + yaffsfs_SetError(-EBADF); + renameAllowed = 0; + } else if(olddir->myDev != newdir->myDev) { // oops must be on same device // todo error yaffsfs_SetError(-EXDEV); - renameAllowed = 0; - } - else if(obj && obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) - { - // It is a directory, check that it is not being renamed to + renameAllowed = 0; + } else if(obj && obj->variantType == 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; - - while( renameAllowed && xx) - { + + while( renameAllowed && xx){ if(xx == obj) - { renameAllowed = 0; - } 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; } @@ -827,80 +924,74 @@ static int yaffsfs_DoStat(yaffs_Object *obj,struct yaffs_stat *buf) int retVal = -1; if(obj) - { obj = yaffs_GetEquivalentObject(obj); - } - if(obj && 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 && 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) 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; - } else if(obj->variantType == YAFFS_OBJECT_TYPE_FILE) - { buf->st_mode |= S_IFREG; - } - - buf->st_nlink = yaffs_GetObjectLinkCount(obj); - 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_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; + + buf->st_nlink = yaffs_GetObjectLinkCount(obj); + 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->nDataBytesPerChunk; + 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]; + 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); - } else - { // 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); } @@ -908,289 +999,534 @@ 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); - } yaffsfs_Unlock(); 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,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) - { + + if(obj) { obj->yst_mode = mode; obj->dirty = 1; - result = yaffs_FlushFile(obj,0); + result = yaffs_FlushFile(obj,0,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); - } else - { // 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); - } 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 + else { + 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) - { - if(!dev->isMounted) - { + if(dev){ + if(!dev->isMounted){ result = yaffs_GutsInitialise(dev); if(result == YAFFS_FAIL) - { // todo error - mount failed yaffsfs_SetError(-ENOMEM); - } retVal = result ? 0 : -1; - + } else - { //todo error - already mounted. yaffsfs_SetError(-EBUSY); - } - } - else - { + } else // todo error - no device yaffsfs_SetError(-ENODEV); - } + 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) - { - if(dev->isMounted) - { + if(dev){ + if(dev->isMounted){ int i; int inUse; - for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse; i++) - { + + 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) - { inUse = 1; // the device is in use, can't unmount - } } - - if(!inUse) - { + + if(!inUse){ yaffs_Deinitialise(dev); - + retVal = 0; - } - else - { + } else // todo error can't unmount as files are open yaffsfs_SetError(-EBUSY); - } - - } - else - { + + } 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) - { + if(dev && dev->isMounted){ retVal = yaffs_GetNumberOfFreeChunks(dev); - retVal *= dev->nBytesPerChunk; - - } - else - { + 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; } + + void yaffs_initialise(yaffsfs_DeviceConfiguration *cfgList) { - + yaffsfs_DeviceConfiguration *cfg; - + yaffsfs_configurationList = cfgList; - + yaffsfs_InitHandles(); - + cfg = yaffsfs_configurationList; - - while(cfg && cfg->prefix && cfg->dev) - { + + while(cfg && cfg->prefix && cfg->dev){ cfg->dev->isMounted = 0; + cfg->dev->removeObjectCallback = yaffsfs_RemoveObjectCallback; cfg++; } - - + + } // // Directory search stuff. -yaffs_DIR *yaffs_opendir(const char *dirname) +// +// Directory search context +// +// NB this is an opaque structure. + + +typedef struct +{ + __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 */ + int offset; + struct ylist_head others; +} yaffsfs_DirectorySearchContext; + + + +static struct ylist_head search_contexts; + + +static void yaffsfs_SetDirRewound(yaffsfs_DirectorySearchContext *dsc) +{ + if(dsc && + dsc->dirObj && + dsc->dirObj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){ + + 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! */ + } +} + +static void yaffsfs_DirAdvance(yaffsfs_DirectorySearchContext *dsc) +{ + if(dsc && + dsc->dirObj && + 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 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 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) - { - + + if(obj && obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){ + dsc = YMALLOC(sizeof(yaffsfs_DirectorySearchContext)); dir = (yaffs_DIR *)dsc; - if(dsc) - { - dsc->magic = YAFFS_MAGIC; - dsc->list = NULL; - memset(dsc->name,0,NAME_MAX+1); - strncpy(dsc->name,dirname,NAME_MAX); + + if(dsc){ + 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; } @@ -1198,110 +1534,44 @@ struct yaffs_dirent *yaffs_readdir(yaffs_DIR *dirp) { yaffsfs_DirectorySearchContext *dsc = (yaffsfs_DirectorySearchContext *)dirp; struct yaffs_dirent *retVal = NULL; - struct list_head *i; - yaffs_Object *entry = NULL; - int offset; - yaffs_Object *obj = NULL; - struct yaffsfs_ObjectListEntry *list = NULL; - int inList = 0; - + yaffsfs_Lock(); - - offset = -1; - - if(dsc && dsc->magic == YAFFS_MAGIC) - { + + if(dsc && dsc->magic == YAFFS_MAGIC){ yaffsfs_SetError(0); - - obj = yaffsfs_FindObject(NULL,dsc->name,0); - - if(obj && obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) - { - - list_for_each(i,&obj->variant.directoryVariant.children) - { - offset++; - entry = (i) ? list_entry(i, yaffs_Object,siblings) : NULL; - - if(entry) - { - list = dsc->list; - inList = 0; - while(list && !inList) - { - if(list->objectId == entry->objectId) - { - inList = 1; - } - list = list->next; - } - - if(!inList) goto foundNew; - } - - } - - foundNew: - - if(!inList && entry) + 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); + if(yaffs_strlen(dsc->de.d_name) == 0) { - //This is the entry we're going to return; - struct yaffsfs_ObjectListEntry *le; - - le = YMALLOC(sizeof(struct yaffsfs_ObjectListEntry)); - - if(le) - { - le->next = dsc->list; - le->objectId = entry->objectId; - dsc->list = le; - - dsc->de.d_ino = yaffs_GetEquivalentObject(entry)->objectId; - dsc->de.d_off = offset; - yaffs_GetObjectName(entry,dsc->de.d_name,NAME_MAX+1); - dsc->de.d_reclen = sizeof(struct yaffs_dirent); - - retVal = &dsc->de; - } - + // this should not happen! + yaffs_strcpy(dsc->de.d_name,_Y("zz")); } - } - - } - else - { + dsc->de.d_reclen = sizeof(struct yaffs_dirent); + retVal = &dsc->de; + yaffsfs_DirAdvance(dsc); + } else + retVal = NULL; + } else yaffsfs_SetError(-EBADF); - } - + yaffsfs_Unlock(); - + return retVal; - -} -void yaffsfs_ListClear(yaffsfs_DirectorySearchContext *dsc) -{ - - struct yaffsfs_ObjectListEntry *le; - - if(dsc && dsc->magic == YAFFS_MAGIC) - { - while(dsc->list) - { - le = dsc->list; - dsc->list = dsc->list->next; - YFREE(le); - } - } - } + void yaffs_rewinddir(yaffs_DIR *dirp) { yaffsfs_DirectorySearchContext *dsc = (yaffsfs_DirectorySearchContext *)dirp; - + yaffsfs_Lock(); - yaffsfs_ListClear(dsc); + + yaffsfs_SetDirRewound(dsc); + yaffsfs_Unlock(); } @@ -1309,88 +1579,139 @@ void yaffs_rewinddir(yaffs_DIR *dirp) int yaffs_closedir(yaffs_DIR *dirp) { yaffsfs_DirectorySearchContext *dsc = (yaffsfs_DirectorySearchContext *)dirp; - - yaffsfs_Lock(); - yaffsfs_ListClear(dsc); - dsc->magic = 0; - 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); - if(obj) - { - retVal = 0; - } - else - { - yaffsfs_SetError(-ENOSPC); // just assume no space for now + if(parent){ + obj = yaffs_MknodSymLink(parent,name,mode,0,0,oldpath); + if(obj) + retVal = 0; + else{ + yaffsfs_SetError(-ENOSPC); // just assume no space for now + retVal = -1; + } + } else { + yaffsfs_SetError(-EINVAL); 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) - { + + if(!obj) { yaffsfs_SetError(-ENOENT); retVal = -1; - } - else if(obj->variantType != YAFFS_OBJECT_TYPE_SYMLINK) - { + } else if(obj->variantType != YAFFS_OBJECT_TYPE_SYMLINK) { yaffsfs_SetError(-EINVAL); retVal = -1; - } - else - { - char *alias = obj->variant.symLinkVariant.alias; + } else { + 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); + + 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) +{ + return -1; +} -int yaffs_DumpDevStruct(const char *path) +int yaffs_DumpDevStruct(const YCHAR *path) { - char *rest; - +#if 0 + YCHAR *rest; + yaffs_Object *obj = yaffsfs_FindRoot(path,&rest); - - if(obj) - { + + if(obj){ yaffs_Device *dev = obj->myDev; - + printf("\n" "nPageWrites.......... %d\n" "nPageReads........... %d\n" @@ -1406,8 +1727,10 @@ int yaffs_DumpDevStruct(const char *path) dev->garbageCollections, dev->passiveGarbageCollections ); - + } + +#endif return 0; }