code: drawterm

Info  •  Files  •  Log

delay user prompt until after -u is parsed (Randall Bohn)

--- a/cpu.c

+++ b/cpu.c

@@ -111,9 +111,7 @@

 		close(fd);

 	}

-        user = getenv("USER");

-        if(user == nil)

-        	user = readcons("user", nil, 0);

+	user = getenv("USER");

 	secstoreserver = nil;

 	authserver = getenv("auth");

 	if(authserver == nil)

@@ -160,6 +158,9 @@

 	if(argc != 0)

 		usage();

+

+	if(user == nil)

+		user = readcons("user", nil, 0);

 	if(mountfactotum() < 0){

 		if(secstoreserver == nil)