shithub: 5v

Info  •  Files  •  Log  •  Branches

5e: handle path as expected

--- a/5e.c

+++ b/5e.c

@@ -87,7 +87,7 @@

 static void

 dotext(int argc, char **argv)

 {

-	char *file;

+	char *file, **p, *path[] = {"/bin", ".", nil};

 	if(**argv == '/' || **argv == '.' || **argv == '#') {

 		if(loadtext(*argv, argc, argv) < 0)

@@ -94,10 +94,15 @@

 			sysfatal("loadtext: %r");

 		return;

 	}

-	file = smprint("/bin/%s", *argv);

-	if(loadtext(file, argc, argv) < 0)

-		sysfatal("loadtext: %r");

-	free(file);

+	for(p = path; *p; p++){

+		file = smprint("%s/%s", *p, *argv);

+		if(loadtext(file, argc, argv) >= 0){

+			free(file);

+			return;

+		}

+		free(file);

+	}

+	sysfatal("loadtext: %r");

 }

 void