Patched xsh and posix to allow absolute binary paths.

xomboverlord · Mar 11, 2011 · 6bf9af9 · 6bf9af9
1 parent e6b53bd
commit 6bf9af9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/app/d/posix/posix.d b/app/d/posix/posix.d
@@ -22,6 +22,15 @@ void main(char[][] argv){
 	MinFS.initialize();
 	MessageInAbottle* bottle = MessageInAbottle.getMyBottle();
 
+	int last_slash = 0;
+	foreach(idx, chr; argv[0]) {
+		if (chr == '/') {
+			last_slash = idx+1;
+		}
+	}
+
+	argv[0] = argv[0][last_slash..$];
+
 	switch(argv[0]){
 	case "cat":
 		if(argv.length < 2){
@@ -193,4 +202,4 @@ void main(char[][] argv){
 	}
 
 	//return 0;
-}
+}
diff --git a/app/d/xsh/xsh.d b/app/d/xsh/xsh.d
@@ -228,19 +228,25 @@ void interpret(char[] str) {
 			bool fallback = true;
 			File f;
 
+			uint idx;
+
 			if(arguments[0][0] != '/'){
 				uint len = arguments[0].length < pathName.length - pathNameLength ? arguments[0].length : pathName.length - pathNameLength;				
 				char[] testPathName = pathName[0..(pathNameLength+len)];
 
 				testPathName[pathNameLength..(pathNameLength+len)] = arguments[0];
 
-				uint idx;
-
 				if(testPathName == MinFS.findPrefix(testPathName, idx)){
 					f = MinFS.open(testPathName, AccessMode.Writable);
 					fallback = false;
 				}
 			}
+			else {
+				if(arguments[0] == MinFS.findPrefix(arguments[0], idx)){
+					f = MinFS.open(arguments[0], AccessMode.Writable);
+					fallback = false;
+				}
+			}
 
 			if(fallback){
 				f = MinFS.open("/binaries/posix", AccessMode.Writable);