From 31d829d388824c6795009afa55610ea5f5a22b0c Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Thu, 16 Nov 2006 12:43:11 -0800 Subject: Implement current working directory for LiveProcesses --HG-- extra : convert_revision : a2d3cf29ab65c61af27d82a8c421a41a19fd5aeb --- src/sim/process.hh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/sim/process.hh') diff --git a/src/sim/process.hh b/src/sim/process.hh index 5c37f725e..616c02c00 100644 --- a/src/sim/process.hh +++ b/src/sim/process.hh @@ -177,11 +177,13 @@ class LiveProcess : public Process ObjectFile *objFile; std::vector argv; std::vector envp; + std::string cwd; LiveProcess(const std::string &nm, ObjectFile *objFile, System *_system, int stdin_fd, int stdout_fd, int stderr_fd, std::vector &argv, std::vector &envp, + const std::string &cwd, uint64_t _uid, uint64_t _euid, uint64_t _gid, uint64_t _egid, uint64_t _pid, uint64_t _ppid); @@ -207,6 +209,20 @@ class LiveProcess : public Process inline uint64_t pid() {return __pid;} inline uint64_t ppid() {return __ppid;} + std::string + fullPath(const std::string &filename) + { + if (filename[0] == '/' || cwd.empty()) + return filename; + + std::string full = cwd; + + if (cwd[cwd.size() - 1] != '/') + full += '/'; + + return full + filename; + } + virtual void syscall(int64_t callnum, ThreadContext *tc); virtual SyscallDesc* getDesc(int callnum) = 0; @@ -220,6 +236,7 @@ class LiveProcess : public Process std::string executable, std::vector &argv, std::vector &envp, + const std::string &cwd, uint64_t _uid, uint64_t _euid, uint64_t _gid, uint64_t _egid, uint64_t _pid, uint64_t _ppid); -- cgit v1.2.3