diff --git a/ChangeLog b/ChangeLog index bf9415492..28166777d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,9 @@ [ssh.c tildexpand.c] fix more paths beginning with "//"; . ok markus@ + - stevesk@cvs.openbsd.org 2001/08/13 23:38:54 + [scp.c] + don't need main prototype (also sync with rcp); ok markus@ 20010814 - (stevesk) sshpty.c, cray.[ch]: whitespace, formatting and cleanup @@ -6309,4 +6312,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1480 2001/08/15 23:19:21 mouring Exp $ +$Id: ChangeLog,v 1.1481 2001/08/15 23:21:01 mouring Exp $ diff --git a/scp.c b/scp.c index 4708f0ed4..868a8eb3d 100644 --- a/scp.c +++ b/scp.c @@ -75,7 +75,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: scp.c,v 1.79 2001/08/06 19:47:05 stevesk Exp $"); +RCSID("$OpenBSD: scp.c,v 1.80 2001/08/13 23:38:54 stevesk Exp $"); #include "xmalloc.h" #include "atomicio.h" @@ -214,7 +214,6 @@ int pflag, iamremote, iamrecursive, targetshouldbedirectory; #define CMDNEEDS 64 char cmd[CMDNEEDS]; /* must hold "rcp -r -p -d\0" */ -int main(int, char *[]); int response(void); void rsource(char *, struct stat *); void sink(int, char *[]);