From 0ec7d51b8f08d1b5302d56270d144907b95bcbc9 Mon Sep 17 00:00:00 2001
From: johnvg
Date: Fri, 21 Sep 2012 10:15:06 +0000
Subject: add hierarchical modules

git-svn-id: https://svn.cs.ru.nl/repos/clean-compiler/trunk@2177 1f8540f1-abd5-4d5b-9d24-4c5ce8603e2d
---
 backendC/CleanCompilerSources/windows_io.c | 99 +++++++++++++++++++++++++-----
 1 file changed, 84 insertions(+), 15 deletions(-)

(limited to 'backendC')

diff --git a/backendC/CleanCompilerSources/windows_io.c b/backendC/CleanCompilerSources/windows_io.c
index 932dca7..11e1099 100644
--- a/backendC/CleanCompilerSources/windows_io.c
+++ b/backendC/CleanCompilerSources/windows_io.c
@@ -136,6 +136,66 @@ static Bool find_filepath_and_time (char *fname,FileKind kind,char *path,FileTim
 }
 #endif
 
+
+static void append_file_name_and_ext (char *path_p,char *fname_p,char *ext,int in_clean_system_files_folder)
+{
+	int i;
+	char c;
+	
+	if (in_clean_system_files_folder){
+		int last_dot_i;
+
+		last_dot_i = -1;
+
+		i=0;
+		while (c=fname_p[i], c!='\0'){
+			if (c=='.')
+				last_dot_i=i;
+			++i;
+		}
+
+		if (last_dot_i>=0){
+			i=0;
+			while (i<last_dot_i){
+				path_p[i]=fname_p[i];
+				++i;
+			}
+			path_p[i]='\\';
+			
+			path_p+=last_dot_i+1;
+			fname_p+=last_dot_i+1;
+		}
+		
+
+		strcpy (path_p,"Clean System Files\\");
+		path_p += 19;
+
+		i=0;
+		while (c=fname_p[i], c!='\0'){
+			path_p[i] = c;
+			++i;
+		}
+		path_p+=i;
+	} else {
+		int i;
+		char c;
+
+		i=0;
+		while (c=fname_p[i], c!='\0'){
+			path_p[i] = c=='.' ? '\\' : c;
+			++i;
+		}
+		path_p+=i;
+	}
+
+	i=0;
+	do {
+		c=ext[i];
+		path_p[i]=c;
+		++i;
+	} while (c!='\0');
+}
+
 static Bool findfilepath (char *fname,FileKind kind,char *path)
 {
     char *s,*path_elem,c,*pathlist,*ext;
@@ -178,12 +238,8 @@ static Bool findfilepath (char *fname,FileKind kind,char *path)
 					*dest_p++ = *from_p++;
 				*dest_p = '\0';
 
-				if (in_clean_system_files_folder)
-					strcat (path,"\\Clean System Files\\");
-				else
-				    strcat (path,"\\");
-			    strcat (path,fname);
-			    strcat (path,ext);
+				*dest_p++ = '\\';
+				append_file_name_and_ext (dest_p,fname,ext,in_clean_system_files_folder);
 				if (file_exists (path))
 					return True;
 		    
@@ -196,12 +252,7 @@ static Bool findfilepath (char *fname,FileKind kind,char *path)
 		}
 	}
 
-	if (in_clean_system_files_folder){
-		strcpy (path,"Clean System Files\\");
-		strcat (path,fname);
-	} else
-		strcpy (path,fname);
-	strcat (path,ext);
+	append_file_name_and_ext (path,fname,ext,in_clean_system_files_folder);
 
  	return file_exists (path);
 }
@@ -227,6 +278,23 @@ File FOpenWithFileTime (char *file_name,FileKind kind, char *mode,FileTime *file
 }
 #endif
 
+static char *skip_after_last_dot (char *s)
+{
+	int i,after_last_dot_i;
+	char c;
+
+	after_last_dot_i=0;
+
+	i=0;
+	while (c=s[i],c!='\0'){
+		++i;
+		if (c=='.')
+			after_last_dot_i=i;
+	}
+	
+	return &s[after_last_dot_i];
+}
+
 File FOpen (char *fname,FileKind kind,char *mode)
 {
 	char path[MAXPATHLEN];
@@ -275,9 +343,10 @@ File FOpen (char *fname,FileKind kind,char *mode)
 				}
 
 				strcat (after_last_slash,"\\");
-				strcat (after_last_slash,fname);
+				
+				strcat (after_last_slash,skip_after_last_dot (fname));
 			} else
-				strcpy (after_last_slash,fname);
+				strcpy (after_last_slash,skip_after_last_dot (fname));
 			strcat (after_last_slash,GetFileExtension (kind));
 			
 			return fopen (path,mode);
@@ -409,7 +478,7 @@ int CheckInterrupt (void)
 {	
 	return 0;
 }
- 
+
 void *Alloc (long unsigned count, SizeT size)
 {	
 	if (size == 1){
-- 
cgit v1.2.3