projects
/
platform
/
upstream
/
nsjail.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a2d5b07
)
make indent
author
Robert Swiecki
<robert@swiecki.net>
Thu, 9 Jul 2020 15:29:02 +0000
(17:29 +0200)
committer
Robert Swiecki
<robert@swiecki.net>
Thu, 9 Jul 2020 15:29:02 +0000
(17:29 +0200)
mnt.cc
patch
|
blob
|
history
user.cc
patch
|
blob
|
history
diff --git
a/mnt.cc
b/mnt.cc
index ba8a15443f62a8230b44e189a135378a8ebe1af1..70440b97a47b93d905153a33c4637d21b38cb782 100644
(file)
--- a/
mnt.cc
+++ b/
mnt.cc
@@
-178,8
+178,8
@@
static bool mountPt(mount_t* mpt, const char* newroot, const char* tmpdir) {
return false;
}
if (!util::writeToFd(fd, mpt->src_content.data(), mpt->src_content.length())) {
- LOG_W(
"Writing %zu bytes to '%s' failed", mpt->src_content.length(),
- srcpath);
+ LOG_W(
+
"Writing %zu bytes to '%s' failed", mpt->src_content.length(),
srcpath);
close(fd);
return false;
}
diff --git
a/user.cc
b/user.cc
index dc2d151f500a5fca35238645f56bc24e785e8f68..a335e2d20017c9d8ac3bc25ea3161bb946c0279d 100644
(file)
--- a/
user.cc
+++ b/
user.cc
@@
-48,15
+48,15
@@
constexpr char kNewUidPath[] =
#ifdef NEWUIDMAP_PATH
- STR(NEWUIDMAP_PATH);
+
STR(NEWUIDMAP_PATH);
#else
- "/usr/bin/newuidmap";
+
"/usr/bin/newuidmap";
#endif
constexpr char kNewGidPath[] =
#ifdef NEWGIDMAP_PATH
- STR(NEWGIDMAP_PATH);
+
STR(NEWGIDMAP_PATH);
#else
- "/usr/bin/newgidmap";
+
"/usr/bin/newgidmap";
#endif
namespace user {