obitools/obitools3
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 66 Wiki Activity

Minor changes to make the creation of files and directories cleaner

Browse Source
This commit is contained in:
Celine Mercier
2015-11-09 15:22:01 +01:00
parent b37bd8f21c
commit 65c1b1e8b2
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/obidms.c
View File

@ -128,7 +128,10 @@ OBIDMS_p obi_create_dms(const char* dms_name)
if (mkdir(directory_name, 00777) < 0) if (mkdir(directory_name, 00777) < 0)
{ {
if (errno == EEXIST) if (errno == EEXIST)
{
obi_set_errno(OBIDMS_EXIST_ERROR); obi_set_errno(OBIDMS_EXIST_ERROR);
obidebug(1, "\nAn OBIDMS directory with the same name already exists in this directory.");
}
else else
obi_set_errno(OBIDMS_UNKNOWN_ERROR); obi_set_errno(OBIDMS_UNKNOWN_ERROR);
obidebug(1, "\nProblem creating an OBIDMS directory"); obidebug(1, "\nProblem creating an OBIDMS directory");

4
src/obidmscolumn.c
View File

@ -338,7 +338,7 @@ static obiversion_t create_version_file(OBIDMS_column_directory_p column_directo
return -1; return -1;
// Get the file descriptor associated to the version file // Get the file descriptor associated to the version file
version_file_descriptor = openat(column_directory->dir_fd, version_file_name, O_RDWR | O_CREAT, 0777); version_file_descriptor = openat(column_directory->dir_fd, version_file_name, O_RDWR | O_CREAT | O_EXCL, 0777);
if (version_file_descriptor < 0) if (version_file_descriptor < 0)
{ {
obi_set_errno(OBICOL_UNKNOWN_ERROR); obi_set_errno(OBICOL_UNKNOWN_ERROR);
@ -660,7 +660,7 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
} }
// Open the column file // Open the column file
column_file_descriptor = openat(column_directory->dir_fd, column_file_name, O_RDWR | O_CREAT, 0777); column_file_descriptor = openat(column_directory->dir_fd, column_file_name, O_RDWR | O_CREAT | O_EXCL, 0777);
if (column_file_descriptor < 0) if (column_file_descriptor < 0)
{ {
obi_set_errno(OBICOL_UNKNOWN_ERROR); obi_set_errno(OBICOL_UNKNOWN_ERROR);