Restructed the yaffs_open() function to handle errors caused by not using O_CREATE.
Also added a new yaffs_set_error() function to yaffsfs.c and yaffsfs.h.
An annoying printf in yaffs_fileem2k.c was commented out.
Signed-off-by: Timothy Manning <tfhmanning@gmail.com>
- printf("erase block %d\n",blockNumber);
+ //printf("erase block %d\n",blockNumber);
if(blockNumber == 320)
fail320 = 1;
if(blockNumber == 320)
fail320 = 1;
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 */
/* 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;
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. */
yaffsfs_Handle *hx;
int i;
sharedReadAllowed = 1;
yaffsfs_Handle *hx;
int i;
sharedReadAllowed = 1;
- } 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;
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);
+ 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);
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 */
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
int yaffs_start_up(void);
int yaffsfs_GetLastError(void);
int yaffs_start_up(void);
int yaffsfs_GetLastError(void);
+int yaffs_set_error(int error);
/* Function to get the last error */
int yaffs_get_error(void);
/* Function to get the last error */
int yaffs_get_error(void);