2 files changed, 12 insertions, 3 deletions
diff --git a/src/Exec.cpp b/src/Exec.cpp
index 659d812..a183ed2 100644
--- a/src/Exec.cpp
+++ b/src/Exec.cpp
@@ -19,9 +19,9 @@ namespace sibs
 
         while(!feof(pipe))
         {
-            int bytesRead = fgets(buffer, BUFSIZE, pipe);
-            if(bytesRead > 0)
+            if(fgets(buffer, BUFSIZE, pipe))
             {
+                int bytesRead = strlen(buffer);
                 execStdout.append(buffer, bytesRead);
                 if(print)
                     printf("%.*s", bytesRead, buffer);
diff --git a/src/FileUtil.cpp b/src/FileUtil.cpp
index e29ed36..222edbb 100644
--- a/src/FileUtil.cpp
+++ b/src/FileUtil.cpp
@@ -32,7 +32,16 @@ static int makedir(const _tinydir_char_t *dir)
 namespace sibs
 {
 #if OS_FAMILY == OS_FAMILY_POSIX
-#define toUtf8(input) input
+    std::string toUtf8(const std::string &input)
+    {
+        return input;
+    }
+
+    std::string toUtf8(const char *input)
+    {
+        return input;
+    }
+
     FileString toFileString(const std::string &utf8Str)
     {
         return utf8Str;