Page MenuHomeFreeBSD
Differential D28685

www/logswan: Update to 2.1.9
ClosedPublic
Actions

Authored by otis on Feb 15 2021, 12:30 PM.
Tags
None
Referenced Files
Unknown Object (File)
Feb 7 2025, 3:54 AM
Unknown Object (File)
Feb 2 2025, 3:19 AM
Unknown Object (File)
Jan 30 2025, 4:21 AM
Unknown Object (File)
Jan 30 2025, 3:12 AM
Unknown Object (File)
Nov 1 2024, 8:21 PM
Unknown Object (File)
Nov 1 2024, 8:20 PM
Unknown Object (File)
Nov 1 2024, 8:20 PM
Unknown Object (File)
Nov 1 2024, 8:20 PM
View All 69 Files
Subscribers
mat

Details

Reviewers
osa
swills
Commits
rP565640: MFH: r565606
rP565606: www/logswan: Update to 2.1.10
Summary
  • Update to 2.1.9
  • Switch to versioned download

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 37020
Build 33909: arc lint + arc unit

Revision Contents
Changeset List

PathSize
www/
logswan/
5 lines
6 lines

Diff 83930

View Options

www/logswan/Makefile

Show First 20 Lines • Show All 924 Lines • ▼ Show 20 Lines
ErrorOr<basic_file_status> directory_entry::status() const { ErrorOr<basic_file_status> directory_entry::status() const {
file_status s; file_status s;
if (auto EC = fs::status(Path, s, FollowSymlinks)) if (auto EC = fs::status(Path, s, FollowSymlinks))
return EC; return EC;
return s; return s;
} }
#if !defined(F_GETPATH) //
// FreeBSD optionally provides /proc/self/fd, but it is incompatible with
// Linux. The thing to use is realpath.
//
#if !defined(__FreeBSD__)
#define TRY_PROC_SELF_FD
#endif
#if !defined(F_GETPATH) && defined(TRY_PROC_SELF_FD)
static bool hasProcSelfFD() { static bool hasProcSelfFD() {
// If we have a /proc filesystem mounted, we can quickly establish the // If we have a /proc filesystem mounted, we can quickly establish the
// real name of the file with readlink // real name of the file with readlink
static const bool Result = (::access("/proc/self/fd", R_OK) == 0); static const bool Result = (::access("/proc/self/fd", R_OK) == 0);
return Result; return Result;
} }
#endif #endif
▲ Show 20 Lines • Show All 170 Lines • ▼ Show 20 Lines
#if defined(F_GETPATH) #if defined(F_GETPATH)
// When F_GETPATH is availble, it is the quickest way to get // When F_GETPATH is availble, it is the quickest way to get
// the real path name. // the real path name.
char Buffer[PATH_MAX]; char Buffer[PATH_MAX];
if (::fcntl(ResultFD, F_GETPATH, Buffer) != -1) if (::fcntl(ResultFD, F_GETPATH, Buffer) != -1)
RealPath->append(Buffer, Buffer + strlen(Buffer)); RealPath->append(Buffer, Buffer + strlen(Buffer));
#else #else
char Buffer[PATH_MAX]; char Buffer[PATH_MAX];
#if defined(TRY_PROC_SELF_FD)
if (hasProcSelfFD()) { if (hasProcSelfFD()) {
char ProcPath[64]; char ProcPath[64];
snprintf(ProcPath, sizeof(ProcPath), "/proc/self/fd/%d", ResultFD); snprintf(ProcPath, sizeof(ProcPath), "/proc/self/fd/%d", ResultFD);
ssize_t CharCount = ::readlink(ProcPath, Buffer, sizeof(Buffer)); ssize_t CharCount = ::readlink(ProcPath, Buffer, sizeof(Buffer));
if (CharCount > 0) if (CharCount > 0)
RealPath->append(Buffer, Buffer + CharCount); RealPath->append(Buffer, Buffer + CharCount);
} else { } else {
#endif
SmallString<128> Storage; SmallString<128> Storage;
StringRef P = Name.toNullTerminatedStringRef(Storage); StringRef P = Name.toNullTerminatedStringRef(Storage);
// Use ::realpath to get the real path name // Use ::realpath to get the real path name
if (::realpath(P.begin(), Buffer) != nullptr) if (::realpath(P.begin(), Buffer) != nullptr)
RealPath->append(Buffer, Buffer + strlen(Buffer)); RealPath->append(Buffer, Buffer + strlen(Buffer));
#if defined(TRY_PROC_SELF_FD)
} }
#endif
#endif #endif
return std::error_code(); return std::error_code();
} }
Expected<file_t> openNativeFileForRead(const Twine &Name, OpenFlags Flags, Expected<file_t> openNativeFileForRead(const Twine &Name, OpenFlags Flags,
SmallVectorImpl<char> *RealPath) { SmallVectorImpl<char> *RealPath) {
file_t ResultFD; file_t ResultFD;
std::error_code EC = openFileForRead(Name, ResultFD, Flags, RealPath); std::error_code EC = openFileForRead(Name, ResultFD, Flags, RealPath);
▲ Show 20 Lines • Show All 328 Lines • Show Last 20 Lines
View Options

www/logswan/distinfo

Show First 20 Lines • Show All 924 Lines • ▼ Show 20 Lines
ErrorOr<basic_file_status> directory_entry::status() const { ErrorOr<basic_file_status> directory_entry::status() const {
file_status s; file_status s;
if (auto EC = fs::status(Path, s, FollowSymlinks)) if (auto EC = fs::status(Path, s, FollowSymlinks))
return EC; return EC;
return s; return s;
} }
#if !defined(F_GETPATH) //
// FreeBSD optionally provides /proc/self/fd, but it is incompatible with
// Linux. The thing to use is realpath.
//
#if !defined(__FreeBSD__)
#define TRY_PROC_SELF_FD
#endif
#if !defined(F_GETPATH) && defined(TRY_PROC_SELF_FD)
static bool hasProcSelfFD() { static bool hasProcSelfFD() {
// If we have a /proc filesystem mounted, we can quickly establish the // If we have a /proc filesystem mounted, we can quickly establish the
// real name of the file with readlink // real name of the file with readlink
static const bool Result = (::access("/proc/self/fd", R_OK) == 0); static const bool Result = (::access("/proc/self/fd", R_OK) == 0);
return Result; return Result;
} }
#endif #endif
▲ Show 20 Lines • Show All 170 Lines • ▼ Show 20 Lines
#if defined(F_GETPATH) #if defined(F_GETPATH)
// When F_GETPATH is availble, it is the quickest way to get // When F_GETPATH is availble, it is the quickest way to get
// the real path name. // the real path name.
char Buffer[PATH_MAX]; char Buffer[PATH_MAX];
if (::fcntl(ResultFD, F_GETPATH, Buffer) != -1) if (::fcntl(ResultFD, F_GETPATH, Buffer) != -1)
RealPath->append(Buffer, Buffer + strlen(Buffer)); RealPath->append(Buffer, Buffer + strlen(Buffer));
#else #else
char Buffer[PATH_MAX]; char Buffer[PATH_MAX];
#if defined(TRY_PROC_SELF_FD)
if (hasProcSelfFD()) { if (hasProcSelfFD()) {
char ProcPath[64]; char ProcPath[64];
snprintf(ProcPath, sizeof(ProcPath), "/proc/self/fd/%d", ResultFD); snprintf(ProcPath, sizeof(ProcPath), "/proc/self/fd/%d", ResultFD);
ssize_t CharCount = ::readlink(ProcPath, Buffer, sizeof(Buffer)); ssize_t CharCount = ::readlink(ProcPath, Buffer, sizeof(Buffer));
if (CharCount > 0) if (CharCount > 0)
RealPath->append(Buffer, Buffer + CharCount); RealPath->append(Buffer, Buffer + CharCount);
} else { } else {
#endif
SmallString<128> Storage; SmallString<128> Storage;
StringRef P = Name.toNullTerminatedStringRef(Storage); StringRef P = Name.toNullTerminatedStringRef(Storage);
// Use ::realpath to get the real path name // Use ::realpath to get the real path name
if (::realpath(P.begin(), Buffer) != nullptr) if (::realpath(P.begin(), Buffer) != nullptr)
RealPath->append(Buffer, Buffer + strlen(Buffer)); RealPath->append(Buffer, Buffer + strlen(Buffer));
#if defined(TRY_PROC_SELF_FD)
} }
#endif
#endif #endif
return std::error_code(); return std::error_code();
} }
Expected<file_t> openNativeFileForRead(const Twine &Name, OpenFlags Flags, Expected<file_t> openNativeFileForRead(const Twine &Name, OpenFlags Flags,
SmallVectorImpl<char> *RealPath) { SmallVectorImpl<char> *RealPath) {
file_t ResultFD; file_t ResultFD;
std::error_code EC = openFileForRead(Name, ResultFD, Flags, RealPath); std::error_code EC = openFileForRead(Name, ResultFD, Flags, RealPath);
▲ Show 20 Lines • Show All 328 Lines • Show Last 20 Lines