One way to massive patch. <sigh> It compiles and works under Linux..

[openssh.git] / sftp-server.c

diff --git a/sftp-server.c b/sftp-server.c
index 5be2d4db4365e7c4a3030f2d306ad075f08b6333..7113bce82a292cf886cff7c55adc64e7363215d8 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.7 2000/12/09 14:08:27 markus Exp $");
+RCSID("$OpenBSD: sftp-server.c,v 1.9 2000/12/19 23:17:58 markus Exp $");
 
 #include "ssh.h"
 #include "buffer.h"
@@ -854,7 +854,7 @@ process_remove(void)
        id = get_int();
        name = get_string(NULL);
        TRACE("remove id %d name %s", id, name);
-       ret = remove(name);
+       ret = unlink(name);
        status = (ret == -1) ? errno_to_portable(errno) : SSH_FX_OK;
        send_status(id, status);
        xfree(name);
@@ -944,13 +944,13 @@ process_rename(void)
 void
 process(void)
 {
-       unsigned int msg_len;
-       unsigned int type;
-       unsigned char *cp;
+       u_int msg_len;
+       u_int type;
+       u_char *cp;
 
        if (buffer_len(&iqueue) < 5)
                return;         /* Incomplete message. */
-       cp = (unsigned char *) buffer_ptr(&iqueue);
+       cp = (u_char *) buffer_ptr(&iqueue);
        msg_len = GET_32BIT(cp);
        if (msg_len > 256 * 1024) {
                error("bad message ");