From c7e5767a11fb5f2b386923418f9fb7f930de88b7 Mon Sep 17 00:00:00 2001 From: Rachel Powers <508861+Ryex@users.noreply.github.com> Date: Sat, 25 Mar 2023 19:13:27 -0700 Subject: [PATCH] fix inverted windows detection logic and typo --- src/BufferedFile.cc | 2 +- src/ConsoleStatCalc.cc | 6 +++--- src/SelectEventPoll.cc | 4 ++-- src/SimpleRandomizer.cc | 2 -- src/SocketCore.cc | 10 +++++----- src/util.cc | 8 ++++---- test/TimeTest.cc | 2 +- 7 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/BufferedFile.cc b/src/BufferedFile.cc index bd5af484..d1735bac 100644 --- a/src/BufferedFile.cc +++ b/src/BufferedFile.cc @@ -81,7 +81,7 @@ int BufferedFile::onClose() int rv = 0; if (fp_) { fflush(fp_); -#if defined(__MINGW32__) +#if !defined(__MINGW32__) && !defined(_MSC_VER) fsync(fileno(fp_)); #else // __MINGW32__ _commit(fileno(fp_)); diff --git a/src/ConsoleStatCalc.cc b/src/ConsoleStatCalc.cc index 343f7d37..09a85ad5 100644 --- a/src/ConsoleStatCalc.cc +++ b/src/ConsoleStatCalc.cc @@ -303,20 +303,20 @@ void ConsoleStatCalc::calculateStat(const DownloadEngine* e) unsigned short int cols = 79; if (isTTY_) { -#if efined(__MINGW32__) || defined(_MSC_VER) +#if !defined(__MINGW32__) && !defined(_MSC_VER) # ifdef HAVE_TERMIOS_H struct winsize size; if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) == 0) { cols = std::max(0, (int)size.ws_col - 1); } # endif // HAVE_TERMIOS_H -#else // __MINGW32__ +#else // __MINGW32__ || _MSC_VER CONSOLE_SCREEN_BUFFER_INFO info; if (::GetConsoleScreenBufferInfo(::GetStdHandle(STD_OUTPUT_HANDLE), &info)) { cols = std::max(0, info.dwSize.X - 2); } -#endif // !__MINGW32__ +#endif // !__MINGW32__ && !_MSC_VER std::string line(cols, ' '); global::cout()->printf("\r%s\r", line.c_str()); } diff --git a/src/SelectEventPoll.cc b/src/SelectEventPoll.cc index 7cadd955..24440e7f 100644 --- a/src/SelectEventPoll.cc +++ b/src/SelectEventPoll.cc @@ -262,13 +262,13 @@ void SelectEventPoll::updateFdSet() for (auto& i : socketEntries_) { auto& e = i.second; sock_t fd = e.getSocket(); -#if defined(__MINGW32__) || defined(_MSC_VER) +#if !defined(__MINGW32__) && !defined(_MSC_VER) if (fd < 0 || FD_SETSIZE <= fd) { A2_LOG_WARN("Detected file descriptor >= FD_SETSIZE or < 0. " "Download may slow down or fail."); continue; } -#endif // !__MINGW32__ +#endif // !__MINGW32__ && !_MSC_VER int events = e.getEvents(); if (events & EventPoll::EVENT_READ) { #if defined(__MINGW32__) || defined(_MSC_VER) diff --git a/src/SimpleRandomizer.cc b/src/SimpleRandomizer.cc index 4ebd1d46..45603fdf 100644 --- a/src/SimpleRandomizer.cc +++ b/src/SimpleRandomizer.cc @@ -38,8 +38,6 @@ #ifndef NO_UNIX # include #endif -# include -#endif #include #include #include diff --git a/src/SocketCore.cc b/src/SocketCore.cc index 8b4d5234..35aa0a87 100644 --- a/src/SocketCore.cc +++ b/src/SocketCore.cc @@ -70,7 +70,7 @@ namespace aria2 { -#if defined(__MINGW32__) || defined(_MSC_VER) +#if !defined(__MINGW32__) && !defined(_MSC_VER) # define SOCKET_ERRNO (errno) #else # define SOCKET_ERRNO (WSAGetLastError()) @@ -104,7 +104,7 @@ namespace aria2 { namespace { std::string errorMsg(int errNum) { -#if defined(__MINGW32__) || defined(_MSC_VER) +#if !defined(__MINGW32__) && !defined(_MSC_VER) return util::safeStrerror(errNum); #else auto msg = util::formatLastError(errNum); @@ -656,7 +656,7 @@ void SocketCore::closeConnection() } } -#if defined(__MINGW32__) || defined(_MSC_VER) +#if !defined(__MINGW32__) && !defined(_MSC_VER) # define CHECK_FD(fd) \ if (fd < 0 || FD_SETSIZE <= fd) { \ logger_->warn("Detected file descriptor >= FD_SETSIZE or < 0. " \ @@ -683,7 +683,7 @@ bool SocketCore::isWritable(time_t timeout) } throw DL_RETRY_EX(fmt(EX_SOCKET_CHECK_WRITABLE, errorMsg(errNum).c_str())); #else // !HAVE_POLL -# ifn defined(__MINGW32__) || defined(_MSC_VER) +# if !defined(__MINGW32__) && !defined(_MSC_VER) CHECK_FD(sockfd_); # endif // !__MINGW32__ fd_set fds; @@ -728,7 +728,7 @@ bool SocketCore::isReadable(time_t timeout) } throw DL_RETRY_EX(fmt(EX_SOCKET_CHECK_READABLE, errorMsg(errNum).c_str())); #else // !HAVE_POLL -# ifn defined(__MINGW32__) || defined(_MSC_VER) +# if !defined(__MINGW32__) && !defined(_MSC_VER) CHECK_FD(sockfd_); # endif // !__MINGW32__ fd_set fds; diff --git a/src/util.cc b/src/util.cc index 1e172323..ee575a0f 100644 --- a/src/util.cc +++ b/src/util.cc @@ -1742,7 +1742,7 @@ void setGlobalSignalHandler(int sig, sigset_t* mask, signal_handler_t handler, #endif // HAVE_SIGACTION } -#if defined(__MINGW32__) || defined(_MSC_VER) +#if !defined(__MINGW32__) && !defined(_MSC_VER) std::string getHomeDir() { const char* p = getenv("HOME"); @@ -1789,7 +1789,7 @@ std::string getXDGDir(const std::string& environmentVariable, std::string filename; const char* p = getenv(environmentVariable.c_str()); if (p && -#if defined(__MINGW32__) || defined(_MSC_VER) +#if !defined(__MINGW32__) && !defined(_MSC_VER) p[0] == '/' #else // __MINGW32__ p[0] && p[1] == ':' @@ -2234,7 +2234,7 @@ void executeHook(const std::string& command, a2_gid_t gid, size_t numFiles, { const std::string gidStr = GroupId::toHex(gid); const std::string numFilesStr = util::uitos(numFiles); -#if defined(__MINGW32__) || defined(_MSC_VER) +#if !defined(__MINGW32__) && !defined(_MSC_VER) A2_LOG_INFO(fmt("Executing user command: %s %s %s %s", command.c_str(), gidStr.c_str(), numFilesStr.c_str(), firstFilename.c_str())); pid_t cpid = fork(); @@ -2502,7 +2502,7 @@ std::string formatLastError(int errNum) void make_fd_cloexec(int fd) { -#if defined(__MINGW32__) || defined(_MSC_VER) +#if !defined(__MINGW32__) && !defined(_MSC_VER) int flags; // TODO from linux man page, fcntl() with F_GETFD or F_SETFD does diff --git a/test/TimeTest.cc b/test/TimeTest.cc index 0132175e..f690b819 100644 --- a/test/TimeTest.cc +++ b/test/TimeTest.cc @@ -96,7 +96,7 @@ void TimeTest::testToHTTPDate() { // This test disabled for MinGW32, because the garbage will be // displayed and it hides real errors. -#if defined(__MINGW32__) || defined(_MSC_VER) +#if !defined(__MINGW32__) && !defined(_MSC_VER) Time t(1220714793); CPPUNIT_ASSERT_EQUAL(std::string("Sat, 06 Sep 2008 15:26:33 GMT"), t.toHTTPDate());