- jakob@cvs.openbsd.org 2003/11/10 16:23:41

[openssh.git] / sftp-server.c

diff --git a/sftp-server.c b/sftp-server.c
index 9a66b4de7c61fa8c77daab322840f13b2ab6f821..d528a1d6e6662f6f3b523f96334cb2ef37a4d48d 100644 (file)
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: sftp-server.c,v 1.41 2003/03/26 04:02:51 deraadt Exp $");
+RCSID("$OpenBSD: sftp-server.c,v 1.44 2003/11/10 16:23:41 jakob Exp $");
 
 #include "buffer.h"
 #include "bufaux.h"
@@ -52,7 +52,7 @@ Buffer oqueue;
 /* Version of client */
 int version;
 
-/* portable attibutes, etc. */
+/* portable attributes, etc. */
 
 typedef struct Stat Stat;
 
@@ -149,7 +149,7 @@ handle_init(void)
 }
 
 static int
-handle_new(int use, char *name, int fd, DIR *dirp)
+handle_new(int use, const char *name, int fd, DIR *dirp)
 {
        int i;
 
@@ -184,7 +184,7 @@ handle_to_string(int handle, char **stringp, int *hlenp)
 }
 
 static int
-handle_from_string(char *handle, u_int hlen)
+handle_from_string(const char *handle, u_int hlen)
 {
        int val;
 
@@ -298,7 +298,7 @@ send_status(u_int32_t id, u_int32_t error)
        buffer_free(&msg);
 }
 static void
-send_data_or_handle(char type, u_int32_t id, char *data, int dlen)
+send_data_or_handle(char type, u_int32_t id, const char *data, int dlen)
 {
        Buffer msg;
 
@@ -311,7 +311,7 @@ send_data_or_handle(char type, u_int32_t id, char *data, int dlen)
 }
 
 static void
-send_data(u_int32_t id, char *data, int dlen)
+send_data(u_int32_t id, const char *data, int dlen)
 {
        TRACE("sent data id %u len %d", id, dlen);
        send_data_or_handle(SSH2_FXP_DATA, id, data, dlen);
@@ -330,7 +330,7 @@ send_handle(u_int32_t id, int handle)
 }
 
 static void
-send_names(u_int32_t id, int count, Stat *stats)
+send_names(u_int32_t id, int count, const Stat *stats)
 {
        Buffer msg;
        int i;
@@ -350,7 +350,7 @@ send_names(u_int32_t id, int count, Stat *stats)
 }
 
 static void
-send_attrib(u_int32_t id, Attrib *a)
+send_attrib(u_int32_t id, const Attrib *a)
 {
        Buffer msg;
 
@@ -442,7 +442,7 @@ process_read(void)
            (u_int64_t)off, len);
        if (len > sizeof buf) {
                len = sizeof buf;
-               log("read change len %d", len);
+               logit("read change len %d", len);
        }
        fd = handle_to_fd(handle);
        if (fd >= 0) {
@@ -495,7 +495,7 @@ process_write(void)
                        } else if (ret == len) {
                                status = SSH2_FX_OK;
                        } else {
-                               log("nothing at all written");
+                               logit("nothing at all written");
                        }
                }
        }
@@ -567,7 +567,7 @@ process_fstat(void)
 }
 
 static struct timeval *
-attrib_to_tv(Attrib *a)
+attrib_to_tv(const Attrib *a)
 {
        static struct timeval tv[2];
 
@@ -1030,7 +1030,7 @@ main(int ac, char **av)
 
        /* XXX should use getopt */
 
-       __progname = get_progname(av[0]);
+       __progname = ssh_get_progname(av[0]);
        handle_init();
 
 #ifdef DEBUG_SFTP_SERVER