/*
- * Copyright (c) 2000, 2001, 2002 Markus Friedl. All rights reserved.
+ * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "includes.h"
-RCSID("$OpenBSD: sftp-server.c,v 1.37 2002/06/24 17:57:20 deraadt Exp $");
+RCSID("$OpenBSD: sftp-server.c,v 1.30 2001/07/31 12:42:50 jakob Exp $");
#include "buffer.h"
#include "bufaux.h"
{
int i;
- for (i = 0; i < sizeof(handles)/sizeof(Handle); i++)
+ for(i = 0; i < sizeof(handles)/sizeof(Handle); i++)
handles[i].use = HANDLE_UNUSED;
}
{
int i;
- for (i = 0; i < sizeof(handles)/sizeof(Handle); i++) {
+ for(i = 0; i < sizeof(handles)/sizeof(Handle); i++) {
if (handles[i].use == HANDLE_UNUSED) {
handles[i].use = use;
handles[i].dirp = dirp;
"Unknown error" /* Others */
};
- TRACE("sent status id %u error %u", id, error);
+ TRACE("sent status id %d error %d", id, error);
buffer_init(&msg);
buffer_put_char(&msg, SSH2_FXP_STATUS);
buffer_put_int(&msg, id);
static void
send_data(u_int32_t id, char *data, int dlen)
{
- TRACE("sent data id %u len %d", id, dlen);
+ TRACE("sent data id %d len %d", id, dlen);
send_data_or_handle(SSH2_FXP_DATA, id, data, dlen);
}
int hlen;
handle_to_string(handle, &string, &hlen);
- TRACE("sent handle id %u handle %d", id, handle);
+ TRACE("sent handle id %d handle %d", id, handle);
send_data_or_handle(SSH2_FXP_HANDLE, id, string, hlen);
xfree(string);
}
buffer_put_char(&msg, SSH2_FXP_NAME);
buffer_put_int(&msg, id);
buffer_put_int(&msg, count);
- TRACE("sent names id %u count %d", id, count);
+ TRACE("sent names id %d count %d", id, count);
for (i = 0; i < count; i++) {
buffer_put_cstring(&msg, stats[i].name);
buffer_put_cstring(&msg, stats[i].long_name);
{
Buffer msg;
- TRACE("sent attrib id %u have 0x%x", id, a->flags);
+ TRACE("sent attrib id %d have 0x%x", id, a->flags);
buffer_init(&msg);
buffer_put_char(&msg, SSH2_FXP_ATTRS);
buffer_put_int(&msg, id);
{
Buffer msg;
- version = get_int();
+ version = buffer_get_int(&iqueue);
TRACE("client version %d", version);
buffer_init(&msg);
buffer_put_char(&msg, SSH2_FXP_VERSION);
a = get_attrib();
flags = flags_from_portable(pflags);
mode = (a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) ? a->perm : 0666;
- TRACE("open id %u name %s flags %d mode 0%o", id, name, pflags, mode);
+ TRACE("open id %d name %s flags %d mode 0%o", id, name, pflags, mode);
fd = open(name, flags, mode);
if (fd < 0) {
status = errno_to_portable(errno);
id = get_int();
handle = get_handle();
- TRACE("close id %u handle %d", id, handle);
+ TRACE("close id %d handle %d", id, handle);
ret = handle_close(handle);
status = (ret == -1) ? errno_to_portable(errno) : SSH2_FX_OK;
send_status(id, status);
off = get_int64();
len = get_int();
- TRACE("read id %u handle %d off %llu len %d", id, handle,
+ TRACE("read id %d handle %d off %llu len %d", id, handle,
(u_int64_t)off, len);
if (len > sizeof buf) {
len = sizeof buf;
off = get_int64();
data = get_string(&len);
- TRACE("write id %u handle %d off %llu len %d", id, handle,
+ TRACE("write id %d handle %d off %llu len %d", id, handle,
(u_int64_t)off, len);
fd = handle_to_fd(handle);
if (fd >= 0) {
id = get_int();
name = get_string(NULL);
- TRACE("%sstat id %u name %s", do_lstat ? "l" : "", id, name);
+ TRACE("%sstat id %d name %s", do_lstat ? "l" : "", id, name);
ret = do_lstat ? lstat(name, &st) : stat(name, &st);
if (ret < 0) {
status = errno_to_portable(errno);
id = get_int();
handle = get_handle();
- TRACE("fstat id %u handle %d", id, handle);
+ TRACE("fstat id %d handle %d", id, handle);
fd = handle_to_fd(handle);
if (fd >= 0) {
ret = fstat(fd, &st);
Attrib *a;
u_int32_t id;
char *name;
- int status = SSH2_FX_OK, ret;
+ int ret;
+ int status = SSH2_FX_OK;
id = get_int();
name = get_string(NULL);
a = get_attrib();
- TRACE("setstat id %u name %s", id, name);
- if (a->flags & SSH2_FILEXFER_ATTR_SIZE) {
- ret = truncate(name, a->size);
- if (ret == -1)
- status = errno_to_portable(errno);
- }
+ TRACE("setstat id %d name %s", id, name);
if (a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) {
ret = chmod(name, a->perm & 0777);
if (ret == -1)
id = get_int();
handle = get_handle();
a = get_attrib();
- TRACE("fsetstat id %u handle %d", id, handle);
+ TRACE("fsetstat id %d handle %d", id, handle);
fd = handle_to_fd(handle);
name = handle_to_name(handle);
if (fd < 0 || name == NULL) {
status = SSH2_FX_FAILURE;
} else {
- if (a->flags & SSH2_FILEXFER_ATTR_SIZE) {
- ret = ftruncate(fd, a->size);
- if (ret == -1)
- status = errno_to_portable(errno);
- }
if (a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) {
#ifdef HAVE_FCHMOD
ret = fchmod(fd, a->perm & 0777);
id = get_int();
path = get_string(NULL);
- TRACE("opendir id %u path %s", id, path);
+ TRACE("opendir id %d path %s", id, path);
dirp = opendir(path);
if (dirp == NULL) {
status = errno_to_portable(errno);
if ((pw = getpwuid(st->st_uid)) != NULL) {
user = pw->pw_name;
} else {
- snprintf(ubuf, sizeof ubuf, "%u", (u_int)st->st_uid);
+ snprintf(ubuf, sizeof ubuf, "%d", st->st_uid);
user = ubuf;
}
if ((gr = getgrgid(st->st_gid)) != NULL) {
group = gr->gr_name;
} else {
- snprintf(gbuf, sizeof gbuf, "%u", (u_int)st->st_gid);
+ snprintf(gbuf, sizeof gbuf, "%d", st->st_gid);
group = gbuf;
}
if (ltime != NULL) {
id = get_int();
handle = get_handle();
- TRACE("readdir id %u handle %d", id, handle);
+ TRACE("readdir id %d handle %d", id, handle);
dirp = handle_to_dir(handle);
path = handle_to_name(handle);
if (dirp == NULL || path == NULL) {
char pathname[1024];
Stat *stats;
int nstats = 10, count = 0, i;
-
stats = xmalloc(nstats * sizeof(Stat));
while ((dp = readdir(dirp)) != NULL) {
if (count >= nstats) {
}
if (count > 0) {
send_names(id, count, stats);
- for (i = 0; i < count; i++) {
+ for(i = 0; i < count; i++) {
xfree(stats[i].name);
xfree(stats[i].long_name);
}
id = get_int();
name = get_string(NULL);
- TRACE("remove id %u name %s", id, name);
+ TRACE("remove id %d name %s", id, name);
ret = unlink(name);
status = (ret == -1) ? errno_to_portable(errno) : SSH2_FX_OK;
send_status(id, status);
a = get_attrib();
mode = (a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) ?
a->perm & 0777 : 0777;
- TRACE("mkdir id %u name %s mode 0%o", id, name, mode);
+ TRACE("mkdir id %d name %s mode 0%o", id, name, mode);
ret = mkdir(name, mode);
status = (ret == -1) ? errno_to_portable(errno) : SSH2_FX_OK;
send_status(id, status);
id = get_int();
name = get_string(NULL);
- TRACE("rmdir id %u name %s", id, name);
+ TRACE("rmdir id %d name %s", id, name);
ret = rmdir(name);
status = (ret == -1) ? errno_to_portable(errno) : SSH2_FX_OK;
send_status(id, status);
xfree(path);
path = xstrdup(".");
}
- TRACE("realpath id %u path %s", id, path);
+ TRACE("realpath id %d path %s", id, path);
if (realpath(path, resolvedname) == NULL) {
send_status(id, errno_to_portable(errno));
} else {
id = get_int();
oldpath = get_string(NULL);
newpath = get_string(NULL);
- TRACE("rename id %u old %s new %s", id, oldpath, newpath);
+ TRACE("rename id %d old %s new %s", id, oldpath, newpath);
/* fail if 'newpath' exists */
if (stat(newpath, &st) == -1) {
ret = rename(oldpath, newpath);
id = get_int();
path = get_string(NULL);
- TRACE("readlink id %u path %s", id, path);
+ TRACE("readlink id %d path %s", id, path);
if ((len = readlink(path, link, sizeof(link) - 1)) == -1)
send_status(id, errno_to_portable(errno));
else {
Stat s;
-
+
link[len] = '\0';
attrib_clear(&s.attrib);
s.name = s.long_name = link;
id = get_int();
oldpath = get_string(NULL);
newpath = get_string(NULL);
- TRACE("symlink id %u old %s new %s", id, oldpath, newpath);
+ TRACE("symlink id %d old %s new %s", id, oldpath, newpath);
/* fail if 'newpath' exists */
if (stat(newpath, &st) == -1) {
ret = symlink(oldpath, newpath);
process(void)
{
u_int msg_len;
- u_int buf_len;
- u_int consumed;
u_int type;
u_char *cp;
- buf_len = buffer_len(&iqueue);
- if (buf_len < 5)
+ if (buffer_len(&iqueue) < 5)
return; /* Incomplete message. */
- cp = buffer_ptr(&iqueue);
+ cp = (u_char *) buffer_ptr(&iqueue);
msg_len = GET_32BIT(cp);
if (msg_len > 256 * 1024) {
error("bad message ");
exit(11);
}
- if (buf_len < msg_len + 4)
+ if (buffer_len(&iqueue) < msg_len + 4)
return;
buffer_consume(&iqueue, 4);
- buf_len -= 4;
type = buffer_get_char(&iqueue);
switch (type) {
case SSH2_FXP_INIT:
error("Unknown message %d", type);
break;
}
- /* discard the remaining bytes from the current packet */
- if (buf_len < buffer_len(&iqueue))
- fatal("iqueue grows");
- consumed = buf_len - buffer_len(&iqueue);
- if (msg_len < consumed)
- fatal("msg_len %d < consumed %d", msg_len, consumed);
- if (msg_len > consumed)
- buffer_consume(&iqueue, msg_len - consumed);
}
int