Added several Debian patches from the Debian maintainer of Stella;

Stephen Kitt.

Bumped version # for next round ...


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2192 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba

configure

@@ -472,7 +472,7 @@ else
 	echo_n "Checking hosttype... "
 	echo $_host_os
 	case $_host_os in
-		linux* | openbsd* | freebsd* | netbsd* | bsd* | sunos* | hpux* | beos*)
+		linux* | openbsd* | freebsd* | kfreebsd* | netbsd* | bsd* | gnu0.3 | sunos* | hpux* | beos*)
 			DEFINES="$DEFINES -DUNIX"
 			_host_os=unix
 			;;

src/common/Version.hxx

@@ -22,7 +22,7 @@
 
 #include <cstdlib>
 
-#define STELLA_VERSION "3.3"
+#define STELLA_VERSION "3.3.01"
 #define STELLA_BUILD atoi("$Rev$" + 6)
 
 #endif

src/unix/FSNodePOSIX.cxx

@@ -134,7 +134,11 @@ POSIXFilesystemNode::POSIXFilesystemNode(const string& p, bool verify)
   if ( p.length() >= 2 && p[0] == '~' && p[1] == '/')
   {
     const char *home = getenv("HOME");
+#ifdef MAXPATHLEN
     if (home != NULL && strlen(home) < MAXPATHLEN)
+#else // No MAXPATHLEN, as happens on Hurd
+    if (home != NULL)
+#endif
     {
       _path = home;
       // Skip over the tilde.  We know that p contains at least
@@ -145,14 +149,22 @@ POSIXFilesystemNode::POSIXFilesystemNode(const string& p, bool verify)
   // Expand "./" to the current directory
   else if ( p.length() >= 2 && p[0] == '.' && p[1] == '/')
   {
+#ifdef MAXPATHLEN
     char buf[MAXPATHLEN];
     char* ret = getcwd(buf, MAXPATHLEN);
-    if (ret == buf)
+#else // No MAXPATHLEN, as happens on Hurd
+    char* ret = get_current_dir_name();
+    char* buf = ret;
+#endif
+    if (ret == buf && ret != NULL)
     {
       _path = buf;
-      // Skip over the tilda.  We know that p contains at least
+      // Skip over the dot.  We know that p contains at least
       // two chars, so this is safe:
       _path += p.c_str() + 1;
+#ifndef MAXPATHLEN
+      free(ret);
+#endif
     }
   }
   else

src/unix/stella.desktop

@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Stella
 Comment=A multi-platform Atari 2600 emulator
 Exec=stella

src/win32/FSNodeWin32.cxx

@@ -243,7 +243,7 @@ WindowsFilesystemNode::WindowsFilesystemNode(const string& p)
   if ( p.length() >= 2 && p[0] == '~' && p[1] == '\\')
   {
     _path = myHomeFinder.getHomePath();
-    // Skip over the tilda.  We know that p contains at least
+    // Skip over the tilde.  We know that p contains at least
     // two chars, so this is safe:
     _path += p.c_str() + 1;
   }
@@ -253,7 +253,7 @@ WindowsFilesystemNode::WindowsFilesystemNode(const string& p)
     char path[MAX_PATH];
     GetCurrentDirectory(MAX_PATH, path);
     _path = path;
-    // Skip over the tilda.  We know that p contains at least
+    // Skip over the dot.  We know that p contains at least
     // two chars, so this is safe:
     _path += p.c_str() + 1;
   }