- djm@cvs.openbsd.org 2004/11/29 07:41:24

     [sftp-client.h sftp.c]
     Some small fixes from moritz@jodeit.org. ok deraadt@

diff --git a/ChangeLog b/ChangeLog
index f615fa0aaef1b34b1a3e4527f130af8bf01a3627..bc78610db402b96477e41bfd8c0dc04b282f7d33 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
    - jmc@cvs.openbsd.org 2004/11/29 00:05:17
      [sftp.1]
      missing full stop;
+   - djm@cvs.openbsd.org 2004/11/29 07:41:24
+     [sftp-client.h sftp.c]
+     Some small fixes from moritz@jodeit.org. ok deraadt@
 
 20041203
  - (dtucker) OpenBSD CVS Sync

diff --git a/sftp-client.h b/sftp-client.h
index a0e8e44b3c29f1176183d5287f11249a8efc2817..991e05d332405d35ccc02bdc83b2cae35d5596bb 100644 (file)
--- a/sftp-client.h
+++ b/sftp-client.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.h,v 1.12 2004/02/17 05:39:51 djm Exp $ */
+/* $OpenBSD: sftp-client.h,v 1.13 2004/11/29 07:41:24 djm Exp $ */
 
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
@@ -30,8 +30,8 @@ struct SFTP_DIRENT {
 };
 
 /*
- * Initialiase a SSH filexfer connection. Returns -1 on error or
- * protocol version on success.
+ * Initialiase a SSH filexfer connection. Returns NULL on error or
+ * a pointer to a initialized sftp_conn struct on success.
  */
 struct sftp_conn *do_init(int, int, u_int, u_int);
 

diff --git a/sftp.c b/sftp.c
index b37c36b715fa20b7473d23e49c8b73c352330c69..2c7b546f7c505a33a234c98439fbcd3c6277a45a 100644 (file)
--- a/sftp.c
+++ b/sftp.c
@@ -16,7 +16,7 @@
 
 #include "includes.h"
 
-RCSID("$OpenBSD: sftp.c,v 1.58 2004/11/25 22:22:14 markus Exp $");
+RCSID("$OpenBSD: sftp.c,v 1.59 2004/11/29 07:41:24 djm Exp $");
 
 #ifdef USE_LIBEDIT
 #include <histedit.h>
@@ -160,9 +160,11 @@ static void
 cmd_interrupt(int signo)
 {
        const char msg[] = "\rInterrupt  \n";
+       int olderrno = errno;
 
        write(STDERR_FILENO, msg, sizeof(msg) - 1);
        interrupted = 1;
+       errno = olderrno;
 }
 
 static void
@@ -262,7 +264,7 @@ path_strip(char *path, char *strip)
                return (xstrdup(path));
 
        len = strlen(strip);
-       if (strip != NULL && strncmp(path, strip, len) == 0) {
+       if (strncmp(path, strip, len) == 0) {
                if (strip[len - 1] != '/' && path[len] == '/')
                        len++;
                return (xstrdup(path + len));