move temp files to /tmp (fix #131)

elfmz · Oct 26, 2016 · 959fd2a · 959fd2a
1 parent 871b950
commit 959fd2a
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 19 deletions.
diff --git a/WinPort/src/PathHelpers.cpp b/WinPort/src/PathHelpers.cpp
@@ -178,7 +178,7 @@ bool MatchWildcardICE(const char *string, const char *wild) {
 void WinPortInitWellKnownEnv()
 {
 	if (!getenv("TEMP")) {
-		std::string temp = InMyProfile("tmp");
+		const std::string &temp = InTemp();
 		mkdir(temp.c_str(), 0777);
 		setenv("TEMP", temp.c_str(), 1);
 	}

diff --git a/far2l/treelist.cpp b/far2l/treelist.cpp
@@ -2116,11 +2116,11 @@ static void MkTreeName(FARString &out, const wchar_t *RootDir, const char *ext)
 	int r = sdc_stat(Wide2MB(RootDir).c_str(), &s);
 	if (r == 0) {
 		char tmp[128];
-		sprintf(tmp, "tmp/tree/%llx-%llx.%s", 
+		sprintf(tmp, "tree/%llx-%llx.%s", 
 			(unsigned long long)s.st_rdev, (unsigned long long)s.st_ino, ext);
-		out = InMyProfile(tmp);
+		out = InTemp(tmp);
 	} else {
-		std::string tmp = InMyProfile("tmp/tree/wtf-");
+		std::string tmp = InTemp("tree/wtf-");
 		const std::string &RootMB = Wide2MB(RootDir);
 		for (char c : RootMB) {
 			tmp+= (c==GOOD_SLASH) ? '@' : c;

diff --git a/far2l/vtcompletor.cpp b/far2l/vtcompletor.cpp
@@ -19,7 +19,7 @@ static const char *vtc_inputrc = "set completion-query-items 0\n"
 
 
 VTCompletor::VTCompletor()
-	: _vtc_inputrc(InMyProfile("tmp/vtc_inputrc")),
+	: _vtc_inputrc(InTemp("vtc_inputrc")),
 	_pipe_stdin(-1), _pipe_stdout(-1), _pid(-1)
 {
 	int fd = open(_vtc_inputrc.c_str(), O_RDWR | O_CREAT | O_TRUNC, 0622);

diff --git a/far2l/vtshell.cpp b/far2l/vtshell.cpp
@@ -472,11 +472,11 @@ class VTShell : VTOutputReader::IProcessor, VTInputReader::IProcessor
 		std::string rc_src, rc_dst, rc_arg;
 		if (strstr(shell, "/bash")) {
 			rc_src = std::string(home) + "/.bashrc";
-			rc_dst = InMyProfile("vtcmd/init.bash");
+			rc_dst = InTemp("vtcmd/init.bash");
 			rc_arg = "--rcfile";
 		}/* else if (strstr(shell, "/zsh")) {
 			rc_src = std::string(home) + "/.zshrc";
-			rc_dst = InMyProfile("vtcmd/init.zsh");
+			rc_dst = InTemp("vtcmd/init.zsh");
 			rc_arg = "--rcs";
 		}*/
 
@@ -681,7 +681,7 @@ class VTShell : VTOutputReader::IProcessor, VTInputReader::IProcessor
 	{
 		char name[128]; 
 		sprintf(name, "vtcmd/%x_%p", getpid(), this);
-		std::string cmd_script = InMyProfile(name);
+		std::string cmd_script = InTemp(name);
 		FILE *f = fopen(cmd_script.c_str(), "wt");
 		if (!f)
 			return std::string();

diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
@@ -6,6 +6,7 @@ find_package(PkgConfig REQUIRED)
 set(SOURCES
   src/KeyFileHelper.cpp
   src/utils.cpp
+  src/temp.cpp
   src/ZombieControl.cpp
   src/ConvertUTF.c
 )

diff --git a/utils/include/utils.h b/utils/include/utils.h
@@ -21,6 +21,7 @@ size_t StrStartsFrom(const std::string &haystack, const char *needle);
 std::string EscapeQuotas(std::string str);
 
 std::string InMyProfile(const char *subpath = NULL, bool create_path = true);
+std::string InTemp(const char *subpath = NULL);
 
 
 void CheckedCloseFD(int &fd);

diff --git a/utils/src/temp.cpp b/utils/src/temp.cpp
@@ -21,7 +21,7 @@ static void GetTempRoot(std::string &path)
 		return;
 	}
 
-	char *temp = getenv("TEMP");
+	const char *temp = getenv("TEMP");
 	if (!temp || stat(temp, &s) == -1 || (s.st_mode & S_IFMT) != S_IFDIR) {
 		temp = "/tmp";
 		if (stat(temp, &s) == -1 || (s.st_mode & S_IFMT) != S_IFDIR) {
@@ -41,32 +41,36 @@ static void GetTempRoot(std::string &path)
 		path = temp;
 		path+= GOOD_SLASH;
 		char buf[128];
-		sprintf(buf, "%llx_%u", (unsigned long long)geteuid(), i);
+		sprintf(buf, "far2l_%llx_%u", (unsigned long long)geteuid(), i);
 		path+= buf;
 		mkdir(path.c_str(), 0700);
-		if (stat(temp, &s) == 0 && (s.st_mode & S_IFMT) == S_IFDIR && s.st_uid == geteuid()) {
+		if (stat(path.c_str(), &s) == 0 && 
+			(s.st_mode & S_IFMT) == S_IFDIR && 
+			s.st_uid == geteuid()) {
 			break;
 		}
 
 		if (i == (unsigned int)-1) {
-			perror("Can't create temp!");
+			perror("Can't init temp!");
 			return;
 		}
 	}
-	s_in_prof_temp = path;
+	s_ready_temp = path;
 
 }
 
-std::string InTemp(const char *subpath = NULL)
+std::string InTemp(const char *subpath)
 {
 	std::string path;
 	GetTempRoot(path);
-	out+= GOOD_SLASH;
-	for (;*subpath; ++subpath) {
-		if (*subpath == GOOD_SLASH) {
-			mkdir(path.c_str(), 0700);
+	path+= GOOD_SLASH;
+	if (subpath) {
+		for (;*subpath; ++subpath) {
+			if (*subpath == GOOD_SLASH) {
+				mkdir(path.c_str(), 0700);
+			}
+			path+= *subpath;
 		}
-		path+= subpath;
 	}
 
 	return path;