diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-07-27 21:47:26 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-07-27 21:47:26 +0200 |
| commit | 2da4caba7871455c097c0ed940dd6f2332dbda5d (patch) | |
| tree | f87883d0fcfe4c19ae5f7490306d49cc4f5d02b3 /src/lib/cross_linux.cc | |
| parent | 94aadbd62c259a73d7511522dd167d519c68c5f9 (diff) | |
| parent | 5d440e1133fc68dfffeaf53cf934b996dae811c7 (diff) | |
Merge branch 'warnings' into v2.15.x.
Clean up our handling of compiler warnings in a variety of ways,
and use #pragma rather than -Wno to only disable warnings where
necessary.
Diffstat (limited to 'src/lib/cross_linux.cc')
| -rw-r--r-- | src/lib/cross_linux.cc | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc index 25fd3490e..e17f188b9 100644 --- a/src/lib/cross_linux.cc +++ b/src/lib/cross_linux.cc @@ -113,7 +113,10 @@ run_ffprobe (boost::filesystem::path content, boost::filesystem::path out) { string ffprobe = "ffprobe \"" + content.string() + "\" 2> \"" + out.string() + "\""; LOG_GENERAL (N_("Probing with %1"), ffprobe); - system (ffprobe.c_str ()); + int const r = system (ffprobe.c_str()); + if (r == -1 || (WIFEXITED(r) && WEXITSTATUS(r) != 0)) { + LOG_GENERAL (N_("Could not run ffprobe (system returned %1"), r); + } } list<pair<string, string> > @@ -376,9 +379,10 @@ unprivileged () uid_t ruid, euid, suid; if (getresuid(&ruid, &euid, &suid) == -1) { cerr << "getresuid() failed.\n"; - exit (EXIT_FAILURE); } - seteuid (ruid); + if (seteuid(ruid) == -1) { + cerr << "seteuid() failed.\n"; + } } PrivilegeEscalator::~PrivilegeEscalator () @@ -388,7 +392,10 @@ PrivilegeEscalator::~PrivilegeEscalator () PrivilegeEscalator::PrivilegeEscalator () { - seteuid (0); + int const r = seteuid(0); + if (r < 0) { + throw PrivilegeError (String::compose("seteuid() call failed with %1", errno)); + } } boost::filesystem::path |