% ape/diff -p ssh.c /n/dump/2020/0202/9front/sys/src/cmd/ssh.c
*** ssh.c	Sun Feb  2 08:34:12 2020
--- /n/dump/2020/0202/9front/sys/src/cmd/ssh.c	Sat Oct 28 18:57:42 2017
*************** uchar sid[256];
*** 81,87 ****
  char thumb[2*SHA2_256dlen+1], *thumbfile;
  
  int fd, intr, raw, debug;
! char *user, *service, *status, *host, *port, *cmd;
  
  Oneway recv, send;
  void dispatch(void);
--- 81,87 ----
  char thumb[2*SHA2_256dlen+1], *thumbfile;
  
  int fd, intr, raw, debug;
! char *user, *service, *status, *host, *cmd;
  
  Oneway recv, send;
  void dispatch(void);
*************** kfmt(Fmt *f)
*** 1133,1139 ****
  void
  usage(void)
  {
! 	fprint(2, "usage: %s [-dR] [-t thumbfile] [-T tries] [-u user] [-h] [-p port] [user@]host[:port] [cmd args...]\n", argv0);
  	exits("usage");
  }
  
--- 1133,1139 ----
  void
  usage(void)
  {
! 	fprint(2, "usage: %s [-dR] [-t thumbfile] [-T tries] [-u user] [-h] [user@]host [cmd args...]\n", argv0);
  	exits("usage");
  }
  
*************** main(int argc, char *argv[])
*** 1157,1171 ****
  	case 'd':
  		debug++;
  		break;
- 	case 'h':
- 		host = EARGF(usage());
- 		break;
- 	case 'p':
- 		port = EARGF(usage());
- 		break;
  	case 'R':
  		raw = 0;
  		break;
  	case 't':
  		thumbfile = EARGF(usage());
  		break;
--- 1157,1171 ----
  	case 'd':
  		debug++;
  		break;
  	case 'R':
  		raw = 0;
  		break;
+ 	case 'u':
+ 		user = EARGF(usage());
+ 		break;
+ 	case 'h':
+ 		host = EARGF(usage());
+ 		break;
  	case 't':
  		thumbfile = EARGF(usage());
  		break;
*************** main(int argc, char *argv[])
*** 1173,1181 ****
  		MaxPwTries = strtol(EARGF(usage()), &s, 0);
  		if(*s != 0) usage();
  		break;
- 	case 'u':
- 		user = EARGF(usage());
- 		break;
  	} ARGEND;
  
  	if(host == nil){
--- 1173,1178 ----
*************** main(int argc, char *argv[])
*** 1192,1205 ****
  			host = s;
  		}
  	}
- 	if(port == nil){
- 		port = "ssh";
- 		s = strchr(host, ':');
- 		if(s != nil){
- 			*s = '\0';
- 			port = s+1;
- 		}
- 	}
  
  	for(cmd = nil; *argv != nil; argv++){
  		if(cmd == nil){
--- 1189,1194 ----
*************** main(int argc, char *argv[])
*** 1212,1218 ****
  		}
  	}
  
! 	if((fd = dial(netmkaddr(host, nil, port), nil, nil, nil)) < 0)
  		sysfatal("dial: %r");
  
  	send.v = "SSH-2.0-(9)";
--- 1201,1207 ----
  		}
  	}
  
! 	if((fd = dial(netmkaddr(host, nil, "ssh"), nil, nil, nil)) < 0)
  		sysfatal("dial: %r");
  
  	send.v = "SSH-2.0-(9)";