[2/2] winefile: Get rid of _wsplitpath duplication

André Hentschel nerv at dawncrow.de
Mon Feb 20 13:51:10 CST 2012


---
 programs/winefile/Makefile.in |    3 +-
 programs/winefile/splitpath.c |   92 -----------------------------------------
 2 files changed, 1 insertions(+), 94 deletions(-)
 delete mode 100644 programs/winefile/splitpath.c

diff --git a/programs/winefile/Makefile.in b/programs/winefile/Makefile.in
index efd2bf3..18716c1 100644
--- a/programs/winefile/Makefile.in
+++ b/programs/winefile/Makefile.in
@@ -1,10 +1,9 @@
 EXTRADEFS = -D__WINE__
 MODULE    = winefile.exe
-APPMODE   = -mwindows -municode
+APPMODE   = -mwindows -municode -mno-cygwin
 IMPORTS   = uuid shell32 comdlg32 comctl32 ole32 mpr version user32 gdi32 advapi32
 
 C_SRCS = \
-	splitpath.c \
 	winefile.c
 
 RC_SRCS = winefile.rc
diff --git a/programs/winefile/splitpath.c b/programs/winefile/splitpath.c
deleted file mode 100644
index 20d7ded..0000000
--- a/programs/winefile/splitpath.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2000, 2004 Martin Fuchs
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "winefile.h"
-
-
-void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext)
-{
-        const WCHAR* end; /* end of processed string */
-	const WCHAR* p;	  /* search pointer */
-	const WCHAR* s;	  /* copy pointer */
-
-	/* extract drive name */
-	if (path[0] && path[1]==':') {
-		if (drv) {
-			*drv++ = *path++;
-			*drv++ = *path++;
-			*drv = '\0';
-		}
-	} else if (drv)
-		*drv = '\0';
-
-        end = path + lstrlenW(path);
-
-	/* search for begin of file extension */
-	for(p=end; p>path && *--p!='\\' && *p!='/'; )
-		if (*p == '.') {
-			end = p;
-			break;
-		}
-
-	if (ext)
-		for(s=end; (*ext=*s++); )
-			ext++;
-
-	/* search for end of directory name */
-	for(p=end; p>path; )
-		if (*--p=='\\' || *p=='/') {
-			p++;
-			break;
-		}
-
-	if (name) {
-		for(s=p; s<end; )
-			*name++ = *s++;
-
-		*name = '\0';
-	}
-
-	if (dir) {
-		for(s=path; s<p; )
-			*dir++ = *s++;
-
-		*dir = '\0';
-	}
-}
-
-
-/*
-void main()	// test splipath()
-{
-	WCHAR drv[_MAX_DRIVE+1], dir[_MAX_DIR], name[_MAX_FNAME], ext[_MAX_EXT];
-
-	_wsplitpath(L"x\\y", drv, dir, name, ext);
-	_wsplitpath(L"x\\", drv, dir, name, ext);
-	_wsplitpath(L"\\x", drv, dir, name, ext);
-	_wsplitpath(L"x", drv, dir, name, ext);
-	_wsplitpath(L"", drv, dir, name, ext);
-	_wsplitpath(L".x", drv, dir, name, ext);
-	_wsplitpath(L":x", drv, dir, name, ext);
-	_wsplitpath(L"a:x", drv, dir, name, ext);
-	_wsplitpath(L"a.b:x", drv, dir, name, ext);
-	_wsplitpath(L"W:\\/\\abc/Z:~", drv, dir, name, ext);
-	_wsplitpath(L"abc.EFGH:12345", drv, dir, name, ext);
-	_wsplitpath(L"C:/dos/command.com", drv, dir, name, ext);
-}
-*/
-- 

Best Regards, André Hentschel
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: Nachrichtenteil als Anhang
URL: <http://www.winehq.org/pipermail/wine-patches/attachments/20120220/6e7849db/attachment.ksh>


More information about the wine-patches mailing list