summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-01-14 22:22:11 +1100
committerDamien Miller <djm@mindrot.org>2003-01-14 22:22:11 +1100
commit0141319d859ace49008c9a9923f6b448190786b3 (patch)
tree5ec7d4ae7de9e4d4dbfb40477134be1e185d4810
parent7d9012729123a55cbed793028618c81339309cbb (diff)
- (djm) OpenBSD CVS Sync
- fgsch@cvs.openbsd.org 2003/01/10 23:23:24 [sftp-int.c] typo; from Nils Nordman <nino at nforced dot com>.
-rw-r--r--ChangeLog10
-rw-r--r--sftp-int.c4
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 971caa643..25d6c6c0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
120030103 120030114
2 - (djm) OpenBSD CVS Sync
3 - fgsch@cvs.openbsd.org 2003/01/10 23:23:24
4 [sftp-int.c]
5 typo; from Nils Nordman <nino at nforced dot com>.
6
720030113
2 - (djm) Rework openbsd-compat/setproctitle.c a bit: move emulation type 8 - (djm) Rework openbsd-compat/setproctitle.c a bit: move emulation type
3 detection to configure.ac. Prompted by stevesk@ 9 detection to configure.ac. Prompted by stevesk@
4 - (djm) Bug #467: Add a --disable-strip option to turn off stripping of 10 - (djm) Bug #467: Add a --disable-strip option to turn off stripping of
@@ -1000,4 +1006,4 @@
1000 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1006 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1001 ok provos@ 1007 ok provos@
1002 1008
1003$Id: ChangeLog,v 1.2566 2003/01/13 05:55:22 djm Exp $ 1009$Id: ChangeLog,v 1.2567 2003/01/14 11:22:11 djm Exp $
diff --git a/sftp-int.c b/sftp-int.c
index 88b0530ab..111d19031 100644
--- a/sftp-int.c
+++ b/sftp-int.c
@@ -25,7 +25,7 @@
25/* XXX: recursive operations */ 25/* XXX: recursive operations */
26 26
27#include "includes.h" 27#include "includes.h"
28RCSID("$OpenBSD: sftp-int.c,v 1.52 2003/01/10 08:19:07 fgsch Exp $"); 28RCSID("$OpenBSD: sftp-int.c,v 1.53 2003/01/10 23:23:24 fgsch Exp $");
29 29
30#include "buffer.h" 30#include "buffer.h"
31#include "xmalloc.h" 31#include "xmalloc.h"
@@ -137,7 +137,7 @@ help(void)
137 printf("ls [path] Display remote directory listing\n"); 137 printf("ls [path] Display remote directory listing\n");
138 printf("lumask umask Set local umask to 'umask'\n"); 138 printf("lumask umask Set local umask to 'umask'\n");
139 printf("mkdir path Create remote directory\n"); 139 printf("mkdir path Create remote directory\n");
140 printf("preogress Toggle display of progress meter\n"); 140 printf("progress Toggle display of progress meter\n");
141 printf("put local-path [remote-path] Upload file\n"); 141 printf("put local-path [remote-path] Upload file\n");
142 printf("pwd Display remote working directory\n"); 142 printf("pwd Display remote working directory\n");
143 printf("exit Quit sftp\n"); 143 printf("exit Quit sftp\n");