WIP on macOS

nzeemin · May 10, 2024 · e94a316 · e94a316
1 parent 656dc83
commit e94a316
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/BKImage.cpp b/BKImage.cpp
@@ -424,10 +424,11 @@ void CBKImage::PrintItem(BKDirDataItem& fr, const int level, std::wstring dirpat
             std::wcout << std::setw(strSpecific.length()) << std::left << strSpec;
         }
 
-        if (m_bCalcSHA1)
+        std::wcout << L" | ";
+        if (m_bCalcSHA1 && (fr.nAttr & FR_ATTR::DELETED) == 0)
         {
             std::wstring strHash = m_pFloppyImage->CalcFileSHA1(&fr);
-            std::wcout << L" | " << strHash;
+            std::wcout << strHash;
         }
     }
     else if (m_nListingFormat == LISTING_FORMAT::RAR_LIKE)

diff --git a/bkdecmd.cpp b/bkdecmd.cpp
@@ -2,6 +2,7 @@
 //
 
 #include "pch.h"
+#include <clocale>
 
 #include "BKParseImage.h"
 #include "BKImage.h"
@@ -209,6 +210,7 @@ int main(int argc, char* argv[])
 {
     // Console output mode
     std::setlocale(LC_ALL, "");
+    std::wcout.imbue(std::locale(""));
 
     std::vector<std::wstring> wargs;
     std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;