Overcome string length limit in messageBox

magiblot · May 20, 2023 · a357e7d · a357e7d
1 parent 7c2d667
commit a357e7d
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/source/tvision/msgbox.cpp b/source/tvision/msgbox.cpp
@@ -25,10 +25,6 @@
 #define Uses_TLabel
 #include <tvision/tv.h>
 
-#if !defined( __STDIO_H )
-#include <stdio.h>
-#endif  // __STDIO_H
-
 #if !defined( __STRING_H )
 #include <string.h>
 #endif  // __STRING_H
@@ -104,13 +100,15 @@ ushort messageBoxRect( const TRect &r,
                        ... ) noexcept
 {
     va_list argptr;
-    char msg[256];
 
     va_start( argptr, fmt );
-    vsnprintf( msg, 256, fmt, argptr );
+    char *msg = vfmtStr( fmt, argptr );
     va_end( argptr );
 
-    return messageBoxRect( r, msg, aOptions );
+    ushort ret = messageBoxRect( r, msg, aOptions );
+
+    delete[] msg;
+    return ret;
 }
 
 static TRect makeRect(TStringView text)
@@ -134,13 +132,15 @@ ushort messageBox( TStringView msg, ushort aOptions ) noexcept
 ushort messageBox( unsigned aOptions, const char *fmt, ... ) noexcept
 {
     va_list argptr;
-    char msg[256];
 
     va_start( argptr, fmt );
-    vsnprintf( msg, 256, fmt, argptr );
+    char *msg = vfmtStr( fmt, argptr );
     va_end( argptr );
 
-    return messageBoxRect( makeRect(msg), msg, aOptions );
+    ushort ret = messageBoxRect( makeRect(msg), msg, aOptions );
+
+    delete[] msg;
+    return ret;
 }
 
 ushort inputBox( TStringView Title, TStringView aLabel, char *s, uchar limit ) noexcept