emilytrau/lix
1
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* createDirs(path): if path already exists, make sure it's a

Browse source 
directory.
* Provide a C++ wrapper around lstat().
This commit is contained in:
Eelco Dolstra 2010-12-13 13:32:58 +00:00
parent d7ca6f44eb
commit 100becf8d1
2 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/libutil/util.cc
View file

@ -7,11 +7,8 @@
#include <sstream> #include <sstream>
#include <cstring> #include <cstring>
#include <sys/stat.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/types.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h>
#include <limits.h> #include <limits.h>
#include "util.hh" #include "util.hh"
@ -149,6 +146,15 @@ string baseNameOf(const Path & path)
} }
struct stat lstat(const Path & path)
{
struct stat st;
if (lstat(path.c_str(), &st))
throw SysError(format("getting status of `%1%'") % path);
return st;
}
bool pathExists(const Path & path) bool pathExists(const Path & path)
{ {
int res; int res;
@ -164,9 +170,7 @@ bool pathExists(const Path & path)
Path readLink(const Path & path) Path readLink(const Path & path)
{ {
checkInterrupt(); checkInterrupt();
struct stat st; struct stat st = lstat(path);
if (lstat(path.c_str(), &st))
throw SysError(format("getting status of `%1%'") % path);
if (!S_ISLNK(st.st_mode)) if (!S_ISLNK(st.st_mode))
throw Error(format("`%1%' is not a symlink") % path); throw Error(format("`%1%' is not a symlink") % path);
char buf[st.st_size]; char buf[st.st_size];
@ -178,9 +182,7 @@ Path readLink(const Path & path)
bool isLink(const Path & path) bool isLink(const Path & path)
{ {
struct stat st; struct stat st = lstat(path);
if (lstat(path.c_str(), &st))
throw SysError(format("getting status of `%1%'") % path);
return S_ISLNK(st.st_mode); return S_ISLNK(st.st_mode);
} }
@ -269,9 +271,7 @@ static void _computePathSize(const Path & path,
{ {
checkInterrupt(); checkInterrupt();
struct stat st; struct stat st = lstat(path);
if (lstat(path.c_str(), &st))
throw SysError(format("getting attributes of path `%1%'") % path);
bytes += st.st_size; bytes += st.st_size;
blocks += st.st_blocks; blocks += st.st_blocks;
@ -301,9 +301,7 @@ static void _deletePath(const Path & path, unsigned long long & bytesFreed,
printMsg(lvlVomit, format("%1%") % path); printMsg(lvlVomit, format("%1%") % path);
struct stat st; struct stat st = lstat(path);
if (lstat(path.c_str(), &st))
throw SysError(format("getting attributes of path `%1%'") % path);
if (!S_ISDIR(st.st_mode) && st.st_nlink == 1) { if (!S_ISDIR(st.st_mode) && st.st_nlink == 1) {
bytesFreed += st.st_size; bytesFreed += st.st_size;
@ -350,9 +348,7 @@ void makePathReadOnly(const Path & path)
{ {
checkInterrupt(); checkInterrupt();
struct stat st; struct stat st = lstat(path);
if (lstat(path.c_str(), &st))
throw SysError(format("getting attributes of path `%1%'") % path);
if (!S_ISLNK(st.st_mode) && (st.st_mode & S_IWUSR)) { if (!S_ISLNK(st.st_mode) && (st.st_mode & S_IWUSR)) {
if (chmod(path.c_str(), st.st_mode & ~S_IWUSR) == -1) if (chmod(path.c_str(), st.st_mode & ~S_IWUSR) == -1)
@ -411,12 +407,18 @@ Paths createDirs(const Path & path)
{ {
Paths created; Paths created;
if (path == "/") return created; if (path == "/") return created;
if (!pathExists(path)) {
struct stat st;
if (lstat(path.c_str(), &st) == -1) {
created = createDirs(dirOf(path)); created = createDirs(dirOf(path));
if (mkdir(path.c_str(), 0777) == -1) if (mkdir(path.c_str(), 0777) == -1 && errno != EEXIST)
throw SysError(format("creating directory `%1%'") % path); throw SysError(format("creating directory `%1%'") % path);
st = lstat(path);
created.push_back(path); created.push_back(path);
} }
if (!S_ISDIR(st.st_mode)) throw Error(format("`%1%' is not a directory") % path);
return created; return created;
} }

4
src/libutil/util.hh
View file

@ -4,6 +4,7 @@
#include "types.hh" #include "types.hh"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h>
#include <dirent.h> #include <dirent.h>
#include <unistd.h> #include <unistd.h>
#include <signal.h> #include <signal.h>
@ -42,6 +43,9 @@ Path dirOf(const Path & path);
following the final `/'. */ following the final `/'. */
string baseNameOf(const Path & path); string baseNameOf(const Path & path);
/* Get status of `path'. */
struct stat lstat(const Path & path);
/* Return true iff the given path exists. */ /* Return true iff the given path exists. */
bool pathExists(const Path & path); bool pathExists(const Path & path);