summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2001-01-01 14:52:50 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2001-01-01 14:52:50 +0000
commit5a5af2a983a55728c6e04719455a0f8aca95d571 (patch)
tree543d68998baecbc3032046cd74e0cc2b5122ce29 /usr.bin
parent59a5dce293f1ff46f1aac565ab075e286491a59a (diff)
use shared fatal(); from stevesk@pobox.com
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/scp.c15
-rw-r--r--usr.bin/ssh/scp/Makefile2
2 files changed, 2 insertions, 15 deletions
diff --git a/usr.bin/ssh/scp.c b/usr.bin/ssh/scp.c
index dbcff5d3ccb..69313bd4584 100644
--- a/usr.bin/ssh/scp.c
+++ b/usr.bin/ssh/scp.c
@@ -75,7 +75,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.47 2000/12/19 23:17:57 markus Exp $");
+RCSID("$OpenBSD: scp.c,v 1.48 2001/01/01 14:52:49 markus Exp $");
#include "ssh.h"
#include "xmalloc.h"
@@ -182,19 +182,6 @@ do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout, int argc)
return 0;
}
-void
-fatal(const char *fmt,...)
-{
- va_list ap;
- char buf[1024];
-
- va_start(ap, fmt);
- vsnprintf(buf, sizeof(buf), fmt, ap);
- va_end(ap);
- fprintf(stderr, "%s\n", buf);
- exit(255);
-}
-
typedef struct {
int cnt;
char *buf;
diff --git a/usr.bin/ssh/scp/Makefile b/usr.bin/ssh/scp/Makefile
index fc45dfd0238..2931ad4f069 100644
--- a/usr.bin/ssh/scp/Makefile
+++ b/usr.bin/ssh/scp/Makefile
@@ -8,6 +8,6 @@ BINMODE?=555
BINDIR= /usr/bin
MAN= scp.1
-SRCS= scp.c
+SRCS= scp.c log-client.c
.include <bsd.prog.mk>