projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs direct: Change tracing flag for mount message
[yaffs2.git]
/
direct
/
yaffsfs.c
diff --git
a/direct/yaffsfs.c
b/direct/yaffsfs.c
index b1871423e96de733ee74123f4f7f060389203bb4..38b3fb6fa4640ec1391f9c7f09b118d7cd87aeaf 100644
(file)
--- a/
direct/yaffsfs.c
+++ b/
direct/yaffsfs.c
@@
-641,6
+641,7
@@
int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
obj->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
obj = NULL;
obj->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
obj = NULL;
+
if(obj){
/* The file already exists or it might be a directory */
if(obj){
/* The file already exists or it might be a directory */
@@
-655,7
+656,7
@@
int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
/* Open should fail if O_CREAT and O_EXCL are specified since
* the file exists
*/
/* Open should fail if O_CREAT and O_EXCL are specified since
* the file exists
*/
- if((oflag & O_EXCL) && (oflag & O_CREAT)){
+ if(
!errorReported &&
(oflag & O_EXCL) && (oflag & O_CREAT)){
openDenied = 1;
yaffsfs_SetError(-EEXIST);
errorReported = 1;
openDenied = 1;
yaffsfs_SetError(-EEXIST);
errorReported = 1;
@@
-668,8
+669,14
@@
int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
if( writeRequested && !(obj->yst_mode & S_IWRITE))
openDenied = 1;
if( writeRequested && !(obj->yst_mode & S_IWRITE))
openDenied = 1;
+ if(openDenied && !errorReported ) {
+ /* Error if the file exists but permissions are refused. */
+ yaffsfs_SetError(-EACCES);
+ errorReported = 1;
+ }
+
/* Check sharing of an existing object. */
/* Check sharing of an existing object. */
- {
+
if(!openDenied)
{
yaffsfs_Handle *hx;
int i;
sharedReadAllowed = 1;
yaffsfs_Handle *hx;
int i;
sharedReadAllowed = 1;
@@
-704,20
+711,39
@@
int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
}
}
}
}
- } else if((oflag & O_CREAT)) {
- /* Let's see if we can create this file */
+ }
+
+ /* If we could not open an existing object, then let's see if
+ * the directory exists. If not, error.
+ */
+ if(!obj && !errorReported){
dir = yaffsfs_FindDirectory(NULL,path,&name,0);
dir = yaffsfs_FindDirectory(NULL,path,&name,0);
- if(dir && dir->my_dev->read_only){
+ if(!dir){
+ yaffsfs_SetError(-ENOTDIR);
+ errorReported = 1;
+ }
+ }
+
+ if(!obj && dir && !errorReported && (oflag & O_CREAT)) {
+ /* Let's see if we can create this file if it does not exist. */
+ if(dir->my_dev->read_only){
yaffsfs_SetError(-EINVAL);
errorReported = 1;
yaffsfs_SetError(-EINVAL);
errorReported = 1;
- } else
if(dir)
+ } else
obj = yaffs_create_file(dir,name,mode,0,0);
obj = yaffs_create_file(dir,name,mode,0,0);
- else {
- yaffsfs_SetError(-ENOTDIR);
+
+ if(!obj && !errorReported){
+ yaffsfs_SetError(-ENOSPC);
errorReported = 1;
}
}
errorReported = 1;
}
}
+ if(!obj && dir && !errorReported && !(oflag & O_CREAT)) {
+ /* Error if the file does not exist and CREAT is not set. */
+ yaffsfs_SetError(-ENOENT);
+ errorReported = 1;
+ }
+
if(obj && !openDenied) {
int inodeId = yaffsfs_GetInodeIdForObject(obj);
if(obj && !openDenied) {
int inodeId = yaffsfs_GetInodeIdForObject(obj);
@@
-743,10
+769,8
@@
int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
yaffs_resize_file(obj,0);
} else {
yaffsfs_PutHandle(handle);
yaffs_resize_file(obj,0);
} else {
yaffsfs_PutHandle(handle);
- if(!errorReported) {
- yaffsfs_SetError(!obj ? -ENOSPC : -EACCES);
- errorReported = 1;
- }
+ if(!errorReported)
+ yaffsfs_SetError(0); /* Problem */
handle = -1;
}
}
handle = -1;
}
}
@@
-1820,7
+1844,7
@@
int yaffs_mount2(const YCHAR *path,int read_only)
struct yaffs_dev *dev=NULL;
YCHAR *dummy;
struct yaffs_dev *dev=NULL;
YCHAR *dummy;
- T(YAFFS_TRACE_
ALWAYS
,(TSTR("yaffs: Mounting %s" TENDSTR),path));
+ T(YAFFS_TRACE_
MOUNT
,(TSTR("yaffs: Mounting %s" TENDSTR),path));
yaffsfs_Lock();
yaffsfs_Lock();
@@
-2383,6
+2407,13
@@
int yaffs_get_error(void)
return yaffsfs_GetLastError();
}
return yaffsfs_GetLastError();
}
+int yaffs_set_error(int error)
+{
+ /*yaffsfs_SetError does not return. So the program is assumed to have worked. */
+ yaffsfs_SetError(error);
+ return 0;
+}
+
int yaffs_dump_dev(const YCHAR *path)
{
#if 0
int yaffs_dump_dev(const YCHAR *path)
{
#if 0