[Scummvm-cvs-logs] SF.net SVN: scummvm:[38279] scummvm/trunk/engines/sci

[fingolfin at users.sourceforge.net]

Revision: 38279
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38279&view=rev
Author:   fingolfin
Date:     2009-02-15 18:58:10 +0000 (Sun, 15 Feb 2009)

Log Message:
-----------
SCI: Got rid of HAVE_FNMATCH_H

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kfile.cpp
    scummvm/trunk/engines/sci/include/kernel.h
    scummvm/trunk/engines/sci/include/resource.h

Modified: scummvm/trunk/engines/sci/engine/kfile.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kfile.cpp	2009-02-15 18:53:27 UTC (rev 38278)
+++ scummvm/trunk/engines/sci/engine/kfile.cpp	2009-02-15 18:58:10 UTC (rev 38279)
@@ -25,6 +25,8 @@
 
 ***************************************************************************/
 
+#include "common/str.h"
+
 #include "sci/include/engine.h"
 
 
@@ -516,14 +518,8 @@
 		char *path1_s = kernel_dereference_char_pointer(s, argv[1], 0);
 		char *path2_s = kernel_dereference_char_pointer(s, argv[2], 0);
 
-#ifndef HAVE_FNMATCH_H
-#ifndef _DOS
-#  warning "File matches will be unprecise!"
-#endif
-		return make_reg(0, !strcmp(path1_s, path2_s));
-#else
-		return make_reg(0, fnmatch(path1_s, path2_s, FNM_PATHNAME) /* POSIX.2 */);
-#endif
+		//return make_reg(0, !strcmp(path1_s, path2_s));
+		return make_reg(0, Common::matchString(path2_s, path1_s, true));
   }
 		break;
 

Modified: scummvm/trunk/engines/sci/include/kernel.h
===================================================================
--- scummvm/trunk/engines/sci/include/kernel.h	2009-02-15 18:53:27 UTC (rev 38278)
+++ scummvm/trunk/engines/sci/include/kernel.h	2009-02-15 18:58:10 UTC (rev 38279)
@@ -35,10 +35,6 @@
 #include "sci/include/vm.h"
 #include "sci/include/console.h" /* sciprintf() */
 
-#ifdef HAVE_FNMATCH_H
-#include <fnmatch.h>
-#endif /* HAVE_FNMATCH_H */
-
 #ifdef _MSC_VER
 #  include <direct.h>
 #  include <ctype.h>

Modified: scummvm/trunk/engines/sci/include/resource.h
===================================================================
--- scummvm/trunk/engines/sci/include/resource.h	2009-02-15 18:53:27 UTC (rev 38278)
+++ scummvm/trunk/engines/sci/include/resource.h	2009-02-15 18:58:10 UTC (rev 38279)
@@ -66,9 +66,6 @@
 #define HAVE_UNLINK
 #define HAVE_RMDIR
 #define HAVE_MEMCHR
-#ifndef _WIN32
-#define HAVE_FNMATCH_H
-#endif
 #define HAVE_SYS_TIME_H
 #define HAVE_GETTIMEOFDAY
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.