aboutsummaryrefslogtreecommitdiffstats
path: root/util/folder
diff options
context:
space:
mode:
authorvvvv <vvvv@yandex-team.ru>2022-02-10 16:46:37 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:46:37 +0300
commita693106aae8a3a3c7236a4ae953058a9611d7a92 (patch)
tree49e222ea1c5804306084bb3ae065bb702625360f /util/folder
parentad94e93a059747f4fc3d7add88d1a83daf40b733 (diff)
downloadydb-a693106aae8a3a3c7236a4ae953058a9611d7a92.tar.gz
Restoring authorship annotation for <vvvv@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'util/folder')
-rw-r--r--util/folder/dirut.cpp2
-rw-r--r--util/folder/fts.cpp16
-rw-r--r--util/folder/fts.h6
-rw-r--r--util/folder/lstat_win.c2
-rw-r--r--util/folder/lstat_win.h2
5 files changed, 14 insertions, 14 deletions
diff --git a/util/folder/dirut.cpp b/util/folder/dirut.cpp
index 07e986c729..ffc9b09f96 100644
--- a/util/folder/dirut.cpp
+++ b/util/folder/dirut.cpp
@@ -1,7 +1,7 @@
#include "dirut.h"
#include "iterator.h"
#include "filelist.h"
-#include "fts.h"
+#include "fts.h"
#include "pathsplit.h"
#include "path.h"
diff --git a/util/folder/fts.cpp b/util/folder/fts.cpp
index b715e5191e..0e6a6f86eb 100644
--- a/util/folder/fts.cpp
+++ b/util/folder/fts.cpp
@@ -1100,7 +1100,7 @@ fts_stat(FTS* sp, FTSENT* p, int follow)
{
dev_t dev;
ino_t ino;
- stat_struct *sbp, sb;
+ stat_struct *sbp, sb;
int saved_errno;
/* If user needs stat info, stat buffer already allocated. */
sbp = ISSET(FTS_NOSTAT) ? &sb : p->fts_statp;
@@ -1122,19 +1122,19 @@ fts_stat(FTS* sp, FTSENT* p, int follow)
* fail, set the errno from the stat call.
*/
if (ISSET(FTS_LOGICAL) || follow) {
- if (STAT_FUNC(p->fts_accpath, sbp)) {
+ if (STAT_FUNC(p->fts_accpath, sbp)) {
saved_errno = errno;
if (!lstat(p->fts_accpath, sbp)) {
errno = 0;
return (FTS_SLNONE);
}
p->fts_errno = saved_errno;
- memset(sbp, 0, sizeof(stat_struct));
+ memset(sbp, 0, sizeof(stat_struct));
return (FTS_NS);
}
} else if (lstat(p->fts_accpath, sbp)) {
p->fts_errno = errno;
- memset(sbp, 0, sizeof(stat_struct));
+ memset(sbp, 0, sizeof(stat_struct));
return (FTS_NS);
}
@@ -1239,7 +1239,7 @@ fts_alloc(FTS* sp, const char* name, int namelen)
*/
len = sizeof(FTSENT) + namelen;
if (!ISSET(FTS_NOSTAT)) {
- len += sizeof(stat_struct) + ALIGNBYTES;
+ len += sizeof(stat_struct) + ALIGNBYTES;
}
if ((p = (FTSENT*)malloc(len)) == nullptr) {
return nullptr;
@@ -1359,7 +1359,7 @@ static int
fts_safe_changedir(FTS* sp, FTSENT* p, int fd, const char* path)
{
int ret, oerrno, newfd;
- stat_struct sb;
+ stat_struct sb;
newfd = fd;
if (ISSET(FTS_NOCHDIR)) {
@@ -1391,11 +1391,11 @@ static int
fts_safe_changedir(FTS* sp, FTSENT* p, int /*fd*/, const char* path)
{
int ret;
- stat_struct sb;
+ stat_struct sb;
if (ISSET(FTS_NOCHDIR))
return (0);
- if (STAT_FUNC(path, &sb)) {
+ if (STAT_FUNC(path, &sb)) {
ret = -1;
goto bail;
}
diff --git a/util/folder/fts.h b/util/folder/fts.h
index a70a35ca90..f3c799e8c8 100644
--- a/util/folder/fts.h
+++ b/util/folder/fts.h
@@ -6,14 +6,14 @@
#ifndef _win32_
typedef int dird;
-typedef struct stat stat_struct;
+typedef struct stat stat_struct;
#define STAT_FUNC stat
#else
#include <util/folder/dirent_win.h>
typedef WCHAR* dird;
typedef unsigned short u_short;
typedef unsigned int nlink_t;
-typedef struct _stat64 stat_struct;
+typedef struct _stat64 stat_struct;
#define STAT_FUNC stat64UTF
//TODO: remove from global scope stat64UTF stat64UTF
#ifdef __cplusplus
@@ -97,7 +97,7 @@ typedef struct _ftsent {
#define FTS_SKIP 4 /* discard node */
u_short fts_instr; /* yfts_set() instructions */
- stat_struct* fts_statp; /* stat(2) information */
+ stat_struct* fts_statp; /* stat(2) information */
char fts_name[1]; /* file name */
} FTSENT;
diff --git a/util/folder/lstat_win.c b/util/folder/lstat_win.c
index d89a7a8d79..cf94cec01a 100644
--- a/util/folder/lstat_win.c
+++ b/util/folder/lstat_win.c
@@ -19,7 +19,7 @@ int lstat(const char* fileName, stat_struct* fileStat) {
int result;
result = _wstat64(buf, fileStat);
if (result == 0) {
- SetLastError(0);
+ SetLastError(0);
findHandle = FindFirstFileW(buf, &findBuf);
if (findBuf.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT &&
(findBuf.dwReserved0 == IO_REPARSE_TAG_MOUNT_POINT || findBuf.dwReserved0 == IO_REPARSE_TAG_SYMLINK))
diff --git a/util/folder/lstat_win.h b/util/folder/lstat_win.h
index 2a93dd716d..0bf7c19055 100644
--- a/util/folder/lstat_win.h
+++ b/util/folder/lstat_win.h
@@ -1,7 +1,7 @@
#pragma once
#include <util/system/defaults.h>
-#include "fts.h"
+#include "fts.h"
#ifdef _win_
#include <sys/stat.h>