maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Get rid of unicode quotes (#1140)"

Browse source 
This reverts commit f78126bfd6. There
really is no need for such a massive change...
This commit is contained in:
Eelco Dolstra 2016-11-26 00:37:43 +01:00
parent f78126bfd6
commit 215b70f51e
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
96 changed files with 670 additions and 670 deletions
Download patch file Download diff file Expand all files Collapse all files

56
src/libutil/util.cc
View file

@ -97,7 +97,7 @@ Path canonPath(const Path & path, bool resolveSymlinks)
string s;
if (path[0] != '/')
throw Error(format("not an absolute path: '%1%'") % path);
throw Error(format("not an absolute path: ‘%1%’") % path);
string::const_iterator i = path.begin(), end = path.end();
string temp;
@ -133,7 +133,7 @@ Path canonPath(const Path & path, bool resolveSymlinks)
the symlink target might contain new symlinks). */
if (resolveSymlinks && isLink(s)) {
if (++followCount >= maxFollow)
throw Error(format("infinite symlink recursion in path '%1%'") % path);
throw Error(format("infinite symlink recursion in path ‘%1%’") % path);
temp = absPath(readLink(s), dirOf(s))
+ string(i, end);
i = temp.begin(); /* restart */
@ -151,7 +151,7 @@ Path dirOf(const Path & path)
{
Path::size_type pos = path.rfind('/');
if (pos == string::npos)
throw Error(format("invalid file name '%1%'") % path);
throw Error(format("invalid file name ‘%1%’") % path);
return pos == 0 ? "/" : Path(path, 0, pos);
}
@ -188,7 +188,7 @@ struct stat lstat(const Path & path)
{
struct stat st;
if (lstat(path.c_str(), &st))
throw SysError(format("getting status of '%1%'") % path);
throw SysError(format("getting status of ‘%1%’") % path);
return st;
}
@ -210,13 +210,13 @@ Path readLink(const Path & path)
checkInterrupt();
struct stat st = lstat(path);
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];
ssize_t rlsize = readlink(path.c_str(), buf, st.st_size);
if (rlsize == -1)
throw SysError(format("reading symbolic link '%1%'") % path);
throw SysError(format("reading symbolic link ‘%1%’") % path);
else if (rlsize > st.st_size)
throw Error(format("symbolic link '%1%' size overflow %2% > %3%")
throw Error(format("symbolic link ‘%1%’ size overflow %2% > %3%")
% path % rlsize % st.st_size);
return string(buf, rlsize);
}
@ -235,7 +235,7 @@ DirEntries readDirectory(const Path & path)
entries.reserve(64);
AutoCloseDir dir = opendir(path.c_str());
if (!dir) throw SysError(format("opening directory '%1%'") % path);
if (!dir) throw SysError(format("opening directory ‘%1%’") % path);
struct dirent * dirent;
while (errno = 0, dirent = readdir(dir)) { /* sic */
@ -250,7 +250,7 @@ DirEntries readDirectory(const Path & path)
#endif
);
}
if (errno) throw SysError(format("reading directory '%1%'") % path);
if (errno) throw SysError(format("reading directory ‘%1%’") % path);
return entries;
}
@ -284,7 +284,7 @@ string readFile(const Path & path, bool drain)
{
AutoCloseFD fd = open(path.c_str(), O_RDONLY | O_CLOEXEC);
if (!fd)
throw SysError(format("opening file '%1%'") % path);
throw SysError(format("opening file ‘%1%’") % path);
return drain ? drainFD(fd.get()) : readFile(fd.get());
}
@ -293,7 +293,7 @@ void writeFile(const Path & path, const string & s)
{
AutoCloseFD fd = open(path.c_str(), O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC, 0666);
if (!fd)
throw SysError(format("opening file '%1%'") % path);
throw SysError(format("opening file ‘%1%’") % path);
writeFull(fd.get(), s);
}
@ -332,7 +332,7 @@ static void _deletePath(const Path & path, unsigned long long & bytesFreed)
struct stat st;
if (lstat(path.c_str(), &st) == -1) {
if (errno == ENOENT) return;
throw SysError(format("getting status of '%1%'") % path);
throw SysError(format("getting status of ‘%1%’") % path);
}
if (!S_ISDIR(st.st_mode) && st.st_nlink == 1)
@ -343,7 +343,7 @@ static void _deletePath(const Path & path, unsigned long long & bytesFreed)
const auto PERM_MASK = S_IRUSR | S_IWUSR | S_IXUSR;
if ((st.st_mode & PERM_MASK) != PERM_MASK) {
if (chmod(path.c_str(), st.st_mode | PERM_MASK) == -1)
throw SysError(format("chmod '%1%'") % path);
throw SysError(format("chmod ‘%1%’") % path);
}
for (auto & i : readDirectory(path))
@ -352,7 +352,7 @@ static void _deletePath(const Path & path, unsigned long long & bytesFreed)
if (remove(path.c_str()) == -1) {
if (errno == ENOENT) return;
throw SysError(format("cannot unlink '%1%'") % path);
throw SysError(format("cannot unlink ‘%1%’") % path);
}
}
@ -366,7 +366,7 @@ void deletePath(const Path & path)
void deletePath(const Path & path, unsigned long long & bytesFreed)
{
Activity act(*logger, lvlDebug, format("recursively deleting path '%1%'") % path);
Activity act(*logger, lvlDebug, format("recursively deleting path ‘%1%’") % path);
bytesFreed = 0;
_deletePath(path, bytesFreed);
}
@ -404,12 +404,12 @@ Path createTempDir(const Path & tmpRoot, const Path & prefix,
"wheel", then "tar" will fail to unpack archives that
have the setgid bit set on directories. */
if (chown(tmpDir.c_str(), (uid_t) -1, getegid()) != 0)
throw SysError(format("setting group of directory '%1%'") % tmpDir);
throw SysError(format("setting group of directory ‘%1%’") % tmpDir);
#endif
return tmpDir;
}
if (errno != EEXIST)
throw SysError(format("creating directory '%1%'") % tmpDir);
throw SysError(format("creating directory ‘%1%’") % tmpDir);
}
}
@ -435,15 +435,15 @@ Paths createDirs(const Path & path)
if (lstat(path.c_str(), &st) == -1) {
created = createDirs(dirOf(path));
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);
}
if (S_ISLNK(st.st_mode) && stat(path.c_str(), &st) == -1)
throw SysError(format("statting symlink '%1%'") % path);
throw SysError(format("statting symlink ‘%1%’") % path);
if (!S_ISDIR(st.st_mode)) throw Error(format("'%1%' is not a directory") % path);
if (!S_ISDIR(st.st_mode)) throw Error(format("‘%1%’ is not a directory") % path);
return created;
}
@ -452,7 +452,7 @@ Paths createDirs(const Path & path)
void createSymlink(const Path & target, const Path & link)
{
if (symlink(target.c_str(), link.c_str()))
throw SysError(format("creating symlink from '%1%' to '%2%'") % link % target);
throw SysError(format("creating symlink from ‘%1%’ to ‘%2%’") % link % target);
}
@ -463,7 +463,7 @@ void replaceSymlink(const Path & target, const Path & link)
createSymlink(target, tmp);
if (rename(tmp.c_str(), link.c_str()) != 0)
throw SysError(format("renaming '%1%' to '%2%'") % tmp % link);
throw SysError(format("renaming ‘%1%’ to ‘%2%’") % tmp % link);
}
@ -542,7 +542,7 @@ AutoDelete::~AutoDelete()
deletePath(path);
else {
if (remove(path.c_str()) == -1)
throw SysError(format("cannot unlink '%1%'") % path);
throw SysError(format("cannot unlink ‘%1%’") % path);
}
}
} catch (...) {
@ -788,7 +788,7 @@ pid_t Pid::release()
void killUser(uid_t uid)
{
debug(format("killing all processes running under uid '%1%'") % uid);
debug(format("killing all processes running under uid ‘%1%’") % uid);
assert(uid != 0); /* just to be safe... */
@ -817,7 +817,7 @@ void killUser(uid_t uid)
#endif
if (errno == ESRCH) break; /* no more processes */
if (errno != EINTR)
throw SysError(format("cannot kill processes for uid '%1%'") % uid);
throw SysError(format("cannot kill processes for uid ‘%1%’") % uid);
}
_exit(0);
@ -825,7 +825,7 @@ void killUser(uid_t uid)
int status = pid.wait(true);
if (status != 0)
throw Error(format("cannot kill processes for uid '%1%': %2%") % uid % statusToString(status));
throw Error(format("cannot kill processes for uid ‘%1%’: %2%") % uid % statusToString(status));
/* !!! We should really do some check to make sure that there are
no processes left running under `uid', but there is no portable
@ -919,7 +919,7 @@ string runProgram(Path program, bool searchPath, const Strings & args,
else
execv(program.c_str(), stringsToCharPtrs(args_).data());
throw SysError(format("executing '%1%'") % program);
throw SysError(format("executing ‘%1%’") % program);
});
out.writeSide = -1;
@ -936,7 +936,7 @@ string runProgram(Path program, bool searchPath, const Strings & args,
/* Wait for the child to finish. */
int status = pid.wait(true);
if (!statusOk(status))
throw ExecError(status, format("program '%1%' %2%")
throw ExecError(status, format("program ‘%1%’ %2%")
% program % statusToString(status));
return result;