From f352dd54f0c495798d73e54ec96be8d628a2c787 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 29 Jan 2003 15:00:57 +0000 Subject: [PATCH] removing path corrections for wxMac, we now want a correct platform string for unzOpen git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/unzip.c | 49 +--------------------------------------------- 1 file changed, 1 insertion(+), 48 deletions(-) diff --git a/src/common/unzip.c b/src/common/unzip.c index a94a700ca6..04f8a8c0b8 100644 --- a/src/common/unzip.c +++ b/src/common/unzip.c @@ -368,48 +368,6 @@ local uLong unzlocal_SearchCentralDir(fin) return uPosFound; } -#if defined(__WXMAC__) && !defined(__UNIX__) -void wxUnix2MacFilename (char *s) ; -void -wxUnix2MacFilename (char *s) -{ - if (s) - { - if ( *s == '.' ) - { - /* relative path , since it goes on with slash which is translated to a : */ - memmove( s , s+1 ,strlen( s ) ) ; - } - else if ( *s == '/' ) - { - /* absolute path -> on mac just start with the drive name */ - memmove( s , s+1 ,strlen( s ) ) ; - } - else - { -/* wxASSERT_MSG( 1 , "unkown path beginning" ) ; */ - } - while (*s) - { - if (*s == '/' || *s == '\\') - { - /* convert any back-directory situations */ - if ( *(s+1) == '.' && *(s+2) == '.' && ( (*(s+3) == '/' || *(s+3) == '\\') ) ) - { - *s = ':'; - memmove( s+1 , s+3 ,strlen( s+3 ) + 1 ) ; - } - else - *s = ':'; - } - - s++ ; - } - } -} -extern char * wxBuffer ; -#endif - /* Open a Zip file. path contain the full pathname (by example, on a Windows NT computer "c:\\test\\zlib109.zip" or on an Unix computer @@ -440,13 +398,8 @@ extern unzFile ZEXPORT unzOpen (path) if (unz_copyright[0]!=' ') return NULL; -#if defined(__WXMAC__) && !defined(__UNIX__) - strcpy( wxBuffer , path ) ; - wxUnix2MacFilename( wxBuffer ) ; - fin=fopen(wxBuffer,"rb"); -#else fin=fopen(path,"rb"); -#endif + if (fin==NULL) return NULL; -- 2.47.2