#define YAFFSFS_RW_SIZE (1<<YAFFSFS_RW_SHIFT)
/* Some forward references */
-static yaffs_Object *yaffsfs_FindObject(yaffs_Object *relativeDirectory, const YCHAR *path, int symDepth);
-static void yaffsfs_RemoveObjectCallback(yaffs_Object *obj);
+static yaffs_obj_t *yaffsfs_FindObject(yaffs_obj_t *relativeDirectory, const YCHAR *path, int symDepth, int getEquiv);
+static void yaffsfs_RemoveObjectCallback(yaffs_obj_t *obj);
unsigned int yaffs_wr_attempts;
typedef struct {
int count; /* Number of handles accessing this inode */
- yaffs_Object *iObj;
+ yaffs_obj_t *iObj;
} yaffsfs_Inode;
typedef struct{
- __u8 readOnly:1;
+ __u8 reading:1;
+ __u8 writing:1;
__u8 append:1;
- int inodeId:13; /* Index to corresponding yaffsfs_Inode */
- int useCount:16; /* Use count for this handle */
+ __u8 shareRead:1;
+ __u8 shareWrite:1;
+ int inodeId:12; /* Index to corresponding yaffsfs_Inode */
+ int useCount:10; /* Use count for this handle */
__u32 position; /* current position in file */
}yaffsfs_Handle;
static yaffsfs_Inode yaffsfs_inode[YAFFSFS_N_HANDLES];
static yaffsfs_Handle yaffsfs_handle[YAFFSFS_N_HANDLES];
+static int yaffsfs_handlesInitialised;
/*
* yaffsfs_InitHandle
* Inilitalise handle management on start-up.
*/
-static int yaffsfs_InitHandles(void)
+static void yaffsfs_InitHandles(void)
{
int i;
+ if(yaffsfs_handlesInitialised)
+ return;
+
memset(yaffsfs_inode,0,sizeof(yaffsfs_inode));
memset(yaffsfs_handle,0,sizeof(yaffsfs_handle));
for(i = 0; i < YAFFSFS_N_HANDLES; i++)
yaffsfs_handle[i].inodeId = -1;
-
- return 0;
}
yaffsfs_Handle *yaffsfs_GetHandlePointer(int h)
return NULL;
}
-yaffs_Object *yaffsfs_GetHandleObject(int handle)
+yaffs_obj_t *yaffsfs_GetHandleObject(int handle)
{
yaffsfs_Inode *in = yaffsfs_GetInodePointer(handle);
}
/*
- * yaffsfs_GetInodeIdForObject
- * Grab an inode entry when opening a new inode.
+ * yaffsfs_FindInodeIdForObject
+ * Find the inode entry for an object, if it exists.
*/
-static int yaffsfs_GetInodeIdForObject(yaffs_Object *obj)
+static int yaffsfs_FindInodeIdForObject(yaffs_obj_t *obj)
{
int i;
int ret = -1;
- yaffsfs_Inode *in = NULL;
if(obj)
- obj = yaffs_GetEquivalentObject(obj);
+ obj = yaffs_get_equivalent_obj(obj);
- /* Look for it. If we can't find it then make one */
+ /* Look for it in open inode table*/
for(i = 0; i < YAFFSFS_N_HANDLES && ret < 0; i++){
if(yaffsfs_inode[i].iObj == obj)
ret = i;
}
+ return ret;
+}
+
+/*
+ * yaffsfs_GetInodeIdForObject
+ * Grab an inode entry when opening a new inode.
+ */
+static int yaffsfs_GetInodeIdForObject(yaffs_obj_t *obj)
+{
+ int i;
+ int ret;
+ yaffsfs_Inode *in = NULL;
+
+ if(obj)
+ obj = yaffs_get_equivalent_obj(obj);
+
+ ret = yaffsfs_FindInodeIdForObject(obj);
for(i = 0; i < YAFFSFS_N_HANDLES && ret < 0; i++){
if(!yaffsfs_inode[i].iObj)
ret = i;
}
-
-
+
if(ret>=0){
in = &yaffsfs_inode[ret];
if(!in->iObj)
return ret;
}
+
+static int yaffsfs_CountHandles(yaffs_obj_t *obj)
+{
+ int i = yaffsfs_FindInodeIdForObject(obj);
+
+ if(i >= 0)
+ return yaffsfs_inode[i].count;
+ else
+ return 0;
+}
+
static void yaffsfs_ReleaseInode(yaffsfs_Inode *in)
{
- yaffs_Object *obj;
+ yaffs_obj_t *obj;
obj = in->iObj;
if(obj->unlinked)
- yaffs_DeleteObject(obj);
+ yaffs_del_obj(obj);
- obj->myInode = NULL;
+ obj->my_inode = NULL;
in->iObj = NULL;
}
}
/*
- * yaffs_GetHandle
+ * yaffs_get_handle
* Increase use of handle when reading/writing a file
*/
static int yaffsfs_GetHandle(int handle)
}
/*
- * yaffs_PutHandle
+ * yaffs_put_handle
* Let go of a handle when closing a file or aborting an open or
* ending a read or write.
*/
int yaffsfs_IsPathDivider(YCHAR ch)
{
- YCHAR *str = YAFFS_PATH_DIVIDERS;
+ const YCHAR *str = YAFFS_PATH_DIVIDERS;
while(*str){
if(*str == ch)
* Curveballs: Should match paths that end in '/' too
* Curveball2 Might have "/x/ and "/x/y". Need to return the longest match
*/
-static yaffs_Device *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath)
+static yaffs_dev_t *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath)
{
struct ylist_head *cfg;
const YCHAR *leftOver;
const YCHAR *p;
- yaffs_Device *retval = NULL;
- yaffs_Device *dev = NULL;
+ yaffs_dev_t *retval = NULL;
+ yaffs_dev_t *dev = NULL;
int thisMatchLength;
int longestMatch = -1;
int matching;
* 2) Matches the longest.
*/
ylist_for_each(cfg, &yaffsfs_deviceList){
- dev = ylist_entry(cfg, yaffs_Device, devList);
+ dev = ylist_entry(cfg, yaffs_dev_t, dev_list);
leftOver = path;
p = dev->param.name;
thisMatchLength = 0;
}
#if 0
-static yaffs_Device *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath)
+static yaffs_dev_t *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath)
{
yaffsfs_DeviceConfiguration *cfg = yaffsfs_configurationList;
const YCHAR *leftOver;
const YCHAR *p;
- yaffs_Device *retval = NULL;
+ yaffs_dev_t *retval = NULL;
int thisMatchLength;
int longestMatch = -1;
}
#endif
-static yaffs_Object *yaffsfs_FindRoot(const YCHAR *path, YCHAR **restOfPath)
+static yaffs_obj_t *yaffsfs_FindRoot(const YCHAR *path, YCHAR **restOfPath)
{
- yaffs_Device *dev;
+ yaffs_dev_t *dev;
dev= yaffsfs_FindDevice(path,restOfPath);
- if(dev && dev->isMounted){
- return dev->rootDir;
+ if(dev && dev->is_mounted){
+ return dev->root_dir;
}
return NULL;
}
-static yaffs_Object *yaffsfs_FollowLink(yaffs_Object *obj,int symDepth)
+static yaffs_obj_t *yaffsfs_FollowLink(yaffs_obj_t *obj,int symDepth)
{
- while(obj && obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK){
- YCHAR *alias = obj->variant.symLinkVariant.alias;
+ if(obj)
+ obj = yaffs_get_equivalent_obj(obj);
+
+ while(obj && obj->variant_type == YAFFS_OBJECT_TYPE_SYMLINK){
+ YCHAR *alias = obj->variant.symlink_variant.alias;
if(yaffsfs_IsPathDivider(*alias))
/* Starts with a /, need to scan from root up */
- obj = yaffsfs_FindObject(NULL,alias,symDepth++);
+ obj = yaffsfs_FindObject(NULL,alias,symDepth++,1);
else
/* Relative to here, so use the parent of the symlink as a start */
- obj = yaffsfs_FindObject(obj->parent,alias,symDepth++);
+ obj = yaffsfs_FindObject(obj->parent,alias,symDepth++,1);
}
return obj;
}
*
* eg. "/data/xx/ff" --> puts name="ff" and returns the directory "/data/xx"
*/
-static yaffs_Object *yaffsfs_DoFindDirectory(yaffs_Object *startDir,
+static yaffs_obj_t *yaffsfs_DoFindDirectory(yaffs_obj_t *startDir,
const YCHAR *path, YCHAR **name, int symDepth)
{
- yaffs_Object *dir;
+ yaffs_obj_t *dir;
YCHAR *restOfPath;
YCHAR str[YAFFS_MAX_NAME_LENGTH+1];
int i;
else if(yaffs_strcmp(str,_Y("..")) == 0)
dir = dir->parent;
else{
- dir = yaffs_FindObjectByName(dir,str);
+ dir = yaffs_find_by_name(dir,str);
- while(dir && dir->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
- dir = yaffsfs_FollowLink(dir,symDepth);
+ dir = yaffsfs_FollowLink(dir,symDepth);
-
- if(dir && dir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
+ if(dir && dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
dir = NULL;
}
}
return NULL;
}
-static yaffs_Object *yaffsfs_FindDirectory(yaffs_Object *relativeDirectory,
+static yaffs_obj_t *yaffsfs_FindDirectory(yaffs_obj_t *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 YCHAR *path,int symDepth)
+static yaffs_obj_t *yaffsfs_FindObject(yaffs_obj_t *relativeDirectory, const YCHAR *path,int symDepth, int getEquiv)
{
- yaffs_Object *dir;
+ yaffs_obj_t *dir;
+ yaffs_obj_t *obj;
YCHAR *name;
dir = yaffsfs_FindDirectory(relativeDirectory,path,&name,symDepth);
if(dir && *name)
- return yaffs_FindObjectByName(dir,name);
+ obj = yaffs_find_by_name(dir,name);
+ else
+ obj = dir;
- return dir;
+ if(getEquiv)
+ obj = yaffs_get_equivalent_obj(obj);
+
+ return obj;
}
}
-int yaffs_open(const YCHAR *path, int oflag, int mode)
+
+
+int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
{
- yaffs_Object *obj = NULL;
- yaffs_Object *dir = NULL;
+ yaffs_obj_t *obj = NULL;
+ yaffs_obj_t *dir = NULL;
YCHAR *name;
int handle = -1;
- yaffsfs_Handle *h = NULL;
+ yaffsfs_Handle *yh = NULL;
int openDenied = 0;
int symDepth = 0;
int errorReported = 0;
+ int rwflags = oflag & ( O_RDWR | O_RDONLY | O_WRONLY);
+ __u8 shareRead = (sharing & YAFFS_SHARE_READ) ? 1 : 0;
+ __u8 shareWrite = (sharing & YAFFS_SHARE_WRITE) ? 1 : 0;
+ __u8 sharedReadAllowed;
+ __u8 sharedWriteAllowed;
+ __u8 alreadyReading;
+ __u8 alreadyWriting;
+ __u8 readRequested;
+ __u8 writeRequested;
/* O_EXCL only has meaning if O_CREAT is specified */
if(!(oflag & O_CREAT))
/* Todo: Are there any more flag combos to sanitise ? */
+ /* Figure out if reading or writing is requested */
+
+ readRequested = (rwflags == O_RDWR || rwflags == O_RDONLY) ? 1 : 0;
+ writeRequested = (rwflags == O_RDWR || rwflags == O_WRONLY) ? 1 : 0;
yaffsfs_Lock();
handle = yaffsfs_GetNewHandle();
- if(handle >= 0){
-
- h = yaffsfs_GetHandlePointer(handle);
+ if(handle < 0){
+ yaffsfs_SetError(-ENFILE);
+ errorReported = 1;
+ } else {
+ yh = yaffsfs_GetHandlePointer(handle);
/* try to find the exisiting object */
- obj = yaffsfs_FindObject(NULL,path,0);
+ obj = yaffsfs_FindObject(NULL,path,0,1);
- if(obj && obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
- obj = yaffsfs_FollowLink(obj,symDepth++);
-
- if(obj)
- obj = yaffs_GetEquivalentObject(obj);
+ obj = yaffsfs_FollowLink(obj,symDepth++);
if(obj &&
- obj->variantType != YAFFS_OBJECT_TYPE_FILE &&
- obj->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
+ obj->variant_type != YAFFS_OBJECT_TYPE_FILE &&
+ obj->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
obj = NULL;
if(obj){
/* The file already exists or it might be a directory */
/* If it is a directory then we can't open it as a file */
- if(obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){
+ if(obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY){
openDenied = 1;
yaffsfs_SetError(-EISDIR);
errorReported = 1;
}
/* Check file permissions */
- if( (oflag & (O_RDWR | O_WRONLY)) == 0 && /* ie O_RDONLY */
- !(obj->yst_mode & S_IREAD))
+ if( readRequested && !(obj->yst_mode & S_IREAD))
openDenied = 1;
- if( (oflag & O_RDWR) &&
- !(obj->yst_mode & S_IREAD))
+ if( writeRequested && !(obj->yst_mode & S_IWRITE))
openDenied = 1;
- if( (oflag & (O_RDWR | O_WRONLY)) &&
- !(obj->yst_mode & S_IWRITE))
- openDenied = 1;
+ /* Check sharing of an existing object. */
+ {
+ yaffsfs_Handle *hx;
+ int i;
+ sharedReadAllowed = 1;
+ sharedWriteAllowed = 1;
+ alreadyReading = 0;
+ alreadyWriting = 0;
+ for( i = 0; i < YAFFSFS_N_HANDLES; i++){
+ hx = &yaffsfs_handle[i];
+ if(hx->useCount > 0 &&
+ hx->inodeId >= 0 &&
+ yaffsfs_inode[hx->inodeId].iObj == obj){
+ if(!hx->shareRead)
+ sharedReadAllowed = 0;
+ if(!hx->shareWrite)
+ sharedWriteAllowed = 0;
+ if(hx->reading)
+ alreadyReading = 1;
+ if(hx->writing)
+ alreadyWriting = 1;
+ }
+ }
+
+
+
+ if((!sharedReadAllowed && readRequested)||
+ (!shareRead && alreadyReading) ||
+ (!sharedWriteAllowed && writeRequested) ||
+ (!shareWrite && alreadyWriting)){
+ openDenied = 1;
+ yaffsfs_SetError(-EBUSY);
+ errorReported=1;
+ }
+ }
} else if((oflag & O_CREAT)) {
/* Let's see if we can create this file */
dir = yaffsfs_FindDirectory(NULL,path,&name,0);
- if(dir && dir->myDev->readOnly){
+ if(dir && dir->my_dev->read_only){
yaffsfs_SetError(-EINVAL);
errorReported = 1;
} else if(dir)
- obj = yaffs_MknodFile(dir,name,mode,0,0);
+ obj = yaffs_create_file(dir,name,mode,0,0);
else {
yaffsfs_SetError(-ENOTDIR);
errorReported = 1;
*/
}
- h->inodeId = inodeId;
- h->readOnly = (oflag & (O_WRONLY | O_RDWR)) ? 0 : 1;
- h->append = (oflag & O_APPEND) ? 1 : 0;
- h->position = 0;
+ yh->inodeId = inodeId;
+ yh->reading = readRequested;
+ yh->writing = writeRequested;
+ yh->append = (oflag & O_APPEND) ? 1 : 0;
+ yh->position = 0;
+ yh->shareRead = shareRead;
+ yh->shareWrite = shareWrite;
/* Hook inode to object */
- obj->myInode = (void*) &yaffsfs_inode[inodeId];
+ obj->my_inode = (void*) &yaffsfs_inode[inodeId];
- if((oflag & O_TRUNC) && !h->readOnly)
- yaffs_ResizeFile(obj,0);
+ if((oflag & O_TRUNC) && yh->writing)
+ yaffs_resize_file(obj,0);
} else {
yaffsfs_PutHandle(handle);
if(!errorReported) {
- yaffsfs_SetError(-EACCES);
+ yaffsfs_SetError(!obj ? -ENOSPC : -EACCES);
errorReported = 1;
}
handle = -1;
return handle;
}
+int yaffs_open(const YCHAR *path, int oflag, int mode)
+{
+ return yaffs_open_sharing(path, oflag, mode, YAFFS_SHARE_READ | YAFFS_SHARE_WRITE);
+}
+
int yaffs_Dofsync(int fd,int datasync)
{
yaffsfs_Handle *h = NULL;
if(h && h->useCount > 0)
/* flush the file */
- yaffs_FlushFile(yaffsfs_inode[h->inodeId].iObj,1,datasync);
+ yaffs_flush_file(yaffsfs_inode[h->inodeId].iObj,1,datasync);
else {
/* bad handle */
yaffsfs_SetError(-EBADF);
if(h && h->useCount > 0) {
/* clean up */
- yaffs_FlushFile(yaffsfs_inode[h->inodeId].iObj,1,0);
+ yaffs_flush_file(yaffsfs_inode[h->inodeId].iObj,1,0);
yaffsfs_PutHandle(fd);
retVal = 0;
} else {
int yaffsfs_do_read(int fd, void *vbuf, unsigned int nbyte, int isPread, int offset)
{
yaffsfs_Handle *h = NULL;
- yaffs_Object *obj = NULL;
+ yaffs_obj_t *obj = NULL;
int pos = 0;
int startPos = 0;
int nRead = 0;
/* bad handle */
yaffsfs_SetError(-EBADF);
totalRead = -1;
- } else if( h && obj){
+ } else if(!h->reading){
+ /* Not a reading handle */
+ yaffsfs_SetError(-EINVAL);
+ totalRead = -1;
+ } else {
if(isPread)
startPos = offset;
else
pos = startPos;
- if(yaffs_GetObjectFileLength(obj) > pos)
- maxRead = yaffs_GetObjectFileLength(obj) - pos;
+ if(yaffs_get_obj_length(obj) > pos)
+ maxRead = yaffs_get_obj_length(obj) - pos;
else
maxRead = 0;
nToRead = YAFFSFS_RW_SIZE - (pos & (YAFFSFS_RW_SIZE -1));
if(nToRead > nbyte)
nToRead = nbyte;
- nRead = yaffs_ReadDataFromFile(obj,buf,pos,nToRead);
+ nRead = yaffs_file_rd(obj,buf,pos,nToRead);
if(nRead > 0){
totalRead += nRead;
int yaffsfs_do_write(int fd, const void *vbuf, unsigned int nbyte, int isPwrite, int offset)
{
yaffsfs_Handle *h = NULL;
- yaffs_Object *obj = NULL;
+ yaffs_obj_t *obj = NULL;
int pos = 0;
int startPos = 0;
int nWritten = 0;
int totalWritten = 0;
- int writeThrough = 0;
+ int write_trhrough = 0;
int nToWrite = 0;
const __u8 *buf = (const __u8 *)vbuf;
/* bad handle */
yaffsfs_SetError(-EBADF);
totalWritten = -1;
- } else if( h && obj && (h->readOnly || obj->myDev->readOnly)){
+ } else if( h && obj && (!h->writing || obj->my_dev->read_only)){
yaffsfs_SetError(-EINVAL);
totalWritten=-1;
- } else if( h && obj){
+ } else {
if(h->append)
- startPos = yaffs_GetObjectFileLength(obj);
+ startPos = yaffs_get_obj_length(obj);
else if(isPwrite)
startPos = offset;
else
if(nToWrite > nbyte)
nToWrite = nbyte;
- nWritten = yaffs_WriteDataToFile(obj,buf,pos,nToWrite,writeThrough);
+ nWritten = yaffs_wr_file(obj,buf,pos,nToWrite,write_trhrough);
if(nWritten > 0){
totalWritten += nWritten;
pos += nWritten;
}
-int yaffs_truncate(const YCHAR *path,off_t newSize)
+int yaffs_truncate(const YCHAR *path,off_t new_size)
{
- yaffs_Object *obj = NULL;
+ yaffs_obj_t *obj = NULL;
int result = YAFFS_FAIL;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0);
- if(obj)
- obj = yaffs_GetEquivalentObject(obj);
+ obj = yaffsfs_FindObject(NULL,path,0,1);
if(!obj)
yaffsfs_SetError(-ENOENT);
- else if(obj->variantType != YAFFS_OBJECT_TYPE_FILE)
+ else if(obj->variant_type != YAFFS_OBJECT_TYPE_FILE)
yaffsfs_SetError(-EISDIR);
- else if(obj->myDev->readOnly)
+ else if(obj->my_dev->read_only)
yaffsfs_SetError(-EINVAL);
else
- result = yaffs_ResizeFile(obj,newSize);
+ result = yaffs_resize_file(obj,new_size);
yaffsfs_Unlock();
return (result) ? 0 : -1;
}
-int yaffs_ftruncate(int fd, off_t newSize)
+int yaffs_ftruncate(int fd, off_t new_size)
{
yaffsfs_Handle *h = NULL;
- yaffs_Object *obj = NULL;
+ yaffs_obj_t *obj = NULL;
int result = 0;
yaffsfs_Lock();
if(!h || !obj)
/* bad handle */
yaffsfs_SetError(-EBADF);
- else if(obj->myDev->readOnly)
+ else if(obj->my_dev->read_only)
yaffsfs_SetError(-EINVAL);
else
/* resize the file */
- result = yaffs_ResizeFile(obj,newSize);
+ result = yaffs_resize_file(obj,new_size);
yaffsfs_Unlock();
off_t yaffs_lseek(int fd, off_t offset, int whence)
{
yaffsfs_Handle *h = NULL;
- yaffs_Object *obj = NULL;
+ yaffs_obj_t *obj = NULL;
int pos = -1;
int fSize = -1;
h = yaffsfs_GetHandlePointer(fd);
obj = yaffsfs_GetHandleObject(fd);
- if(!h || !obj)
+ if(!h || !obj){
/* bad handle */
yaffsfs_SetError(-EBADF);
- else if(whence == SEEK_SET){
- if(offset >= 0)
- pos = offset;
- }
- else if(whence == SEEK_CUR) {
- if( (h->position + offset) >= 0)
- pos = (h->position + offset);
- }
- else if(whence == SEEK_END) {
- fSize = yaffs_GetObjectFileLength(obj);
- if(fSize >= 0 && (fSize + offset) >= 0)
- pos = fSize + offset;
- }
-
- if(pos >= 0)
- h->position = pos;
- else {
- /* todo error */
+ } else {
+ if(whence == SEEK_SET){
+ if(offset >= 0)
+ pos = offset;
+ } else if(whence == SEEK_CUR) {
+ if( (h->position + offset) >= 0)
+ pos = (h->position + offset);
+ } else if(whence == SEEK_END) {
+ fSize = yaffs_get_obj_length(obj);
+ if(fSize >= 0 && (fSize + offset) >= 0)
+ pos = fSize + offset;
+ }
+
+ if(pos >= 0)
+ h->position = pos;
+ else
+ yaffsfs_SetError(-EINVAL);
}
-
yaffsfs_Unlock();
return pos;
int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory)
{
- yaffs_Object *dir = NULL;
- yaffs_Object *obj = NULL;
+ yaffs_obj_t *dir = NULL;
+ yaffs_obj_t *obj = NULL;
YCHAR *name;
int result = YAFFS_FAIL;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0);
+ obj = yaffsfs_FindObject(NULL,path,0,0);
dir = yaffsfs_FindDirectory(NULL,path,&name,0);
if(!dir)
yaffsfs_SetError(-ENOTDIR);
else if(!obj)
yaffsfs_SetError(-ENOENT);
- else if(obj->myDev->readOnly)
+ else if(obj->my_dev->read_only)
yaffsfs_SetError(-EINVAL);
- else if(!isDirectory && obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY)
+ else if(!isDirectory && obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY)
yaffsfs_SetError(-EISDIR);
- else if(isDirectory && obj->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
+ else if(isDirectory && obj->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
yaffsfs_SetError(-ENOTDIR);
else {
- result = yaffs_Unlink(dir,name);
+ result = yaffs_unlinker(dir,name);
if(result == YAFFS_FAIL && isDirectory)
yaffsfs_SetError(-ENOTEMPTY);
int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath)
{
- yaffs_Object *olddir = NULL;
- yaffs_Object *newdir = NULL;
- yaffs_Object *obj = NULL;
+ yaffs_obj_t *olddir = NULL;
+ yaffs_obj_t *newdir = NULL;
+ yaffs_obj_t *obj = NULL;
YCHAR *oldname;
YCHAR *newname;
int result= YAFFS_FAIL;
- int renameAllowed = 1;
+ int rename_allowed = 1;
yaffsfs_Lock();
olddir = yaffsfs_FindDirectory(NULL,oldPath,&oldname,0);
newdir = yaffsfs_FindDirectory(NULL,newPath,&newname,0);
- obj = yaffsfs_FindObject(NULL,oldPath,0);
+ obj = yaffsfs_FindObject(NULL,oldPath,0,0);
if(!olddir || !newdir || !obj) {
/* bad file */
yaffsfs_SetError(-EBADF);
- renameAllowed = 0;
- } else if(obj->myDev->readOnly){
+ rename_allowed = 0;
+ } else if(obj->my_dev->read_only){
yaffsfs_SetError(-EINVAL);
- renameAllowed = 0;
- } else if(olddir->myDev != newdir->myDev) {
+ rename_allowed = 0;
+ } else if(olddir->my_dev != newdir->my_dev) {
/* oops must be on same device */
/* todo error */
yaffsfs_SetError(-EXDEV);
- renameAllowed = 0;
- } else if(obj && obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) {
+ rename_allowed = 0;
+ } else if(obj && obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY) {
/*
* It is a directory, check that it is not being renamed to
* being its own decendent.
* Do this by tracing from the new directory back to the root, checking for obj
*/
- yaffs_Object *xx = newdir;
+ yaffs_obj_t *xx = newdir;
- while( renameAllowed && xx){
+ while( rename_allowed && xx){
if(xx == obj)
- renameAllowed = 0;
+ rename_allowed = 0;
xx = xx->parent;
}
- if(!renameAllowed)
+ if(!rename_allowed)
yaffsfs_SetError(-EACCES);
}
- if(renameAllowed)
- result = yaffs_RenameObject(olddir,oldname,newdir,newname);
+ if(rename_allowed)
+ result = yaffs_rename_obj(olddir,oldname,newdir,newname);
yaffsfs_Unlock();
}
-static int yaffsfs_DoStat(yaffs_Object *obj,struct yaffs_stat *buf)
+static int yaffsfs_DoStat(yaffs_obj_t *obj,struct yaffs_stat *buf)
{
int retVal = -1;
- if(obj)
- obj = yaffs_GetEquivalentObject(obj);
+ obj = yaffs_get_equivalent_obj(obj);
if(obj && buf){
- buf->st_dev = (int)obj->myDev->osContext;
- buf->st_ino = obj->objectId;
+ buf->st_dev = (int)obj->my_dev->os_context;
+ buf->st_ino = obj->obj_id;
buf->st_mode = obj->yst_mode & ~S_IFMT; /* clear out file type bits */
- if(obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY)
+ if(obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY)
buf->st_mode |= S_IFDIR;
- else if(obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
+ else if(obj->variant_type == YAFFS_OBJECT_TYPE_SYMLINK)
buf->st_mode |= S_IFLNK;
- else if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
+ else if(obj->variant_type == YAFFS_OBJECT_TYPE_FILE)
buf->st_mode |= S_IFREG;
- buf->st_nlink = yaffs_GetObjectLinkCount(obj);
+ buf->st_nlink = yaffs_get_obj_link_count(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_size = yaffs_get_obj_length(obj);
+ buf->st_blksize = obj->my_dev->data_bytes_per_chunk;
buf->st_blocks = (buf->st_size + buf->st_blksize -1)/buf->st_blksize;
#if CONFIG_YAFFS_WINCE
buf->yst_wince_atime[0] = obj->win_atime[0];
static int yaffsfs_DoStatOrLStat(const YCHAR *path, struct yaffs_stat *buf,int doLStat)
{
- yaffs_Object *obj;
+ yaffs_obj_t *obj;
int retVal = -1;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0);
+
+ obj = yaffsfs_FindObject(NULL,path,0,1);
if(!doLStat && obj)
obj = yaffsfs_FollowLink(obj,0);
int yaffs_fstat(int fd, struct yaffs_stat *buf)
{
- yaffs_Object *obj;
+ yaffs_obj_t *obj;
int retVal = -1;
static int yaffs_do_setxattr(const YCHAR *path, const char *name, const void *data, int size, int flags, int follow)
{
- yaffs_Object *obj;
+ yaffs_obj_t *obj;
int retVal = -1;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0);
+
+ obj = yaffsfs_FindObject(NULL,path,0,1);
if(follow)
obj = yaffsfs_FollowLink(obj,0);
if(obj) {
- retVal = yaffs_SetXAttribute(obj,name,data,size,flags);
+ retVal = yaffs_set_xattrib(obj,name,data,size,flags);
if(retVal< 0){
yaffsfs_SetError(retVal);
retVal = -1;
int yaffs_fsetxattr(int fd, const char *name, const void *data, int size, int flags)
{
- yaffs_Object *obj;
+ yaffs_obj_t *obj;
int retVal = -1;
obj = yaffsfs_GetHandleObject(fd);
if(obj) {
- retVal = yaffs_SetXAttribute(obj,name,data,size,flags);
+ retVal = yaffs_set_xattrib(obj,name,data,size,flags);
if(retVal< 0){
yaffsfs_SetError(retVal);
retVal = -1;
static int yaffs_do_getxattr(const YCHAR *path, const char *name, void *data, int size, int follow)
{
- yaffs_Object *obj;
+ yaffs_obj_t *obj;
int retVal = -1;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0);
+
+ obj = yaffsfs_FindObject(NULL,path,0,1);
if(follow)
obj = yaffsfs_FollowLink(obj,0);
if(obj) {
- retVal = yaffs_GetXAttribute(obj,name,data,size);
+ retVal = yaffs_get_xattrib(obj,name,data,size);
if(retVal< 0){
yaffsfs_SetError(retVal);
retVal = -1;
int yaffs_fgetxattr(int fd, const char *name, void *data, int size)
{
- yaffs_Object *obj;
+ yaffs_obj_t *obj;
int retVal = -1;
obj = yaffsfs_GetHandleObject(fd);
if(obj) {
- retVal = yaffs_GetXAttribute(obj,name,data,size);
+ retVal = yaffs_get_xattrib(obj,name,data,size);
if(retVal< 0){
yaffsfs_SetError(retVal);
retVal = -1;
static int yaffs_do_listxattr(const YCHAR *path, char *data, int size, int follow)
{
- yaffs_Object *obj;
+ yaffs_obj_t *obj;
int retVal = -1;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0);
+
+ obj = yaffsfs_FindObject(NULL,path,0,1);
if(follow)
obj = yaffsfs_FollowLink(obj,0);
if(obj) {
- retVal = yaffs_ListXAttributes(obj, data,size);
+ retVal = yaffs_list_xattrib(obj, data,size);
if(retVal< 0){
yaffsfs_SetError(retVal);
retVal = -1;
int yaffs_flistxattr(int fd, char *data, int size)
{
- yaffs_Object *obj;
+ yaffs_obj_t *obj;
int retVal = -1;
obj = yaffsfs_GetHandleObject(fd);
if(obj) {
- retVal = yaffs_ListXAttributes(obj,data,size);
+ retVal = yaffs_list_xattrib(obj,data,size);
if(retVal< 0){
yaffsfs_SetError(retVal);
retVal = -1;
static int yaffs_do_removexattr(const YCHAR *path, const char *name, int follow)
{
- yaffs_Object *obj;
+ yaffs_obj_t *obj;
int retVal = -1;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0);
+
+ obj = yaffsfs_FindObject(NULL,path,0,1);
if(follow)
obj = yaffsfs_FollowLink(obj,0);
if(obj) {
- retVal = yaffs_RemoveXAttribute(obj,name);
+ retVal = yaffs_remove_xattrib(obj,name);
if(retVal< 0){
yaffsfs_SetError(retVal);
retVal = -1;
int yaffs_fremovexattr(int fd, const char *name)
{
- yaffs_Object *obj;
+ yaffs_obj_t *obj;
int retVal = -1;
obj = yaffsfs_GetHandleObject(fd);
if(obj){
- retVal = yaffs_RemoveXAttribute(obj,name);
+ retVal = yaffs_remove_xattrib(obj,name);
if(retVal< 0){
yaffsfs_SetError(retVal);
retVal = -1;
#ifdef CONFIG_YAFFS_WINCE
int yaffs_get_wince_times(int fd, unsigned *wctime, unsigned *watime, unsigned *wmtime)
{
- yaffs_Object *obj;
+ yaffs_obj_t *obj;
int retVal = -1;
const unsigned *watime,
const unsigned *wmtime)
{
- yaffs_Object *obj;
+ yaffs_obj_t *obj;
int result;
int retVal = -1;
}
obj->dirty = 1;
- result = yaffs_FlushFile(obj,0,0);
+ result = yaffs_flush_file(obj,0,0);
retVal = 0;
} else
/* bad handle */
#endif
-static int yaffsfs_DoChMod(yaffs_Object *obj,mode_t mode)
+static int yaffsfs_DoChMod(yaffs_obj_t *obj,mode_t mode)
{
int result = -1;
if(obj)
- obj = yaffs_GetEquivalentObject(obj);
+ obj = yaffs_get_equivalent_obj(obj);
if(obj) {
obj->yst_mode = mode;
obj->dirty = 1;
- result = yaffs_FlushFile(obj,0,0);
+ result = yaffs_flush_file(obj,0,0);
}
return result == YAFFS_OK ? 0 : -1;
int yaffs_access(const YCHAR *path, int amode)
{
- yaffs_Object *obj;
+ yaffs_obj_t *obj;
int retval = 0;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0);
+
+ obj = yaffsfs_FindObject(NULL,path,0,1);
if(obj) {
int access_ok = 1;
int yaffs_chmod(const YCHAR *path, mode_t mode)
{
- yaffs_Object *obj;
+ yaffs_obj_t *obj;
int retVal = -1;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0);
+
+ obj = yaffsfs_FindObject(NULL,path,0,1);
if(!obj)
yaffsfs_SetError(-ENOENT);
- else if(obj->myDev->readOnly)
+ else if(obj->my_dev->read_only)
yaffsfs_SetError(-EINVAL);
else
retVal = yaffsfs_DoChMod(obj,mode);
int yaffs_fchmod(int fd, mode_t mode)
{
- yaffs_Object *obj;
+ yaffs_obj_t *obj;
int retVal = -1;
if(!obj)
yaffsfs_SetError(-ENOENT);
- else if(obj->myDev->readOnly)
+ else if(obj->my_dev->read_only)
yaffsfs_SetError(-EINVAL);
else
retVal = yaffsfs_DoChMod(obj,mode);
int yaffs_mkdir(const YCHAR *path, mode_t mode)
{
- yaffs_Object *parent = NULL;
- yaffs_Object *dir = NULL;
+ yaffs_obj_t *parent = NULL;
+ yaffs_obj_t *dir = NULL;
YCHAR *name;
+ YCHAR *use_path = NULL;
+ int path_length = 0;
int retVal= -1;
+ int i;
+
+
+ /*
+ * We don't have a definition for max path length.
+ * We will use 3 * max name length instead.
+ */
+
+ path_length = strnlen(path,(YAFFS_MAX_NAME_LENGTH+1)*3 +1);
+ /* If the last character is a path divider, then we need to
+ * trim it back so that the name look-up works properly.
+ * eg. /foo/new_dir/ -> /foo/newdir
+ * Curveball: Need to handle multiple path dividers:
+ * eg. /foof/sdfse///// -> /foo/sdfse
+ */
+ if(path_length > 0 &&
+ yaffsfs_IsPathDivider(path[path_length-1])){
+ use_path = YMALLOC(path_length + 1);
+ if(!use_path){
+ yaffsfs_SetError(-ENOMEM);
+ return -1;
+ }
+ strcpy(use_path, path);
+ for(i = path_length-1;
+ i >= 0 && yaffsfs_IsPathDivider(use_path[i]);
+ i--)
+ use_path[i] = (YCHAR) 0;
+ path = use_path;
+ }
+
yaffsfs_Lock();
parent = yaffsfs_FindDirectory(NULL,path,&name,0);
- if(parent && parent->myDev->readOnly){
+ if(parent && yaffs_strnlen(name,5) == 0){
+ /* Trying to make the root itself */
+ yaffsfs_SetError(-EEXIST);
+ } else if(parent && parent->my_dev->read_only){
yaffsfs_SetError(-EINVAL);
} else {
if(parent)
- dir = yaffs_MknodDirectory(parent,name,mode,0,0);
+ dir = yaffs_create_dir(parent,name,mode,0,0);
if(dir)
retVal = 0;
else {
if(!parent)
yaffsfs_SetError(-ENOENT); /* missing path */
- else if (yaffs_FindObjectByName(parent,name))
+ else if (yaffs_find_by_name(parent,name))
yaffsfs_SetError(-EEXIST); /* the name already exists */
else
yaffsfs_SetError(-ENOSPC); /* just assume no space */
yaffsfs_Unlock();
+ if(use_path)
+ YFREE(use_path);
+
return retVal;
}
void * yaffs_getdev(const YCHAR *path)
{
- yaffs_Device *dev=NULL;
+ yaffs_dev_t *dev=NULL;
YCHAR *dummy;
dev = yaffsfs_FindDevice(path,&dummy);
return (void *)dev;
}
-int yaffs_mount2(const YCHAR *path,int readOnly)
+int yaffs_mount2(const YCHAR *path,int read_only)
{
int retVal=-1;
int result=YAFFS_FAIL;
- yaffs_Device *dev=NULL;
+ yaffs_dev_t *dev=NULL;
YCHAR *dummy;
T(YAFFS_TRACE_ALWAYS,(TSTR("yaffs: Mounting %s" TENDSTR),path));
yaffsfs_Lock();
+
+ yaffsfs_InitHandles();
+
dev = yaffsfs_FindDevice(path,&dummy);
if(dev){
- if(!dev->isMounted){
- dev->readOnly = readOnly ? 1 : 0;
- result = yaffs_GutsInitialise(dev);
+ if(!dev->is_mounted){
+ dev->read_only = read_only ? 1 : 0;
+ result = yaffs_guts_initialise(dev);
if(result == YAFFS_FAIL)
/* todo error - mount failed */
yaffsfs_SetError(-ENOMEM);
int yaffs_sync(const YCHAR *path)
{
int retVal=-1;
- yaffs_Device *dev=NULL;
+ yaffs_dev_t *dev=NULL;
YCHAR *dummy;
yaffsfs_Lock();
dev = yaffsfs_FindDevice(path,&dummy);
if(dev){
- if(dev->isMounted){
+ if(dev->is_mounted){
- yaffs_FlushEntireDeviceCache(dev);
- yaffs_CheckpointSave(dev);
+ yaffs_flush_whole_cache(dev);
+ yaffs_checkpoint_save(dev);
retVal = 0;
} else
}
-int yaffs_remount(const YCHAR *path, int force, int readOnly)
+int yaffs_remount(const YCHAR *path, int force, int read_only)
{
int retVal=-1;
- yaffs_Device *dev=NULL;
+ yaffs_dev_t *dev=NULL;
YCHAR *dummy;
yaffsfs_Lock();
dev = yaffsfs_FindDevice(path,&dummy);
if(dev){
- if(dev->isMounted){
+ if(dev->is_mounted){
int i;
int inUse;
- yaffs_FlushEntireDeviceCache(dev);
+ yaffs_flush_whole_cache(dev);
for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse && !force; i++){
- if(yaffsfs_handle[i].useCount>0 && yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj->myDev == dev)
+ if(yaffsfs_handle[i].useCount>0 && yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj->my_dev == dev)
inUse = 1; /* the device is in use, can't unmount */
}
if(!inUse || force){
- if(readOnly)
- yaffs_CheckpointSave(dev);
- dev->readOnly = readOnly ? 1 : 0;
+ if(read_only)
+ yaffs_checkpoint_save(dev);
+ dev->read_only = read_only ? 1 : 0;
retVal = 0;
} else
yaffsfs_SetError(-EBUSY);
int yaffs_unmount2(const YCHAR *path, int force)
{
int retVal=-1;
- yaffs_Device *dev=NULL;
+ yaffs_dev_t *dev=NULL;
YCHAR *dummy;
yaffsfs_Lock();
dev = yaffsfs_FindDevice(path,&dummy);
if(dev){
- if(dev->isMounted){
+ if(dev->is_mounted){
int i;
int inUse;
- yaffs_FlushEntireDeviceCache(dev);
- yaffs_CheckpointSave(dev);
+ yaffs_flush_whole_cache(dev);
+ yaffs_checkpoint_save(dev);
for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse; i++){
- if(yaffsfs_handle[i].useCount > 0 && yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj->myDev == dev)
+ if(yaffsfs_handle[i].useCount > 0 && yaffsfs_inode[yaffsfs_handle[i].inodeId].iObj->my_dev == dev)
inUse = 1; /* the device is in use, can't unmount */
}
if(!inUse || force){
- yaffs_Deinitialise(dev);
+ yaffs_deinitialise(dev);
retVal = 0;
} else
loff_t yaffs_freespace(const YCHAR *path)
{
loff_t retVal=-1;
- yaffs_Device *dev=NULL;
+ yaffs_dev_t *dev=NULL;
YCHAR *dummy;
yaffsfs_Lock();
dev = yaffsfs_FindDevice(path,&dummy);
- if(dev && dev->isMounted){
- retVal = yaffs_GetNumberOfFreeChunks(dev);
- retVal *= dev->nDataBytesPerChunk;
+ if(dev && dev->is_mounted){
+ retVal = yaffs_get_n_free_chunks(dev);
+ retVal *= dev->data_bytes_per_chunk;
} else
yaffsfs_SetError(-EINVAL);
loff_t yaffs_totalspace(const YCHAR *path)
{
loff_t retVal=-1;
- yaffs_Device *dev=NULL;
+ yaffs_dev_t *dev=NULL;
YCHAR *dummy;
yaffsfs_Lock();
dev = yaffsfs_FindDevice(path,&dummy);
- if(dev && dev->isMounted){
- retVal = (dev->param.endBlock - dev->param.startBlock + 1) - dev->param.nReservedBlocks;
- retVal *= dev->param.nChunksPerBlock;
- retVal *= dev->nDataBytesPerChunk;
+ if(dev && dev->is_mounted){
+ retVal = (dev->param.end_block - dev->param.start_block + 1) - dev->param.n_reserved_blocks;
+ retVal *= dev->param.chunks_per_block;
+ retVal *= dev->data_bytes_per_chunk;
} else
yaffsfs_SetError(-EINVAL);
int yaffs_inodecount(const YCHAR *path)
{
loff_t retVal= -1;
- yaffs_Device *dev=NULL;
+ yaffs_dev_t *dev=NULL;
YCHAR *dummy;
yaffsfs_Lock();
dev = yaffsfs_FindDevice(path,&dummy);
- if(dev && dev->isMounted) {
- int nObjects = dev->nObjects;
- if(nObjects > dev->nHardLinks)
- retVal = nObjects - dev->nHardLinks;
+ if(dev && dev->is_mounted) {
+ int n_obj = dev->n_obj;
+ if(n_obj > dev->n_hardlinks)
+ retVal = n_obj - dev->n_hardlinks;
}
if(retVal < 0)
}
-void yaffs_AddDevice(yaffs_Device *dev)
+void yaffs_add_device(yaffs_dev_t *dev)
{
- dev->isMounted = 0;
- dev->param.removeObjectCallback = yaffsfs_RemoveObjectCallback;
+ dev->is_mounted = 0;
+ dev->param.remove_obj_fn = yaffsfs_RemoveObjectCallback;
- if(!dev->devList.next)
- YINIT_LIST_HEAD(&dev->devList);
+ if(!dev->dev_list.next)
+ YINIT_LIST_HEAD(&dev->dev_list);
- ylist_add(&dev->devList,&yaffsfs_deviceList);
+ ylist_add(&dev->dev_list,&yaffsfs_deviceList);
}
-void yaffs_RemoveDevice(yaffs_Device *dev)
+void yaffs_remove_device(yaffs_dev_t *dev)
{
- ylist_del_init(&dev->devList);
+ ylist_del_init(&dev->dev_list);
}
__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 */
+ yaffs_obj_t *dirObj; /* ptr to directory being searched */
+ yaffs_obj_t *nextReturn; /* obj to be returned by next readddir */
int offset;
struct ylist_head others;
} yaffsfs_DirectorySearchContext;
{
if(dsc &&
dsc->dirObj &&
- dsc->dirObj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){
+ dsc->dirObj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY){
dsc->offset = 0;
- if( ylist_empty(&dsc->dirObj->variant.directoryVariant.children))
+ if( ylist_empty(&dsc->dirObj->variant.dir_variant.children))
dsc->nextReturn = NULL;
else
- dsc->nextReturn = ylist_entry(dsc->dirObj->variant.directoryVariant.children.next,
- yaffs_Object,siblings);
+ dsc->nextReturn = ylist_entry(dsc->dirObj->variant.dir_variant.children.next,
+ yaffs_obj_t,siblings);
} else {
/* Hey someone isn't playing nice! */
}
{
if(dsc &&
dsc->dirObj &&
- dsc->dirObj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){
+ dsc->dirObj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY){
if( dsc->nextReturn == NULL ||
- ylist_empty(&dsc->dirObj->variant.directoryVariant.children))
+ ylist_empty(&dsc->dirObj->variant.dir_variant.children))
dsc->nextReturn = NULL;
else {
struct ylist_head *next = dsc->nextReturn->siblings.next;
- if( next == &dsc->dirObj->variant.directoryVariant.children)
+ if( next == &dsc->dirObj->variant.dir_variant.children)
dsc->nextReturn = NULL; /* end of list */
else
- dsc->nextReturn = ylist_entry(next,yaffs_Object,siblings);
+ dsc->nextReturn = ylist_entry(next,yaffs_obj_t,siblings);
}
} else {
/* Hey someone isn't playing nice! */
}
}
-static void yaffsfs_RemoveObjectCallback(yaffs_Object *obj)
+static void yaffsfs_RemoveObjectCallback(yaffs_obj_t *obj)
{
struct ylist_head *i;
yaffs_DIR *yaffs_opendir(const YCHAR *dirname)
{
yaffs_DIR *dir = NULL;
- yaffs_Object *obj = NULL;
+ yaffs_obj_t *obj = NULL;
yaffsfs_DirectorySearchContext *dsc = NULL;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,dirname,0);
+ obj = yaffsfs_FindObject(NULL,dirname,0,1);
- if(obj && obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){
+ if(obj && obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY){
dsc = YMALLOC(sizeof(yaffsfs_DirectorySearchContext));
dir = (yaffs_DIR *)dsc;
if(dsc && dsc->magic == YAFFS_MAGIC){
yaffsfs_SetError(0);
if(dsc->nextReturn){
- dsc->de.d_ino = yaffs_GetEquivalentObject(dsc->nextReturn)->objectId;
+ dsc->de.d_ino = yaffs_get_equivalent_obj(dsc->nextReturn)->obj_id;
dsc->de.d_dont_use = (unsigned)dsc->nextReturn;
dsc->de.d_off = dsc->offset++;
- yaffs_GetObjectName(dsc->nextReturn,dsc->de.d_name,NAME_MAX);
+ yaffs_get_obj_name(dsc->nextReturn,dsc->de.d_name,NAME_MAX);
if(yaffs_strnlen(dsc->de.d_name,NAME_MAX+1) == 0)
{
/* this should not happen! */
int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath)
{
- yaffs_Object *parent = NULL;
- yaffs_Object *obj;
+ yaffs_obj_t *parent = NULL;
+ yaffs_obj_t *obj;
YCHAR *name;
int retVal= -1;
int mode = 0; /* ignore for now */
yaffsfs_Lock();
parent = yaffsfs_FindDirectory(NULL,newpath,&name,0);
- if(parent && parent->myDev->readOnly)
+ if(parent && parent->my_dev->read_only)
yaffsfs_SetError(-EINVAL);
else if(parent){
- obj = yaffs_MknodSymLink(parent,name,mode,0,0,oldpath);
+ obj = yaffs_create_symlink(parent,name,mode,0,0,oldpath);
if(obj)
retVal = 0;
else{
int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz)
{
- yaffs_Object *obj = NULL;
+ yaffs_obj_t *obj = NULL;
int retVal;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,path,0);
+ obj = yaffsfs_FindObject(NULL,path,0,1);
if(!obj) {
yaffsfs_SetError(-ENOENT);
retVal = -1;
- } else if(obj->variantType != YAFFS_OBJECT_TYPE_SYMLINK) {
+ } else if(obj->variant_type != YAFFS_OBJECT_TYPE_SYMLINK) {
yaffsfs_SetError(-EINVAL);
retVal = -1;
} else {
- YCHAR *alias = obj->variant.symLinkVariant.alias;
+ YCHAR *alias = obj->variant.symlink_variant.alias;
memset(buf,0,bufsiz);
yaffs_strncpy(buf,alias,bufsiz - 1);
retVal = 0;
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;
+ yaffs_obj_t *obj = NULL;
+ yaffs_obj_t *target = NULL;
int retVal = 0;
- int newNameLength = 0;
+ int new_nameLength = 0;
yaffsfs_Lock();
- obj = yaffsfs_FindObject(NULL,oldpath,0);
- target = yaffsfs_FindObject(NULL,newpath,0);
+ obj = yaffsfs_FindObject(NULL,oldpath,0,1);
+ target = yaffsfs_FindObject(NULL,newpath,0,0);
if(!obj) {
yaffsfs_SetError(-ENOENT);
retVal = -1;
- } else if(obj->myDev->readOnly){
+ } else if(obj->my_dev->read_only){
yaffsfs_SetError(-EINVAL);
retVal= -1;
} else if(target) {
yaffsfs_SetError(-EEXIST);
retVal = -1;
} else {
- yaffs_Object *newdir = NULL;
- yaffs_Object *link = NULL;
+ yaffs_obj_t *newdir = NULL;
+ yaffs_obj_t *link = NULL;
YCHAR *newname;
if(!newdir){
yaffsfs_SetError(-ENOTDIR);
retVal = -1;
- }else if(newdir->myDev != obj->myDev){
+ }else if(newdir->my_dev != obj->my_dev){
yaffsfs_SetError(-EXDEV);
retVal = -1;
}
- newNameLength = yaffs_strnlen(newname,YAFFS_MAX_NAME_LENGTH+1);
+ new_nameLength = yaffs_strnlen(newname,YAFFS_MAX_NAME_LENGTH+1);
- if(newNameLength == 0){
+ if(new_nameLength == 0){
yaffsfs_SetError(-ENOENT);
retVal = -1;
- } else if (newNameLength > YAFFS_MAX_NAME_LENGTH){
+ } else if (new_nameLength > YAFFS_MAX_NAME_LENGTH){
yaffsfs_SetError(-ENAMETOOLONG);
retVal = -1;
}
if(retVal == 0) {
- link = yaffs_Link(newdir,newname,obj);
+ link = yaffs_link_obj(newdir,newname,obj);
if(link)
retVal = 0;
else{
return -1;
}
-int yaffs_DumpDevStruct(const YCHAR *path)
+
+
+/*
+ * yaffs_n_handles()
+ * Returns number of handles attached to the object
+ */
+int yaffs_n_handles(const YCHAR *path)
+{
+ yaffs_obj_t *obj;
+
+ obj = yaffsfs_FindObject(NULL,path,0,1);
+
+ return yaffsfs_CountHandles(obj);
+}
+
+int yaffs_get_error(void)
+{
+ return yaffsfs_GetLastError();
+}
+
+int yaffs_dump_dev(const YCHAR *path)
{
#if 0
YCHAR *rest;
- yaffs_Object *obj = yaffsfs_FindRoot(path,&rest);
+ yaffs_obj_t *obj = yaffsfs_FindRoot(path,&rest);
if(obj){
- yaffs_Device *dev = obj->myDev;
+ yaffs_dev_t *dev = obj->my_dev;
printf("\n"
- "nPageWrites.......... %d\n"
- "nPageReads........... %d\n"
- "nBlockErasures....... %d\n"
- "nGCCopies............ %d\n"
+ "n_page_writes.......... %d\n"
+ "n_page_reads........... %d\n"
+ "n_erasures....... %d\n"
+ "n_gc_copies............ %d\n"
"garbageCollections... %d\n"
"passiveGarbageColl'ns %d\n"
"\n",
- dev->nPageWrites,
- dev->nPageReads,
- dev->nBlockErasures,
- dev->nGCCopies,
+ dev->n_page_writes,
+ dev->n_page_reads,
+ dev->n_erasures,
+ dev->n_gc_copies,
dev->garbageCollections,
dev->passiveGarbageCollections
);
projects / yaffs2.git / blobdiff