=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sftp-server.c,v retrieving revision 1.41.2.2 retrieving revision 1.42 diff -u -r1.41.2.2 -r1.42 --- src/usr.bin/ssh/sftp-server.c 2004/03/04 18:18:16 1.41.2.2 +++ src/usr.bin/ssh/sftp-server.c 2003/04/08 20:21:29 1.42 @@ -1,20 +1,28 @@ /* - * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. + * Copyright (c) 2000, 2001, 2002 Markus Friedl. All rights reserved. * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "includes.h" -RCSID("$OpenBSD: sftp-server.c,v 1.41.2.2 2004/03/04 18:18:16 brad Exp $"); +RCSID("$OpenBSD: sftp-server.c,v 1.42 2003/04/08 20:21:29 itojun Exp $"); #include "buffer.h" #include "bufaux.h" @@ -38,7 +46,7 @@ /* Version of client */ int version; -/* portable attributes, etc. */ +/* portable attibutes, etc. */ typedef struct Stat Stat; @@ -135,7 +143,7 @@ } static int -handle_new(int use, const char *name, int fd, DIR *dirp) +handle_new(int use, char *name, int fd, DIR *dirp) { int i; @@ -170,7 +178,7 @@ } static int -handle_from_string(const char *handle, u_int hlen) +handle_from_string(char *handle, u_int hlen) { int val; @@ -284,7 +292,7 @@ buffer_free(&msg); } static void -send_data_or_handle(char type, u_int32_t id, const char *data, int dlen) +send_data_or_handle(char type, u_int32_t id, char *data, int dlen) { Buffer msg; @@ -297,7 +305,7 @@ } static void -send_data(u_int32_t id, const char *data, int dlen) +send_data(u_int32_t id, char *data, int dlen) { TRACE("sent data id %u len %d", id, dlen); send_data_or_handle(SSH2_FXP_DATA, id, data, dlen); @@ -316,7 +324,7 @@ } static void -send_names(u_int32_t id, int count, const Stat *stats) +send_names(u_int32_t id, int count, Stat *stats) { Buffer msg; int i; @@ -336,7 +344,7 @@ } static void -send_attrib(u_int32_t id, const Attrib *a) +send_attrib(u_int32_t id, Attrib *a) { Buffer msg; @@ -553,7 +561,7 @@ } static struct timeval * -attrib_to_tv(const Attrib *a) +attrib_to_tv(Attrib *a) { static struct timeval tv[2];