From 469013e618a82496df124fee97ff2b945c5d12ef Mon Sep 17 00:00:00 2001
From: Ulf Wohlers <finsterr@users.sourceforge.net>
Date: Thu, 13 Mar 2003 10:16:59 +0000
Subject: [PATCH] drivecache removes trailing dot, if no extension is available
 (linux compatibility)

Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@758
---
 src/dos/drive_cache.cpp | 16 ++++++++++++++++
 src/dos/drives.h        |  7 ++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/dos/drive_cache.cpp b/src/dos/drive_cache.cpp
index 820e6925..3241cc3d 100644
--- a/src/dos/drive_cache.cpp
+++ b/src/dos/drive_cache.cpp
@@ -279,8 +279,23 @@ Bit16u DOS_Drive_Cache::CreateShortNameID(CFileInfo* curDir, const char* name)
 	return foundNr+1;
 };
 
+bool DOS_Drive_Cache::RemoveTrailingDot(char* shortname)
+// remove trailing '.' if no extension is available (Linux compatibility)
+{
+	Bitu len = strlen(shortname);
+	if (len && (shortname[len-1]=='.')) {
+		if (len==1) return false;
+		if ((len==2) && (shortname[0]=='.')) return false;
+		shortname[len-1] = 0;	
+		return true;
+	}	
+	return false;
+};
+
 Bit16s DOS_Drive_Cache::GetLongName(CFileInfo* curDir, char* shortName)
 {
+	// Remove dot, if no extension...
+	RemoveTrailingDot(shortName);
 	// Search long name and return array number of element
 	Bit16s low	= 0;
 	Bit16s high = curDir->fileList.size()-1;
@@ -381,6 +396,7 @@ void DOS_Drive_Cache::CreateShortName(CFileInfo* curDir, CFileInfo* info)
 	} else {
 		strcpy(info->shortname,tmpName);
 	}
+	RemoveTrailingDot(info->shortname);
 };
 
 DOS_Drive_Cache::CFileInfo* DOS_Drive_Cache::FindDirInfo(const char* path, char* expandedPath)
diff --git a/src/dos/drives.h b/src/dos/drives.h
index 375e789e..8c8f6887 100644
--- a/src/dos/drives.h
+++ b/src/dos/drives.h
@@ -63,9 +63,9 @@ public:
 		char		orgname		[CROSS_LEN];
 		char		shortname	[DOS_NAMELENGTH_ASCII];
 		bool		isDir;
-		Bit16u		nextEntry;
-		Bit16u		shortNr;
-		Bit16u		compareCount;
+		Bitu		nextEntry;
+		Bitu		shortNr;
+		Bitu		compareCount;
 		// contents
 		std::vector<CFileInfo*>	fileList;
 		std::vector<CFileInfo*>	longNameList;
@@ -74,6 +74,7 @@ public:
 
 private:
 
+	bool		RemoveTrailingDot	(char* shortname);
 	Bit16s		GetLongName			(CFileInfo* info, char* shortname);
 	void		CreateShortName		(CFileInfo* dir, CFileInfo* info);
 	Bit16u		CreateShortNameID	(CFileInfo* dir, const char* name);