- markus@cvs.openbsd.org 2001/04/22 23:58:36

[openssh.git] / sftp-server.c

diff --git a/sftp-server.c b/sftp-server.c
index 178084577e129d3ff7e1a8dc1adbf9ae9a1cbd1e..75c19c8a63e1892cd6a4acaf59b0b062c5cb066f 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.23 2001/03/07 10:11:23 djm Exp $");
+RCSID("$OpenBSD: sftp-server.c,v 1.25 2001/04/05 10:42:53 markus Exp $");
 
 #include "buffer.h"
 #include "bufaux.h"
@@ -288,7 +288,7 @@ send_status(u_int32_t id, u_int32_t error)
        buffer_put_int(&msg, id);
        buffer_put_int(&msg, error);
        if (version >= 3) {
-               buffer_put_cstring(&msg, 
+               buffer_put_cstring(&msg,
                    status_messages[MIN(error,SSH2_FX_MAX)]);
                buffer_put_cstring(&msg, "");
        }
@@ -1031,6 +1031,8 @@ main(int ac, char **av)
        int in, out, max;
        ssize_t len, olen, set_size;
 
+       /* XXX should use getopt */
+
        __progname = get_progname(av[0]);
        handle_init();
 
@@ -1041,6 +1043,11 @@ main(int ac, char **av)
        in = dup(STDIN_FILENO);
        out = dup(STDOUT_FILENO);
 
+#ifdef HAVE_CYGWIN
+       setmode(in, O_BINARY);
+       setmode(out, O_BINARY);
+#endif
+
        max = 0;
        if (in > max)
                max = in;