[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.95

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