[mupen64plus] 190/262: Add dummy PATH_MAX on systems without it

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus.

commit c987c4f1860c80b7346a52a1e9a3b1717f6e9bf1
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Mon Jul 12 23:00:08 2010 +0200

    Add dummy PATH_MAX on systems without it
    
    Posix only defines that PATH_MAX may is defined through limits.h.
    GNU/Hurd has removed this definition without violating the standards.
    
    Mupen64Plus still relies on it and we work around that problem by
    defining PATH_MAX as 4096 in all places it is needed. This is not 100%
    correct as their are ways to generate longer paths, but mupen64plus must
    be heavily refactored in some places to fix the actual problem.
---
 debian/changelog              |   8 +++
 debian/patches/path_max.patch | 129 ++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series         |   1 +
 3 files changed, 138 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5f345b8..363e57a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mupen64plus (1.5+dfsg1-13) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - Add path_max.patch, Add dummy PATH_MAX on systems without it (Closes:
+      #588066)
+
+ -- Sven Eckelmann <sven.eckelmann at gmx.de>  Mon, 12 Jul 2010 22:38:17 +0200
+
 mupen64plus (1.5+dfsg1-12) unstable; urgency=low
 
   * Use googlecode.debian.net instead of complex own filters for debian/watch
diff --git a/debian/patches/path_max.patch b/debian/patches/path_max.patch
new file mode 100644
index 0000000..7b3b86a
--- /dev/null
+++ b/debian/patches/path_max.patch
@@ -0,0 +1,129 @@
+Description: Add dummy PATH_MAX on systems without it
+ Posix only defines that PATH_MAX may is defined through limits.h. GNU/Hurd has
+ removed this definition without violating the standards.
+ .
+ Mupen64Plus still relies on it and we work around that problem by defining
+ PATH_MAX as 4096 in all places it is needed. This is not 100% correct as their
+ are ways to generate longer paths, but mupen64plus must be heavily refactored
+ in some places to fix the actual problem.
+Bug-Debian: http://bugs.debian.org/588066
+Author: Sven Eckelmann <sven.eckelmann at gmx.de>
+
+---
+diff --git a/glide64/winlnxdefs.h b/glide64/winlnxdefs.h
+index cdbbf39c7426e55c972b9f7a377185200ea80b53..a1f8b901334371de9aedc2ebbc01f0f19088a396 100644
+--- a/glide64/winlnxdefs.h
++++ b/glide64/winlnxdefs.h
+@@ -63,5 +63,9 @@ typedef union _LARGE_INTEGER
+ #define HIWORD(a) ((unsigned int)(a) >> 16)
+ #define LOWORD(a) ((a) & 0xFFFF)
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ #endif // WINLNXDEFS_H
+ 
+diff --git a/main/cheat.c b/main/cheat.c
+index 4e60682603d0371389c594613bbc09073d34d6fa..f37049e82d4d19cfdeb117adbbe4c6c744f0a27a 100644
+--- a/main/cheat.c
++++ b/main/cheat.c
+@@ -26,6 +26,7 @@
+ #include <limits.h>
+ #include <zlib.h> // TODO: compress cfg file
+ 
++#include "winlnxdefs.h"
+ #include "../memory/memory.h"
+ #include "cheat.h"
+ #include "main.h"
+diff --git a/main/config.c b/main/config.c
+index 65ed17431f15d353c27e43b9a9e8b04c92052691..7f44323b82e69100ff3e21d6bcce538a4e7c58d7 100644
+--- a/main/config.c
++++ b/main/config.c
+@@ -26,6 +26,7 @@
+ #include <errno.h>
+ #include <limits.h>
+ 
++#include "winlnxdefs.h"
+ #include "config.h"
+ #include "main.h"
+ #include "util.h"
+diff --git a/main/rom.c b/main/rom.c
+index 0f2e95ff3a35e5cab25d95c175d5b1b2daa18613..e22c370481ea06c72a06fd16d5f6e91b771ea14b 100644
+--- a/main/rom.c
++++ b/main/rom.c
+@@ -27,6 +27,7 @@
+ #include <limits.h>
+ #include <zlib.h>
+ 
++#include "winlnxdefs.h"
+ #include "zip/unzip.h"
+ #include <bzlib.h>
+ #include <lzma.h>
+diff --git a/main/romcache.h b/main/romcache.h
+index ed7d4918e11fcf8dfb611889602b5f8ab916a844..0cab0a9f981f2b6f98e83a4803239593fe10066b 100644
+--- a/main/romcache.h
++++ b/main/romcache.h
+@@ -24,6 +24,7 @@
+ 
+ #include <limits.h> 
+ #include "md5.h"
++#include "winlnxdefs.h"
+ 
+ #define COMMENT_MAXLENGTH 256
+ 
+diff --git a/main/translate.c b/main/translate.c
+index 6341cc7c8b4eedd394e4f8143d73a408fe3c876d..c4c36b7b5a53053336f8bce0701f80006315eeff 100644
+--- a/main/translate.c
++++ b/main/translate.c
+@@ -29,6 +29,8 @@ Email                : blight at Ashitaka
+ #include <iconv.h>
+ #include <errno.h>
+ 
++#include "winlnxdefs.h"
++
+ // types
+ typedef struct
+ {
+diff --git a/main/winlnxdefs.h b/main/winlnxdefs.h
+index 26e1f148dbddc65f8cf419292ce6cfdcc31ca739..9c749e387158ac18b4084cbda39a698c076c8eea 100644
+--- a/main/winlnxdefs.h
++++ b/main/winlnxdefs.h
+@@ -58,6 +58,10 @@ typedef void* LPVOID;
+ #define TRUE 1
+ #endif
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ #endif // __WIN32__
+ #endif // WINLNXDEFS_H
+ 
+diff --git a/opengl/screenshot.cpp b/opengl/screenshot.cpp
+index 8028bc94e65c50c3993a94bbedd2d609b4361640..ec77cae067e993dbb50cccefdfdbbe0e4fd26123 100644
+--- a/opengl/screenshot.cpp
++++ b/opengl/screenshot.cpp
+@@ -31,6 +31,7 @@
+ #include <SDL.h>
+ #include <png.h>
+ 
++#include "../main/winlnxdefs.h"
+ #include "osd.h"
+ 
+ extern "C" {
+diff --git a/rice_video/winlnxdefs.h b/rice_video/winlnxdefs.h
+index 215524f4b860bf334e4c97c2301d06a3bfb00d2c..6c7646ce3fb22795a64ad86592e13f7017d17a4a 100644
+--- a/rice_video/winlnxdefs.h
++++ b/rice_video/winlnxdefs.h
+@@ -64,6 +64,10 @@ typedef struct _COORDRECT
+ #define TRUE 1
+ #endif
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ #define MAX_PATH PATH_MAX
+ #define _MAX_PATH PATH_MAX
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 286fb2e..6dd539b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -42,3 +42,4 @@ rsp_hle_bigendian.patch
 rice-crash-vendorstring.patch
 rice-ati-symbols.patch
 link_gdk.patch
+path_max.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git