fiddle

Russ Cox committed 21 years ago

Commit 64b62a31 parent ad9a4044 files · +13 −23Browse files

Unified · Split

4 files

cpu.c+10−18

 void
 cpumain(int argc, char **argv)
 {
-	char dat[MaxStr], buf[MaxStr], cmd[MaxStr], *p, *err, *secstoreserver, *s;
+	char dat[MaxStr], buf[MaxStr], cmd[MaxStr], *err, *secstoreserver, *s;
 	int fd, ms, data;
 	/* see if we should use a larger message size */
         if(user == nil)
         	user = readcons("user", nil, 0);
 	secstoreserver = nil;
+	authserver = getenv("auth");
+	if(authserver == nil)
+		authserver = "auth";
+	system = getenv("cpu");
+	if(system == nil)
+		system = "cpu";
 	ARGBEGIN{
 	case 'a':
 		authserver = EARGF(usage());
 		usage();
 	}ARGEND;
+	if(argc != 0)
+		usage();
 	if(mountfactotum() < 0){
 		if(secstoreserver == nil)
 			secstoreserver = authserver;
 	        }
 	}
-	if(argc != 0)
-		usage();
-	if(system == nil) {
-		p = getenv("cpu");
-		if(p == 0)
-			fatal(0, "set $cpu");
-		system = p;
-	}
-	if(authserver == nil) {
-		p = getenv("auth");
-		if(p == 0)
-			fatal(0, "set $auth");
-		authserver = p;
-	}
 	if((err = rexcall(&data, system, srvname)))
 		fatal(1, "%s: %s", err, system);

@@ -2,7 +2,7 @@ extern int havesecstore(char addr, char owner); · 1 unmodified line
2	extern char *secstore;	2	extern char *secstore;
3	extern char secstorebuf[65536];	3	extern char secstorebuf[65536];
4	extern char secstorefetch(char addr, char owner, char passwd);	4	extern char secstorefetch(char addr, char owner, char passwd);
5	extern char *authaddr;	5	extern char *authserver;
6	extern char readcons(char prompt, char *def, int secret);	6	extern char readcons(char prompt, char *def, int secret);
7	extern int exportfs(int, int);	7	extern int exportfs(int, int);
8	extern char *user;	8	extern char *user;

@@ -41,9 +41,9 @@ secdial(char *secstore) · 40 unmodified lines
41	* like il!host or tcp!host or host.	41	* like il!host or tcp!host or host.
42	*/	42	*/
43	if(strcmp(p, "$auth")==0){	43	if(strcmp(p, "$auth")==0){
44	if(authaddr == nil)	44	if(authserver == nil)
45	return -1;	45	return -1;
46	strecpy(buf, buf+sizeof buf, authaddr);	46	strecpy(buf, buf+sizeof buf, authserver);
47	nf = getfields(buf, f, nelem(f), 0, "!");	47	nf = getfields(buf, f, nelem(f), 0, "!");
48	switch(nf){	48	switch(nf){
49	default:	49	default:

Keyboard shortcuts