summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--misc.c25
-rw-r--r--misc.h14
-rw-r--r--scp.c55
-rw-r--r--sftp.c123
5 files changed, 83 insertions, 139 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d9d7035..ce6b6b63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
adds correct error reporting to async connect()s
fixes the server-discards-data-before-connected-bug found by
onoe@sm.sony.co.jp
+ - mouring@cvs.openbsd.org 2001/05/08 19:45:25
+ [misc.c misc.h scp.c sftp.c]
+ Use addargs() in sftp plus some clean up of addargs(). OK Markus
20010508
- (bal) Fixed configure test for USE_SIA.
@@ -5368,4 +5371,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1207 2001/05/08 20:07:39 mouring Exp $
+$Id: ChangeLog,v 1.1208 2001/05/08 20:27:25 mouring Exp $
diff --git a/misc.c b/misc.c
index e949ded8..d12bcefe 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.6 2001/05/03 23:09:52 mouring Exp $ */
+/* $OpenBSD: misc.c,v 1.7 2001/05/08 19:45:24 mouring Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: misc.c,v 1.6 2001/05/03 23:09:52 mouring Exp $");
+RCSID("$OpenBSD: misc.c,v 1.7 2001/05/08 19:45:24 mouring Exp $");
#include "misc.h"
#include "log.h"
@@ -164,6 +164,27 @@ colon(char *cp)
return (0);
}
+void
+addargs(arglist *args, char *fmt, ...)
+{
+ va_list ap;
+ char buf[1024];
+
+ va_start(ap, fmt);
+ vsnprintf(buf, sizeof(buf), fmt, ap);
+ va_end(ap);
+
+ if (args->list == NULL) {
+ args->nalloc = 32;
+ args->num = 0;
+ } else if (args->num+2 >= args->nalloc)
+ args->nalloc *= 2;
+
+ args->list = xrealloc(args->list, args->nalloc * sizeof(char *));
+ args->list[args->num++] = xstrdup(buf);
+ args->list[args->num] = NULL;
+}
+
mysig_t
mysignal(int sig, mysig_t act)
{
diff --git a/misc.h b/misc.h
index a307df3a..b30fe488 100644
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.h,v 1.5 2001/05/03 23:09:52 mouring Exp $ */
+/* $OpenBSD: misc.h,v 1.6 2001/05/08 19:45:24 mouring Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -28,11 +28,21 @@ struct passwd * pwcopy(struct passwd *pw);
* Return 0 if invalid.
*/
int a2port(const char *s);
-
+
/* code from scp.c/rcp.c */
char *cleanhostname(char *host);
char *colon(char *cp);
+/* function to assist building execv() arguments */
+typedef struct arglist arglist;
+struct arglist {
+ char **list;
+ int num;
+ int nalloc;
+};
+
+void addargs(arglist *args, char *fmt, ...) __attribute__((format(printf, 2, 3)));
+
/* wrapper for signal interface */
typedef void (*mysig_t)(int);
mysig_t mysignal(int sig, mysig_t act);
diff --git a/scp.c b/scp.c
index 10b77af6..52fd513c 100644
--- a/scp.c
+++ b/scp.c
@@ -75,7 +75,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.69 2001/05/03 23:09:53 mouring Exp $");
+RCSID("$OpenBSD: scp.c,v 1.70 2001/05/08 19:45:24 mouring Exp $");
#include "xmalloc.h"
#include "atomicio.h"
@@ -107,8 +107,8 @@ void progressmeter(int);
int getttywidth(void);
int do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout, int argc);
-/* setup arguments for the call to ssh */
-void addargs(char *fmt, ...) __attribute__((format(printf, 1, 2)));
+/* Struct for addargs */
+arglist args;
/* Time a transfer started. */
static struct timeval start;
@@ -131,13 +131,6 @@ int showprogress = 1;
/* This is the program to execute for the secured connection. ("ssh" or -S) */
char *ssh_program = _PATH_SSH_PROGRAM;
-/* This is the list of arguments that scp passes to ssh */
-struct {
- char **list;
- int num;
- int nalloc;
-} args;
-
/*
* This function executes the given command as the specified user on the
* given host. This returns < 0 if execution fails, and >= 0 otherwise. This
@@ -181,9 +174,9 @@ do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout, int argc)
args.list[0] = ssh_program;
if (remuser != NULL)
- addargs("-l%s", remuser);
- addargs("%s", host);
- addargs("%s", cmd);
+ addargs(&args, "-l%s", remuser);
+ addargs(&args, "%s", host);
+ addargs(&args, "%s", cmd);
execvp(ssh_program, args.list);
perror(ssh_program);
@@ -238,9 +231,9 @@ main(argc, argv)
__progname = get_progname(argv[0]);
args.list = NULL;
- addargs("ssh"); /* overwritten with ssh_program */
- addargs("-x");
- addargs("-oFallBackToRsh no");
+ addargs(&args, "ssh"); /* overwritten with ssh_program */
+ addargs(&args, "-x");
+ addargs(&args, "-oFallBackToRsh no");
fflag = tflag = 0;
while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S:o:")) != -1)
@@ -249,18 +242,18 @@ main(argc, argv)
case '4':
case '6':
case 'C':
- addargs("-%c", ch);
+ addargs(&args, "-%c", ch);
break;
case 'o':
case 'c':
case 'i':
- addargs("-%c%s", ch, optarg);
+ addargs(&args, "-%c%s", ch, optarg);
break;
case 'P':
- addargs("-p%s", optarg);
+ addargs(&args, "-p%s", optarg);
break;
case 'B':
- addargs("-oBatchmode yes");
+ addargs(&args, "-oBatchmode yes");
break;
case 'p':
pflag = 1;
@@ -1212,25 +1205,3 @@ getttywidth(void)
else
return (80);
}
-
-void
-addargs(char *fmt, ...)
-{
- va_list ap;
- char buf[1024];
-
- va_start(ap, fmt);
- vsnprintf(buf, sizeof(buf), fmt, ap);
- va_end(ap);
-
- if (args.list == NULL) {
- args.nalloc = 32;
- args.num = 0;
- args.list = xmalloc(args.nalloc * sizeof(char *));
- } else if (args.num+2 >= args.nalloc) {
- args.nalloc *= 2;
- args.list = xrealloc(args.list, args.nalloc * sizeof(char *));
- }
- args.list[args.num++] = xstrdup(buf);
- args.list[args.num] = NULL;
-}
diff --git a/sftp.c b/sftp.c
index 895e0e12..dd8c08b1 100644
--- a/sftp.c
+++ b/sftp.c
@@ -24,7 +24,7 @@
#include "includes.h"
-RCSID("$OpenBSD: sftp.c,v 1.16 2001/05/03 23:09:53 mouring Exp $");
+RCSID("$OpenBSD: sftp.c,v 1.17 2001/05/08 19:45:25 mouring Exp $");
/* XXX: commandline mode */
/* XXX: short-form remote directory listings (like 'ls -C') */
@@ -46,9 +46,7 @@ extern char *__progname;
char *__progname;
#endif
-int use_ssh1 = 0;
char *ssh_program = _PATH_SSH_PROGRAM;
-char *sftp_server = NULL;
FILE* infile;
void
@@ -92,58 +90,6 @@ connect_to_server(char **args, int *in, int *out, pid_t *sshpid)
close(c_out);
}
-char **
-make_ssh_args(char *add_arg)
-{
- static char **args = NULL;
- static int nargs = 0;
- char debug_buf[4096];
- int i;
-
- /* Init args array */
- if (args == NULL) {
- nargs = 2;
- i = 0;
- args = xmalloc(sizeof(*args) * nargs);
- args[i++] = "ssh";
- args[i++] = NULL;
- }
-
- /* If asked to add args, then do so and return */
- if (add_arg) {
- i = nargs++ - 1;
- args = xrealloc(args, sizeof(*args) * nargs);
- args[i++] = add_arg;
- args[i++] = NULL;
- return(NULL);
- }
-
- /* no subsystem if the server-spec contains a '/' */
- if (sftp_server == NULL || strchr(sftp_server, '/') == NULL)
- make_ssh_args("-s");
- make_ssh_args("-oForwardX11=no");
- make_ssh_args("-oForwardAgent=no");
- make_ssh_args(use_ssh1 ? "-oProtocol=1" : "-oProtocol=2");
-
- /* Otherwise finish up and return the arg array */
- if (sftp_server != NULL)
- make_ssh_args(sftp_server);
- else
- make_ssh_args("sftp");
-
- /* XXX: overflow - doesn't grow debug_buf */
- debug_buf[0] = '\0';
- for(i = 0; args[i]; i++) {
- if (i)
- strlcat(debug_buf, " ", sizeof(debug_buf));
-
- strlcat(debug_buf, args[i], sizeof(debug_buf));
- }
- debug("SSH args \"%s\"", debug_buf);
-
- return(args);
-}
-
void
usage(void)
{
@@ -154,32 +100,42 @@ usage(void)
int
main(int argc, char **argv)
{
- int in, out, ch, debug_level, compress_flag;
+ int in, out, ch;
pid_t sshpid;
- char *file1 = NULL;
char *host, *userhost, *cp, *file2;
- LogLevel ll;
+ int debug_level = 0, sshver = 2;
+ char *file1 = NULL, *sftp_server = NULL;
+ LogLevel ll = SYSLOG_LEVEL_INFO;
+ arglist args;
extern int optind;
extern char *optarg;
__progname = get_progname(argv[0]);
- infile = stdin; /* Read from STDIN unless changed by -b */
- debug_level = compress_flag = 0;
+ args.list = NULL;
+ addargs(&args, "ssh"); /* overwritten with ssh_program */
+ addargs(&args, "-oFallBackToRsh no");
+ addargs(&args, "-oForwardX11 no");
+ addargs(&args, "-oForwardAgent no");
+ ll = SYSLOG_LEVEL_INFO;
+ infile = stdin; /* Read from STDIN unless changed by -b */
while ((ch = getopt(argc, argv, "1hvCo:s:S:b:")) != -1) {
switch (ch) {
case 'C':
- compress_flag = 1;
+ addargs(&args, "-C");
break;
case 'v':
- debug_level = MIN(3, debug_level + 1);
+ if (debug_level < 3) {
+ addargs(&args, "-v");
+ ll = SYSLOG_LEVEL_DEBUG1 + debug_level;
+ }
+ debug_level++;
break;
case 'o':
- make_ssh_args("-o");
- make_ssh_args(optarg);
+ addargs(&args, "-o%s", optarg);
break;
case '1':
- use_ssh1 = 1;
+ sshver = 1;
if (sftp_server == NULL)
sftp_server = _PATH_SFTP_SERVER;
break;
@@ -222,8 +178,7 @@ main(int argc, char **argv)
fprintf(stderr, "Missing username\n");
usage();
}
- make_ssh_args("-l");
- make_ssh_args(userhost);
+ addargs(&args, "-l%s",userhost);
}
host = cleanhostname(host);
@@ -232,36 +187,20 @@ main(int argc, char **argv)
usage();
}
- /* Set up logging and debug '-d' arguments to ssh */
- ll = SYSLOG_LEVEL_INFO;
- switch (debug_level) {
- case 1:
- ll = SYSLOG_LEVEL_DEBUG1;
- make_ssh_args("-v");
- break;
- case 2:
- ll = SYSLOG_LEVEL_DEBUG2;
- make_ssh_args("-v");
- make_ssh_args("-v");
- break;
- case 3:
- ll = SYSLOG_LEVEL_DEBUG3;
- make_ssh_args("-v");
- make_ssh_args("-v");
- make_ssh_args("-v");
- break;
- }
-
- if (compress_flag)
- make_ssh_args("-C");
-
log_init(argv[0], ll, SYSLOG_FACILITY_USER, 1);
+ addargs(&args, "-oProtocol %d", sshver);
+
+ /* no subsystem if the server-spec contains a '/' */
+ if (sftp_server == NULL || strchr(sftp_server, '/') == NULL)
+ addargs(&args, "-s");
- make_ssh_args(host);
+ addargs(&args, "%s", host);
+ addargs(&args, "%s", (sftp_server != NULL ? sftp_server : "sftp"));
+ args.list[0] = ssh_program;
fprintf(stderr, "Connecting to %s...\n", host);
- connect_to_server(make_ssh_args(NULL), &in, &out, &sshpid);
+ connect_to_server(args.list, &in, &out, &sshpid);
interactive_loop(in, out, file1, file2);