Fixed name shorting to account for multiple dots

CherryPill · May 26, 2017 · aef747f · aef747f
1 parent b1c3918
commit aef747f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/crypto_md5/utility.c b/crypto_md5/utility.c
@@ -27,16 +27,29 @@ void getFileNameFromPath(TCHAR *fullPath, TCHAR *fileName) {
 TCHAR *shortenPath(TCHAR *path) {
 	static TCHAR shortenedPath[256] = {0};
 	TCHAR *lastPart = NULL;
-	TCHAR *extensionPart;
+	TCHAR *extensionPart[256] = {0};
 	_tcsncpy(shortenedPath, path, 4);
 	_tcscat(shortenedPath, _T(".."));
 	path+=4+1;
-	_tcstok(path, _T("."));
+	separateNameAndExt(path, extensionPart);
 	lastPart = path+_tcslen(path)-4;
 	_tcscat(shortenedPath, lastPart);
-	path = _tcstok(NULL, _T("."));
-	_tcscat(shortenedPath, _T("."));
-	_tcscat(shortenedPath, path);
+	_tcscat(shortenedPath, extensionPart);
 	memset(path, 0, sizeof(path));
 	return shortenedPath;
+}
+void separateNameAndExt(TCHAR *fullPath, TCHAR *ext) {
+	int c = _tcslen(fullPath)-1;
+	TCHAR *extLoc = fullPath+c;
+	TCHAR singleChar;
+	do {
+		singleChar = *extLoc;
+		if (singleChar == _T('.')) {
+			break;
+		}
+		--c;
+		extLoc = fullPath+c;
+	}while(extLoc!=fullPath);
+	_tcscpy(ext, extLoc);
+	fullPath[c] = _T('\0');
 }
diff --git a/crypto_md5/utility.h b/crypto_md5/utility.h
@@ -1,4 +1,5 @@
 #pragma once
 void centerWindow(POINT*);
 void getFileNameFromPath(TCHAR *fullPath, TCHAR *fileName);
-TCHAR *shortenPath(TCHAR *);
+TCHAR *shortenPath(TCHAR *);
+void separateNameAndExt(TCHAR *fullPath, TCHAR *ext);