[BACK]Return to sftp-client.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Annotation of src/usr.bin/ssh/sftp-client.c, Revision 1.93

1.93    ! djm         1: /* $OpenBSD: sftp-client.c,v 1.92 2010/07/19 03:16:33 djm Exp $ */
1.1       djm         2: /*
1.46      djm         3:  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
1.1       djm         4:  *
1.46      djm         5:  * Permission to use, copy, modify, and distribute this software for any
                      6:  * purpose with or without fee is hereby granted, provided that the above
                      7:  * copyright notice and this permission notice appear in all copies.
1.1       djm         8:  *
1.46      djm         9:  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
                     10:  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
                     11:  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
                     12:  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
                     13:  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
                     14:  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
                     15:  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1.1       djm        16:  */
                     17:
                     18: /* XXX: memleaks */
                     19: /* XXX: signed vs unsigned */
1.23      djm        20: /* XXX: remove all logging, only return status codes */
1.1       djm        21: /* XXX: copy between two remote sites */
                     22:
1.74      deraadt    23: #include <sys/types.h>
1.93    ! djm        24: #include <sys/poll.h>
1.21      djm        25: #include <sys/queue.h>
1.60      stevesk    26: #include <sys/stat.h>
1.71      stevesk    27: #include <sys/time.h>
1.72      stevesk    28: #include <sys/param.h>
1.82      djm        29: #include <sys/statvfs.h>
1.74      deraadt    30: #include <sys/uio.h>
1.66      stevesk    31:
1.89      djm        32: #include <dirent.h>
1.67      stevesk    33: #include <errno.h>
1.66      stevesk    34: #include <fcntl.h>
1.70      stevesk    35: #include <signal.h>
1.87      dtucker    36: #include <stdarg.h>
1.73      stevesk    37: #include <stdio.h>
1.69      stevesk    38: #include <string.h>
1.68      stevesk    39: #include <unistd.h>
1.1       djm        40:
1.74      deraadt    41: #include "xmalloc.h"
1.1       djm        42: #include "buffer.h"
                     43: #include "log.h"
                     44: #include "atomicio.h"
1.39      fgsch      45: #include "progressmeter.h"
1.64      djm        46: #include "misc.h"
1.1       djm        47:
                     48: #include "sftp.h"
                     49: #include "sftp-common.h"
                     50: #include "sftp-client.h"
                     51:
1.49      djm        52: extern volatile sig_atomic_t interrupted;
1.39      fgsch      53: extern int showprogress;
                     54:
1.59      david      55: /* Minimum amount of data to read at a time */
1.21      djm        56: #define MIN_READ_SIZE  512
                     57:
1.89      djm        58: /* Maximum depth to descend in directory trees */
                     59: #define MAX_DIR_DEPTH 64
                     60:
1.23      djm        61: struct sftp_conn {
                     62:        int fd_in;
                     63:        int fd_out;
                     64:        u_int transfer_buflen;
                     65:        u_int num_requests;
                     66:        u_int version;
                     67:        u_int msg_id;
1.82      djm        68: #define SFTP_EXT_POSIX_RENAME  0x00000001
                     69: #define SFTP_EXT_STATVFS       0x00000002
                     70: #define SFTP_EXT_FSTATVFS      0x00000004
1.81      djm        71:        u_int exts;
1.93    ! djm        72:        u_int64_t limit_kbps;
        !            73:        struct bwlimit bwlimit_in, bwlimit_out;
1.23      djm        74: };
1.4       djm        75:
1.88      djm        76: static char *
1.93    ! djm        77: get_handle(struct sftp_conn *conn, u_int expected_id, u_int *len,
        !            78:     const char *errfmt, ...) __attribute__((format(printf, 4, 5)));
        !            79:
        !            80: /* ARGSUSED */
        !            81: static int
        !            82: sftpio(void *_bwlimit, size_t amount)
        !            83: {
        !            84:        struct bwlimit *bwlimit = (struct bwlimit *)_bwlimit;
        !            85:
        !            86:        bandwidth_limit(bwlimit, amount);
        !            87:        return 0;
        !            88: }
1.88      djm        89:
1.17      itojun     90: static void
1.93    ! djm        91: send_msg(struct sftp_conn *conn, Buffer *m)
1.1       djm        92: {
1.40      djm        93:        u_char mlen[4];
1.65      djm        94:        struct iovec iov[2];
1.40      djm        95:
1.58      djm        96:        if (buffer_len(m) > SFTP_MAX_MSG_LENGTH)
1.40      djm        97:                fatal("Outbound message too long %u", buffer_len(m));
                     98:
                     99:        /* Send length first */
1.64      djm       100:        put_u32(mlen, buffer_len(m));
1.65      djm       101:        iov[0].iov_base = mlen;
                    102:        iov[0].iov_len = sizeof(mlen);
                    103:        iov[1].iov_base = buffer_ptr(m);
                    104:        iov[1].iov_len = buffer_len(m);
1.74      deraadt   105:
1.93    ! djm       106:        if (atomiciov6(writev, conn->fd_out, iov, 2,
        !           107:            conn->limit_kbps > 0 ? sftpio : NULL, &conn->bwlimit_out) !=
        !           108:            buffer_len(m) + sizeof(mlen))
1.1       djm       109:                fatal("Couldn't send packet: %s", strerror(errno));
                    110:
1.40      djm       111:        buffer_clear(m);
1.1       djm       112: }
                    113:
1.17      itojun    114: static void
1.93    ! djm       115: get_msg(struct sftp_conn *conn, Buffer *m)
1.1       djm       116: {
1.40      djm       117:        u_int msg_len;
1.1       djm       118:
1.40      djm       119:        buffer_append_space(m, 4);
1.93    ! djm       120:        if (atomicio6(read, conn->fd_in, buffer_ptr(m), 4,
        !           121:            conn->limit_kbps > 0 ? sftpio : NULL, &conn->bwlimit_in) != 4) {
1.54      avsm      122:                if (errno == EPIPE)
                    123:                        fatal("Connection closed");
                    124:                else
                    125:                        fatal("Couldn't read packet: %s", strerror(errno));
                    126:        }
1.1       djm       127:
1.40      djm       128:        msg_len = buffer_get_int(m);
1.58      djm       129:        if (msg_len > SFTP_MAX_MSG_LENGTH)
1.33      deraadt   130:                fatal("Received message too long %u", msg_len);
1.1       djm       131:
1.40      djm       132:        buffer_append_space(m, msg_len);
1.93    ! djm       133:        if (atomicio6(read, conn->fd_in, buffer_ptr(m), msg_len,
        !           134:            conn->limit_kbps > 0 ? sftpio : NULL, &conn->bwlimit_in)
        !           135:            != msg_len) {
1.54      avsm      136:                if (errno == EPIPE)
                    137:                        fatal("Connection closed");
                    138:                else
                    139:                        fatal("Read packet: %s", strerror(errno));
                    140:        }
1.1       djm       141: }
                    142:
1.17      itojun    143: static void
1.93    ! djm       144: send_string_request(struct sftp_conn *conn, u_int id, u_int code, char *s,
1.1       djm       145:     u_int len)
                    146: {
                    147:        Buffer msg;
                    148:
                    149:        buffer_init(&msg);
                    150:        buffer_put_char(&msg, code);
                    151:        buffer_put_int(&msg, id);
                    152:        buffer_put_string(&msg, s, len);
1.93    ! djm       153:        send_msg(conn, &msg);
        !           154:        debug3("Sent message fd %d T:%u I:%u", conn->fd_out, code, id);
1.1       djm       155:        buffer_free(&msg);
                    156: }
                    157:
1.17      itojun    158: static void
1.93    ! djm       159: send_string_attrs_request(struct sftp_conn *conn, u_int id, u_int code,
        !           160:     char *s, u_int len, Attrib *a)
1.1       djm       161: {
                    162:        Buffer msg;
                    163:
                    164:        buffer_init(&msg);
                    165:        buffer_put_char(&msg, code);
                    166:        buffer_put_int(&msg, id);
                    167:        buffer_put_string(&msg, s, len);
                    168:        encode_attrib(&msg, a);
1.93    ! djm       169:        send_msg(conn, &msg);
        !           170:        debug3("Sent message fd %d T:%u I:%u", conn->fd_out, code, id);
1.1       djm       171:        buffer_free(&msg);
                    172: }
                    173:
1.17      itojun    174: static u_int
1.93    ! djm       175: get_status(struct sftp_conn *conn, u_int expected_id)
1.1       djm       176: {
                    177:        Buffer msg;
                    178:        u_int type, id, status;
                    179:
                    180:        buffer_init(&msg);
1.93    ! djm       181:        get_msg(conn, &msg);
1.1       djm       182:        type = buffer_get_char(&msg);
                    183:        id = buffer_get_int(&msg);
                    184:
                    185:        if (id != expected_id)
1.33      deraadt   186:                fatal("ID mismatch (%u != %u)", id, expected_id);
1.1       djm       187:        if (type != SSH2_FXP_STATUS)
1.33      deraadt   188:                fatal("Expected SSH2_FXP_STATUS(%u) packet, got %u",
1.1       djm       189:                    SSH2_FXP_STATUS, type);
                    190:
                    191:        status = buffer_get_int(&msg);
                    192:        buffer_free(&msg);
                    193:
1.33      deraadt   194:        debug3("SSH2_FXP_STATUS %u", status);
1.1       djm       195:
1.93    ! djm       196:        return status;
1.1       djm       197: }
                    198:
1.17      itojun    199: static char *
1.93    ! djm       200: get_handle(struct sftp_conn *conn, u_int expected_id, u_int *len,
        !           201:     const char *errfmt, ...)
1.1       djm       202: {
                    203:        Buffer msg;
                    204:        u_int type, id;
1.88      djm       205:        char *handle, errmsg[256];
                    206:        va_list args;
                    207:        int status;
                    208:
                    209:        va_start(args, errfmt);
                    210:        if (errfmt != NULL)
                    211:                vsnprintf(errmsg, sizeof(errmsg), errfmt, args);
                    212:        va_end(args);
1.1       djm       213:
                    214:        buffer_init(&msg);
1.93    ! djm       215:        get_msg(conn, &msg);
1.1       djm       216:        type = buffer_get_char(&msg);
                    217:        id = buffer_get_int(&msg);
                    218:
                    219:        if (id != expected_id)
1.88      djm       220:                fatal("%s: ID mismatch (%u != %u)",
                    221:                    errfmt == NULL ? __func__ : errmsg, id, expected_id);
1.1       djm       222:        if (type == SSH2_FXP_STATUS) {
1.88      djm       223:                status = buffer_get_int(&msg);
                    224:                if (errfmt != NULL)
                    225:                        error("%s: %s", errmsg, fx2txt(status));
1.52      markus    226:                buffer_free(&msg);
1.1       djm       227:                return(NULL);
                    228:        } else if (type != SSH2_FXP_HANDLE)
1.88      djm       229:                fatal("%s: Expected SSH2_FXP_HANDLE(%u) packet, got %u",
                    230:                    errfmt == NULL ? __func__ : errmsg, SSH2_FXP_HANDLE, type);
1.1       djm       231:
                    232:        handle = buffer_get_string(&msg, len);
                    233:        buffer_free(&msg);
                    234:
                    235:        return(handle);
                    236: }
                    237:
1.17      itojun    238: static Attrib *
1.93    ! djm       239: get_decode_stat(struct sftp_conn *conn, u_int expected_id, int quiet)
1.1       djm       240: {
                    241:        Buffer msg;
                    242:        u_int type, id;
                    243:        Attrib *a;
                    244:
                    245:        buffer_init(&msg);
1.93    ! djm       246:        get_msg(conn, &msg);
1.1       djm       247:
                    248:        type = buffer_get_char(&msg);
                    249:        id = buffer_get_int(&msg);
                    250:
1.33      deraadt   251:        debug3("Received stat reply T:%u I:%u", type, id);
1.1       djm       252:        if (id != expected_id)
1.33      deraadt   253:                fatal("ID mismatch (%u != %u)", id, expected_id);
1.1       djm       254:        if (type == SSH2_FXP_STATUS) {
                    255:                int status = buffer_get_int(&msg);
                    256:
1.14      djm       257:                if (quiet)
                    258:                        debug("Couldn't stat remote file: %s", fx2txt(status));
                    259:                else
                    260:                        error("Couldn't stat remote file: %s", fx2txt(status));
1.52      markus    261:                buffer_free(&msg);
1.1       djm       262:                return(NULL);
                    263:        } else if (type != SSH2_FXP_ATTRS) {
1.33      deraadt   264:                fatal("Expected SSH2_FXP_ATTRS(%u) packet, got %u",
1.1       djm       265:                    SSH2_FXP_ATTRS, type);
                    266:        }
                    267:        a = decode_attrib(&msg);
                    268:        buffer_free(&msg);
                    269:
                    270:        return(a);
                    271: }
                    272:
1.82      djm       273: static int
1.93    ! djm       274: get_decode_statvfs(struct sftp_conn *conn, struct sftp_statvfs *st,
        !           275:     u_int expected_id, int quiet)
1.82      djm       276: {
                    277:        Buffer msg;
                    278:        u_int type, id, flag;
                    279:
                    280:        buffer_init(&msg);
1.93    ! djm       281:        get_msg(conn, &msg);
1.82      djm       282:
                    283:        type = buffer_get_char(&msg);
                    284:        id = buffer_get_int(&msg);
                    285:
                    286:        debug3("Received statvfs reply T:%u I:%u", type, id);
                    287:        if (id != expected_id)
                    288:                fatal("ID mismatch (%u != %u)", id, expected_id);
                    289:        if (type == SSH2_FXP_STATUS) {
                    290:                int status = buffer_get_int(&msg);
                    291:
                    292:                if (quiet)
                    293:                        debug("Couldn't statvfs: %s", fx2txt(status));
                    294:                else
                    295:                        error("Couldn't statvfs: %s", fx2txt(status));
                    296:                buffer_free(&msg);
                    297:                return -1;
                    298:        } else if (type != SSH2_FXP_EXTENDED_REPLY) {
                    299:                fatal("Expected SSH2_FXP_EXTENDED_REPLY(%u) packet, got %u",
                    300:                    SSH2_FXP_EXTENDED_REPLY, type);
                    301:        }
                    302:
                    303:        bzero(st, sizeof(*st));
1.84      dtucker   304:        st->f_bsize = buffer_get_int64(&msg);
                    305:        st->f_frsize = buffer_get_int64(&msg);
1.82      djm       306:        st->f_blocks = buffer_get_int64(&msg);
                    307:        st->f_bfree = buffer_get_int64(&msg);
                    308:        st->f_bavail = buffer_get_int64(&msg);
                    309:        st->f_files = buffer_get_int64(&msg);
                    310:        st->f_ffree = buffer_get_int64(&msg);
                    311:        st->f_favail = buffer_get_int64(&msg);
1.83      djm       312:        st->f_fsid = buffer_get_int64(&msg);
1.84      dtucker   313:        flag = buffer_get_int64(&msg);
                    314:        st->f_namemax = buffer_get_int64(&msg);
1.82      djm       315:
                    316:        st->f_flag = (flag & SSH2_FXE_STATVFS_ST_RDONLY) ? ST_RDONLY : 0;
                    317:        st->f_flag |= (flag & SSH2_FXE_STATVFS_ST_NOSUID) ? ST_NOSUID : 0;
                    318:
                    319:        buffer_free(&msg);
                    320:
                    321:        return 0;
                    322: }
                    323:
1.23      djm       324: struct sftp_conn *
1.93    ! djm       325: do_init(int fd_in, int fd_out, u_int transfer_buflen, u_int num_requests,
        !           326:     u_int64_t limit_kbps)
1.1       djm       327: {
1.93    ! djm       328:        u_int type;
1.1       djm       329:        Buffer msg;
1.23      djm       330:        struct sftp_conn *ret;
1.1       djm       331:
1.93    ! djm       332:        ret = xmalloc(sizeof(*ret));
        !           333:        ret->fd_in = fd_in;
        !           334:        ret->fd_out = fd_out;
        !           335:        ret->transfer_buflen = transfer_buflen;
        !           336:        ret->num_requests = num_requests;
        !           337:        ret->exts = 0;
        !           338:        ret->limit_kbps = 0;
        !           339:
1.1       djm       340:        buffer_init(&msg);
                    341:        buffer_put_char(&msg, SSH2_FXP_INIT);
                    342:        buffer_put_int(&msg, SSH2_FILEXFER_VERSION);
1.93    ! djm       343:        send_msg(ret, &msg);
1.1       djm       344:
                    345:        buffer_clear(&msg);
                    346:
1.93    ! djm       347:        get_msg(ret, &msg);
1.1       djm       348:
1.3       stevesk   349:        /* Expecting a VERSION reply */
1.1       djm       350:        if ((type = buffer_get_char(&msg)) != SSH2_FXP_VERSION) {
1.33      deraadt   351:                error("Invalid packet back from SSH2_FXP_INIT (type %u)",
1.1       djm       352:                    type);
                    353:                buffer_free(&msg);
1.23      djm       354:                return(NULL);
1.1       djm       355:        }
1.93    ! djm       356:        ret->version = buffer_get_int(&msg);
1.1       djm       357:
1.93    ! djm       358:        debug2("Remote version: %u", ret->version);
1.1       djm       359:
                    360:        /* Check for extensions */
                    361:        while (buffer_len(&msg) > 0) {
                    362:                char *name = buffer_get_string(&msg, NULL);
                    363:                char *value = buffer_get_string(&msg, NULL);
1.85      djm       364:                int known = 0;
1.1       djm       365:
1.82      djm       366:                if (strcmp(name, "posix-rename@openssh.com") == 0 &&
1.85      djm       367:                    strcmp(value, "1") == 0) {
1.93    ! djm       368:                        ret->exts |= SFTP_EXT_POSIX_RENAME;
1.85      djm       369:                        known = 1;
                    370:                } else if (strcmp(name, "statvfs@openssh.com") == 0 &&
                    371:                    strcmp(value, "2") == 0) {
1.93    ! djm       372:                        ret->exts |= SFTP_EXT_STATVFS;
1.85      djm       373:                        known = 1;
                    374:                } if (strcmp(name, "fstatvfs@openssh.com") == 0 &&
                    375:                    strcmp(value, "2") == 0) {
1.93    ! djm       376:                        ret->exts |= SFTP_EXT_FSTATVFS;
1.85      djm       377:                        known = 1;
                    378:                }
                    379:                if (known) {
                    380:                        debug2("Server supports extension \"%s\" revision %s",
                    381:                            name, value);
                    382:                } else {
                    383:                        debug2("Unrecognised server extension \"%s\"", name);
                    384:                }
1.1       djm       385:                xfree(name);
                    386:                xfree(value);
                    387:        }
                    388:
                    389:        buffer_free(&msg);
1.11      djm       390:
1.23      djm       391:        /* Some filexfer v.0 servers don't support large packets */
1.93    ! djm       392:        if (ret->version == 0)
1.29      markus    393:                ret->transfer_buflen = MIN(ret->transfer_buflen, 20480);
1.23      djm       394:
1.93    ! djm       395:        ret->limit_kbps = limit_kbps;
        !           396:        if (ret->limit_kbps > 0) {
        !           397:                bandwidth_limit_init(&ret->bwlimit_in, ret->limit_kbps,
        !           398:                    ret->transfer_buflen);
        !           399:                bandwidth_limit_init(&ret->bwlimit_out, ret->limit_kbps,
        !           400:                    ret->transfer_buflen);
        !           401:        }
        !           402:
        !           403:        return ret;
1.23      djm       404: }
                    405:
                    406: u_int
                    407: sftp_proto_version(struct sftp_conn *conn)
                    408: {
1.93    ! djm       409:        return conn->version;
1.1       djm       410: }
                    411:
                    412: int
1.23      djm       413: do_close(struct sftp_conn *conn, char *handle, u_int handle_len)
1.1       djm       414: {
                    415:        u_int id, status;
                    416:        Buffer msg;
                    417:
                    418:        buffer_init(&msg);
                    419:
1.23      djm       420:        id = conn->msg_id++;
1.1       djm       421:        buffer_put_char(&msg, SSH2_FXP_CLOSE);
                    422:        buffer_put_int(&msg, id);
                    423:        buffer_put_string(&msg, handle, handle_len);
1.93    ! djm       424:        send_msg(conn, &msg);
1.33      deraadt   425:        debug3("Sent message SSH2_FXP_CLOSE I:%u", id);
1.1       djm       426:
1.93    ! djm       427:        status = get_status(conn, id);
1.1       djm       428:        if (status != SSH2_FX_OK)
                    429:                error("Couldn't close file: %s", fx2txt(status));
                    430:
                    431:        buffer_free(&msg);
                    432:
1.93    ! djm       433:        return status;
1.1       djm       434: }
                    435:
1.12      djm       436:
1.17      itojun    437: static int
1.23      djm       438: do_lsreaddir(struct sftp_conn *conn, char *path, int printflag,
1.12      djm       439:     SFTP_DIRENT ***dir)
1.1       djm       440: {
                    441:        Buffer msg;
1.55      djm       442:        u_int count, type, id, handle_len, i, expected_id, ents = 0;
1.1       djm       443:        char *handle;
                    444:
1.23      djm       445:        id = conn->msg_id++;
1.1       djm       446:
                    447:        buffer_init(&msg);
                    448:        buffer_put_char(&msg, SSH2_FXP_OPENDIR);
                    449:        buffer_put_int(&msg, id);
                    450:        buffer_put_cstring(&msg, path);
1.93    ! djm       451:        send_msg(conn, &msg);
1.1       djm       452:
                    453:        buffer_clear(&msg);
                    454:
1.93    ! djm       455:        handle = get_handle(conn, id, &handle_len,
1.88      djm       456:            "remote readdir(\"%s\")", path);
1.1       djm       457:        if (handle == NULL)
1.93    ! djm       458:                return -1;
1.1       djm       459:
1.12      djm       460:        if (dir) {
                    461:                ents = 0;
                    462:                *dir = xmalloc(sizeof(**dir));
                    463:                (*dir)[0] = NULL;
                    464:        }
                    465:
1.49      djm       466:        for (; !interrupted;) {
1.23      djm       467:                id = expected_id = conn->msg_id++;
1.1       djm       468:
1.33      deraadt   469:                debug3("Sending SSH2_FXP_READDIR I:%u", id);
1.1       djm       470:
                    471:                buffer_clear(&msg);
                    472:                buffer_put_char(&msg, SSH2_FXP_READDIR);
                    473:                buffer_put_int(&msg, id);
                    474:                buffer_put_string(&msg, handle, handle_len);
1.93    ! djm       475:                send_msg(conn, &msg);
1.1       djm       476:
                    477:                buffer_clear(&msg);
                    478:
1.93    ! djm       479:                get_msg(conn, &msg);
1.1       djm       480:
                    481:                type = buffer_get_char(&msg);
                    482:                id = buffer_get_int(&msg);
                    483:
1.33      deraadt   484:                debug3("Received reply T:%u I:%u", type, id);
1.1       djm       485:
                    486:                if (id != expected_id)
1.33      deraadt   487:                        fatal("ID mismatch (%u != %u)", id, expected_id);
1.1       djm       488:
                    489:                if (type == SSH2_FXP_STATUS) {
                    490:                        int status = buffer_get_int(&msg);
                    491:
                    492:                        debug3("Received SSH2_FXP_STATUS %d", status);
                    493:
                    494:                        if (status == SSH2_FX_EOF) {
                    495:                                break;
                    496:                        } else {
                    497:                                error("Couldn't read directory: %s",
                    498:                                    fx2txt(status));
1.23      djm       499:                                do_close(conn, handle, handle_len);
1.42      markus    500:                                xfree(handle);
1.9       djm       501:                                return(status);
1.1       djm       502:                        }
                    503:                } else if (type != SSH2_FXP_NAME)
1.33      deraadt   504:                        fatal("Expected SSH2_FXP_NAME(%u) packet, got %u",
1.1       djm       505:                            SSH2_FXP_NAME, type);
                    506:
                    507:                count = buffer_get_int(&msg);
1.7       markus    508:                if (count == 0)
                    509:                        break;
1.8       stevesk   510:                debug3("Received %d SSH2_FXP_NAME responses", count);
1.19      deraadt   511:                for (i = 0; i < count; i++) {
1.1       djm       512:                        char *filename, *longname;
                    513:                        Attrib *a;
                    514:
                    515:                        filename = buffer_get_string(&msg, NULL);
                    516:                        longname = buffer_get_string(&msg, NULL);
                    517:                        a = decode_attrib(&msg);
                    518:
1.12      djm       519:                        if (printflag)
                    520:                                printf("%s\n", longname);
                    521:
1.89      djm       522:                        /*
                    523:                         * Directory entries should never contain '/'
                    524:                         * These can be used to attack recursive ops
                    525:                         * (e.g. send '../../../../etc/passwd')
                    526:                         */
                    527:                        if (strchr(filename, '/') != NULL) {
                    528:                                error("Server sent suspect path \"%s\" "
                    529:                                    "during readdir of \"%s\"", filename, path);
                    530:                                goto next;
                    531:                        }
                    532:
1.12      djm       533:                        if (dir) {
1.62      djm       534:                                *dir = xrealloc(*dir, ents + 2, sizeof(**dir));
1.12      djm       535:                                (*dir)[ents] = xmalloc(sizeof(***dir));
                    536:                                (*dir)[ents]->filename = xstrdup(filename);
                    537:                                (*dir)[ents]->longname = xstrdup(longname);
                    538:                                memcpy(&(*dir)[ents]->a, a, sizeof(*a));
                    539:                                (*dir)[++ents] = NULL;
                    540:                        }
1.89      djm       541:  next:
1.1       djm       542:                        xfree(filename);
                    543:                        xfree(longname);
                    544:                }
                    545:        }
                    546:
                    547:        buffer_free(&msg);
1.23      djm       548:        do_close(conn, handle, handle_len);
1.1       djm       549:        xfree(handle);
                    550:
1.49      djm       551:        /* Don't return partial matches on interrupt */
                    552:        if (interrupted && dir != NULL && *dir != NULL) {
                    553:                free_sftp_dirents(*dir);
                    554:                *dir = xmalloc(sizeof(**dir));
                    555:                **dir = NULL;
                    556:        }
                    557:
1.93    ! djm       558:        return 0;
1.12      djm       559: }
                    560:
                    561: int
1.23      djm       562: do_readdir(struct sftp_conn *conn, char *path, SFTP_DIRENT ***dir)
1.12      djm       563: {
1.23      djm       564:        return(do_lsreaddir(conn, path, 0, dir));
1.12      djm       565: }
                    566:
                    567: void free_sftp_dirents(SFTP_DIRENT **s)
                    568: {
                    569:        int i;
1.19      deraadt   570:
                    571:        for (i = 0; s[i]; i++) {
1.12      djm       572:                xfree(s[i]->filename);
                    573:                xfree(s[i]->longname);
                    574:                xfree(s[i]);
                    575:        }
                    576:        xfree(s);
                    577: }
                    578:
                    579: int
1.23      djm       580: do_rm(struct sftp_conn *conn, char *path)
1.1       djm       581: {
                    582:        u_int status, id;
                    583:
                    584:        debug2("Sending SSH2_FXP_REMOVE \"%s\"", path);
                    585:
1.23      djm       586:        id = conn->msg_id++;
1.93    ! djm       587:        send_string_request(conn, id, SSH2_FXP_REMOVE, path, strlen(path));
        !           588:        status = get_status(conn, id);
1.1       djm       589:        if (status != SSH2_FX_OK)
                    590:                error("Couldn't delete file: %s", fx2txt(status));
                    591:        return(status);
                    592: }
                    593:
                    594: int
1.89      djm       595: do_mkdir(struct sftp_conn *conn, char *path, Attrib *a, int printflag)
1.1       djm       596: {
                    597:        u_int status, id;
                    598:
1.23      djm       599:        id = conn->msg_id++;
1.93    ! djm       600:        send_string_attrs_request(conn, id, SSH2_FXP_MKDIR, path,
1.1       djm       601:            strlen(path), a);
                    602:
1.93    ! djm       603:        status = get_status(conn, id);
1.89      djm       604:        if (status != SSH2_FX_OK && printflag)
1.1       djm       605:                error("Couldn't create directory: %s", fx2txt(status));
                    606:
                    607:        return(status);
                    608: }
                    609:
                    610: int
1.23      djm       611: do_rmdir(struct sftp_conn *conn, char *path)
1.1       djm       612: {
                    613:        u_int status, id;
                    614:
1.23      djm       615:        id = conn->msg_id++;
1.93    ! djm       616:        send_string_request(conn, id, SSH2_FXP_RMDIR, path,
1.23      djm       617:            strlen(path));
1.1       djm       618:
1.93    ! djm       619:        status = get_status(conn, id);
1.1       djm       620:        if (status != SSH2_FX_OK)
                    621:                error("Couldn't remove directory: %s", fx2txt(status));
                    622:
                    623:        return(status);
                    624: }
                    625:
                    626: Attrib *
1.23      djm       627: do_stat(struct sftp_conn *conn, char *path, int quiet)
1.1       djm       628: {
                    629:        u_int id;
                    630:
1.23      djm       631:        id = conn->msg_id++;
                    632:
1.93    ! djm       633:        send_string_request(conn, id,
1.28      markus    634:            conn->version == 0 ? SSH2_FXP_STAT_VERSION_0 : SSH2_FXP_STAT,
1.23      djm       635:            path, strlen(path));
                    636:
1.93    ! djm       637:        return(get_decode_stat(conn, id, quiet));
1.1       djm       638: }
                    639:
                    640: Attrib *
1.23      djm       641: do_lstat(struct sftp_conn *conn, char *path, int quiet)
1.1       djm       642: {
                    643:        u_int id;
                    644:
1.23      djm       645:        if (conn->version == 0) {
                    646:                if (quiet)
                    647:                        debug("Server version does not support lstat operation");
                    648:                else
1.43      itojun    649:                        logit("Server version does not support lstat operation");
1.30      markus    650:                return(do_stat(conn, path, quiet));
1.23      djm       651:        }
                    652:
                    653:        id = conn->msg_id++;
1.93    ! djm       654:        send_string_request(conn, id, SSH2_FXP_LSTAT, path,
1.23      djm       655:            strlen(path));
                    656:
1.93    ! djm       657:        return(get_decode_stat(conn, id, quiet));
1.1       djm       658: }
                    659:
1.78      chl       660: #ifdef notyet
1.1       djm       661: Attrib *
1.23      djm       662: do_fstat(struct sftp_conn *conn, char *handle, u_int handle_len, int quiet)
1.1       djm       663: {
                    664:        u_int id;
                    665:
1.23      djm       666:        id = conn->msg_id++;
1.93    ! djm       667:        send_string_request(conn, id, SSH2_FXP_FSTAT, handle,
1.23      djm       668:            handle_len);
                    669:
1.93    ! djm       670:        return(get_decode_stat(conn, id, quiet));
1.1       djm       671: }
1.78      chl       672: #endif
1.1       djm       673:
                    674: int
1.23      djm       675: do_setstat(struct sftp_conn *conn, char *path, Attrib *a)
1.1       djm       676: {
                    677:        u_int status, id;
                    678:
1.23      djm       679:        id = conn->msg_id++;
1.93    ! djm       680:        send_string_attrs_request(conn, id, SSH2_FXP_SETSTAT, path,
1.1       djm       681:            strlen(path), a);
                    682:
1.93    ! djm       683:        status = get_status(conn, id);
1.1       djm       684:        if (status != SSH2_FX_OK)
                    685:                error("Couldn't setstat on \"%s\": %s", path,
                    686:                    fx2txt(status));
                    687:
                    688:        return(status);
                    689: }
                    690:
                    691: int
1.23      djm       692: do_fsetstat(struct sftp_conn *conn, char *handle, u_int handle_len,
1.1       djm       693:     Attrib *a)
                    694: {
                    695:        u_int status, id;
                    696:
1.23      djm       697:        id = conn->msg_id++;
1.93    ! djm       698:        send_string_attrs_request(conn, id, SSH2_FXP_FSETSTAT, handle,
1.1       djm       699:            handle_len, a);
                    700:
1.93    ! djm       701:        status = get_status(conn, id);
1.1       djm       702:        if (status != SSH2_FX_OK)
                    703:                error("Couldn't fsetstat: %s", fx2txt(status));
                    704:
                    705:        return(status);
                    706: }
                    707:
                    708: char *
1.23      djm       709: do_realpath(struct sftp_conn *conn, char *path)
1.1       djm       710: {
                    711:        Buffer msg;
                    712:        u_int type, expected_id, count, id;
                    713:        char *filename, *longname;
                    714:        Attrib *a;
                    715:
1.23      djm       716:        expected_id = id = conn->msg_id++;
1.93    ! djm       717:        send_string_request(conn, id, SSH2_FXP_REALPATH, path,
1.23      djm       718:            strlen(path));
1.1       djm       719:
                    720:        buffer_init(&msg);
                    721:
1.93    ! djm       722:        get_msg(conn, &msg);
1.1       djm       723:        type = buffer_get_char(&msg);
                    724:        id = buffer_get_int(&msg);
                    725:
                    726:        if (id != expected_id)
1.33      deraadt   727:                fatal("ID mismatch (%u != %u)", id, expected_id);
1.1       djm       728:
                    729:        if (type == SSH2_FXP_STATUS) {
                    730:                u_int status = buffer_get_int(&msg);
                    731:
                    732:                error("Couldn't canonicalise: %s", fx2txt(status));
1.91      djm       733:                buffer_free(&msg);
                    734:                return NULL;
1.1       djm       735:        } else if (type != SSH2_FXP_NAME)
1.33      deraadt   736:                fatal("Expected SSH2_FXP_NAME(%u) packet, got %u",
1.1       djm       737:                    SSH2_FXP_NAME, type);
                    738:
                    739:        count = buffer_get_int(&msg);
                    740:        if (count != 1)
                    741:                fatal("Got multiple names (%d) from SSH_FXP_REALPATH", count);
                    742:
                    743:        filename = buffer_get_string(&msg, NULL);
                    744:        longname = buffer_get_string(&msg, NULL);
                    745:        a = decode_attrib(&msg);
                    746:
                    747:        debug3("SSH_FXP_REALPATH %s -> %s", path, filename);
                    748:
                    749:        xfree(longname);
                    750:
                    751:        buffer_free(&msg);
                    752:
                    753:        return(filename);
                    754: }
                    755:
                    756: int
1.23      djm       757: do_rename(struct sftp_conn *conn, char *oldpath, char *newpath)
1.1       djm       758: {
                    759:        Buffer msg;
                    760:        u_int status, id;
                    761:
                    762:        buffer_init(&msg);
                    763:
                    764:        /* Send rename request */
1.23      djm       765:        id = conn->msg_id++;
1.81      djm       766:        if ((conn->exts & SFTP_EXT_POSIX_RENAME)) {
                    767:                buffer_put_char(&msg, SSH2_FXP_EXTENDED);
                    768:                buffer_put_int(&msg, id);
                    769:                buffer_put_cstring(&msg, "posix-rename@openssh.com");
                    770:        } else {
                    771:                buffer_put_char(&msg, SSH2_FXP_RENAME);
                    772:                buffer_put_int(&msg, id);
                    773:        }
1.1       djm       774:        buffer_put_cstring(&msg, oldpath);
                    775:        buffer_put_cstring(&msg, newpath);
1.93    ! djm       776:        send_msg(conn, &msg);
1.81      djm       777:        debug3("Sent message %s \"%s\" -> \"%s\"",
                    778:            (conn->exts & SFTP_EXT_POSIX_RENAME) ? "posix-rename@openssh.com" :
                    779:            "SSH2_FXP_RENAME", oldpath, newpath);
1.1       djm       780:        buffer_free(&msg);
                    781:
1.93    ! djm       782:        status = get_status(conn, id);
1.1       djm       783:        if (status != SSH2_FX_OK)
1.23      djm       784:                error("Couldn't rename file \"%s\" to \"%s\": %s", oldpath,
                    785:                    newpath, fx2txt(status));
1.1       djm       786:
                    787:        return(status);
1.11      djm       788: }
                    789:
                    790: int
1.23      djm       791: do_symlink(struct sftp_conn *conn, char *oldpath, char *newpath)
1.11      djm       792: {
                    793:        Buffer msg;
                    794:        u_int status, id;
                    795:
1.23      djm       796:        if (conn->version < 3) {
                    797:                error("This server does not support the symlink operation");
                    798:                return(SSH2_FX_OP_UNSUPPORTED);
                    799:        }
                    800:
1.11      djm       801:        buffer_init(&msg);
                    802:
1.48      djm       803:        /* Send symlink request */
1.23      djm       804:        id = conn->msg_id++;
1.11      djm       805:        buffer_put_char(&msg, SSH2_FXP_SYMLINK);
                    806:        buffer_put_int(&msg, id);
                    807:        buffer_put_cstring(&msg, oldpath);
                    808:        buffer_put_cstring(&msg, newpath);
1.93    ! djm       809:        send_msg(conn, &msg);
1.11      djm       810:        debug3("Sent message SSH2_FXP_SYMLINK \"%s\" -> \"%s\"", oldpath,
                    811:            newpath);
                    812:        buffer_free(&msg);
                    813:
1.93    ! djm       814:        status = get_status(conn, id);
1.11      djm       815:        if (status != SSH2_FX_OK)
1.36      markus    816:                error("Couldn't symlink file \"%s\" to \"%s\": %s", oldpath,
1.23      djm       817:                    newpath, fx2txt(status));
1.11      djm       818:
                    819:        return(status);
                    820: }
                    821:
1.78      chl       822: #ifdef notyet
1.11      djm       823: char *
1.23      djm       824: do_readlink(struct sftp_conn *conn, char *path)
1.11      djm       825: {
                    826:        Buffer msg;
                    827:        u_int type, expected_id, count, id;
                    828:        char *filename, *longname;
                    829:        Attrib *a;
                    830:
1.23      djm       831:        expected_id = id = conn->msg_id++;
1.93    ! djm       832:        send_string_request(conn, id, SSH2_FXP_READLINK, path, strlen(path));
1.11      djm       833:
                    834:        buffer_init(&msg);
                    835:
1.93    ! djm       836:        get_msg(conn, &msg);
1.11      djm       837:        type = buffer_get_char(&msg);
                    838:        id = buffer_get_int(&msg);
                    839:
                    840:        if (id != expected_id)
1.33      deraadt   841:                fatal("ID mismatch (%u != %u)", id, expected_id);
1.11      djm       842:
                    843:        if (type == SSH2_FXP_STATUS) {
                    844:                u_int status = buffer_get_int(&msg);
                    845:
                    846:                error("Couldn't readlink: %s", fx2txt(status));
                    847:                return(NULL);
                    848:        } else if (type != SSH2_FXP_NAME)
1.33      deraadt   849:                fatal("Expected SSH2_FXP_NAME(%u) packet, got %u",
1.11      djm       850:                    SSH2_FXP_NAME, type);
                    851:
                    852:        count = buffer_get_int(&msg);
                    853:        if (count != 1)
                    854:                fatal("Got multiple names (%d) from SSH_FXP_READLINK", count);
                    855:
                    856:        filename = buffer_get_string(&msg, NULL);
                    857:        longname = buffer_get_string(&msg, NULL);
                    858:        a = decode_attrib(&msg);
                    859:
                    860:        debug3("SSH_FXP_READLINK %s -> %s", path, filename);
                    861:
                    862:        xfree(longname);
                    863:
                    864:        buffer_free(&msg);
                    865:
                    866:        return(filename);
1.82      djm       867: }
                    868: #endif
                    869:
                    870: int
1.84      dtucker   871: do_statvfs(struct sftp_conn *conn, const char *path, struct sftp_statvfs *st,
1.82      djm       872:     int quiet)
                    873: {
                    874:        Buffer msg;
                    875:        u_int id;
                    876:
                    877:        if ((conn->exts & SFTP_EXT_STATVFS) == 0) {
                    878:                error("Server does not support statvfs@openssh.com extension");
                    879:                return -1;
                    880:        }
                    881:
                    882:        id = conn->msg_id++;
                    883:
                    884:        buffer_init(&msg);
                    885:        buffer_clear(&msg);
                    886:        buffer_put_char(&msg, SSH2_FXP_EXTENDED);
                    887:        buffer_put_int(&msg, id);
                    888:        buffer_put_cstring(&msg, "statvfs@openssh.com");
                    889:        buffer_put_cstring(&msg, path);
1.93    ! djm       890:        send_msg(conn, &msg);
1.82      djm       891:        buffer_free(&msg);
                    892:
1.93    ! djm       893:        return get_decode_statvfs(conn, st, id, quiet);
1.82      djm       894: }
                    895:
                    896: #ifdef notyet
                    897: int
                    898: do_fstatvfs(struct sftp_conn *conn, const char *handle, u_int handle_len,
1.84      dtucker   899:     struct sftp_statvfs *st, int quiet)
1.82      djm       900: {
                    901:        Buffer msg;
                    902:        u_int id;
                    903:
                    904:        if ((conn->exts & SFTP_EXT_FSTATVFS) == 0) {
                    905:                error("Server does not support fstatvfs@openssh.com extension");
                    906:                return -1;
                    907:        }
                    908:
                    909:        id = conn->msg_id++;
                    910:
                    911:        buffer_init(&msg);
                    912:        buffer_clear(&msg);
                    913:        buffer_put_char(&msg, SSH2_FXP_EXTENDED);
                    914:        buffer_put_int(&msg, id);
                    915:        buffer_put_cstring(&msg, "fstatvfs@openssh.com");
                    916:        buffer_put_string(&msg, handle, handle_len);
1.93    ! djm       917:        send_msg(conn, &msg);
1.82      djm       918:        buffer_free(&msg);
                    919:
1.93    ! djm       920:        return get_decode_statvfs(conn, st, id, quiet);
1.1       djm       921: }
1.78      chl       922: #endif
1.1       djm       923:
1.21      djm       924: static void
1.93    ! djm       925: send_read_request(struct sftp_conn *conn, u_int id, u_int64_t offset,
        !           926:     u_int len, char *handle, u_int handle_len)
1.21      djm       927: {
                    928:        Buffer msg;
1.28      markus    929:
1.21      djm       930:        buffer_init(&msg);
                    931:        buffer_clear(&msg);
                    932:        buffer_put_char(&msg, SSH2_FXP_READ);
                    933:        buffer_put_int(&msg, id);
                    934:        buffer_put_string(&msg, handle, handle_len);
                    935:        buffer_put_int64(&msg, offset);
                    936:        buffer_put_int(&msg, len);
1.93    ! djm       937:        send_msg(conn, &msg);
1.21      djm       938:        buffer_free(&msg);
1.28      markus    939: }
1.21      djm       940:
1.1       djm       941: int
1.23      djm       942: do_download(struct sftp_conn *conn, char *remote_path, char *local_path,
1.89      djm       943:     Attrib *a, int pflag)
1.1       djm       944: {
1.89      djm       945:        Attrib junk;
1.21      djm       946:        Buffer msg;
1.1       djm       947:        char *handle;
1.57      dtucker   948:        int local_fd, status = 0, write_error;
1.21      djm       949:        int read_error, write_errno;
                    950:        u_int64_t offset, size;
1.55      djm       951:        u_int handle_len, mode, type, id, buflen, num_req, max_req;
1.39      fgsch     952:        off_t progress_counter;
1.21      djm       953:        struct request {
                    954:                u_int id;
                    955:                u_int len;
                    956:                u_int64_t offset;
1.28      markus    957:                TAILQ_ENTRY(request) tq;
1.21      djm       958:        };
                    959:        TAILQ_HEAD(reqhead, request) requests;
                    960:        struct request *req;
                    961:
                    962:        TAILQ_INIT(&requests);
1.1       djm       963:
1.89      djm       964:        if (a == NULL && (a = do_stat(conn, remote_path, 0)) == NULL)
                    965:                return -1;
1.1       djm       966:
1.86      djm       967:        /* Do not preserve set[ug]id here, as we do not preserve ownership */
1.1       djm       968:        if (a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS)
1.38      djm       969:                mode = a->perm & 0777;
1.1       djm       970:        else
                    971:                mode = 0666;
                    972:
1.14      djm       973:        if ((a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) &&
1.41      djm       974:            (!S_ISREG(a->perm))) {
                    975:                error("Cannot download non-regular file: %s", remote_path);
1.14      djm       976:                return(-1);
                    977:        }
                    978:
1.21      djm       979:        if (a->flags & SSH2_FILEXFER_ATTR_SIZE)
                    980:                size = a->size;
                    981:        else
                    982:                size = 0;
                    983:
1.23      djm       984:        buflen = conn->transfer_buflen;
1.1       djm       985:        buffer_init(&msg);
                    986:
                    987:        /* Send open request */
1.23      djm       988:        id = conn->msg_id++;
1.1       djm       989:        buffer_put_char(&msg, SSH2_FXP_OPEN);
                    990:        buffer_put_int(&msg, id);
                    991:        buffer_put_cstring(&msg, remote_path);
                    992:        buffer_put_int(&msg, SSH2_FXF_READ);
                    993:        attrib_clear(&junk); /* Send empty attributes */
                    994:        encode_attrib(&msg, &junk);
1.93    ! djm       995:        send_msg(conn, &msg);
1.33      deraadt   996:        debug3("Sent message SSH2_FXP_OPEN I:%u P:%s", id, remote_path);
1.1       djm       997:
1.93    ! djm       998:        handle = get_handle(conn, id, &handle_len,
1.88      djm       999:            "remote open(\"%s\")", remote_path);
1.1       djm      1000:        if (handle == NULL) {
                   1001:                buffer_free(&msg);
                   1002:                return(-1);
                   1003:        }
                   1004:
1.45      djm      1005:        local_fd = open(local_path, O_WRONLY | O_CREAT | O_TRUNC,
1.38      djm      1006:            mode | S_IWRITE);
1.23      djm      1007:        if (local_fd == -1) {
                   1008:                error("Couldn't open local file \"%s\" for writing: %s",
                   1009:                    local_path, strerror(errno));
1.79      djm      1010:                do_close(conn, handle, handle_len);
1.24      markus   1011:                buffer_free(&msg);
                   1012:                xfree(handle);
1.23      djm      1013:                return(-1);
                   1014:        }
                   1015:
1.1       djm      1016:        /* Read from remote and write to local */
1.21      djm      1017:        write_error = read_error = write_errno = num_req = offset = 0;
                   1018:        max_req = 1;
1.39      fgsch    1019:        progress_counter = 0;
                   1020:
1.47      djm      1021:        if (showprogress && size != 0)
                   1022:                start_progress_meter(remote_path, size, &progress_counter);
1.39      fgsch    1023:
1.21      djm      1024:        while (num_req > 0 || max_req > 0) {
                   1025:                char *data;
1.1       djm      1026:                u_int len;
                   1027:
1.49      djm      1028:                /*
1.51      deraadt  1029:                 * Simulate EOF on interrupt: stop sending new requests and
1.49      djm      1030:                 * allow outstanding requests to drain gracefully
                   1031:                 */
                   1032:                if (interrupted) {
                   1033:                        if (num_req == 0) /* If we haven't started yet... */
                   1034:                                break;
                   1035:                        max_req = 0;
                   1036:                }
                   1037:
1.21      djm      1038:                /* Send some more requests */
                   1039:                while (num_req < max_req) {
1.28      markus   1040:                        debug3("Request range %llu -> %llu (%d/%d)",
1.25      itojun   1041:                            (unsigned long long)offset,
                   1042:                            (unsigned long long)offset + buflen - 1,
                   1043:                            num_req, max_req);
1.21      djm      1044:                        req = xmalloc(sizeof(*req));
1.23      djm      1045:                        req->id = conn->msg_id++;
1.21      djm      1046:                        req->len = buflen;
                   1047:                        req->offset = offset;
                   1048:                        offset += buflen;
                   1049:                        num_req++;
                   1050:                        TAILQ_INSERT_TAIL(&requests, req, tq);
1.93    ! djm      1051:                        send_read_request(conn, req->id, req->offset,
1.21      djm      1052:                            req->len, handle, handle_len);
                   1053:                }
1.1       djm      1054:
                   1055:                buffer_clear(&msg);
1.93    ! djm      1056:                get_msg(conn, &msg);
1.1       djm      1057:                type = buffer_get_char(&msg);
                   1058:                id = buffer_get_int(&msg);
1.33      deraadt  1059:                debug3("Received reply T:%u I:%u R:%d", type, id, max_req);
1.21      djm      1060:
                   1061:                /* Find the request in our queue */
1.53      deraadt  1062:                for (req = TAILQ_FIRST(&requests);
1.21      djm      1063:                    req != NULL && req->id != id;
                   1064:                    req = TAILQ_NEXT(req, tq))
                   1065:                        ;
                   1066:                if (req == NULL)
                   1067:                        fatal("Unexpected reply %u", id);
                   1068:
                   1069:                switch (type) {
                   1070:                case SSH2_FXP_STATUS:
1.5       djm      1071:                        status = buffer_get_int(&msg);
1.21      djm      1072:                        if (status != SSH2_FX_EOF)
                   1073:                                read_error = 1;
                   1074:                        max_req = 0;
                   1075:                        TAILQ_REMOVE(&requests, req, tq);
                   1076:                        xfree(req);
                   1077:                        num_req--;
                   1078:                        break;
                   1079:                case SSH2_FXP_DATA:
                   1080:                        data = buffer_get_string(&msg, &len);
1.26      itojun   1081:                        debug3("Received data %llu -> %llu",
1.28      markus   1082:                            (unsigned long long)req->offset,
1.26      itojun   1083:                            (unsigned long long)req->offset + len - 1);
1.21      djm      1084:                        if (len > req->len)
                   1085:                                fatal("Received more data than asked for "
1.37      deraadt  1086:                                    "%u > %u", len, req->len);
1.21      djm      1087:                        if ((lseek(local_fd, req->offset, SEEK_SET) == -1 ||
1.44      deraadt  1088:                            atomicio(vwrite, local_fd, data, len) != len) &&
1.21      djm      1089:                            !write_error) {
                   1090:                                write_errno = errno;
                   1091:                                write_error = 1;
                   1092:                                max_req = 0;
                   1093:                        }
1.39      fgsch    1094:                        progress_counter += len;
1.21      djm      1095:                        xfree(data);
1.1       djm      1096:
1.21      djm      1097:                        if (len == req->len) {
                   1098:                                TAILQ_REMOVE(&requests, req, tq);
                   1099:                                xfree(req);
                   1100:                                num_req--;
                   1101:                        } else {
                   1102:                                /* Resend the request for the missing data */
                   1103:                                debug3("Short data block, re-requesting "
1.26      itojun   1104:                                    "%llu -> %llu (%2d)",
1.28      markus   1105:                                    (unsigned long long)req->offset + len,
1.27      itojun   1106:                                    (unsigned long long)req->offset +
                   1107:                                    req->len - 1, num_req);
1.23      djm      1108:                                req->id = conn->msg_id++;
1.21      djm      1109:                                req->len -= len;
                   1110:                                req->offset += len;
1.93    ! djm      1111:                                send_read_request(conn, req->id,
1.23      djm      1112:                                    req->offset, req->len, handle, handle_len);
1.21      djm      1113:                                /* Reduce the request size */
                   1114:                                if (len < buflen)
                   1115:                                        buflen = MAX(MIN_READ_SIZE, len);
                   1116:                        }
                   1117:                        if (max_req > 0) { /* max_req = 0 iff EOF received */
                   1118:                                if (size > 0 && offset > size) {
                   1119:                                        /* Only one request at a time
                   1120:                                         * after the expected EOF */
                   1121:                                        debug3("Finish at %llu (%2d)",
1.26      itojun   1122:                                            (unsigned long long)offset,
                   1123:                                            num_req);
1.21      djm      1124:                                        max_req = 1;
1.49      djm      1125:                                } else if (max_req <= conn->num_requests) {
1.21      djm      1126:                                        ++max_req;
                   1127:                                }
1.1       djm      1128:                        }
1.21      djm      1129:                        break;
                   1130:                default:
1.33      deraadt  1131:                        fatal("Expected SSH2_FXP_DATA(%u) packet, got %u",
1.1       djm      1132:                            SSH2_FXP_DATA, type);
                   1133:                }
1.21      djm      1134:        }
1.1       djm      1135:
1.39      fgsch    1136:        if (showprogress && size)
                   1137:                stop_progress_meter();
                   1138:
1.21      djm      1139:        /* Sanity check */
                   1140:        if (TAILQ_FIRST(&requests) != NULL)
                   1141:                fatal("Transfer complete, but requests still in queue");
                   1142:
                   1143:        if (read_error) {
1.28      markus   1144:                error("Couldn't read from remote file \"%s\" : %s",
1.21      djm      1145:                    remote_path, fx2txt(status));
1.23      djm      1146:                do_close(conn, handle, handle_len);
1.21      djm      1147:        } else if (write_error) {
                   1148:                error("Couldn't write to \"%s\": %s", local_path,
                   1149:                    strerror(write_errno));
                   1150:                status = -1;
1.23      djm      1151:                do_close(conn, handle, handle_len);
1.21      djm      1152:        } else {
1.23      djm      1153:                status = do_close(conn, handle, handle_len);
1.21      djm      1154:
                   1155:                /* Override umask and utimes if asked */
                   1156:                if (pflag && fchmod(local_fd, mode) == -1)
                   1157:                        error("Couldn't set mode on \"%s\": %s", local_path,
1.37      deraadt  1158:                            strerror(errno));
1.21      djm      1159:                if (pflag && (a->flags & SSH2_FILEXFER_ATTR_ACMODTIME)) {
                   1160:                        struct timeval tv[2];
                   1161:                        tv[0].tv_sec = a->atime;
                   1162:                        tv[1].tv_sec = a->mtime;
                   1163:                        tv[0].tv_usec = tv[1].tv_usec = 0;
                   1164:                        if (utimes(local_path, tv) == -1)
                   1165:                                error("Can't set times on \"%s\": %s",
1.37      deraadt  1166:                                    local_path, strerror(errno));
1.1       djm      1167:                }
1.10      djm      1168:        }
1.5       djm      1169:        close(local_fd);
                   1170:        buffer_free(&msg);
1.1       djm      1171:        xfree(handle);
1.23      djm      1172:
                   1173:        return(status);
1.1       djm      1174: }
                   1175:
1.89      djm      1176: static int
                   1177: download_dir_internal(struct sftp_conn *conn, char *src, char *dst,
                   1178:     Attrib *dirattrib, int pflag, int printflag, int depth)
                   1179: {
                   1180:        int i, ret = 0;
                   1181:        SFTP_DIRENT **dir_entries;
                   1182:        char *filename, *new_src, *new_dst;
                   1183:        mode_t mode = 0777;
                   1184:
                   1185:        if (depth >= MAX_DIR_DEPTH) {
                   1186:                error("Maximum directory depth exceeded: %d levels", depth);
                   1187:                return -1;
                   1188:        }
                   1189:
                   1190:        if (dirattrib == NULL &&
                   1191:            (dirattrib = do_stat(conn, src, 1)) == NULL) {
                   1192:                error("Unable to stat remote directory \"%s\"", src);
                   1193:                return -1;
                   1194:        }
                   1195:        if (!S_ISDIR(dirattrib->perm)) {
                   1196:                error("\"%s\" is not a directory", src);
                   1197:                return -1;
                   1198:        }
                   1199:        if (printflag)
                   1200:                printf("Retrieving %s\n", src);
                   1201:
                   1202:        if (dirattrib->flags & SSH2_FILEXFER_ATTR_PERMISSIONS)
                   1203:                mode = dirattrib->perm & 01777;
                   1204:        else {
                   1205:                debug("Server did not send permissions for "
                   1206:                    "directory \"%s\"", dst);
                   1207:        }
                   1208:
                   1209:        if (mkdir(dst, mode) == -1 && errno != EEXIST) {
                   1210:                error("mkdir %s: %s", dst, strerror(errno));
                   1211:                return -1;
                   1212:        }
                   1213:
                   1214:        if (do_readdir(conn, src, &dir_entries) == -1) {
                   1215:                error("%s: Failed to get directory contents", src);
                   1216:                return -1;
                   1217:        }
                   1218:
                   1219:        for (i = 0; dir_entries[i] != NULL && !interrupted; i++) {
                   1220:                filename = dir_entries[i]->filename;
                   1221:
                   1222:                new_dst = path_append(dst, filename);
                   1223:                new_src = path_append(src, filename);
                   1224:
                   1225:                if (S_ISDIR(dir_entries[i]->a.perm)) {
                   1226:                        if (strcmp(filename, ".") == 0 ||
                   1227:                            strcmp(filename, "..") == 0)
                   1228:                                continue;
                   1229:                        if (download_dir_internal(conn, new_src, new_dst,
                   1230:                            &(dir_entries[i]->a), pflag, printflag,
                   1231:                            depth + 1) == -1)
                   1232:                                ret = -1;
                   1233:                } else if (S_ISREG(dir_entries[i]->a.perm) ) {
                   1234:                        if (do_download(conn, new_src, new_dst,
                   1235:                            &(dir_entries[i]->a), pflag) == -1) {
                   1236:                                error("Download of file %s to %s failed",
                   1237:                                    new_src, new_dst);
                   1238:                                ret = -1;
                   1239:                        }
                   1240:                } else
                   1241:                        logit("%s: not a regular file\n", new_src);
                   1242:
                   1243:                xfree(new_dst);
                   1244:                xfree(new_src);
                   1245:        }
                   1246:
                   1247:        if (pflag) {
                   1248:                if (dirattrib->flags & SSH2_FILEXFER_ATTR_ACMODTIME) {
                   1249:                        struct timeval tv[2];
                   1250:                        tv[0].tv_sec = dirattrib->atime;
                   1251:                        tv[1].tv_sec = dirattrib->mtime;
                   1252:                        tv[0].tv_usec = tv[1].tv_usec = 0;
                   1253:                        if (utimes(dst, tv) == -1)
                   1254:                                error("Can't set times on \"%s\": %s",
                   1255:                                    dst, strerror(errno));
                   1256:                } else
                   1257:                        debug("Server did not send times for directory "
                   1258:                            "\"%s\"", dst);
                   1259:        }
                   1260:
                   1261:        free_sftp_dirents(dir_entries);
                   1262:
                   1263:        return ret;
                   1264: }
                   1265:
                   1266: int
                   1267: download_dir(struct sftp_conn *conn, char *src, char *dst,
                   1268:     Attrib *dirattrib, int pflag, int printflag)
                   1269: {
                   1270:        char *src_canon;
                   1271:        int ret;
                   1272:
                   1273:        if ((src_canon = do_realpath(conn, src)) == NULL) {
                   1274:                error("Unable to canonicalise path \"%s\"", src);
                   1275:                return -1;
                   1276:        }
                   1277:
                   1278:        ret = download_dir_internal(conn, src_canon, dst,
                   1279:            dirattrib, pflag, printflag, 0);
                   1280:        xfree(src_canon);
                   1281:        return ret;
                   1282: }
                   1283:
1.1       djm      1284: int
1.23      djm      1285: do_upload(struct sftp_conn *conn, char *local_path, char *remote_path,
                   1286:     int pflag)
1.1       djm      1287: {
1.80      djm      1288:        int local_fd;
                   1289:        int status = SSH2_FX_OK;
1.22      djm      1290:        u_int handle_len, id, type;
1.77      djm      1291:        off_t offset;
1.20      djm      1292:        char *handle, *data;
1.1       djm      1293:        Buffer msg;
                   1294:        struct stat sb;
                   1295:        Attrib a;
1.21      djm      1296:        u_int32_t startid;
                   1297:        u_int32_t ackid;
1.22      djm      1298:        struct outstanding_ack {
                   1299:                u_int id;
                   1300:                u_int len;
1.77      djm      1301:                off_t offset;
1.28      markus   1302:                TAILQ_ENTRY(outstanding_ack) tq;
1.22      djm      1303:        };
                   1304:        TAILQ_HEAD(ackhead, outstanding_ack) acks;
1.50      pedro    1305:        struct outstanding_ack *ack = NULL;
1.22      djm      1306:
                   1307:        TAILQ_INIT(&acks);
1.1       djm      1308:
                   1309:        if ((local_fd = open(local_path, O_RDONLY, 0)) == -1) {
                   1310:                error("Couldn't open local file \"%s\" for reading: %s",
                   1311:                    local_path, strerror(errno));
                   1312:                return(-1);
                   1313:        }
                   1314:        if (fstat(local_fd, &sb) == -1) {
                   1315:                error("Couldn't fstat local file \"%s\": %s",
                   1316:                    local_path, strerror(errno));
1.41      djm      1317:                close(local_fd);
                   1318:                return(-1);
                   1319:        }
                   1320:        if (!S_ISREG(sb.st_mode)) {
                   1321:                error("%s is not a regular file", local_path);
1.1       djm      1322:                close(local_fd);
                   1323:                return(-1);
                   1324:        }
                   1325:        stat_to_attrib(&sb, &a);
                   1326:
                   1327:        a.flags &= ~SSH2_FILEXFER_ATTR_SIZE;
                   1328:        a.flags &= ~SSH2_FILEXFER_ATTR_UIDGID;
                   1329:        a.perm &= 0777;
                   1330:        if (!pflag)
                   1331:                a.flags &= ~SSH2_FILEXFER_ATTR_ACMODTIME;
                   1332:
                   1333:        buffer_init(&msg);
                   1334:
                   1335:        /* Send open request */
1.23      djm      1336:        id = conn->msg_id++;
1.1       djm      1337:        buffer_put_char(&msg, SSH2_FXP_OPEN);
                   1338:        buffer_put_int(&msg, id);
                   1339:        buffer_put_cstring(&msg, remote_path);
                   1340:        buffer_put_int(&msg, SSH2_FXF_WRITE|SSH2_FXF_CREAT|SSH2_FXF_TRUNC);
                   1341:        encode_attrib(&msg, &a);
1.93    ! djm      1342:        send_msg(conn, &msg);
1.33      deraadt  1343:        debug3("Sent message SSH2_FXP_OPEN I:%u P:%s", id, remote_path);
1.1       djm      1344:
                   1345:        buffer_clear(&msg);
                   1346:
1.93    ! djm      1347:        handle = get_handle(conn, id, &handle_len,
1.88      djm      1348:            "remote open(\"%s\")", remote_path);
1.1       djm      1349:        if (handle == NULL) {
                   1350:                close(local_fd);
                   1351:                buffer_free(&msg);
1.80      djm      1352:                return -1;
1.1       djm      1353:        }
                   1354:
1.21      djm      1355:        startid = ackid = id + 1;
1.23      djm      1356:        data = xmalloc(conn->transfer_buflen);
1.20      djm      1357:
1.1       djm      1358:        /* Read from local and write to remote */
                   1359:        offset = 0;
1.39      fgsch    1360:        if (showprogress)
                   1361:                start_progress_meter(local_path, sb.st_size, &offset);
                   1362:
1.19      deraadt  1363:        for (;;) {
1.1       djm      1364:                int len;
                   1365:
                   1366:                /*
1.51      deraadt  1367:                 * Can't use atomicio here because it returns 0 on EOF,
1.49      djm      1368:                 * thus losing the last block of the file.
1.51      deraadt  1369:                 * Simulate an EOF on interrupt, allowing ACKs from the
1.49      djm      1370:                 * server to drain.
1.1       djm      1371:                 */
1.80      djm      1372:                if (interrupted || status != SSH2_FX_OK)
1.49      djm      1373:                        len = 0;
                   1374:                else do
1.23      djm      1375:                        len = read(local_fd, data, conn->transfer_buflen);
1.1       djm      1376:                while ((len == -1) && (errno == EINTR || errno == EAGAIN));
                   1377:
                   1378:                if (len == -1)
                   1379:                        fatal("Couldn't read from \"%s\": %s", local_path,
                   1380:                            strerror(errno));
1.21      djm      1381:
                   1382:                if (len != 0) {
1.22      djm      1383:                        ack = xmalloc(sizeof(*ack));
                   1384:                        ack->id = ++id;
                   1385:                        ack->offset = offset;
                   1386:                        ack->len = len;
                   1387:                        TAILQ_INSERT_TAIL(&acks, ack, tq);
                   1388:
1.21      djm      1389:                        buffer_clear(&msg);
                   1390:                        buffer_put_char(&msg, SSH2_FXP_WRITE);
1.22      djm      1391:                        buffer_put_int(&msg, ack->id);
1.21      djm      1392:                        buffer_put_string(&msg, handle, handle_len);
                   1393:                        buffer_put_int64(&msg, offset);
                   1394:                        buffer_put_string(&msg, data, len);
1.93    ! djm      1395:                        send_msg(conn, &msg);
1.33      deraadt  1396:                        debug3("Sent message SSH2_FXP_WRITE I:%u O:%llu S:%u",
1.37      deraadt  1397:                            id, (unsigned long long)offset, len);
1.22      djm      1398:                } else if (TAILQ_FIRST(&acks) == NULL)
1.1       djm      1399:                        break;
                   1400:
1.22      djm      1401:                if (ack == NULL)
                   1402:                        fatal("Unexpected ACK %u", id);
                   1403:
1.28      markus   1404:                if (id == startid || len == 0 ||
1.23      djm      1405:                    id - ackid >= conn->num_requests) {
1.32      markus   1406:                        u_int r_id;
1.31      djm      1407:
1.22      djm      1408:                        buffer_clear(&msg);
1.93    ! djm      1409:                        get_msg(conn, &msg);
1.22      djm      1410:                        type = buffer_get_char(&msg);
1.31      djm      1411:                        r_id = buffer_get_int(&msg);
1.22      djm      1412:
                   1413:                        if (type != SSH2_FXP_STATUS)
                   1414:                                fatal("Expected SSH2_FXP_STATUS(%d) packet, "
                   1415:                                    "got %d", SSH2_FXP_STATUS, type);
                   1416:
                   1417:                        status = buffer_get_int(&msg);
                   1418:                        debug3("SSH2_FXP_STATUS %d", status);
                   1419:
                   1420:                        /* Find the request in our queue */
1.53      deraadt  1421:                        for (ack = TAILQ_FIRST(&acks);
1.31      djm      1422:                            ack != NULL && ack->id != r_id;
1.22      djm      1423:                            ack = TAILQ_NEXT(ack, tq))
                   1424:                                ;
                   1425:                        if (ack == NULL)
1.33      deraadt  1426:                                fatal("Can't find request for ID %u", r_id);
1.22      djm      1427:                        TAILQ_REMOVE(&acks, ack, tq);
1.77      djm      1428:                        debug3("In write loop, ack for %u %u bytes at %lld",
                   1429:                            ack->id, ack->len, (long long)ack->offset);
1.21      djm      1430:                        ++ackid;
1.34      deraadt  1431:                        xfree(ack);
1.1       djm      1432:                }
                   1433:                offset += len;
1.77      djm      1434:                if (offset < 0)
                   1435:                        fatal("%s: offset < 0", __func__);
1.1       djm      1436:        }
1.80      djm      1437:        buffer_free(&msg);
                   1438:
1.39      fgsch    1439:        if (showprogress)
                   1440:                stop_progress_meter();
1.20      djm      1441:        xfree(data);
1.1       djm      1442:
1.80      djm      1443:        if (status != SSH2_FX_OK) {
                   1444:                error("Couldn't write to remote file \"%s\": %s",
                   1445:                    remote_path, fx2txt(status));
                   1446:                status = -1;
                   1447:        }
                   1448:
1.1       djm      1449:        if (close(local_fd) == -1) {
                   1450:                error("Couldn't close local file \"%s\": %s", local_path,
                   1451:                    strerror(errno));
1.5       djm      1452:                status = -1;
1.1       djm      1453:        }
                   1454:
1.10      djm      1455:        /* Override umask and utimes if asked */
                   1456:        if (pflag)
1.23      djm      1457:                do_fsetstat(conn, handle, handle_len, &a);
1.10      djm      1458:
1.80      djm      1459:        if (do_close(conn, handle, handle_len) != SSH2_FX_OK)
                   1460:                status = -1;
                   1461:        xfree(handle);
1.5       djm      1462:
1.80      djm      1463:        return status;
1.1       djm      1464: }
1.89      djm      1465:
                   1466: static int
                   1467: upload_dir_internal(struct sftp_conn *conn, char *src, char *dst,
                   1468:     int pflag, int printflag, int depth)
                   1469: {
                   1470:        int ret = 0, status;
                   1471:        DIR *dirp;
                   1472:        struct dirent *dp;
                   1473:        char *filename, *new_src, *new_dst;
                   1474:        struct stat sb;
                   1475:        Attrib a;
                   1476:
                   1477:        if (depth >= MAX_DIR_DEPTH) {
                   1478:                error("Maximum directory depth exceeded: %d levels", depth);
                   1479:                return -1;
                   1480:        }
                   1481:
                   1482:        if (stat(src, &sb) == -1) {
                   1483:                error("Couldn't stat directory \"%s\": %s",
                   1484:                    src, strerror(errno));
                   1485:                return -1;
                   1486:        }
                   1487:        if (!S_ISDIR(sb.st_mode)) {
                   1488:                error("\"%s\" is not a directory", src);
                   1489:                return -1;
                   1490:        }
                   1491:        if (printflag)
                   1492:                printf("Entering %s\n", src);
                   1493:
                   1494:        attrib_clear(&a);
                   1495:        stat_to_attrib(&sb, &a);
                   1496:        a.flags &= ~SSH2_FILEXFER_ATTR_SIZE;
                   1497:        a.flags &= ~SSH2_FILEXFER_ATTR_UIDGID;
                   1498:        a.perm &= 01777;
                   1499:        if (!pflag)
                   1500:                a.flags &= ~SSH2_FILEXFER_ATTR_ACMODTIME;
                   1501:
                   1502:        status = do_mkdir(conn, dst, &a, 0);
                   1503:        /*
                   1504:         * we lack a portable status for errno EEXIST,
                   1505:         * so if we get a SSH2_FX_FAILURE back we must check
                   1506:         * if it was created successfully.
                   1507:         */
                   1508:        if (status != SSH2_FX_OK) {
                   1509:                if (status != SSH2_FX_FAILURE)
                   1510:                        return -1;
                   1511:                if (do_stat(conn, dst, 0) == NULL)
                   1512:                        return -1;
                   1513:        }
                   1514:
                   1515:        if ((dirp = opendir(src)) == NULL) {
                   1516:                error("Failed to open dir \"%s\": %s", src, strerror(errno));
                   1517:                return -1;
                   1518:        }
                   1519:
                   1520:        while (((dp = readdir(dirp)) != NULL) && !interrupted) {
                   1521:                if (dp->d_ino == 0)
                   1522:                        continue;
                   1523:                filename = dp->d_name;
                   1524:                new_dst = path_append(dst, filename);
                   1525:                new_src = path_append(src, filename);
                   1526:
1.90      dtucker  1527:                if (lstat(new_src, &sb) == -1) {
                   1528:                        logit("%s: lstat failed: %s", filename,
                   1529:                            strerror(errno));
                   1530:                        ret = -1;
                   1531:                } else if (S_ISDIR(sb.st_mode)) {
1.89      djm      1532:                        if (strcmp(filename, ".") == 0 ||
                   1533:                            strcmp(filename, "..") == 0)
                   1534:                                continue;
                   1535:
                   1536:                        if (upload_dir_internal(conn, new_src, new_dst,
1.92      djm      1537:                            pflag, printflag, depth + 1) == -1)
1.89      djm      1538:                                ret = -1;
1.90      dtucker  1539:                } else if (S_ISREG(sb.st_mode)) {
1.89      djm      1540:                        if (do_upload(conn, new_src, new_dst, pflag) == -1) {
                   1541:                                error("Uploading of file %s to %s failed!",
                   1542:                                    new_src, new_dst);
                   1543:                                ret = -1;
                   1544:                        }
                   1545:                } else
                   1546:                        logit("%s: not a regular file\n", filename);
                   1547:                xfree(new_dst);
                   1548:                xfree(new_src);
                   1549:        }
                   1550:
                   1551:        do_setstat(conn, dst, &a);
                   1552:
                   1553:        (void) closedir(dirp);
                   1554:        return ret;
                   1555: }
                   1556:
                   1557: int
                   1558: upload_dir(struct sftp_conn *conn, char *src, char *dst, int printflag,
                   1559:     int pflag)
                   1560: {
                   1561:        char *dst_canon;
                   1562:        int ret;
                   1563:
                   1564:        if ((dst_canon = do_realpath(conn, dst)) == NULL) {
                   1565:                error("Unable to canonicalise path \"%s\"", dst);
                   1566:                return -1;
                   1567:        }
                   1568:
                   1569:        ret = upload_dir_internal(conn, src, dst_canon, pflag, printflag, 0);
                   1570:        xfree(dst_canon);
                   1571:        return ret;
                   1572: }
                   1573:
                   1574: char *
                   1575: path_append(char *p1, char *p2)
                   1576: {
                   1577:        char *ret;
                   1578:        size_t len = strlen(p1) + strlen(p2) + 2;
                   1579:
                   1580:        ret = xmalloc(len);
                   1581:        strlcpy(ret, p1, len);
                   1582:        if (p1[0] != '\0' && p1[strlen(p1) - 1] != '/')
                   1583:                strlcat(ret, "/", len);
                   1584:        strlcat(ret, p2, len);
                   1585:
                   1586:        return(ret);
                   1587: }
                   1588: