From: "Yordan Karadzhov (VMware)" <y.karadz@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org,
"Yordan Karadzhov (VMware)" <y.karadz@gmail.com>,
Slavomir Kaslev <kaslevs@vmware.com>
Subject: [PATCH v2] kernel-shark: Retrieve the home of root using getpwent()
Date: Thu, 12 Dec 2019 15:45:08 +0200 [thread overview]
Message-ID: <20191212134508.32748-1-y.karadz@gmail.com> (raw)
Do not assume that root is always at "/root". Instead use getpwent(void)
and searche for user id of 0. Return the home path for that user. On any
error just quietly default back to "/root".
Suggested-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Suggested-by: Slavomir Kaslev <kaslevs@vmware.com>
Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com>
---
kernel-shark/src/KsMainWindow.cpp | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/kernel-shark/src/KsMainWindow.cpp b/kernel-shark/src/KsMainWindow.cpp
index bd6c338..31224ed 100644
--- a/kernel-shark/src/KsMainWindow.cpp
+++ b/kernel-shark/src/KsMainWindow.cpp
@@ -422,6 +422,20 @@ QString KsMainWindow::_getCacheDir()
QDir().mkpath(dir);
};
+ auto lamRootHome = [] () {
+ QString home("/root");
+ struct passwd *pwd;
+
+ while ((pwd = getpwent()) != NULL) {
+ if (pwd->pw_uid == 0) {
+ home = pwd->pw_dir;
+ break;
+ }
+ }
+
+ return home;
+ };
+
dir = getenv("KS_USER_CACHE_DIR");
if (!dir.isEmpty()) {
if (!QDir(dir).exists())
@@ -432,7 +446,7 @@ QString KsMainWindow::_getCacheDir()
dir += "/kernelshark";
if (geteuid() == 0)
- dir.replace(QDir::homePath(), "/root");
+ dir.replace(QDir::homePath(), lamRootHome());
if (!QDir(dir).exists())
lamMakePath(false);
--
2.20.1
reply other threads:[~2019-12-12 13:46 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191212134508.32748-1-y.karadz@gmail.com \
--to=y.karadz@gmail.com \
--cc=kaslevs@vmware.com \
--cc=linux-trace-devel@vger.kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).