diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-02 04:55:52 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-02 04:55:52 +0000 |
commit | 88c33974b2a8ace947fa012348cb1e12e04cf615 (patch) | |
tree | a6b8179f477cb825f62336fa78d08e4ad0df678a | |
parent | 321ae73a1fa8b10baee39fa6fdb57d9afc80346c (diff) |
20010102
- (bal) OpenBSD CVS Update
- markus@cvs.openbsd.org 2001/01/01 14:52:49
[scp.c]
use shared fatal(); from stevesk@pobox.com
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | Makefile.in | 4 | ||||
-rw-r--r-- | scp.c | 15 |
3 files changed, 9 insertions, 16 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20010102 | ||
2 | - (bal) OpenBSD CVS Update | ||
3 | - markus@cvs.openbsd.org 2001/01/01 14:52:49 | ||
4 | [scp.c] | ||
5 | use shared fatal(); from stevesk@pobox.com | ||
6 | |||
1 | 20001231 | 7 | 20001231 |
2 | - (bal) Reverted out of MAXHOSTNAMELEN. This should be set per OS. | 8 | - (bal) Reverted out of MAXHOSTNAMELEN. This should be set per OS. |
3 | for multiple reasons. | 9 | for multiple reasons. |
diff --git a/Makefile.in b/Makefile.in index 21a345df4..e1c1c8157 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -91,8 +91,8 @@ ssh$(EXEEXT): libopenbsd-compat.a libssh.a $(SSHOBJS) | |||
91 | sshd$(EXEEXT): libssh.a libopenbsd-compat.a $(SSHDOBJS) | 91 | sshd$(EXEEXT): libssh.a libopenbsd-compat.a $(SSHDOBJS) |
92 | $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 92 | $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
93 | 93 | ||
94 | scp$(EXEEXT): libopenbsd-compat.a libssh.a scp.o | 94 | scp$(EXEEXT): libopenbsd-compat.a libssh.a scp.o log-client.o |
95 | $(LD) -o $@ scp.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 95 | $(LD) -o $@ scp.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
96 | 96 | ||
97 | ssh-add$(EXEEXT): libopenbsd-compat.a libssh.a ssh-add.o log-client.o | 97 | ssh-add$(EXEEXT): libopenbsd-compat.a libssh.a ssh-add.o log-client.o |
98 | $(LD) -o $@ ssh-add.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 98 | $(LD) -o $@ ssh-add.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
@@ -75,7 +75,7 @@ | |||
75 | */ | 75 | */ |
76 | 76 | ||
77 | #include "includes.h" | 77 | #include "includes.h" |
78 | RCSID("$OpenBSD: scp.c,v 1.47 2000/12/19 23:17:57 markus Exp $"); | 78 | RCSID("$OpenBSD: scp.c,v 1.48 2001/01/01 14:52:49 markus Exp $"); |
79 | 79 | ||
80 | #include "ssh.h" | 80 | #include "ssh.h" |
81 | #include "xmalloc.h" | 81 | #include "xmalloc.h" |
@@ -198,19 +198,6 @@ do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout, int argc) | |||
198 | return 0; | 198 | return 0; |
199 | } | 199 | } |
200 | 200 | ||
201 | void | ||
202 | fatal(const char *fmt,...) | ||
203 | { | ||
204 | va_list ap; | ||
205 | char buf[1024]; | ||
206 | |||
207 | va_start(ap, fmt); | ||
208 | vsnprintf(buf, sizeof(buf), fmt, ap); | ||
209 | va_end(ap); | ||
210 | fprintf(stderr, "%s\n", buf); | ||
211 | exit(255); | ||
212 | } | ||
213 | |||
214 | typedef struct { | 201 | typedef struct { |
215 | int cnt; | 202 | int cnt; |
216 | char *buf; | 203 | char *buf; |