Add an exclusive create flag to IO::File

[libs/core.git] / source / io / file.cpp

diff --git a/source/io/file.cpp b/source/io/file.cpp
index 1b207a25971f960ef99fa5f4481a0be23239e38d..208371df8bff5b33bedb5ddbd72847dfc6fcf7d2 100644 (file)
--- a/source/io/file.cpp
+++ b/source/io/file.cpp
@@ -17,7 +17,9 @@ File::File(const string &fn, Mode m, CreateMode cm)
 {
        if(!(m&M_RDWR))
                throw invalid_argument("File::File mode");
-       if(cm&~(C_CREATE|C_TRUNCATE))
+       if(cm&~(C_CREATE|C_TRUNCATE|C_EXCLUSIVE))
+               throw invalid_argument("File::File create");
+       if((cm&C_EXCLUSIVE) && (!(cm&C_CREATE) || (cm&C_TRUNCATE)))
                throw invalid_argument("File::File create");
 
        mode = m;
@@ -38,6 +40,7 @@ File::File(const string &fn, Mode m, CreateMode cm)
                case C_CREATE:   create_flags = OPEN_ALWAYS; break;
                case C_TRUNCATE: create_flags = TRUNCATE_EXISTING; break;
                case C_CREATE+C_TRUNCATE: create_flags = CREATE_ALWAYS; break;
+               case C_CREATE+C_EXCLUSIVE: create_flags = CREATE_NEW; break;
                }
        }
 
@@ -47,6 +50,8 @@ File::File(const string &fn, Mode m, CreateMode cm)
                int err = GetLastError();
                if(err==ERROR_FILE_NOT_FOUND)
                        throw file_not_found(fn);
+               else if(err==ERROR_FILE_EXISTS)
+                       throw file_already_exists(fn);
                else
                        throw system_error(format("CreateFile(%s)", fn), err);
        }
@@ -66,6 +71,8 @@ File::File(const string &fn, Mode m, CreateMode cm)
                        flags |= O_CREAT;
                if(cm&C_TRUNCATE)
                        flags |= O_TRUNC;
+               if(cm&C_EXCLUSIVE)
+                       flags |= O_EXCL;
        }
        if(mode&M_APPEND)
                flags |= O_APPEND;
@@ -78,6 +85,8 @@ File::File(const string &fn, Mode m, CreateMode cm)
                int err = errno;
                if(err==ENOENT)
                        throw file_not_found(fn);
+               else if(err==EEXIST)
+                       throw file_already_exists(fn);
                else
                        throw system_error(format("open(%s)", fn), err);
        }
@@ -86,26 +95,12 @@ File::File(const string &fn, Mode m, CreateMode cm)
 
 File::~File()
 {
-       close();
-}
-
-void File::close()
-{
-       if(!handle)
-               return;
-
        signal_flush_required.emit();
-
        sys_close(handle);
-
-       handle = Handle();
-       signal_closed.emit();
 }
 
 void File::set_block(bool b)
 {
-       check_access(M_NONE);
-
        mode = (mode&~M_NONBLOCK);
        if(b)
                mode = (mode|M_NONBLOCK);
@@ -139,10 +134,7 @@ unsigned File::do_read(char *buf, unsigned size)
 
        unsigned ret = sys_read(handle, buf, size);
        if(ret==0)
-       {
-               eof_flag = true;
-               signal_end_of_file.emit();
-       }
+               set_eof();
 
        return ret;
 }
@@ -156,49 +148,24 @@ void File::sync()
 #endif
 }
 
-unsigned File::seek(int off, SeekType st)
+SeekOffset File::seek(SeekOffset off, SeekType type)
 {
-       check_access(M_NONE);
-
        signal_flush_required.emit();
-
-       int type = sys_seek_type(st);
-#ifdef WIN32
-       DWORD ret = SetFilePointer(*handle, off, 0, type);
-       if(ret==INVALID_SET_FILE_POINTER)
-               throw system_error("SetFilePointer");
-#else
-       off_t ret = lseek(*handle, off, type);
-       if(ret==(off_t)-1)
-               throw system_error("lseek");
-#endif
-
+       off = sys_seek(handle, off, type);
        eof_flag = false;
 
-       return ret;
+       return off;
 }
 
-unsigned File::tell() const
+SeekOffset File::tell() const
 {
-       check_access(M_NONE);
-
-#ifdef WIN32
-       DWORD ret = SetFilePointer(*handle, 0, 0, FILE_CURRENT);
-       if(ret==INVALID_SET_FILE_POINTER)
-               throw system_error("SetFilePointer");
-#else
-       off_t ret = lseek(*handle, 0, SEEK_CUR);
-       if(ret==(off_t)-1)
-               throw system_error("lseek");
-#endif
-
-       return ret;
+       return sys_seek(const_cast<Handle &>(handle), 0, S_CUR);
 }
 
-void File::check_access(Mode m) const
+const Handle &File::get_handle(Mode m)
 {
-       if(!handle || (m && !(mode&m)))
-               throw invalid_access(m);
+       check_access(m);
+       return handle;
 }
 
 } // namespace IO