summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sftp-int.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a10e69f41..7cac8a951 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,9 @@
28 [sftp.1 sftp-client.c sftp-client.h sftp-common.c sftp-common.h] 28 [sftp.1 sftp-client.c sftp-client.h sftp-common.c sftp-common.h]
29 [sftp-glob.c sftp-glob.h sftp-int.c sftp-server.c] 29 [sftp-glob.c sftp-glob.h sftp-int.c sftp-server.c]
30 support for short/long listings and globbing in "ls"; ok markus@ 30 support for short/long listings and globbing in "ls"; ok markus@
31 - djm@cvs.openbsd.org 2002/09/12 00:13:06
32 [sftp-int.c]
33 zap unused var introduced in last commit
31 34
3220020911 3520020911
33 - (djm) Sync openbsd-compat with OpenBSD -current 36 - (djm) Sync openbsd-compat with OpenBSD -current
@@ -1648,4 +1651,4 @@
1648 - (stevesk) entropy.c: typo in debug message 1651 - (stevesk) entropy.c: typo in debug message
1649 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1652 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1650 1653
1651$Id: ChangeLog,v 1.2459 2002/09/12 00:32:59 djm Exp $ 1654$Id: ChangeLog,v 1.2460 2002/09/12 00:34:13 djm Exp $
diff --git a/sftp-int.c b/sftp-int.c
index d3dc085e2..6a2012910 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.48 2002/09/11 22:41:50 djm Exp $"); 28RCSID("$OpenBSD: sftp-int.c,v 1.49 2002/09/12 00:13:06 djm Exp $");
29 29
30#include "buffer.h" 30#include "buffer.h"
31#include "xmalloc.h" 31#include "xmalloc.h"
@@ -205,7 +205,6 @@ static char *
205path_strip(char *path, char *strip) 205path_strip(char *path, char *strip)
206{ 206{
207 size_t len; 207 size_t len;
208 char *ret;
209 208
210 if (strip == NULL) 209 if (strip == NULL)
211 return (xstrdup(path)); 210 return (xstrdup(path));