X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffsfs.c;h=191c34f6bd1b6f79209c5642a4df244e1b79a85a;hp=e082dfd95f3f700c6860d5649179faa87dbb96c5;hb=570d9b811895119f6b3411678cbdcaa27226f403;hpb=fb246b6eb57f7a7bd318d12b0562ee8708404f25 diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c index e082dfd..191c34f 100644 --- a/direct/yaffsfs.c +++ b/direct/yaffsfs.c @@ -1,7 +1,7 @@ /* * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * - * Copyright (C) 2002-2007 Aleph One Ltd. + * Copyright (C) 2002-2010 Aleph One Ltd. * for Toby Churchill Ltd and Brightstar Engineering * * Created by Charles Manning @@ -17,7 +17,7 @@ #include "yportenv.h" #include "yaffs_trace.h" -#include // for memset +#include /* for memset */ #define YAFFSFS_MAX_SYMLINK_DEREFERENCES 5 @@ -30,44 +30,44 @@ #define YAFFSFS_RW_SHIFT (13) #define YAFFSFS_RW_SIZE (1<useCount < 1){ memset(h,0,sizeof(yaffsfs_Handle)); @@ -193,8 +195,10 @@ static int yaffsfs_GetNewHandle(void) return -1; } -// yaffs_GetHandle -// Increase use of handle when reading/writing a file +/* + * yaffs_GetHandle + * Increase use of handle when reading/writing a file + */ static int yaffsfs_GetHandle(int handle) { yaffsfs_Handle *h = yaffsfs_GetHandlePointer(handle); @@ -205,10 +209,11 @@ static int yaffsfs_GetHandle(int handle) return 0; } -// yaffs_PutHandle -// Let go of a handle when closing a file or aborting an open or -// ending a read or write. -// +/* + * yaffs_PutHandle + * Let go of a handle when closing a file or aborting an open or + * ending a read or write. + */ static int yaffsfs_PutHandle(int handle) { yaffsfs_Handle *h = yaffsfs_GetHandlePointer(handle); @@ -228,12 +233,14 @@ static int yaffsfs_PutHandle(int handle) -// Stuff to search for a directory from a path +/* + * Stuff to search for a directory from a path + */ int yaffsfs_Match(YCHAR a, YCHAR b) { - // case sensitive + /* case sensitive */ return (a == b); } @@ -250,41 +257,51 @@ int yaffsfs_IsPathDivider(YCHAR ch) return 0; } -// yaffsfs_FindDevice -// yaffsfs_FindRoot -// Scan the configuration list to find the root. -// Curveballs: Should match paths that end in '/' too -// Curveball2 Might have "/x/ and "/x/y". Need to return the longest match + + +YLIST_HEAD(yaffsfs_deviceList); + +/* + * yaffsfs_FindDevice + * yaffsfs_FindRoot + * Scan the configuration list to find the root. + * 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; + struct ylist_head *cfg; const YCHAR *leftOver; const YCHAR *p; yaffs_Device *retval = NULL; + yaffs_Device *dev = 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){ + /* + * Check all configs, choose the one that: + * 1) Actually matches a prefix (ie /a amd /abc will not match + * 2) Matches the longest. + */ + ylist_for_each(cfg, &yaffsfs_deviceList){ + dev = ylist_entry(cfg, yaffs_Device, devList); leftOver = path; - p = cfg->prefix; + p = dev->param.name; thisMatchLength = 0; matching = 1; while(matching && *p && *leftOver){ - // Skip over any /s + /* Skip over any /s */ while(yaffsfs_IsPathDivider(*p)) p++; - // Skip over any /s + /* Skip over any /s */ while(yaffsfs_IsPathDivider(*leftOver)) leftOver++; - // Now match the text part + /* Now match the text part */ while(matching && *p && !yaffsfs_IsPathDivider(*p) && *leftOver && !yaffsfs_IsPathDivider(*leftOver)){ @@ -298,19 +315,26 @@ static yaffs_Device *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath) } } - // Skip over any /s in leftOver + /* Skip over any /s in leftOver */ while(yaffsfs_IsPathDivider(*leftOver)) leftOver++; - - if( matching && (thisMatchLength > longestMatch)){ + // Skip over any /s in p + while(yaffsfs_IsPathDivider(*p)) + p++; + + // p should now be at the end of the string (ie. fully matched) + if(*p) + matching = 0; + + if( matching && (thisMatchLength > longestMatch)) + { // Matched prefix *restOfPath = (YCHAR *)leftOver; - retval = cfg->dev; + retval = dev; longestMatch = thisMatchLength; } - cfg++; } return retval; } @@ -325,28 +349,29 @@ static yaffs_Device *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath) 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. + /* + * Check all configs, choose the one that: + * 1) Actually matches a prefix (ie /a amd /abc will not match + * 2) Matches the longest. + */ while(cfg && cfg->prefix && cfg->dev){ leftOver = path; p = cfg->prefix; thisMatchLength = 0; - while(*p && //unmatched part of prefix - !(yaffsfs_IsPathDivider(*p) && (p[1] == 0)) && // the rest of the prefix is not / (to catch / at end) - *leftOver && - yaffsfs_Match(*p,*leftOver)){ + while(*p && /* unmatched part of prefix */ + !(yaffsfs_IsPathDivider(*p) && (p[1] == 0)) && + *leftOver && yaffsfs_Match(*p,*leftOver)){ p++; leftOver++; thisMatchLength++; } - if((!*p || (yaffsfs_IsPathDivider(*p) && (p[1] == 0))) && // end of prefix - (!*leftOver || yaffsfs_IsPathDivider(*leftOver)) && // no more in this path name part + 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 + /* Matched prefix */ *restOfPath = (YCHAR *)leftOver; retval = cfg->dev; longestMatch = thisMatchLength; @@ -376,21 +401,24 @@ static yaffs_Object *yaffsfs_FollowLink(yaffs_Object *obj,int symDepth) YCHAR *alias = obj->variant.symLinkVariant.alias; if(yaffsfs_IsPathDivider(*alias)) - // Starts with a /, need to scan from root up + /* 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 + /* Relative to here, so use the parent of the symlink as a start */ obj = yaffsfs_FindObject(obj->parent,alias,symDepth++); } return obj; } -// yaffsfs_FindDirectory -// 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 YCHAR *path,YCHAR **name,int symDepth) +/* + * yaffsfs_FindDirectory + * 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 YCHAR *path, YCHAR **name, int symDepth) { yaffs_Object *dir; YCHAR *restOfPath; @@ -408,11 +436,13 @@ static yaffs_Object *yaffsfs_DoFindDirectory(yaffs_Object *startDir,const YCHAR dir = yaffsfs_FindRoot(path,&restOfPath); while(dir){ - // parse off /. - // curve ball: also throw away surplus '/' - // eg. "/ram/x////ff" gets treated the same as "/ram/x/ff" + /* + * parse off /. + * curve ball: also throw away surplus '/' + * eg. "/ram/x////ff" gets treated the same as "/ram/x/ff" + */ while(yaffsfs_IsPathDivider(*restOfPath)) - restOfPath++; // get rid of '/' + restOfPath++; /* get rid of '/' */ *name = restOfPath; i = 0; @@ -427,12 +457,12 @@ static yaffs_Object *yaffsfs_DoFindDirectory(yaffs_Object *startDir,const YCHAR } if(!*restOfPath) - // got to the end of the string + /* got to the end of the string */ return dir; else{ if(yaffs_strcmp(str,_Y(".")) == 0) { - // Do nothing + /* Do nothing */ } else if(yaffs_strcmp(str,_Y("..")) == 0) dir = dir->parent; @@ -448,17 +478,19 @@ static yaffs_Object *yaffsfs_DoFindDirectory(yaffs_Object *startDir,const YCHAR } } } - // directory did not exist. + /* directory did not exist. */ return NULL; } -static yaffs_Object *yaffsfs_FindDirectory(yaffs_Object *relativeDirectory,const YCHAR *path,YCHAR **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 -// +/* + * yaffsfs_FindObject turns a path for an existing object into the object + */ static yaffs_Object *yaffsfs_FindObject(yaffs_Object *relativeDirectory, const YCHAR *path,int symDepth) { yaffs_Object *dir; @@ -508,16 +540,19 @@ int yaffs_open(const YCHAR *path, int oflag, int mode) YCHAR *name; int handle = -1; yaffsfs_Handle *h = NULL; - int alreadyOpen = 0; - int alreadyExclusive = 0; int openDenied = 0; int symDepth = 0; int errorReported = 0; - int i; + /* O_EXCL only has meaning if O_CREAT is specified */ + if(!(oflag & O_CREAT)) + oflag &= ~(O_EXCL); + /* O_TRUNC has no meaning if (O_CREAT | O_EXCL) is specified */ + if( (oflag & O_CREAT) & (oflag & O_EXCL)) + oflag &= ~(O_TRUNC); - // todo sanity check oflag (eg. can't have O_TRUNC without WRONLY or RDWR + /* Todo: Are there any more flag combos to sanitise ? */ yaffsfs_Lock(); @@ -529,7 +564,7 @@ int yaffs_open(const YCHAR *path, int oflag, int mode) h = yaffsfs_GetHandlePointer(handle); - // try to find the exisiting object + /* try to find the exisiting object */ obj = yaffsfs_FindObject(NULL,path,0); if(obj && obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) @@ -538,35 +573,33 @@ int yaffs_open(const YCHAR *path, int oflag, int mode) if(obj) obj = yaffs_GetEquivalentObject(obj); - if(obj && obj->variantType != YAFFS_OBJECT_TYPE_FILE) + if(obj && + obj->variantType != YAFFS_OBJECT_TYPE_FILE && + obj->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) obj = NULL; if(obj){ - // Check if the object is already in use - alreadyOpen = alreadyExclusive = 0; - - for(i = 0; i < YAFFSFS_N_HANDLES; i++){ - if(i != handle && - yaffsfs_handle[i].useCount > 0 && - obj == yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj){ - alreadyOpen = 1; - if(yaffsfs_handle[i].exclusive) - alreadyExclusive = 1; - } - } - if(((oflag & O_EXCL) && alreadyOpen) || alreadyExclusive) + /* The file already exists or it might be a directory */ + + /* If it is a directory then we can't open it as a file */ + if(obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){ openDenied = 1; + yaffsfs_SetError(-EISDIR); + errorReported = 1; + } - // Open should fail if O_CREAT and O_EXCL are specified + /* Open should fail if O_CREAT and O_EXCL are specified since + * the file exists + */ 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 + /* Check file permissions */ + if( (oflag & (O_RDWR | O_WRONLY)) == 0 && /* ie O_RDONLY */ !(obj->yst_mode & S_IREAD)) openDenied = 1; @@ -579,9 +612,12 @@ int yaffs_open(const YCHAR *path, int oflag, int mode) openDenied = 1; } else if((oflag & O_CREAT)) { - // Let's see if we can create this file + /* Let's see if we can create this file */ dir = yaffsfs_FindDirectory(NULL,path,&name,0); - if(dir) + if(dir && dir->myDev->readOnly){ + yaffsfs_SetError(-EINVAL); + errorReported = 1; + } else if(dir) obj = yaffs_MknodFile(dir,name,mode,0,0); else { yaffsfs_SetError(-ENOTDIR); @@ -602,7 +638,6 @@ int yaffs_open(const YCHAR *path, int oflag, int mode) h->inodeId = inodeId; 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; /* Hook inode to object */ @@ -635,10 +670,10 @@ int yaffs_Dofsync(int fd,int datasync) h = yaffsfs_GetHandlePointer(fd); if(h && h->useCount > 0) - // flush the file + /* flush the file */ yaffs_FlushFile(yaffsfs_inode[h->inodeId].iObj,1,datasync); else { - // bad handle + /* bad handle */ yaffsfs_SetError(-EBADF); retVal = -1; } @@ -673,12 +708,12 @@ int yaffs_close(int fd) h = yaffsfs_GetHandlePointer(fd); if(h && h->useCount > 0) { - // clean up + /* clean up */ yaffs_FlushFile(yaffsfs_inode[h->inodeId].iObj,1,0); yaffsfs_PutHandle(fd); retVal = 0; } else { - // bad handle + /* bad handle */ yaffsfs_SetError(-EBADF); retVal = -1; } @@ -690,7 +725,7 @@ int yaffs_close(int fd) -int yaffsfs_do_read(int fd, void *buf, unsigned int nbyte, int isPread, int offset) +int yaffsfs_do_read(int fd, void *vbuf, unsigned int nbyte, int isPread, int offset) { yaffsfs_Handle *h = NULL; yaffs_Object *obj = NULL; @@ -700,13 +735,14 @@ int yaffsfs_do_read(int fd, void *buf, unsigned int nbyte, int isPread, int offs int nToRead = 0; int totalRead = 0; unsigned int maxRead; + __u8 *buf = (__u8 *)vbuf; yaffsfs_Lock(); h = yaffsfs_GetHandlePointer(fd); obj = yaffsfs_GetHandleObject(fd); if(!h || !obj){ - // bad handle + /* bad handle */ yaffsfs_SetError(-EBADF); totalRead = -1; } else if( h && obj){ @@ -714,7 +750,9 @@ int yaffsfs_do_read(int fd, void *buf, unsigned int nbyte, int isPread, int offs startPos = offset; else startPos = h->position; - + + pos = startPos; + if(yaffs_GetObjectFileLength(obj) > pos) maxRead = yaffs_GetObjectFileLength(obj) - pos; else @@ -724,46 +762,42 @@ int yaffsfs_do_read(int fd, void *buf, unsigned int nbyte, int isPread, int offs nbyte = maxRead; - if(nbyte > 0) { - yaffsfs_GetHandle(fd); - pos = startPos; - - while(nbyte > 0) { - nToRead = YAFFSFS_RW_SIZE - (pos & (YAFFSFS_RW_SIZE -1)); - if(nToRead > nbyte) - nToRead = nbyte; + yaffsfs_GetHandle(fd); - nRead = yaffs_ReadDataFromFile(obj,buf,pos,nToRead); + while(nbyte > 0) { + nToRead = YAFFSFS_RW_SIZE - (pos & (YAFFSFS_RW_SIZE -1)); + if(nToRead > nbyte) + nToRead = nbyte; + nRead = yaffs_ReadDataFromFile(obj,buf,pos,nToRead); - if(nRead > 0){ - totalRead += nRead; - pos += nRead; - buf += nRead; - } + if(nRead > 0){ + totalRead += nRead; + pos += nRead; + buf += nRead; + } - if(nRead == nToRead) - nbyte-=nRead; - else - nbyte = 0; /* no more to read */ + if(nRead == nToRead) + nbyte-=nRead; + else + nbyte = 0; /* no more to read */ - if(nbyte > 0){ - yaffsfs_Unlock(); - yaffsfs_Lock(); - } - + if(nbyte > 0){ + yaffsfs_Unlock(); + yaffsfs_Lock(); } - yaffsfs_PutHandle(fd); - if(!isPread) { - if(totalRead >= 0) - h->position = startPos + totalRead; - else { - //todo error - } + } + + yaffsfs_PutHandle(fd); + + if(!isPread) { + if(totalRead >= 0) + h->position = startPos + totalRead; + else { + /* todo error */ } - } else - totalRead = 0; + } } @@ -783,7 +817,7 @@ int yaffs_pread(int fd, void *buf, unsigned int nbyte, unsigned int offset) return yaffsfs_do_read(fd, buf, nbyte, 1, offset); } -int yaffsfs_do_write(int fd, const void *buf, unsigned int nbyte, int isPwrite, int offset) +int yaffsfs_do_write(int fd, const void *vbuf, unsigned int nbyte, int isPwrite, int offset) { yaffsfs_Handle *h = NULL; yaffs_Object *obj = NULL; @@ -793,74 +827,71 @@ int yaffsfs_do_write(int fd, const void *buf, unsigned int nbyte, int isPwrite, int totalWritten = 0; int writeThrough = 0; int nToWrite = 0; + const __u8 *buf = (const __u8 *)vbuf; yaffsfs_Lock(); h = yaffsfs_GetHandlePointer(fd); obj = yaffsfs_GetHandleObject(fd); if(!h || !obj){ - // bad handle + /* bad handle */ yaffsfs_SetError(-EBADF); totalWritten = -1; - } else if( h && obj && h->readOnly){ + } else if( h && obj && (h->readOnly || obj->myDev->readOnly)){ yaffsfs_SetError(-EINVAL); totalWritten=-1; } else if( h && obj){ - if(isPwrite) - startPos = offset; if(h->append) startPos = yaffs_GetObjectFileLength(obj); + else if(isPwrite) + startPos = offset; else startPos = h->position; - if( nbyte > 0){ - yaffsfs_GetHandle(fd); - pos = startPos; - while(nbyte > 0) { - nToWrite = YAFFSFS_RW_SIZE - (pos & (YAFFSFS_RW_SIZE -1)); - if(nToWrite > nbyte) - nToWrite = nbyte; - - nWritten = yaffs_WriteDataToFile(obj,buf,pos,nToWrite,writeThrough); - if(nWritten > 0){ - totalWritten += nWritten; - pos += nWritten; - buf += nWritten; - } - if(nWritten == nToWrite) - nbyte -= nToWrite; - else - nbyte = 0; - - if(nWritten < 1 && totalWritten < 1){ - yaffsfs_SetError(-ENOSPC); - totalWritten = -1; - } - - if(nbyte > 0){ - yaffsfs_Unlock(); - yaffsfs_Lock(); - } + yaffsfs_GetHandle(fd); + pos = startPos; + while(nbyte > 0) { + nToWrite = YAFFSFS_RW_SIZE - (pos & (YAFFSFS_RW_SIZE -1)); + if(nToWrite > nbyte) + nToWrite = nbyte; + + nWritten = yaffs_WriteDataToFile(obj,buf,pos,nToWrite,writeThrough); + if(nWritten > 0){ + totalWritten += nWritten; + pos += nWritten; + buf += nWritten; } - yaffsfs_PutHandle(fd); + if(nWritten == nToWrite) + nbyte -= nToWrite; + else + nbyte = 0; - if(!isPwrite){ - if(totalWritten > 0) - h->position = startPos + totalWritten; - else { - //todo error - } + if(nWritten < 1 && totalWritten < 1){ + yaffsfs_SetError(-ENOSPC); + totalWritten = -1; } - } else - totalWritten = 0; + if(nbyte > 0){ + yaffsfs_Unlock(); + yaffsfs_Lock(); + } + } + + yaffsfs_PutHandle(fd); + + if(!isPwrite){ + if(totalWritten > 0) + h->position = startPos + totalWritten; + else { + /* todo error */ + } + } } yaffsfs_Unlock(); return (totalWritten >= 0) ? totalWritten : -1; - } int yaffs_write(int fd, const void *buf, unsigned int nbyte) @@ -889,6 +920,8 @@ int yaffs_truncate(const YCHAR *path,off_t newSize) yaffsfs_SetError(-ENOENT); else if(obj->variantType != YAFFS_OBJECT_TYPE_FILE) yaffsfs_SetError(-EISDIR); + else if(obj->myDev->readOnly) + yaffsfs_SetError(-EINVAL); else result = yaffs_ResizeFile(obj,newSize); @@ -909,10 +942,12 @@ int yaffs_ftruncate(int fd, off_t newSize) obj = yaffsfs_GetHandleObject(fd); if(!h || !obj) - // bad handle + /* bad handle */ yaffsfs_SetError(-EBADF); + else if(obj->myDev->readOnly) + yaffsfs_SetError(-EINVAL); else - // resize the file + /* resize the file */ result = yaffs_ResizeFile(obj,newSize); yaffsfs_Unlock(); @@ -933,7 +968,7 @@ off_t yaffs_lseek(int fd, off_t offset, int whence) obj = yaffsfs_GetHandleObject(fd); if(!h || !obj) - // bad handle + /* bad handle */ yaffsfs_SetError(-EBADF); else if(whence == SEEK_SET){ if(offset >= 0) @@ -952,7 +987,7 @@ off_t yaffs_lseek(int fd, off_t offset, int whence) if(pos >= 0) h->position = pos; else { - // todo error + /* todo error */ } @@ -977,6 +1012,8 @@ int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory) yaffsfs_SetError(-ENOTDIR); else if(!obj) yaffsfs_SetError(-ENOENT); + else if(obj->myDev->readOnly) + yaffsfs_SetError(-EINVAL); else if(!isDirectory && obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) yaffsfs_SetError(-EISDIR); else if(isDirectory && obj->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) @@ -990,7 +1027,7 @@ int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory) yaffsfs_Unlock(); - // todo error + /* todo error */ return (result == YAFFS_FAIL) ? -1 : 0; } @@ -1023,18 +1060,23 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath) obj = yaffsfs_FindObject(NULL,oldPath,0); if(!olddir || !newdir || !obj) { - // bad file + /* bad file */ yaffsfs_SetError(-EBADF); renameAllowed = 0; + } else if(obj->myDev->readOnly){ + yaffsfs_SetError(-EINVAL); + renameAllowed = 0; } else if(olddir->myDev != newdir->myDev) { - // oops must be on same device - // todo error + /* 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 - // being its own decendent. - // Do this by tracing from the new directory back to the root, checking for obj + /* + * 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; @@ -1064,9 +1106,9 @@ static int yaffsfs_DoStat(yaffs_Object *obj,struct yaffs_stat *buf) obj = yaffs_GetEquivalentObject(obj); if(obj && buf){ - buf->st_dev = (int)obj->myDev->genericDevice; + buf->st_dev = (int)obj->myDev->osContext; buf->st_ino = obj->objectId; - buf->st_mode = obj->yst_mode & ~S_IFMT; // clear out file type bits + 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; @@ -1114,7 +1156,7 @@ static int yaffsfs_DoStatOrLStat(const YCHAR *path, struct yaffs_stat *buf,int d if(obj) retVal = yaffsfs_DoStat(obj,buf); else - // todo error not found + /* todo error not found */ yaffsfs_SetError(-ENOENT); yaffsfs_Unlock(); @@ -1145,7 +1187,7 @@ int yaffs_fstat(int fd, struct yaffs_stat *buf) if(obj) retVal = yaffsfs_DoStat(obj,buf); else - // bad handle + /* bad handle */ yaffsfs_SetError(-EBADF); yaffsfs_Unlock(); @@ -1153,6 +1195,262 @@ int yaffs_fstat(int fd, struct yaffs_stat *buf) return retVal; } +#ifndef CONFIG_YAFFS_WINCE +/* xattrib functions */ + + +static int yaffs_do_setxattr(const YCHAR *path, const char *name, const void *data, int size, int flags, int follow) +{ + yaffs_Object *obj; + + int retVal = -1; + + yaffsfs_Lock(); + obj = yaffsfs_FindObject(NULL,path,0); + + if(follow) + obj = yaffsfs_FollowLink(obj,0); + + if(obj) { + retVal = yaffs_SetXAttribute(obj,name,data,size,flags); + if(retVal< 0){ + yaffsfs_SetError(retVal); + retVal = -1; + } + } else + /* todo error not found */ + yaffsfs_SetError(-ENOENT); + + yaffsfs_Unlock(); + + return retVal; + +} + +int yaffs_setxattr(const YCHAR *path, const char *name, const void *data, int size, int flags) +{ + return yaffs_do_setxattr(path, name, data, size, flags, 1); +} + +int yaffs_lsetxattr(const YCHAR *path, const char *name, const void *data, int size, int flags) +{ + return yaffs_do_setxattr(path, name, data, size, flags, 0); +} + + + +int yaffs_fsetxattr(int fd, const char *name, const void *data, int size, int flags) +{ + yaffs_Object *obj; + + int retVal = -1; + + yaffsfs_Lock(); + obj = yaffsfs_GetHandleObject(fd); + + if(obj) { + retVal = yaffs_SetXAttribute(obj,name,data,size,flags); + if(retVal< 0){ + yaffsfs_SetError(retVal); + retVal = -1; + } + } else + /* bad handle */ + yaffsfs_SetError(-EBADF); + + yaffsfs_Unlock(); + + return retVal; +} + +static int yaffs_do_getxattr(const YCHAR *path, const char *name, void *data, int size, int follow) +{ + yaffs_Object *obj; + + int retVal = -1; + + yaffsfs_Lock(); + obj = yaffsfs_FindObject(NULL,path,0); + + if(follow) + obj = yaffsfs_FollowLink(obj,0); + + if(obj) { + retVal = yaffs_GetXAttribute(obj,name,data,size); + if(retVal< 0){ + yaffsfs_SetError(retVal); + retVal = -1; + } + } else + /* todo error not found */ + yaffsfs_SetError(-ENOENT); + + yaffsfs_Unlock(); + + return retVal; + +} + +int yaffs_getxattr(const YCHAR *path, const char *name, void *data, int size) +{ + return yaffs_do_getxattr( path, name, data, size, 1); +} +int yaffs_lgetxattr(const YCHAR *path, const char *name, void *data, int size) +{ + return yaffs_do_getxattr( path, name, data, size, 0); +} + + + +int yaffs_fgetxattr(int fd, const char *name, void *data, int size) +{ + yaffs_Object *obj; + + int retVal = -1; + + yaffsfs_Lock(); + obj = yaffsfs_GetHandleObject(fd); + + if(obj) { + retVal = yaffs_GetXAttribute(obj,name,data,size); + if(retVal< 0){ + yaffsfs_SetError(retVal); + retVal = -1; + } + } else + /* bad handle */ + yaffsfs_SetError(-EBADF); + + yaffsfs_Unlock(); + + return retVal; +} + +static int yaffs_do_listxattr(const YCHAR *path, char *data, int size, int follow) +{ + yaffs_Object *obj; + + int retVal = -1; + + yaffsfs_Lock(); + obj = yaffsfs_FindObject(NULL,path,0); + + if(follow) + obj = yaffsfs_FollowLink(obj,0); + + if(obj) { + retVal = yaffs_ListXAttributes(obj, data,size); + if(retVal< 0){ + yaffsfs_SetError(retVal); + retVal = -1; + } + } else + /* todo error not found */ + yaffsfs_SetError(-ENOENT); + + yaffsfs_Unlock(); + + return retVal; + +} + +int yaffs_listxattr(const YCHAR *path, char *data, int size) +{ + return yaffs_do_listxattr(path, data, size, 1); +} + +int yaffs_llistxattr(const YCHAR *path, char *data, int size) +{ + return yaffs_do_listxattr(path, data, size, 0); +} + +int yaffs_flistxattr(int fd, char *data, int size) +{ + yaffs_Object *obj; + + int retVal = -1; + + yaffsfs_Lock(); + obj = yaffsfs_GetHandleObject(fd); + + if(obj) { + retVal = yaffs_ListXAttributes(obj,data,size); + if(retVal< 0){ + yaffsfs_SetError(retVal); + retVal = -1; + } + } else + /* bad handle */ + yaffsfs_SetError(-EBADF); + + yaffsfs_Unlock(); + + return retVal; +} + +static int yaffs_do_removexattr(const YCHAR *path, const char *name, int follow) +{ + yaffs_Object *obj; + + int retVal = -1; + + yaffsfs_Lock(); + obj = yaffsfs_FindObject(NULL,path,0); + + if(follow) + obj = yaffsfs_FollowLink(obj,0); + + if(obj) { + retVal = yaffs_RemoveXAttribute(obj,name); + if(retVal< 0){ + yaffsfs_SetError(retVal); + retVal = -1; + } + } else + /* todo error not found */ + yaffsfs_SetError(-ENOENT); + + yaffsfs_Unlock(); + + return retVal; + +} + +int yaffs_removexattr(const YCHAR *path, const char *name) +{ + return yaffs_do_removexattr(path, name, 1); +} + +int yaffs_lremovexattr(const YCHAR *path, const char *name) +{ + return yaffs_do_removexattr(path, name, 0); +} + +int yaffs_fremovexattr(int fd, const char *name) +{ + yaffs_Object *obj; + + int retVal = -1; + + yaffsfs_Lock(); + obj = yaffsfs_GetHandleObject(fd); + + if(obj){ + retVal = yaffs_RemoveXAttribute(obj,name); + if(retVal< 0){ + yaffsfs_SetError(retVal); + retVal = -1; + } + }else + /* bad handle */ + yaffsfs_SetError(-EBADF); + + yaffsfs_Unlock(); + + return retVal; +} +#endif + #ifdef CONFIG_YAFFS_WINCE int yaffs_get_wince_times(int fd, unsigned *wctime, unsigned *watime, unsigned *wmtime) { @@ -1181,7 +1479,7 @@ int yaffs_get_wince_times(int fd, unsigned *wctime, unsigned *watime, unsigned * retVal = 0; } else - // bad handle + /* bad handle */ yaffsfs_SetError(-EBADF); yaffsfs_Unlock(); @@ -1221,7 +1519,7 @@ int yaffs_set_wince_times(int fd, result = yaffs_FlushFile(obj,0,0); retVal = 0; } else - // bad handle + /* bad handle */ yaffsfs_SetError(-EBADF); yaffsfs_Unlock(); @@ -1273,7 +1571,7 @@ int yaffs_access(const YCHAR *path, int amode) retval = -1; } } else { - // todo error not found + /* todo error not found */ yaffsfs_SetError(-ENOENT); retval = -1; } @@ -1294,11 +1592,12 @@ int yaffs_chmod(const YCHAR *path, mode_t mode) yaffsfs_Lock(); obj = yaffsfs_FindObject(NULL,path,0); - if(obj) - retVal = yaffsfs_DoChMod(obj,mode); - else - // todo error not found + if(!obj) yaffsfs_SetError(-ENOENT); + else if(obj->myDev->readOnly) + yaffsfs_SetError(-EINVAL); + else + retVal = yaffsfs_DoChMod(obj,mode); yaffsfs_Unlock(); @@ -1316,11 +1615,12 @@ int yaffs_fchmod(int fd, mode_t mode) yaffsfs_Lock(); obj = yaffsfs_GetHandleObject(fd); - if(obj) - retVal = yaffsfs_DoChMod(obj,mode); + if(!obj) + yaffsfs_SetError(-ENOENT); + else if(obj->myDev->readOnly) + yaffsfs_SetError(-EINVAL); else - // bad handle - yaffsfs_SetError(-EBADF); + retVal = yaffsfs_DoChMod(obj,mode); yaffsfs_Unlock(); @@ -1337,18 +1637,22 @@ int yaffs_mkdir(const YCHAR *path, mode_t mode) yaffsfs_Lock(); parent = yaffsfs_FindDirectory(NULL,path,&name,0); - if(parent) - dir = yaffs_MknodDirectory(parent,name,mode,0,0); - if(dir) - retVal = 0; - 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; + if(parent && parent->myDev->readOnly){ + yaffsfs_SetError(-EINVAL); + } else { + if(parent) + dir = yaffs_MknodDirectory(parent,name,mode,0,0); + if(dir) + retVal = 0; + 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(); @@ -1356,7 +1660,7 @@ int yaffs_mkdir(const YCHAR *path, mode_t mode) return retVal; } -int yaffs_mount(const YCHAR *path) +int yaffs_mount2(const YCHAR *path,int readOnly) { int retVal=-1; int result=YAFFS_FAIL; @@ -1369,18 +1673,19 @@ int yaffs_mount(const YCHAR *path) dev = yaffsfs_FindDevice(path,&dummy); if(dev){ if(!dev->isMounted){ + dev->readOnly = readOnly ? 1 : 0; result = yaffs_GutsInitialise(dev); if(result == YAFFS_FAIL) - // todo error - mount failed + /* todo error - mount failed */ yaffsfs_SetError(-ENOMEM); retVal = result ? 0 : -1; } else - //todo error - already mounted. + /* todo error - already mounted. */ yaffsfs_SetError(-EBUSY); } else - // todo error - no device + /* todo error - no device */ yaffsfs_SetError(-ENODEV); yaffsfs_Unlock(); @@ -1388,6 +1693,11 @@ int yaffs_mount(const YCHAR *path) } +int yaffs_mount(const YCHAR *path) +{ + return yaffs_mount2(path,0); +} + int yaffs_sync(const YCHAR *path) { int retVal=-1; @@ -1404,11 +1714,11 @@ int yaffs_sync(const YCHAR *path) } else - //todo error - not mounted. + /* todo error - not mounted. */ yaffsfs_SetError(-EINVAL); }else - // todo error - no device + /* todo error - no device */ yaffsfs_SetError(-ENODEV); yaffsfs_Unlock(); @@ -1416,7 +1726,47 @@ int yaffs_sync(const YCHAR *path) } -int yaffs_unmount(const YCHAR *path) +int yaffs_remount(const YCHAR *path, int force, int readOnly) +{ + int retVal=-1; + yaffs_Device *dev=NULL; + YCHAR *dummy; + + yaffsfs_Lock(); + dev = yaffsfs_FindDevice(path,&dummy); + if(dev){ + if(dev->isMounted){ + int i; + int inUse; + + yaffs_FlushEntireDeviceCache(dev); + + for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse && !force; i++){ + if(yaffsfs_handle[i].useCount>0 && yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj->myDev == dev) + inUse = 1; /* the device is in use, can't unmount */ + } + + if(!inUse || force){ + if(readOnly) + yaffs_CheckpointSave(dev); + dev->readOnly = readOnly ? 1 : 0; + retVal = 0; + } else + yaffsfs_SetError(-EBUSY); + + } else + yaffsfs_SetError(-EINVAL); + + } + else + yaffsfs_SetError(-ENODEV); + + yaffsfs_Unlock(); + return retVal; + +} + +int yaffs_unmount2(const YCHAR *path, int force) { int retVal=-1; yaffs_Device *dev=NULL; @@ -1434,24 +1784,24 @@ int yaffs_unmount(const YCHAR *path) for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse; i++){ if(yaffsfs_handle[i].useCount > 0 && yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj->myDev == dev) - inUse = 1; // the device is in use, can't unmount + inUse = 1; /* the device is in use, can't unmount */ } - if(!inUse){ + if(!inUse || force){ yaffs_Deinitialise(dev); retVal = 0; } else - // todo error can't unmount as files are open + /* todo error can't unmount as files are open */ yaffsfs_SetError(-EBUSY); } else - //todo error - not mounted. + /* todo error - not mounted. */ yaffsfs_SetError(-EINVAL); } else - // todo error - no device + /* todo error - no device */ yaffsfs_SetError(-ENODEV); yaffsfs_Unlock(); @@ -1459,6 +1809,11 @@ int yaffs_unmount(const YCHAR *path) } +int yaffs_unmount(const YCHAR *path) +{ + return yaffs_unmount2(path,0); +} + loff_t yaffs_freespace(const YCHAR *path) { loff_t retVal=-1; @@ -1487,8 +1842,8 @@ loff_t yaffs_totalspace(const YCHAR *path) yaffsfs_Lock(); dev = yaffsfs_FindDevice(path,&dummy); if(dev && dev->isMounted){ - retVal = (dev->endBlock - dev->startBlock + 1) - dev->nReservedBlocks; - retVal *= dev->nChunksPerBlock; + retVal = (dev->param.endBlock - dev->param.startBlock + 1) - dev->param.nReservedBlocks; + retVal *= dev->param.nChunksPerBlock; retVal *= dev->nDataBytesPerChunk; } else @@ -1507,7 +1862,7 @@ int yaffs_inodecount(const YCHAR *path) yaffsfs_Lock(); dev = yaffsfs_FindDevice(path,&dummy); if(dev && dev->isMounted) { - int nObjects = dev->nObjectsCreated - dev->nFreeObjects; + int nObjects = dev->nObjects; if(nObjects > dev->nHardLinks) retVal = nObjects - dev->nHardLinks; } @@ -1520,35 +1875,32 @@ int yaffs_inodecount(const YCHAR *path) } - -void yaffs_initialise(yaffsfs_DeviceConfiguration *cfgList) +void yaffs_AddDevice(yaffs_Device *dev) { + dev->isMounted = 0; + dev->param.removeObjectCallback = yaffsfs_RemoveObjectCallback; - yaffsfs_DeviceConfiguration *cfg; - - yaffsfs_configurationList = cfgList; + if(!dev->devList.next) + YINIT_LIST_HEAD(&dev->devList); - yaffsfs_InitHandles(); - - cfg = yaffsfs_configurationList; + ylist_add(&dev->devList,&yaffsfs_deviceList); +} - while(cfg && cfg->prefix && cfg->dev){ - cfg->dev->isMounted = 0; - cfg->dev->removeObjectCallback = yaffsfs_RemoveObjectCallback; - cfg++; - } +void yaffs_RemoveDevice(yaffs_Device *dev) +{ + ylist_del_init(&dev->devList); +} -} -// -// Directory search stuff. +/* Directory search stuff. */ -// -// Directory search context -// -// NB this is an opaque structure. +/* + * Directory search context + * + * NB this is an opaque structure. + */ typedef struct @@ -1683,7 +2035,7 @@ struct yaffs_dirent *yaffs_readdir(yaffs_DIR *dirp) yaffs_GetObjectName(dsc->nextReturn,dsc->de.d_name,NAME_MAX); if(yaffs_strnlen(dsc->de.d_name,NAME_MAX+1) == 0) { - // this should not happen! + /* this should not happen! */ yaffs_strcpy(dsc->de.d_name,_Y("zz")); } dsc->de.d_reclen = sizeof(struct yaffs_dirent); @@ -1725,7 +2077,7 @@ int yaffs_closedir(yaffs_DIR *dirp) return 0; } -// end of directory stuff +/* End of directory stuff */ int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath) @@ -1734,16 +2086,18 @@ int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath) yaffs_Object *obj; YCHAR *name; int retVal= -1; - int mode = 0; // ignore for now + int mode = 0; /* ignore for now */ yaffsfs_Lock(); parent = yaffsfs_FindDirectory(NULL,newpath,&name,0); - if(parent){ + if(parent && parent->myDev->readOnly) + yaffsfs_SetError(-EINVAL); + else 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 + yaffsfs_SetError(-ENOSPC); /* just assume no space for now */ retVal = -1; } } else { @@ -1785,7 +2139,7 @@ int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz) int yaffs_link(const YCHAR *oldpath, const YCHAR *newpath) { - // Creates a link called newpath to existing oldpath + /* Creates a link called newpath to existing oldpath */ yaffs_Object *obj = NULL; yaffs_Object *target = NULL; int retVal = 0; @@ -1800,6 +2154,9 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *newpath) if(!obj) { yaffsfs_SetError(-ENOENT); retVal = -1; + } else if(obj->myDev->readOnly){ + yaffsfs_SetError(-EINVAL); + retVal= -1; } else if(target) { yaffsfs_SetError(-EEXIST); retVal = -1;