X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fum%2Fos-Linux%2Fmain.c;h=2878e89a674f0190108f4c527feb637de85ca6dc;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=90912aaca7aa154ef577e63bbc0d9c6aa6d87800;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/arch/um/os-Linux/main.c b/arch/um/os-Linux/main.c
index 90912aaca..2878e89a6 100644
--- a/arch/um/os-Linux/main.c
+++ b/arch/um/os-Linux/main.c
@@ -59,7 +59,7 @@ static __init void do_uml_initcalls(void)
 	initcall_t *call;
 
 	call = &__uml_initcall_start;
-	while (call < &__uml_initcall_end){
+	while (call < &__uml_initcall_end){;
 		(*call)();
 		call++;
 	}
@@ -74,34 +74,6 @@ static void last_ditch_exit(int sig)
 	exit(1);
 }
 
-#define UML_LIB_PATH	":/usr/lib/uml"
-
-static void setup_env_path(void)
-{
-	char *new_path = NULL;
-	char *old_path = NULL;
-	int path_len = 0;
-
-	old_path = getenv("PATH");
-	/* if no PATH variable is set or it has an empty value
-	 * just use the default + /usr/lib/uml
-	 */
-	if (!old_path || (path_len = strlen(old_path)) == 0) {
-		putenv("PATH=:/bin:/usr/bin/" UML_LIB_PATH);
-		return;
-	}
-
-	/* append /usr/lib/uml to the existing path */
-	path_len += strlen("PATH=" UML_LIB_PATH) + 1;
-	new_path = malloc(path_len);
-	if (!new_path) {
-		perror("coudn't malloc to set a new PATH");
-		return;
-	}
-	snprintf(new_path, path_len, "PATH=%s" UML_LIB_PATH, old_path);
-	putenv(new_path);
-}
-
 extern int uml_exitcode;
 
 extern void scan_elf_aux( char **envp);
@@ -142,8 +114,6 @@ int main(int argc, char **argv, char **envp)
 
 	set_stklim();
 
-	setup_env_path();
-
 	new_argv = malloc((argc + 1) * sizeof(char *));
 	if(new_argv == NULL){
 		perror("Mallocing argv");