util.c: Print carriage return before warnings/errors

[wimlib] / src / util.c

diff --git a/src/util.c b/src/util.c
index a93e688bee9ebbcf5931a50a6d467e0da48d29f7..30f2296bb5a251c74baff71b2374dea7ca86fc2f 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -80,20 +80,25 @@ special:
                        tchar *tstr;
                        size_t tstr_nbytes;
                        utf16lechar *ucs = va_arg(va, utf16lechar*);
-                       size_t ucs_nbytes = utf16le_strlen(ucs);
 
-                       ret = utf16le_to_tstr(ucs, ucs_nbytes,
-                                             &tstr, &tstr_nbytes);
-                       if (ret) {
-                               ret = tfprintf(fp, T("??????"));
+                       if (ucs) {
+                               size_t ucs_nbytes = utf16le_strlen(ucs);
+
+                               ret = utf16le_to_tstr(ucs, ucs_nbytes,
+                                                     &tstr, &tstr_nbytes);
+                               if (ret) {
+                                       ret = tfprintf(fp, T("??????"));
+                               } else {
+                                       ret = tfprintf(fp, T("%"TS), tstr);
+                                       FREE(tstr);
+                               }
+                               if (ret < 0)
+                                       return -1;
+                               else
+                                       n += ret;
                        } else {
-                               ret = tfprintf(fp, T("%"TS), tstr);
-                               FREE(tstr);
+                               n += tfprintf(fp, T("(null)"));
                        }
-                       if (ret < 0)
-                               return -1;
-                       else
-                               n += ret;
                        p++;
                } else {
                        if (tputc(*p, fp) == EOF)
@@ -172,7 +177,7 @@ wimlib_error(const tchar *format, ...)
        va_list va;
 
        va_start(va, format);
-       wimlib_vmsg(T("[ERROR] "), format, va, false);
+       wimlib_vmsg(T("\r[ERROR] "), format, va, false);
        va_end(va);
 }
 
@@ -182,7 +187,7 @@ wimlib_error_with_errno(const tchar *format, ...)
        va_list va;
 
        va_start(va, format);
-       wimlib_vmsg(T("[ERROR] "), format, va, true);
+       wimlib_vmsg(T("\r[ERROR] "), format, va, true);
        va_end(va);
 }
 
@@ -192,7 +197,7 @@ wimlib_warning(const tchar *format, ...)
        va_list va;
 
        va_start(va, format);
-       wimlib_vmsg(T("[WARNING] "), format, va, false);
+       wimlib_vmsg(T("\r[WARNING] "), format, va, false);
        va_end(va);
 }
 
@@ -202,7 +207,7 @@ wimlib_warning_with_errno(const tchar *format, ...)
        va_list va;
 
        va_start(va, format);
-       wimlib_vmsg(T("[WARNING] "), format, va, true);
+       wimlib_vmsg(T("\r[WARNING] "), format, va, true);
        va_end(va);
 }