Unified · Split
| @@ -27,6 +27,7 @@ static int getkey(Authkey*, char*, char*, char*); · 26 unmodified lines | |||
| 27 | static int findkey(Authkey*, char*, char*, char*); | 27 | static int findkey(Authkey*, char*, char*, char*); |
| 28 | 28 | ||
| 29 | static char *host; | 29 | static char *host; |
| 30 | static int norcpu; | ||
| 30 | static int nokbd; | 31 | static int nokbd; |
| 31 | static int cflag; | 32 | static int cflag; |
| 32 | extern int dbg; | 33 | extern int dbg; |
| @@ -50,7 +51,7 @@ exits(char *s) · 17 unmodified lines | |||
| 50 | void | 51 | void |
| 51 | usage(void) | 52 | usage(void) |
| 52 | { | 53 | { |
| 53 | fprint(2, "usage: drawterm [-a authserver] [-c cpuserver] [-s secstore] [-u user] [-r root]\n"); | 54 | fprint(2, "usage: drawterm [-BOp] [-h host | -c cpuserver] [-a authserver] [-s secstore] [-u user] [-r root]\n"); |
| 54 | exits("usage"); | 55 | exits("usage"); |
| 55 | } | 56 | } |
| 56 | 57 | ||
| @@ -200,6 +201,7 @@ cpumain(int argc, char **argv) · 143 unmodified lines | |||
| 200 | case 'a': | 201 | case 'a': |
| 201 | authserver = EARGF(usage()); | 202 | authserver = EARGF(usage()); |
| 202 | break; | 203 | break; |
| 204 | case 'h': | ||
| 203 | case 'c': | 205 | case 'c': |
| 204 | host = EARGF(usage()); | 206 | host = EARGF(usage()); |
| 205 | break; | 207 | break; |
| @@ -226,18 +228,21 @@ cpumain(int argc, char **argv) · 20 unmodified lines | |||
| 226 | strcat(cmd, p); | 228 | strcat(cmd, p); |
| 227 | } | 229 | } |
| 228 | break; | 230 | break; |
| 229 | case 'k': | ||
| 230 | keyspec = EARGF(usage()); | ||
| 231 | break; | ||
| 232 | case 's': | 231 | case 's': |
| 233 | secstoreserver = EARGF(usage()); | 232 | secstoreserver = EARGF(usage()); |
| 234 | break; | 233 | break; |
| 234 | case 'k': | ||
| 235 | keyspec = EARGF(usage()); | ||
| 236 | break; | ||
| 235 | case 'u': | 237 | case 'u': |
| 236 | user = EARGF(usage()); | 238 | user = EARGF(usage()); |
| 237 | break; | 239 | break; |
| 238 | case 'B': | 240 | case 'B': |
| 239 | nokbd = 1; | 241 | nokbd = 1; |
| 240 | break; | 242 | break; |
| 243 | case 'O': | ||
| 244 | norcpu = 1; | ||
| 245 | break; | ||
| 241 | case 'p': | 246 | case 'p': |
| 242 | aanfilter = 1; | 247 | aanfilter = 1; |
| 243 | break; | 248 | break; |
| @@ -273,7 +278,8 @@ cpumain(int argc, char **argv) · 29 unmodified lines | |||
| 273 | } | 278 | } |
| 274 | } | 279 | } |
| 275 | 280 | ||
| 276 | rcpu(host); | 281 | if(!norcpu) |
| 282 | rcpu(host); | ||
| 277 | 283 | ||
| 278 | if((err = rexcall(&data, host, srvname))) | 284 | if((err = rexcall(&data, host, srvname))) |
| 279 | fatal(1, "%s: %s", err, host); | 285 | fatal(1, "%s: %s", err, host); |