27c27
< RCSID("$OpenBSD: sftp.c,v 1.34 2003/01/10 08:19:07 fgsch Exp $");
---
> RCSID("$OpenBSD: sftp.c,v 1.37 2003/07/10 20:05:55 markus Exp $");
29,30d28
< /* XXX: short-form remote directory listings (like 'ls -C') */
<
50a49
> static pid_t sshpid = -1;
55c54
< connect_to_server(char *path, char **args, int *in, int *out, pid_t *sshpid)
---
> killchild(int signo)
56a56,64
> if (sshpid > 1)
> kill(sshpid, signo);
>
> _exit(1);
> }
>
> static void
> connect_to_server(char *path, char **args, int *in, int *out)
> {
77c85
< if ((*sshpid = fork()) == -1)
---
> if ((sshpid = fork()) == -1)
79c87
< else if (*sshpid == 0) {
---
> else if (sshpid == 0) {
93a102,104
> signal(SIGTERM, killchild);
> signal(SIGINT, killchild);
> signal(SIGHUP, killchild);
104,105c115,117
< "usage: %s [-vC1] [-b batchfile] [-o option] [-s subsystem|path] [-B buffer_size]\n"
< " [-F config] [-P direct server path] [-S program]\n"
---
> "usage: %s [-vC1] [-b batchfile] [-o ssh_option] [-s subsystem | sftp_server]\n"
> " [-B buffer_size] [-F ssh_config] [-P sftp_server path]\n"
> " [-R num_requests] [-S program]\n"
114d125
< pid_t sshpid;
124c135
< __progname = get_progname(argv[0]);
---
> __progname = ssh_get_progname(argv[0]);
232,233c243
< connect_to_server(ssh_program, args.list, &in, &out,
< &sshpid);
---
> connect_to_server(ssh_program, args.list, &in, &out);
239,240c249
< connect_to_server(sftp_direct, args.list, &in, &out,
< &sshpid);
---
> connect_to_server(sftp_direct, args.list, &in, &out);