From da87c80cef4a08761b02e87d317d4e859fbf0f69 Mon Sep 17 00:00:00 2001
From: Ulf Wohlers <finsterr@users.sourceforge.net>
Date: Mon, 22 Sep 2003 12:22:25 +0000
Subject: [PATCH] Drivecache: new FindFirst/FindNext methods, removed
 outputList, changed Bit16s types to Bits

Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1260
---
 include/dos_system.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/dos_system.h b/include/dos_system.h
index 14593882..02ce52c2 100644
--- a/include/dos_system.h
+++ b/include/dos_system.h
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: dos_system.h,v 1.14 2003-08-13 14:46:15 qbix79 Exp $ */
+/* $Id: dos_system.h,v 1.15 2003-09-22 12:22:25 finsterr Exp $ */
 
 #ifndef DOSSYSTEM_H_
 #define DOSSYSTEM_H_
@@ -104,6 +104,9 @@ public:
 	char*		GetExpandName		(const char* path);
 	bool		GetShortName		(const char* fullname, char* shortname);
 	
+	bool		FindFirst			(char* path, Bit16u& id);
+	bool		FindNext			(Bit16u& id, char* &result);
+
 	void		CacheOut			(const char* path, bool ignoreLastDir = false);
 	void		AddEntry			(const char* path, bool checkExist = false);
 	void		DeleteEntry			(const char* path, bool ignoreLastDir = false);
@@ -118,7 +121,6 @@ public:
 			for (Bit32u i=0; i<fileList.size(); i++) delete fileList[i];
 			fileList.clear();
 			longNameList.clear();
-			outputList.clear();
 		};
 		char		orgname		[CROSS_LEN];
 		char		shortname	[DOS_NAMELENGTH_ASCII];
@@ -129,13 +131,12 @@ public:
 		// contents
 		std::vector<CFileInfo*>	fileList;
 		std::vector<CFileInfo*>	longNameList;
-		std::vector<CFileInfo*>	outputList;
 	};
 
 private:
 
 	bool		RemoveTrailingDot	(char* shortname);
-	Bit16s		GetLongName			(CFileInfo* info, char* shortname);
+	Bits		GetLongName			(CFileInfo* info, char* shortname);
 	void		CreateShortName		(CFileInfo* dir, CFileInfo* info);
 	Bit16u		CreateShortNameID	(CFileInfo* dir, const char* name);
 	bool		SetResult			(CFileInfo* dir, char * &result, Bit16u entryNr);
@@ -160,6 +161,7 @@ private:
 	CFileInfo*	dirSearch			[MAX_OPENDIRS];
 	char		dirSearchName		[MAX_OPENDIRS];
 	bool		free				[MAX_OPENDIRS];
+	CFileInfo*	dirFindFirst;
 
 	char		label				[CROSS_LEN];
 };