Avoid deprecated WIN32 functions

Signed-off-by: Rosen Penev <[email protected]>

Author: neheb

app/actions.cpp

@@ -42,6 +42,7 @@
 #define _setmode(a, b) \
   do {                 \
   } while (false)
+#define _fileno fileno
 #endif
 
 namespace fs = std::filesystem;
@@ -184,7 +185,7 @@ static int setModeAndPrintStructure(Exiv2::PrintStructureOption option, const st
       }
     }
   } else {
-    _setmode(fileno(stdout), O_BINARY);
+    _setmode(_fileno(stdout), O_BINARY);
     result = printStructure(std::cout, option, path);
   }
 
@@ -776,7 +777,7 @@ int Extract::run(const std::string& path) {
 
     bool bStdout = (Params::instance().target_ & Params::ctStdInOut) != 0;
     if (bStdout) {
-      _setmode(fileno(stdout), _O_BINARY);
+      _setmode(_fileno(stdout), _O_BINARY);
     }
 
     if (Params::instance().target_ & Params::ctThumb) {
@@ -1780,7 +1781,7 @@ int metacopy(const std::string& source, const std::string& tgt, Exiv2::ImageType
 
   // if we used a temporary target, copy it to stdout
   if (rc == 0 && bStdout) {
-    _setmode(fileno(stdout), O_BINARY);
+    _setmode(_fileno(stdout), O_BINARY);
     if (auto f = std::ifstream(target, std::ios::binary)) {
       std::vector<char> buffer(8 * 1024);
 

app/exiv2.cpp

@@ -32,6 +32,7 @@ namespace fs = std::filesystem;
 #else
 #include <sys/select.h>
 #include <unistd.h>
+#define _strdup strdup
 #endif
 
 // *****************************************************************************
@@ -957,7 +958,7 @@ void Params::getStdin(Exiv2::DataBuf& buf) {
   if (stdinBuf.empty()) {
 #if defined(_WIN32)
     DWORD fdwMode;
-    _setmode(fileno(stdin), O_BINARY);
+    _setmode(_fileno(stdin), O_BINARY);
     Sleep(300);
     if (!GetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), &fdwMode)) {  // failed: stdin has bytes!
 #else
@@ -1022,9 +1023,9 @@ int Params::getopt(int argc, char* const Argv[]) {
   for (int i = 0; i < argc; i++) {
     std::string arg(Argv[i]);
     if (longs.contains(arg)) {
-      argv[i] = ::strdup(longs.at(arg).c_str());
+      argv[i] = _strdup(longs.at(arg).c_str());
     } else {
-      argv[i] = ::strdup(Argv[i]);
+      argv[i] = _strdup(Argv[i]);
     }
   }
 

src/basicio.cpp

@@ -43,6 +43,10 @@
 namespace fs = std::filesystem;
 #endif
 
+#ifndef _WIN32
+#define _fileno fileno
+#endif
+
 namespace Exiv2 {
 
 BasicIo::~BasicIo() = default;
@@ -256,7 +260,7 @@ byte* FileIo::mmap(bool isWriteable) {
   if (p_->isWriteable_) {
     prot |= PROT_WRITE;
   }
-  void* rc = ::mmap(nullptr, p_->mappedLength_, prot, MAP_SHARED, fileno(p_->fp_), 0);
+  void* rc = ::mmap(nullptr, p_->mappedLength_, prot, MAP_SHARED, _fileno(p_->fp_), 0);
   if (MAP_FAILED == rc) {
     throw Error(ErrorCode::kerCallFailed, path(), strError(), "mmap");
   }
@@ -277,7 +281,7 @@ byte* FileIo::mmap(bool isWriteable) {
     flProtect = PAGE_READWRITE;
   }
   HANDLE hPh = GetCurrentProcess();
-  auto hFd = reinterpret_cast<HANDLE>(_get_osfhandle(fileno(p_->fp_)));
+  auto hFd = reinterpret_cast<HANDLE>(_get_osfhandle(_fileno(p_->fp_)));
   if (hFd == INVALID_HANDLE_VALUE) {
     throw Error(ErrorCode::kerCallFailed, path(), "MSG1", "_get_osfhandle");
   }
@@ -917,7 +921,7 @@ std::string XPathIo::writeDataToFile(const std::string& orgPath) {
   auto path = stringFormat("{}{}", timestamp, XPathIo::TEMP_FILE_EXT);
 
   if (prot == pStdin) {
-    if (isatty(fileno(stdin)))
+    if (isatty(_fileno(stdin)))
       throw Error(ErrorCode::kerInputDataReadFailed);
 #ifdef _WIN32
     // convert stdin to binary