aboutsummaryrefslogtreecommitdiffstats
path: root/util/folder
diff options
context:
space:
mode:
authorsomov <somov@yandex-team.ru>2022-02-10 16:45:47 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:45:47 +0300
commita5950576e397b1909261050b8c7da16db58f10b1 (patch)
tree7ba7677f6a4c3e19e2cefab34d16df2c8963b4d4 /util/folder
parent81eddc8c0b55990194e112b02d127b87d54164a9 (diff)
downloadydb-a5950576e397b1909261050b8c7da16db58f10b1.tar.gz
Restoring authorship annotation for <somov@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'util/folder')
-rw-r--r--util/folder/dirut.cpp26
-rw-r--r--util/folder/filelist.cpp2
-rw-r--r--util/folder/tempdir.cpp22
-rw-r--r--util/folder/tempdir.h6
4 files changed, 28 insertions, 28 deletions
diff --git a/util/folder/dirut.cpp b/util/folder/dirut.cpp
index ffc9b09f96..690c980c8b 100644
--- a/util/folder/dirut.cpp
+++ b/util/folder/dirut.cpp
@@ -425,17 +425,17 @@ TString RealLocation(const TString& path) {
int MakeTempDir(char path[/*FILENAME_MAX*/], const char* prefix) {
int ret;
-
+
TString sysTmp;
-
+
#ifdef _win32_
- if (!prefix || *prefix == '/') {
+ if (!prefix || *prefix == '/') {
#else
- if (!prefix) {
+ if (!prefix) {
#endif
- sysTmp = GetSystemTempDir();
+ sysTmp = GetSystemTempDir();
prefix = sysTmp.data();
- }
+ }
if ((ret = ResolvePath(prefix, nullptr, path, 1)) != 0)
return ret;
@@ -507,19 +507,19 @@ const char* GetFileNameComponent(const char* f) {
TString GetSystemTempDir() {
#ifdef _win_
- char buffer[1024];
- DWORD size = GetTempPath(1024, buffer);
- if (!size) {
- ythrow TSystemError() << "failed to get system temporary directory";
- }
+ char buffer[1024];
+ DWORD size = GetTempPath(1024, buffer);
+ if (!size) {
+ ythrow TSystemError() << "failed to get system temporary directory";
+ }
return TString(buffer, size);
#else
const char* var = "TMPDIR";
const char* def = "/tmp";
const char* r = getenv(var);
const char* result = r ? r : def;
- return result[0] == '/' ? result : ResolveDir(result);
-#endif
+ return result[0] == '/' ? result : ResolveDir(result);
+#endif
}
TString ResolveDir(const char* path) {
diff --git a/util/folder/filelist.cpp b/util/folder/filelist.cpp
index b21fcdbf20..5345317556 100644
--- a/util/folder/filelist.cpp
+++ b/util/folder/filelist.cpp
@@ -33,7 +33,7 @@ void TFileEntitiesList::Fill(const TString& dirname, TStringBuf prefix, TStringB
if (((Mask & EM_FILES) && file->fts_info == FTS_F) || ((Mask & EM_DIRS) && file->fts_info == FTS_D) || ((Mask & EM_SLINKS) && file->fts_info == FTS_SL)) {
++FileNamesSize;
FileNames.Append(filename.data(), filename.size() + 1);
- }
+ }
}
Restart();
diff --git a/util/folder/tempdir.cpp b/util/folder/tempdir.cpp
index 6fdf8f753c..e72b2a4fb0 100644
--- a/util/folder/tempdir.cpp
+++ b/util/folder/tempdir.cpp
@@ -1,7 +1,7 @@
#include "tempdir.h"
-
+
#include "dirut.h"
-
+
#include <util/system/fs.h>
#include <util/system/maxlen.h>
@@ -12,7 +12,7 @@ TTempDir::TTempDir()
TTempDir::TTempDir(const char* prefix, TCreationToken)
: TempDir()
- , Remove(true)
+ , Remove(true)
{
char tempDir[MAX_PATH];
if (MakeTempDir(tempDir, prefix) != 0) {
@@ -23,7 +23,7 @@ TTempDir::TTempDir(const char* prefix, TCreationToken)
TTempDir::TTempDir(const TString& tempDir)
: TempDir(tempDir)
- , Remove(true)
+ , Remove(true)
{
NFs::Remove(TempDir);
MakeDirIfNotExist(TempDir.c_str());
@@ -33,12 +33,12 @@ TTempDir TTempDir::NewTempDir(const TString& root) {
return {root.c_str(), TCreationToken{}};
}
-void TTempDir::DoNotRemove() {
- Remove = false;
-}
-
+void TTempDir::DoNotRemove() {
+ Remove = false;
+}
+
TTempDir::~TTempDir() {
- if (Remove) {
- RemoveDirWithContents(TempDir);
- }
+ if (Remove) {
+ RemoveDirWithContents(TempDir);
+ }
}
diff --git a/util/folder/tempdir.h b/util/folder/tempdir.h
index ff458f83b9..8fed58245d 100644
--- a/util/folder/tempdir.h
+++ b/util/folder/tempdir.h
@@ -29,8 +29,8 @@ public:
return TempDir;
}
- void DoNotRemove();
-
+ void DoNotRemove();
+
private:
struct TCreationToken {};
@@ -39,5 +39,5 @@ private:
TTempDir(const char* prefix, TCreationToken);
TFsPath TempDir;
- bool Remove;
+ bool Remove;
};