Single header for large file i/o support.

This also fixes Path::IsFile().
adventuregamestudio · Aug 19, 2018 · 4820e22 · 4820e22
1 parent 3b1d304
commit 4820e22
Show file tree

Hide file tree

Showing 77 changed files with 78 additions and 119 deletions.
diff --git a/Common/ac/messageinfo.cpp b/Common/ac/messageinfo.cpp
@@ -12,7 +12,6 @@
 //
 //=============================================================================
 
-#include <stdio.h>
 #include "ac/messageinfo.h"
 #include "util/stream.h"
 

diff --git a/Common/ac/mousecursor.cpp b/Common/ac/mousecursor.cpp
@@ -12,7 +12,6 @@
 //
 //=============================================================================
 
-#include <stdio.h>
 #include "ac/mousecursor.h"
 #include "util/stream.h"
 

diff --git a/Common/ac/point.cpp b/Common/ac/point.cpp
@@ -12,7 +12,6 @@
 //
 //=============================================================================
 
-#include <stdio.h>
 #include "ac/point.h"
 #include "ac/common.h"    // quit()
 #include "util/stream.h"

diff --git a/Common/ac/roomstruct.cpp b/Common/ac/roomstruct.cpp
@@ -12,7 +12,6 @@
 //
 //=============================================================================
 
-#include <stdio.h>
 #include "ac/roomstruct.h"
 #include "ac/common.h"
 #include "ac/wordsdictionary.h"

diff --git a/Common/ac/spritecache.cpp b/Common/ac/spritecache.cpp
@@ -22,6 +22,7 @@
 #pragma warning (disable: 4996 4312)  // disable deprecation warnings
 #endif
 
+#include <stdio.h> // sprintf
 #include "ac/common.h"
 #include "ac/spritecache.h"
 #include "core/assetmanager.h"

diff --git a/Common/ac/view.cpp b/Common/ac/view.cpp
@@ -12,7 +12,6 @@
 //
 //=============================================================================
 
-#include <stdio.h>
 #include <stdlib.h>
 #include "ac/view.h"
 #include "util/alignedstream.h"

diff --git a/Common/ac/wordsdictionary.cpp b/Common/ac/wordsdictionary.cpp
@@ -12,7 +12,6 @@
 //
 //=============================================================================
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "ac/wordsdictionary.h"

diff --git a/Common/font/fonts.cpp b/Common/font/fonts.cpp
@@ -16,7 +16,6 @@
 #define USE_ALFONT
 #endif
 
-#include <stdio.h>
 #include "alfont.h"
 
 #include "ac/common.h"

diff --git a/Common/font/ttffontrenderer.cpp b/Common/font/ttffontrenderer.cpp
@@ -16,7 +16,6 @@
 #define USE_ALFONT
 #endif
 
-#include <stdio.h>
 #include "alfont.h"
 #include "ac/gamestructdefines.h" //FONT_OUTLINE_AUTO
 #include "core/assetmanager.h"

diff --git a/Common/script/cc_error.cpp b/Common/script/cc_error.cpp
@@ -12,7 +12,6 @@
 //
 //=============================================================================
 
-#include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
 #include "cc_error.h"

diff --git a/Common/script/cc_script.cpp b/Common/script/cc_script.cpp
@@ -12,7 +12,6 @@
 //
 //=============================================================================
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "cc_script.h"

diff --git a/Common/util/c99_snprintf.h b/Common/util/c99_snprintf.h
@@ -26,7 +26,7 @@
 
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
+#include <stdio.h> // sprintf
 
 #define snprintf c99_snprintf
 #define vsnprintf c99_vsnprintf

diff --git a/Common/util/compress.cpp b/Common/util/compress.cpp
@@ -12,7 +12,6 @@
 //
 //=============================================================================
 
-#include <stdio.h>
 #include <stdlib.h>
 #include "ac/common.h"	// quit()
 #include "ac/roomstruct.h"
@@ -28,7 +27,6 @@
 
 #include "util/misc.h"
 #include "util/stream.h"
-#include "util/filestream.h"
 #include "gfx/bitmap.h"
 
 using namespace AGS::Common;

diff --git a/Common/util/compress.h b/Common/util/compress.h
@@ -15,7 +15,6 @@
 #ifndef __AC_COMPRESS_H
 #define __AC_COMPRESS_H
 
-#include <stdio.h>
 #include "util/wgt2allg.h" // color (allegro RGB)
 
 namespace AGS { namespace Common { class Stream; class Bitmap; } }

diff --git a/Common/util/file.cpp b/Common/util/file.cpp
@@ -18,19 +18,9 @@
 #include <unistd.h> // for unlink()
 #endif
 #include <errno.h>
-#include <stdio.h>
-#include <sys/stat.h>
 #include "util/file.h"
 #include "util/filestream.h"
-
-#if defined(_MSC_VER) // MSVC
-    #define stat_t      _stat64
-    #define stat_fn     _stati64
-#else
-    #define stat_t      stat
-    #define stat_fn     stat
-#endif
-
+#include "util/stdio_compat.h"
 
 namespace AGS
 {

diff --git a/Common/util/filestream.cpp b/Common/util/filestream.cpp
@@ -12,23 +12,9 @@
 //
 //=============================================================================
 
-#include <stdio.h>
 #include "util/filestream.h"
 #include "util/math.h"
 
-#if defined(HAVE_FSEEKO) // Contemporary POSIX libc
-    #define file_off_t  off_t
-    #define fseek       fseeko
-    #define ftell       ftello
-#elif defined(_MSC_VER) // MSVC
-    #define file_off_t  __int64
-    #define fseek       _fseeki64
-    #define ftell       _ftelli64
-#else // No distinct interface with off_t
-    #define file_off_t  long
-#endif
-
-
 namespace AGS
 {
 namespace Common

diff --git a/Common/util/filestream.h b/Common/util/filestream.h
@@ -18,9 +18,9 @@
 #ifndef __AGS_CN_UTIL__FILESTREAM_H
 #define __AGS_CN_UTIL__FILESTREAM_H
 
-#include <stdio.h>
 #include "util/datastream.h"
 #include "util/file.h"
+#include "util/stdio_compat.h"
 
 namespace AGS
 {

diff --git a/Common/util/lzw.cpp b/Common/util/lzw.cpp
@@ -18,7 +18,6 @@
 
 #define MSS
 
-#include <stdio.h>
 #include <stdlib.h>
 #include "ac/common.h"
 #include "util/stream.h"

diff --git a/Common/util/misc.cpp b/Common/util/misc.cpp
@@ -41,9 +41,15 @@
   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "allegro.h"
+#if !defined (WINDOWS_VERSION)
+#include <unistd.h>
+#include <dirent.h>
+#include <string.h>
+#include <sys/stat.h>
+#endif
+#include <allegro.h>
 #include "util/misc.h"
-#include "util/filestream.h"
+#include "util/stdio_compat.h"
 
 using AGS::Common::Stream;
 

diff --git a/Common/util/misc.h b/Common/util/misc.h
@@ -44,15 +44,6 @@
 #ifndef __MISC_H
 #define __MISC_H
 
-#include <stdio.h>
-
-#if !defined (WINDOWS_VERSION)
-#include <unistd.h>
-#include <dirent.h>
-#include <string.h>
-#include <sys/stat.h>
-#endif
-
 #include "util/file.h"
 
 namespace AGS { namespace Common { class Stream; } }

diff --git a/Common/util/path.cpp b/Common/util/path.cpp
@@ -1,11 +1,10 @@
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #if defined (WINDOWS_VERSION)
 #include <windows.h>
 #endif
-#include "util/path.h"
 #include "allegro/file.h"
+#include "util/path.h"
+#include "util/stdio_compat.h"
 
 // TODO: implement proper portable path length
 #ifndef MAX_PATH
@@ -22,10 +21,10 @@ namespace Path
 
 bool IsDirectory(const String &filename)
 {
-    struct stat st;
+    struct stat_t st;
     // stat() does not like trailing slashes, remove them
     String fixed_path = MakePathNoSlash(filename);
-    if (stat(fixed_path, &st) == 0)
+    if (stat_fn(fixed_path, &st) == 0)
     {
         return (st.st_mode & S_IFMT) == S_IFDIR;
     }
@@ -34,8 +33,8 @@ bool IsDirectory(const String &filename)
 
 bool IsFile(const String &filename)
 {
-    struct stat st;
-    if (stat(filename, &st) == 0)
+    struct stat_t st;
+    if (stat_fn(filename, &st) == 0)
     {
         return (st.st_mode & S_IFMT) == S_IFREG;
     }

diff --git a/Common/util/stdio_compat.h b/Common/util/stdio_compat.h
@@ -0,0 +1,43 @@
+//=============================================================================
+//
+// Adventure Game Studio (AGS)
+//
+// Copyright (C) 1999-2011 Chris Jones and 2011-20xx others
+// The full list of copyright holders can be found in the Copyright.txt
+// file, which is part of this source code distribution.
+//
+// The AGS source code is provided under the Artistic License 2.0.
+// A copy of this license can be found in the file License.txt and at
+// http://www.opensource.org/licenses/artistic-license-2.0.php
+//
+//=============================================================================
+#ifndef __AGS_CN_UTIL__STDIOCOMPAT_H
+#define __AGS_CN_UTIL__STDIOCOMPAT_H
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+// 64-bit fseek/ftell
+#if defined(HAVE_FSEEKO) // Contemporary POSIX libc
+#define file_off_t  off_t
+#define fseek       fseeko
+#define ftell       ftello
+#elif defined(_MSC_VER) // MSVC
+#define file_off_t  __int64
+#define fseek       _fseeki64
+#define ftell       _ftelli64
+#else // No distinct interface with off_t
+#define file_off_t  long
+#endif
+
+// 64-bit stat support for MSVC
+#if defined(_MSC_VER) // MSVC
+#define stat_t      _stat64
+#define stat_fn     _stati64
+#else
+#define stat_t      stat
+#define stat_fn     stat
+#endif
+
+#endif // __AGS_CN_UTIL__STDIOCOMPAT_H
diff --git a/Common/util/string.cpp b/Common/util/string.cpp
@@ -12,7 +12,7 @@
 //
 //=============================================================================
 
-#include <stdio.h>
+#include <stdio.h> // sprintf
 #include <stdlib.h>
 #include <string.h>
 #include "debug/assert.h"

diff --git a/Common/util/string_utils.h b/Common/util/string_utils.h
@@ -18,7 +18,6 @@
 #ifndef __AGS_CN_UTIL__STRINGUTILS_H
 #define __AGS_CN_UTIL__STRINGUTILS_H
 
-#include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
 

diff --git a/Common/util/textstreamwriter.cpp b/Common/util/textstreamwriter.cpp
@@ -13,7 +13,7 @@
 //=============================================================================
 
 #include <stdarg.h>
-#include <stdio.h>
+#include <stdio.h> // sprintf
 #include "util/textstreamwriter.h"
 #include "util/stream.h"
 

diff --git a/Engine/ac/dialog.cpp b/Engine/ac/dialog.cpp
@@ -12,7 +12,6 @@
 //
 //=============================================================================
 
-#include <stdio.h>
 #include "ac/dialog.h"
 #include "ac/common.h"
 #include "ac/character.h"

diff --git a/Engine/ac/drawingsurface.cpp b/Engine/ac/drawingsurface.cpp
@@ -12,7 +12,6 @@
 //
 //=============================================================================
 
-#include <stdio.h>
 #include "ac/draw.h"
 #include "ac/drawingsurface.h"
 #include "ac/common.h"

diff --git a/Engine/ac/dynobj/cc_dynamicarray.cpp b/Engine/ac/dynobj/cc_dynamicarray.cpp
@@ -12,7 +12,6 @@
 //
 //=============================================================================
 
-#include <stdio.h>
 #include <string.h>
 #include "cc_dynamicarray.h"
 

diff --git a/Engine/ac/dynobj/cc_dynamicobject.cpp b/Engine/ac/dynobj/cc_dynamicobject.cpp
@@ -26,7 +26,6 @@
 
 //#define DEBUG_MANAGED_OBJECTS
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "ac/dynobj/cc_dynamicobject.h"

diff --git a/Engine/ac/dynobj/cc_serializer.cpp b/Engine/ac/dynobj/cc_serializer.cpp
@@ -12,7 +12,6 @@
 //
 //=============================================================================
 
-#include <stdio.h>
 #include <string.h>
 #include "ac/dynobj/cc_serializer.h"
 #include "ac/dynobj/all_dynamicclasses.h"

diff --git a/Engine/ac/dynobj/managedobjectpool.cpp b/Engine/ac/dynobj/managedobjectpool.cpp
@@ -12,7 +12,6 @@
 //
 //=============================================================================
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "ac/dynobj/managedobjectpool.h"

diff --git a/Engine/ac/event.cpp b/Engine/ac/event.cpp
@@ -12,7 +12,6 @@
 //
 //=============================================================================
 
-#include <stdio.h>
 #include "event.h"
 #include "ac/common.h"
 #include "ac/draw.h"

diff --git a/Engine/ac/game.cpp b/Engine/ac/game.cpp
@@ -81,7 +81,7 @@
 #include "script/script_runtime.h"
 #include "util/alignedstream.h"
 #include "util/directory.h"
-#include "util/filestream.h"
+#include "util/filestream.h" // TODO: needed only because plugins expect file handle
 #include "util/path.h"
 #include "util/string_utils.h"
 

diff --git a/Engine/ac/global_audio.cpp b/Engine/ac/global_audio.cpp
@@ -12,7 +12,6 @@
 //
 //=============================================================================
 
-#include <stdio.h>
 #include "ac/common.h"
 #include "ac/game.h"
 #include "ac/gamesetup.h"