zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STYLE: reduce indentation in mkDir, minor logic simplication

Browse Source
This commit is contained in:
Mark Olesen
2019-04-02 16:56:00 +02:00
committed by Andrew Heather
parent c24fbfd7e3
commit af0dc60fa1
1 changed files with 114 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

245
src/OSspecific/POSIX/POSIX.C
View File

@ -414,135 +414,122 @@ bool Foam::mkDir(const fileName& pathName, mode_t mode)
// Directory made OK so return true // Directory made OK so return true
return true; return true;
} }
else
switch (errno)
{ {
switch (errno) case EPERM:
{ {
case EPERM: FatalErrorInFunction
{ << "The filesystem containing " << pathName
FatalErrorInFunction << " does not support the creation of directories."
<< "The filesystem containing " << pathName << exit(FatalError);
<< " does not support the creation of directories." break;
<< exit(FatalError); }
return false; case EEXIST:
{
// Directory already exists so simply return true
return true;
}
case EFAULT:
{
FatalErrorInFunction
<< "" << pathName
<< " points outside your accessible address space."
<< exit(FatalError);
break;
}
case EACCES:
{
FatalErrorInFunction
<< "The parent directory does not allow write "
"permission to the process,"<< nl
<< " or one of the directories in " << pathName
<< " did not allow search (execute) permission."
<< exit(FatalError);
break;
}
case ENAMETOOLONG:
{
FatalErrorInFunction
<< "" << pathName << " is too long."
<< exit(FatalError);
break;
}
case ENOENT:
{
// Part of the path does not exist so try to create it
if (pathName.path().size() && mkDir(pathName.path(), mode))
{
return mkDir(pathName, mode);
} }
case EEXIST: FatalErrorInFunction
{ << "Couldn't create directory " << pathName
// Directory already exists so simply return true << exit(FatalError);
return true; break;
} }
case EFAULT: case ENOTDIR:
{ {
FatalErrorInFunction FatalErrorInFunction
<< "" << pathName << "A component used as a directory in " << pathName
<< " points outside your accessible address space." << " is not, in fact, a directory."
<< exit(FatalError); << exit(FatalError);
break;
}
return false; case ENOMEM:
} {
FatalErrorInFunction
<< "Insufficient kernel memory was available to make directory "
<< pathName << '.'
<< exit(FatalError);
break;
}
case EACCES: case EROFS:
{ {
FatalErrorInFunction FatalErrorInFunction
<< "The parent directory does not allow write " << "" << pathName
"permission to the process,"<< nl << " refers to a file on a read-only filesystem."
<< "or one of the directories in " << pathName << exit(FatalError);
<< " did not allow search (execute) permission." break;
<< exit(FatalError); }
return false; case ELOOP:
} {
FatalErrorInFunction
<< "Too many symbolic links were encountered in resolving "
<< pathName << '.'
<< exit(FatalError);
break;
}
case ENAMETOOLONG: case ENOSPC:
{ {
FatalErrorInFunction FatalErrorInFunction
<< "" << pathName << " is too long." << "The device containing " << pathName
<< exit(FatalError); << " has no room for the new directory or "
<< "the user's disk quota is exhausted."
<< exit(FatalError);
break;
}
return false; default:
} {
FatalErrorInFunction
case ENOENT: << "Couldn't create directory " << pathName
{ << exit(FatalError);
// Part of the path does not exist so try to create it break;
if (pathName.path().size() && mkDir(pathName.path(), mode))
{
return mkDir(pathName, mode);
}
else
{
FatalErrorInFunction
<< "Couldn't create directory " << pathName
<< exit(FatalError);
return false;
}
}
case ENOTDIR:
{
FatalErrorInFunction
<< "A component used as a directory in " << pathName
<< " is not, in fact, a directory."
<< exit(FatalError);
return false;
}
case ENOMEM:
{
FatalErrorInFunction
<< "Insufficient kernel memory was available to make "
"directory " << pathName << '.'
<< exit(FatalError);
return false;
}
case EROFS:
{
FatalErrorInFunction
<< "" << pathName
<< " refers to a file on a read-only filesystem."
<< exit(FatalError);
return false;
}
case ELOOP:
{
FatalErrorInFunction
<< "Too many symbolic links were encountered in resolving "
<< pathName << '.'
<< exit(FatalError);
return false;
}
case ENOSPC:
{
FatalErrorInFunction
<< "The device containing " << pathName
<< " has no room for the new directory or "
<< "the user's disk quota is exhausted."
<< exit(FatalError);
return false;
}
default:
{
FatalErrorInFunction
<< "Couldn't create directory " << pathName
<< exit(FatalError);
return false;
}
} }
} }
return false;
} }
@ -1100,12 +1087,10 @@ bool Foam::mv(const fileName& src, const fileName& dst, const bool followLink)
{ {
const fileName dstName(dst/src.name()); const fileName dstName(dst/src.name());
return ::rename(src.c_str(), dstName.c_str()) == 0; return (0 == ::rename(src.c_str(), dstName.c_str()));
}
else
{
return ::rename(src.c_str(), dst.c_str()) == 0;
} }
return (0 == ::rename(src.c_str(), dst.c_str()));
} }
@ -1146,7 +1131,7 @@ bool Foam::mvBak(const fileName& src, const std::string& ext)
// possible index where we have no choice // possible index where we have no choice
if (!exists(dstName, false) || n == maxIndex) if (!exists(dstName, false) || n == maxIndex)
{ {
return ::rename(src.c_str(), dstName.c_str()) == 0; return (0 == ::rename(src.c_str(), dstName.c_str()));
} }
} }
} }
@ -1174,15 +1159,13 @@ bool Foam::rm(const fileName& file)
return false; return false;
} }
// Try returning plain file name; if not there, try with .gz // If removal of plain file name fails, try with .gz
if (::remove(file.c_str()) == 0)
{ return
return true; (
} 0 == ::remove(file.c_str())
else || 0 == ::remove((file + ".gz").c_str())
{ );
return ::remove(string(file + ".gz").c_str()) == 0;
}
} }