void
catch(void*, char *msg)
{
- if(strstr(msg, "interrupt") != nil){
+ if(strcmp(msg, "interrupt") == 0){
intr = 1;
noted(NCONT);
}
char err[ERRMAX];
int r;
- if(intr)
- return 1;
memset(err, 0, sizeof(err));
errstr(err, sizeof(err));
- r = strstr(err, "interrupt") != nil;
+ r = strcmp(err, "interrupted") == 0;
errstr(err, sizeof(err));
return r;
}
return m;
}
-/* libsec */
-extern mpint* pkcs1padbuf(uchar *buf, int len, mpint *modulus, int blocktype);
-extern int asn1encodedigest(DigestState* (*fun)(uchar*, ulong, uchar*, DigestState*),
- uchar *digest, uchar *buf, int len);
-
mpint*
pkcs1digest(uchar *data, int len, RSApub *pub)
{
switch(recv.r[0]){
case MSG_IGNORE:
+ return;
case MSG_GLOBAL_REQUEST:
+ if(unpack(recv.r, recv.w-recv.r, "_sb", &s, &n, &b) < 0)
+ break;
+ if(debug)
+ fprint(2, "%s: global request: %.*s\n", argv0, n, s);
+ if(b != 0)
+ sendpkt("b", MSG_REQUEST_FAILURE);
return;
case MSG_DISCONNECT:
if(unpack(recv.r, recv.w-recv.r, "_us", &c, &s, &n) < 0)
break;
if(n != 0 && status == nil)
status = smprint("%.*s", n, s);
+ c = MSG_CHANNEL_SUCCESS;
} else if(n == 11 && memcmp(s, "exit-status", n) == 0){
if(unpack(p, recv.w-p, "u", &n) < 0)
break;
if(n != 0 && status == nil)
status = smprint("%d", n);
- } else if(debug) {
- fprint(2, "%s: channel request: %.*s\n", argv0, n, s);
+ c = MSG_CHANNEL_SUCCESS;
+ } else {
+ if(debug)
+ fprint(2, "%s: channel request: %.*s\n", argv0, n, s);
+ c = MSG_CHANNEL_FAILURE;
}
+ if(b != 0)
+ sendpkt("bu", c, recv.chan);
return;
case MSG_CHANNEL_EOF:
recv.eof = 1;
} tty;
void
-rawon(void)
+getdim(void)
{
- int ctl;
char *s;
- close(0);
- if(open("/dev/cons", OREAD) != 0)
- sysfatal("open: %r");
- close(1);
- if(open("/dev/cons", OWRITE) != 1)
- sysfatal("open: %r");
- dup(1, 2);
- if((ctl = open("/dev/consctl", OWRITE)) >= 0)
- write(ctl, "rawon", 5);
if(s = getenv("XPIXELS")){
tty.xpixels = atoi(s);
free(s);
}
}
+void
+rawon(void)
+{
+ int ctl;
+
+ close(0);
+ if(open("/dev/cons", OREAD) != 0)
+ sysfatal("open: %r");
+ close(1);
+ if(open("/dev/cons", OWRITE) != 1)
+ sysfatal("open: %r");
+ dup(1, 2);
+ if((ctl = open("/dev/consctl", OWRITE)) >= 0){
+ write(ctl, "rawon", 5);
+ write(ctl, "winchon", 7); /* vt(1): interrupt note on window change */
+ }
+ getdim();
+}
+
#pragma varargck type "k" char*
kfmt(Fmt *f)
void
usage(void)
{
- fprint(2, "usage: %s [-dR] [-t thumbfile] [-T tries] [-u user] [user@]host [cmd args...]\n", argv0);
+ fprint(2, "usage: %s [-dR] [-t thumbfile] [-T tries] [-u user] [-h] [user@]host [cmd args...]\n", argv0);
exits("usage");
}
fmtinstall('k', kfmt);
tty.term = getenv("TERM");
- raw = tty.term != nil && *tty.term != 0;
+ if(tty.term == nil)
+ tty.term = "";
+ raw = *tty.term != 0;
ARGBEGIN {
case 'd':
case 'R':
raw = 0;
break;
+ case 'r':
+ raw = 2; /* bloody */
+ break;
case 'u':
user = EARGF(usage());
break;
+ case 'h':
+ host = EARGF(usage());
+ break;
case 't':
thumbfile = EARGF(usage());
break;
break;
} ARGEND;
- if(argc == 0)
- usage();
+ if(host == nil){
+ if(argc == 0)
+ usage();
+ host = *argv++;
+ }
- host = *argv++;
if(user == nil){
s = strchr(host, '@');
if(s != nil){
for(cmd = nil; *argv != nil; argv++){
if(cmd == nil){
cmd = strdup(*argv);
- raw = 0;
- }else {
+ if(raw == 1)
+ raw = 0;
+ }else{
s = smprint("%s %k", cmd, *argv);
free(cmd);
cmd = s;
/* parent reads and dispatches packets */
if(n > 0) {
send.pid = n;
- while((send.eof|recv.eof) == 0){
+ while(recv.eof == 0){
recvpkt();
qlock(&sl);
dispatch();
qlock(&sl);
if(send.eof)
break;
- if(n < 0 && wasintr()){
+ if(n < 0 && wasintr())
+ intr = 1;
+ if(intr){
if(!raw) break;
+ getdim();
+ sendpkt("busbuuuu", MSG_CHANNEL_REQUEST,
+ send.chan,
+ "window-change", 13,
+ 0,
+ tty.cols,
+ tty.lines,
+ tty.xpixels,
+ tty.ypixels);
sendpkt("busbs", MSG_CHANNEL_REQUEST,
send.chan,
"signal", 6,