summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--scp.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index bf9415492..28166777d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,9 @@
20 [ssh.c tildexpand.c] 20 [ssh.c tildexpand.c]
21 fix more paths beginning with "//"; <bradshaw@staff.crosswalk.com>. 21 fix more paths beginning with "//"; <bradshaw@staff.crosswalk.com>.
22 ok markus@ 22 ok markus@
23 - stevesk@cvs.openbsd.org 2001/08/13 23:38:54
24 [scp.c]
25 don't need main prototype (also sync with rcp); ok markus@
23 26
2420010814 2720010814
25 - (stevesk) sshpty.c, cray.[ch]: whitespace, formatting and cleanup 28 - (stevesk) sshpty.c, cray.[ch]: whitespace, formatting and cleanup
@@ -6309,4 +6312,4 @@
6309 - Wrote replacements for strlcpy and mkdtemp 6312 - Wrote replacements for strlcpy and mkdtemp
6310 - Released 1.0pre1 6313 - Released 1.0pre1
6311 6314
6312$Id: ChangeLog,v 1.1480 2001/08/15 23:19:21 mouring Exp $ 6315$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 @@
75 */ 75 */
76 76
77#include "includes.h" 77#include "includes.h"
78RCSID("$OpenBSD: scp.c,v 1.79 2001/08/06 19:47:05 stevesk Exp $"); 78RCSID("$OpenBSD: scp.c,v 1.80 2001/08/13 23:38:54 stevesk Exp $");
79 79
80#include "xmalloc.h" 80#include "xmalloc.h"
81#include "atomicio.h" 81#include "atomicio.h"
@@ -214,7 +214,6 @@ int pflag, iamremote, iamrecursive, targetshouldbedirectory;
214#define CMDNEEDS 64 214#define CMDNEEDS 64
215char cmd[CMDNEEDS]; /* must hold "rcp -r -p -d\0" */ 215char cmd[CMDNEEDS]; /* must hold "rcp -r -p -d\0" */
216 216
217int main(int, char *[]);
218int response(void); 217int response(void);
219void rsource(char *, struct stat *); 218void rsource(char *, struct stat *);
220void sink(int, char *[]); 219void sink(int, char *[]);