From: jbess <jbess@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Wed, 7 Feb 2001 09:56:53 +0000 (+0000)
Subject: Fix some path problems
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=3895c1378eea714f02cff7961e6f4ddcae1cfcd2;p=fw%2Fsdcc

Fix some path problems


git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@602 4a8a32a2-be11-0410-ad9d-d568d2c75423
---

diff --git a/as/mcs51/asnoice.c b/as/mcs51/asnoice.c
index b8de1bb3..acf86b46 100644
--- a/as/mcs51/asnoice.c
+++ b/as/mcs51/asnoice.c
@@ -35,6 +35,7 @@ char* BaseFileName( int fileNumber )
 
 		/* Name starts after any colon or backslash (DOS) */
 		p2 = strrchr( p1, '\\' );
+		if (p2 == NULL) p2 = strrchr( p1, '/' );
 		if (p2 == NULL) p2 = strrchr( p1, ':' );
 		if (p2 == NULL) p2 = p1-1;
                 strcpy( baseName, p2+1 );
diff --git a/as/mcs51/i51mch.c b/as/mcs51/i51mch.c
index 0446fb26..7af6a135 100644
--- a/as/mcs51/i51mch.c
+++ b/as/mcs51/i51mch.c
@@ -498,7 +498,7 @@ struct mne *mp;
 			v1 = -3;
 		    else   
 			v1 = e1.e_addr - dot.s_addr - 1;
-			if ((v1 < -128) || (v1 > 127))
+			if (pass == 2 && ((v1 < -128) || (v1 > 127)))
 				aerr();
 			outab(v1);
 		} else {
@@ -535,7 +535,7 @@ struct mne *mp;
 			v1 = -2;
 		    else   
 			v1 = e1.e_addr - dot.s_addr - 1;
-			if ((v1 < -128) || (v1 > 127))
+			if (pass == 2 && ((v1 < -128) || (v1 > 127)))
 				aerr();
 			outab(v1);
 		} else {
diff --git a/as/mcs51/lklex.c b/as/mcs51/lklex.c
index d80b9ae4..7466cabe 100644
--- a/as/mcs51/lklex.c
+++ b/as/mcs51/lklex.c
@@ -142,7 +142,7 @@ char *str;
 		if (p < &str[FILSPC-1])
 			*p++ = c;
 		c = get();
-	} while (c && (ctype[c] != SPACE));
+	} while (c && ((ctype[c] != SPACE)||(c == ':')||(c == '\\')));
 	while (p < &str[FILSPC])
 		*p++ = 0;
 }