mirror of git://anongit.mindrot.org/openssh.git
20010102
- (bal) OpenBSD CVS Update - markus@cvs.openbsd.org 2001/01/01 14:52:49 [scp.c] use shared fatal(); from stevesk@pobox.com
This commit is contained in:
parent
321ae73a1f
commit
88c33974b2
|
@ -1,3 +1,9 @@
|
||||||
|
20010102
|
||||||
|
- (bal) OpenBSD CVS Update
|
||||||
|
- markus@cvs.openbsd.org 2001/01/01 14:52:49
|
||||||
|
[scp.c]
|
||||||
|
use shared fatal(); from stevesk@pobox.com
|
||||||
|
|
||||||
20001231
|
20001231
|
||||||
- (bal) Reverted out of MAXHOSTNAMELEN. This should be set per OS.
|
- (bal) Reverted out of MAXHOSTNAMELEN. This should be set per OS.
|
||||||
for multiple reasons.
|
for multiple reasons.
|
||||||
|
|
|
@ -91,8 +91,8 @@ ssh$(EXEEXT): libopenbsd-compat.a libssh.a $(SSHOBJS)
|
||||||
sshd$(EXEEXT): libssh.a libopenbsd-compat.a $(SSHDOBJS)
|
sshd$(EXEEXT): libssh.a libopenbsd-compat.a $(SSHDOBJS)
|
||||||
$(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
|
$(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
|
||||||
|
|
||||||
scp$(EXEEXT): libopenbsd-compat.a libssh.a scp.o
|
scp$(EXEEXT): libopenbsd-compat.a libssh.a scp.o log-client.o
|
||||||
$(LD) -o $@ scp.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
|
$(LD) -o $@ scp.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
|
||||||
|
|
||||||
ssh-add$(EXEEXT): libopenbsd-compat.a libssh.a ssh-add.o log-client.o
|
ssh-add$(EXEEXT): libopenbsd-compat.a libssh.a ssh-add.o log-client.o
|
||||||
$(LD) -o $@ ssh-add.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
|
$(LD) -o $@ ssh-add.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
|
||||||
|
|
15
scp.c
15
scp.c
|
@ -75,7 +75,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#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 "ssh.h"
|
||||||
#include "xmalloc.h"
|
#include "xmalloc.h"
|
||||||
|
@ -198,19 +198,6 @@ do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout, int argc)
|
||||||
return 0;
|
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 {
|
typedef struct {
|
||||||
int cnt;
|
int cnt;
|
||||||
char *buf;
|
char *buf;
|
||||||
|
|
Loading…
Reference in New Issue