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

1.100   ! dtucker     1: /* $OpenBSD: sftp-client.c,v 1.99 2013/06/01 20:59:25 dtucker 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.98      djm       390:                free(name);
                    391:                free(value);
1.1       djm       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:
1.93      djm       458:        handle = get_handle(conn, id, &handle_len,
1.88      djm       459:            "remote readdir(\"%s\")", path);
1.96      markus    460:        if (handle == NULL) {
                    461:                buffer_free(&msg);
1.93      djm       462:                return -1;
1.96      markus    463:        }
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.98      djm       505:                                free(handle);
1.96      markus    506:                                buffer_free(&msg);
1.9       djm       507:                                return(status);
1.1       djm       508:                        }
                    509:                } else if (type != SSH2_FXP_NAME)
1.33      deraadt   510:                        fatal("Expected SSH2_FXP_NAME(%u) packet, got %u",
1.1       djm       511:                            SSH2_FXP_NAME, type);
                    512:
                    513:                count = buffer_get_int(&msg);
1.7       markus    514:                if (count == 0)
                    515:                        break;
1.8       stevesk   516:                debug3("Received %d SSH2_FXP_NAME responses", count);
1.19      deraadt   517:                for (i = 0; i < count; i++) {
1.1       djm       518:                        char *filename, *longname;
                    519:                        Attrib *a;
                    520:
                    521:                        filename = buffer_get_string(&msg, NULL);
                    522:                        longname = buffer_get_string(&msg, NULL);
                    523:                        a = decode_attrib(&msg);
                    524:
1.12      djm       525:                        if (printflag)
                    526:                                printf("%s\n", longname);
                    527:
1.89      djm       528:                        /*
                    529:                         * Directory entries should never contain '/'
                    530:                         * These can be used to attack recursive ops
                    531:                         * (e.g. send '../../../../etc/passwd')
                    532:                         */
                    533:                        if (strchr(filename, '/') != NULL) {
                    534:                                error("Server sent suspect path \"%s\" "
                    535:                                    "during readdir of \"%s\"", filename, path);
                    536:                                goto next;
                    537:                        }
                    538:
1.12      djm       539:                        if (dir) {
1.62      djm       540:                                *dir = xrealloc(*dir, ents + 2, sizeof(**dir));
1.12      djm       541:                                (*dir)[ents] = xmalloc(sizeof(***dir));
                    542:                                (*dir)[ents]->filename = xstrdup(filename);
                    543:                                (*dir)[ents]->longname = xstrdup(longname);
                    544:                                memcpy(&(*dir)[ents]->a, a, sizeof(*a));
                    545:                                (*dir)[++ents] = NULL;
                    546:                        }
1.89      djm       547:  next:
1.98      djm       548:                        free(filename);
                    549:                        free(longname);
1.1       djm       550:                }
                    551:        }
                    552:
                    553:        buffer_free(&msg);
1.23      djm       554:        do_close(conn, handle, handle_len);
1.98      djm       555:        free(handle);
1.1       djm       556:
1.49      djm       557:        /* Don't return partial matches on interrupt */
                    558:        if (interrupted && dir != NULL && *dir != NULL) {
                    559:                free_sftp_dirents(*dir);
                    560:                *dir = xmalloc(sizeof(**dir));
                    561:                **dir = NULL;
                    562:        }
                    563:
1.93      djm       564:        return 0;
1.12      djm       565: }
                    566:
                    567: int
1.23      djm       568: do_readdir(struct sftp_conn *conn, char *path, SFTP_DIRENT ***dir)
1.12      djm       569: {
1.23      djm       570:        return(do_lsreaddir(conn, path, 0, dir));
1.12      djm       571: }
                    572:
                    573: void free_sftp_dirents(SFTP_DIRENT **s)
                    574: {
                    575:        int i;
1.19      deraadt   576:
                    577:        for (i = 0; s[i]; i++) {
1.98      djm       578:                free(s[i]->filename);
                    579:                free(s[i]->longname);
                    580:                free(s[i]);
1.12      djm       581:        }
1.98      djm       582:        free(s);
1.12      djm       583: }
                    584:
                    585: int
1.23      djm       586: do_rm(struct sftp_conn *conn, char *path)
1.1       djm       587: {
                    588:        u_int status, id;
                    589:
                    590:        debug2("Sending SSH2_FXP_REMOVE \"%s\"", path);
                    591:
1.23      djm       592:        id = conn->msg_id++;
1.93      djm       593:        send_string_request(conn, id, SSH2_FXP_REMOVE, path, strlen(path));
                    594:        status = get_status(conn, id);
1.1       djm       595:        if (status != SSH2_FX_OK)
                    596:                error("Couldn't delete file: %s", fx2txt(status));
                    597:        return(status);
                    598: }
                    599:
                    600: int
1.89      djm       601: do_mkdir(struct sftp_conn *conn, char *path, Attrib *a, int printflag)
1.1       djm       602: {
                    603:        u_int status, id;
                    604:
1.23      djm       605:        id = conn->msg_id++;
1.93      djm       606:        send_string_attrs_request(conn, id, SSH2_FXP_MKDIR, path,
1.1       djm       607:            strlen(path), a);
                    608:
1.93      djm       609:        status = get_status(conn, id);
1.89      djm       610:        if (status != SSH2_FX_OK && printflag)
1.1       djm       611:                error("Couldn't create directory: %s", fx2txt(status));
                    612:
                    613:        return(status);
                    614: }
                    615:
                    616: int
1.23      djm       617: do_rmdir(struct sftp_conn *conn, char *path)
1.1       djm       618: {
                    619:        u_int status, id;
                    620:
1.23      djm       621:        id = conn->msg_id++;
1.93      djm       622:        send_string_request(conn, id, SSH2_FXP_RMDIR, path,
1.23      djm       623:            strlen(path));
1.1       djm       624:
1.93      djm       625:        status = get_status(conn, id);
1.1       djm       626:        if (status != SSH2_FX_OK)
                    627:                error("Couldn't remove directory: %s", fx2txt(status));
                    628:
                    629:        return(status);
                    630: }
                    631:
                    632: Attrib *
1.23      djm       633: do_stat(struct sftp_conn *conn, char *path, int quiet)
1.1       djm       634: {
                    635:        u_int id;
                    636:
1.23      djm       637:        id = conn->msg_id++;
                    638:
1.93      djm       639:        send_string_request(conn, id,
1.28      markus    640:            conn->version == 0 ? SSH2_FXP_STAT_VERSION_0 : SSH2_FXP_STAT,
1.23      djm       641:            path, strlen(path));
                    642:
1.93      djm       643:        return(get_decode_stat(conn, id, quiet));
1.1       djm       644: }
                    645:
                    646: Attrib *
1.23      djm       647: do_lstat(struct sftp_conn *conn, char *path, int quiet)
1.1       djm       648: {
                    649:        u_int id;
                    650:
1.23      djm       651:        if (conn->version == 0) {
                    652:                if (quiet)
                    653:                        debug("Server version does not support lstat operation");
                    654:                else
1.43      itojun    655:                        logit("Server version does not support lstat operation");
1.30      markus    656:                return(do_stat(conn, path, quiet));
1.23      djm       657:        }
                    658:
                    659:        id = conn->msg_id++;
1.93      djm       660:        send_string_request(conn, id, SSH2_FXP_LSTAT, path,
1.23      djm       661:            strlen(path));
                    662:
1.93      djm       663:        return(get_decode_stat(conn, id, quiet));
1.1       djm       664: }
                    665:
1.78      chl       666: #ifdef notyet
1.1       djm       667: Attrib *
1.23      djm       668: do_fstat(struct sftp_conn *conn, char *handle, u_int handle_len, int quiet)
1.1       djm       669: {
                    670:        u_int id;
                    671:
1.23      djm       672:        id = conn->msg_id++;
1.93      djm       673:        send_string_request(conn, id, SSH2_FXP_FSTAT, handle,
1.23      djm       674:            handle_len);
                    675:
1.93      djm       676:        return(get_decode_stat(conn, id, quiet));
1.1       djm       677: }
1.78      chl       678: #endif
1.1       djm       679:
                    680: int
1.23      djm       681: do_setstat(struct sftp_conn *conn, char *path, Attrib *a)
1.1       djm       682: {
                    683:        u_int status, id;
                    684:
1.23      djm       685:        id = conn->msg_id++;
1.93      djm       686:        send_string_attrs_request(conn, id, SSH2_FXP_SETSTAT, path,
1.1       djm       687:            strlen(path), a);
                    688:
1.93      djm       689:        status = get_status(conn, id);
1.1       djm       690:        if (status != SSH2_FX_OK)
                    691:                error("Couldn't setstat on \"%s\": %s", path,
                    692:                    fx2txt(status));
                    693:
                    694:        return(status);
                    695: }
                    696:
                    697: int
1.23      djm       698: do_fsetstat(struct sftp_conn *conn, char *handle, u_int handle_len,
1.1       djm       699:     Attrib *a)
                    700: {
                    701:        u_int status, id;
                    702:
1.23      djm       703:        id = conn->msg_id++;
1.93      djm       704:        send_string_attrs_request(conn, id, SSH2_FXP_FSETSTAT, handle,
1.1       djm       705:            handle_len, a);
                    706:
1.93      djm       707:        status = get_status(conn, id);
1.1       djm       708:        if (status != SSH2_FX_OK)
                    709:                error("Couldn't fsetstat: %s", fx2txt(status));
                    710:
                    711:        return(status);
                    712: }
                    713:
                    714: char *
1.23      djm       715: do_realpath(struct sftp_conn *conn, char *path)
1.1       djm       716: {
                    717:        Buffer msg;
                    718:        u_int type, expected_id, count, id;
                    719:        char *filename, *longname;
                    720:        Attrib *a;
                    721:
1.23      djm       722:        expected_id = id = conn->msg_id++;
1.93      djm       723:        send_string_request(conn, id, SSH2_FXP_REALPATH, path,
1.23      djm       724:            strlen(path));
1.1       djm       725:
                    726:        buffer_init(&msg);
                    727:
1.93      djm       728:        get_msg(conn, &msg);
1.1       djm       729:        type = buffer_get_char(&msg);
                    730:        id = buffer_get_int(&msg);
                    731:
                    732:        if (id != expected_id)
1.33      deraadt   733:                fatal("ID mismatch (%u != %u)", id, expected_id);
1.1       djm       734:
                    735:        if (type == SSH2_FXP_STATUS) {
                    736:                u_int status = buffer_get_int(&msg);
                    737:
                    738:                error("Couldn't canonicalise: %s", fx2txt(status));
1.91      djm       739:                buffer_free(&msg);
                    740:                return NULL;
1.1       djm       741:        } else if (type != SSH2_FXP_NAME)
1.33      deraadt   742:                fatal("Expected SSH2_FXP_NAME(%u) packet, got %u",
1.1       djm       743:                    SSH2_FXP_NAME, type);
                    744:
                    745:        count = buffer_get_int(&msg);
                    746:        if (count != 1)
                    747:                fatal("Got multiple names (%d) from SSH_FXP_REALPATH", count);
                    748:
                    749:        filename = buffer_get_string(&msg, NULL);
                    750:        longname = buffer_get_string(&msg, NULL);
                    751:        a = decode_attrib(&msg);
                    752:
1.97      dtucker   753:        debug3("SSH_FXP_REALPATH %s -> %s size %lu", path, filename,
                    754:            (unsigned long)a->size);
1.1       djm       755:
1.98      djm       756:        free(longname);
1.1       djm       757:
                    758:        buffer_free(&msg);
                    759:
                    760:        return(filename);
                    761: }
                    762:
                    763: int
1.23      djm       764: do_rename(struct sftp_conn *conn, char *oldpath, char *newpath)
1.1       djm       765: {
                    766:        Buffer msg;
                    767:        u_int status, id;
                    768:
                    769:        buffer_init(&msg);
                    770:
                    771:        /* Send rename request */
1.23      djm       772:        id = conn->msg_id++;
1.81      djm       773:        if ((conn->exts & SFTP_EXT_POSIX_RENAME)) {
                    774:                buffer_put_char(&msg, SSH2_FXP_EXTENDED);
                    775:                buffer_put_int(&msg, id);
                    776:                buffer_put_cstring(&msg, "posix-rename@openssh.com");
                    777:        } else {
                    778:                buffer_put_char(&msg, SSH2_FXP_RENAME);
                    779:                buffer_put_int(&msg, id);
                    780:        }
1.1       djm       781:        buffer_put_cstring(&msg, oldpath);
                    782:        buffer_put_cstring(&msg, newpath);
1.93      djm       783:        send_msg(conn, &msg);
1.81      djm       784:        debug3("Sent message %s \"%s\" -> \"%s\"",
                    785:            (conn->exts & SFTP_EXT_POSIX_RENAME) ? "posix-rename@openssh.com" :
                    786:            "SSH2_FXP_RENAME", oldpath, newpath);
1.1       djm       787:        buffer_free(&msg);
                    788:
1.93      djm       789:        status = get_status(conn, id);
1.1       djm       790:        if (status != SSH2_FX_OK)
1.23      djm       791:                error("Couldn't rename file \"%s\" to \"%s\": %s", oldpath,
1.94      djm       792:                    newpath, fx2txt(status));
                    793:
                    794:        return(status);
                    795: }
                    796:
                    797: int
                    798: do_hardlink(struct sftp_conn *conn, char *oldpath, char *newpath)
                    799: {
                    800:        Buffer msg;
                    801:        u_int status, id;
                    802:
                    803:        if ((conn->exts & SFTP_EXT_HARDLINK) == 0) {
                    804:                error("Server does not support hardlink@openssh.com extension");
                    805:                return -1;
                    806:        }
                    807:
1.95      markus    808:        buffer_init(&msg);
                    809:
                    810:        /* Send link request */
                    811:        id = conn->msg_id++;
1.94      djm       812:        buffer_put_char(&msg, SSH2_FXP_EXTENDED);
                    813:        buffer_put_int(&msg, id);
                    814:        buffer_put_cstring(&msg, "hardlink@openssh.com");
                    815:        buffer_put_cstring(&msg, oldpath);
                    816:        buffer_put_cstring(&msg, newpath);
                    817:        send_msg(conn, &msg);
                    818:        debug3("Sent message hardlink@openssh.com \"%s\" -> \"%s\"",
                    819:               oldpath, newpath);
                    820:        buffer_free(&msg);
                    821:
                    822:        status = get_status(conn, id);
                    823:        if (status != SSH2_FX_OK)
                    824:                error("Couldn't link file \"%s\" to \"%s\": %s", oldpath,
1.23      djm       825:                    newpath, fx2txt(status));
1.1       djm       826:
                    827:        return(status);
1.11      djm       828: }
                    829:
                    830: int
1.23      djm       831: do_symlink(struct sftp_conn *conn, char *oldpath, char *newpath)
1.11      djm       832: {
                    833:        Buffer msg;
                    834:        u_int status, id;
                    835:
1.23      djm       836:        if (conn->version < 3) {
                    837:                error("This server does not support the symlink operation");
                    838:                return(SSH2_FX_OP_UNSUPPORTED);
                    839:        }
                    840:
1.11      djm       841:        buffer_init(&msg);
                    842:
1.48      djm       843:        /* Send symlink request */
1.23      djm       844:        id = conn->msg_id++;
1.11      djm       845:        buffer_put_char(&msg, SSH2_FXP_SYMLINK);
                    846:        buffer_put_int(&msg, id);
                    847:        buffer_put_cstring(&msg, oldpath);
                    848:        buffer_put_cstring(&msg, newpath);
1.93      djm       849:        send_msg(conn, &msg);
1.11      djm       850:        debug3("Sent message SSH2_FXP_SYMLINK \"%s\" -> \"%s\"", oldpath,
                    851:            newpath);
                    852:        buffer_free(&msg);
                    853:
1.93      djm       854:        status = get_status(conn, id);
1.11      djm       855:        if (status != SSH2_FX_OK)
1.36      markus    856:                error("Couldn't symlink file \"%s\" to \"%s\": %s", oldpath,
1.23      djm       857:                    newpath, fx2txt(status));
1.11      djm       858:
                    859:        return(status);
                    860: }
                    861:
1.78      chl       862: #ifdef notyet
1.11      djm       863: char *
1.23      djm       864: do_readlink(struct sftp_conn *conn, char *path)
1.11      djm       865: {
                    866:        Buffer msg;
                    867:        u_int type, expected_id, count, id;
                    868:        char *filename, *longname;
                    869:        Attrib *a;
                    870:
1.23      djm       871:        expected_id = id = conn->msg_id++;
1.93      djm       872:        send_string_request(conn, id, SSH2_FXP_READLINK, path, strlen(path));
1.11      djm       873:
                    874:        buffer_init(&msg);
                    875:
1.93      djm       876:        get_msg(conn, &msg);
1.11      djm       877:        type = buffer_get_char(&msg);
                    878:        id = buffer_get_int(&msg);
                    879:
                    880:        if (id != expected_id)
1.33      deraadt   881:                fatal("ID mismatch (%u != %u)", id, expected_id);
1.11      djm       882:
                    883:        if (type == SSH2_FXP_STATUS) {
                    884:                u_int status = buffer_get_int(&msg);
                    885:
                    886:                error("Couldn't readlink: %s", fx2txt(status));
1.95      markus    887:                buffer_free(&msg);
1.11      djm       888:                return(NULL);
                    889:        } else if (type != SSH2_FXP_NAME)
1.33      deraadt   890:                fatal("Expected SSH2_FXP_NAME(%u) packet, got %u",
1.11      djm       891:                    SSH2_FXP_NAME, type);
                    892:
                    893:        count = buffer_get_int(&msg);
                    894:        if (count != 1)
                    895:                fatal("Got multiple names (%d) from SSH_FXP_READLINK", count);
                    896:
                    897:        filename = buffer_get_string(&msg, NULL);
                    898:        longname = buffer_get_string(&msg, NULL);
                    899:        a = decode_attrib(&msg);
                    900:
                    901:        debug3("SSH_FXP_READLINK %s -> %s", path, filename);
                    902:
1.98      djm       903:        free(longname);
1.11      djm       904:
                    905:        buffer_free(&msg);
                    906:
                    907:        return(filename);
1.82      djm       908: }
                    909: #endif
                    910:
                    911: int
1.84      dtucker   912: do_statvfs(struct sftp_conn *conn, const char *path, struct sftp_statvfs *st,
1.82      djm       913:     int quiet)
                    914: {
                    915:        Buffer msg;
                    916:        u_int id;
                    917:
                    918:        if ((conn->exts & SFTP_EXT_STATVFS) == 0) {
                    919:                error("Server does not support statvfs@openssh.com extension");
                    920:                return -1;
                    921:        }
                    922:
                    923:        id = conn->msg_id++;
                    924:
                    925:        buffer_init(&msg);
                    926:        buffer_clear(&msg);
                    927:        buffer_put_char(&msg, SSH2_FXP_EXTENDED);
                    928:        buffer_put_int(&msg, id);
                    929:        buffer_put_cstring(&msg, "statvfs@openssh.com");
                    930:        buffer_put_cstring(&msg, path);
1.93      djm       931:        send_msg(conn, &msg);
1.82      djm       932:        buffer_free(&msg);
                    933:
1.93      djm       934:        return get_decode_statvfs(conn, st, id, quiet);
1.82      djm       935: }
                    936:
                    937: #ifdef notyet
                    938: int
                    939: do_fstatvfs(struct sftp_conn *conn, const char *handle, u_int handle_len,
1.84      dtucker   940:     struct sftp_statvfs *st, int quiet)
1.82      djm       941: {
                    942:        Buffer msg;
                    943:        u_int id;
                    944:
                    945:        if ((conn->exts & SFTP_EXT_FSTATVFS) == 0) {
                    946:                error("Server does not support fstatvfs@openssh.com extension");
                    947:                return -1;
                    948:        }
                    949:
                    950:        id = conn->msg_id++;
                    951:
                    952:        buffer_init(&msg);
                    953:        buffer_clear(&msg);
                    954:        buffer_put_char(&msg, SSH2_FXP_EXTENDED);
                    955:        buffer_put_int(&msg, id);
                    956:        buffer_put_cstring(&msg, "fstatvfs@openssh.com");
                    957:        buffer_put_string(&msg, handle, handle_len);
1.93      djm       958:        send_msg(conn, &msg);
1.82      djm       959:        buffer_free(&msg);
                    960:
1.93      djm       961:        return get_decode_statvfs(conn, st, id, quiet);
1.1       djm       962: }
1.78      chl       963: #endif
1.1       djm       964:
1.21      djm       965: static void
1.93      djm       966: send_read_request(struct sftp_conn *conn, u_int id, u_int64_t offset,
                    967:     u_int len, char *handle, u_int handle_len)
1.21      djm       968: {
                    969:        Buffer msg;
1.28      markus    970:
1.21      djm       971:        buffer_init(&msg);
                    972:        buffer_clear(&msg);
                    973:        buffer_put_char(&msg, SSH2_FXP_READ);
                    974:        buffer_put_int(&msg, id);
                    975:        buffer_put_string(&msg, handle, handle_len);
                    976:        buffer_put_int64(&msg, offset);
                    977:        buffer_put_int(&msg, len);
1.93      djm       978:        send_msg(conn, &msg);
1.21      djm       979:        buffer_free(&msg);
1.28      markus    980: }
1.21      djm       981:
1.1       djm       982: int
1.23      djm       983: do_download(struct sftp_conn *conn, char *remote_path, char *local_path,
1.89      djm       984:     Attrib *a, int pflag)
1.1       djm       985: {
1.89      djm       986:        Attrib junk;
1.21      djm       987:        Buffer msg;
1.1       djm       988:        char *handle;
1.57      dtucker   989:        int local_fd, status = 0, write_error;
1.21      djm       990:        int read_error, write_errno;
                    991:        u_int64_t offset, size;
1.55      djm       992:        u_int handle_len, mode, type, id, buflen, num_req, max_req;
1.39      fgsch     993:        off_t progress_counter;
1.21      djm       994:        struct request {
                    995:                u_int id;
                    996:                u_int len;
                    997:                u_int64_t offset;
1.28      markus    998:                TAILQ_ENTRY(request) tq;
1.21      djm       999:        };
                   1000:        TAILQ_HEAD(reqhead, request) requests;
                   1001:        struct request *req;
                   1002:
                   1003:        TAILQ_INIT(&requests);
1.1       djm      1004:
1.89      djm      1005:        if (a == NULL && (a = do_stat(conn, remote_path, 0)) == NULL)
                   1006:                return -1;
1.1       djm      1007:
1.86      djm      1008:        /* Do not preserve set[ug]id here, as we do not preserve ownership */
1.1       djm      1009:        if (a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS)
1.38      djm      1010:                mode = a->perm & 0777;
1.1       djm      1011:        else
                   1012:                mode = 0666;
                   1013:
1.14      djm      1014:        if ((a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) &&
1.41      djm      1015:            (!S_ISREG(a->perm))) {
                   1016:                error("Cannot download non-regular file: %s", remote_path);
1.14      djm      1017:                return(-1);
                   1018:        }
                   1019:
1.21      djm      1020:        if (a->flags & SSH2_FILEXFER_ATTR_SIZE)
                   1021:                size = a->size;
                   1022:        else
                   1023:                size = 0;
                   1024:
1.23      djm      1025:        buflen = conn->transfer_buflen;
1.1       djm      1026:        buffer_init(&msg);
                   1027:
                   1028:        /* Send open request */
1.23      djm      1029:        id = conn->msg_id++;
1.1       djm      1030:        buffer_put_char(&msg, SSH2_FXP_OPEN);
                   1031:        buffer_put_int(&msg, id);
                   1032:        buffer_put_cstring(&msg, remote_path);
                   1033:        buffer_put_int(&msg, SSH2_FXF_READ);
                   1034:        attrib_clear(&junk); /* Send empty attributes */
                   1035:        encode_attrib(&msg, &junk);
1.93      djm      1036:        send_msg(conn, &msg);
1.33      deraadt  1037:        debug3("Sent message SSH2_FXP_OPEN I:%u P:%s", id, remote_path);
1.1       djm      1038:
1.93      djm      1039:        handle = get_handle(conn, id, &handle_len,
1.88      djm      1040:            "remote open(\"%s\")", remote_path);
1.1       djm      1041:        if (handle == NULL) {
                   1042:                buffer_free(&msg);
                   1043:                return(-1);
                   1044:        }
                   1045:
1.45      djm      1046:        local_fd = open(local_path, O_WRONLY | O_CREAT | O_TRUNC,
1.99      dtucker  1047:            mode | S_IWUSR);
1.23      djm      1048:        if (local_fd == -1) {
                   1049:                error("Couldn't open local file \"%s\" for writing: %s",
                   1050:                    local_path, strerror(errno));
1.79      djm      1051:                do_close(conn, handle, handle_len);
1.24      markus   1052:                buffer_free(&msg);
1.98      djm      1053:                free(handle);
1.23      djm      1054:                return(-1);
                   1055:        }
                   1056:
1.1       djm      1057:        /* Read from remote and write to local */
1.21      djm      1058:        write_error = read_error = write_errno = num_req = offset = 0;
                   1059:        max_req = 1;
1.39      fgsch    1060:        progress_counter = 0;
                   1061:
1.47      djm      1062:        if (showprogress && size != 0)
                   1063:                start_progress_meter(remote_path, size, &progress_counter);
1.39      fgsch    1064:
1.21      djm      1065:        while (num_req > 0 || max_req > 0) {
                   1066:                char *data;
1.1       djm      1067:                u_int len;
                   1068:
1.49      djm      1069:                /*
1.51      deraadt  1070:                 * Simulate EOF on interrupt: stop sending new requests and
1.49      djm      1071:                 * allow outstanding requests to drain gracefully
                   1072:                 */
                   1073:                if (interrupted) {
                   1074:                        if (num_req == 0) /* If we haven't started yet... */
                   1075:                                break;
                   1076:                        max_req = 0;
                   1077:                }
                   1078:
1.21      djm      1079:                /* Send some more requests */
                   1080:                while (num_req < max_req) {
1.28      markus   1081:                        debug3("Request range %llu -> %llu (%d/%d)",
1.25      itojun   1082:                            (unsigned long long)offset,
                   1083:                            (unsigned long long)offset + buflen - 1,
                   1084:                            num_req, max_req);
1.21      djm      1085:                        req = xmalloc(sizeof(*req));
1.23      djm      1086:                        req->id = conn->msg_id++;
1.21      djm      1087:                        req->len = buflen;
                   1088:                        req->offset = offset;
                   1089:                        offset += buflen;
                   1090:                        num_req++;
                   1091:                        TAILQ_INSERT_TAIL(&requests, req, tq);
1.93      djm      1092:                        send_read_request(conn, req->id, req->offset,
1.21      djm      1093:                            req->len, handle, handle_len);
                   1094:                }
1.1       djm      1095:
                   1096:                buffer_clear(&msg);
1.93      djm      1097:                get_msg(conn, &msg);
1.1       djm      1098:                type = buffer_get_char(&msg);
                   1099:                id = buffer_get_int(&msg);
1.33      deraadt  1100:                debug3("Received reply T:%u I:%u R:%d", type, id, max_req);
1.21      djm      1101:
                   1102:                /* Find the request in our queue */
1.53      deraadt  1103:                for (req = TAILQ_FIRST(&requests);
1.21      djm      1104:                    req != NULL && req->id != id;
                   1105:                    req = TAILQ_NEXT(req, tq))
                   1106:                        ;
                   1107:                if (req == NULL)
                   1108:                        fatal("Unexpected reply %u", id);
                   1109:
                   1110:                switch (type) {
                   1111:                case SSH2_FXP_STATUS:
1.5       djm      1112:                        status = buffer_get_int(&msg);
1.21      djm      1113:                        if (status != SSH2_FX_EOF)
                   1114:                                read_error = 1;
                   1115:                        max_req = 0;
                   1116:                        TAILQ_REMOVE(&requests, req, tq);
1.98      djm      1117:                        free(req);
1.21      djm      1118:                        num_req--;
                   1119:                        break;
                   1120:                case SSH2_FXP_DATA:
                   1121:                        data = buffer_get_string(&msg, &len);
1.26      itojun   1122:                        debug3("Received data %llu -> %llu",
1.28      markus   1123:                            (unsigned long long)req->offset,
1.26      itojun   1124:                            (unsigned long long)req->offset + len - 1);
1.21      djm      1125:                        if (len > req->len)
                   1126:                                fatal("Received more data than asked for "
1.37      deraadt  1127:                                    "%u > %u", len, req->len);
1.21      djm      1128:                        if ((lseek(local_fd, req->offset, SEEK_SET) == -1 ||
1.44      deraadt  1129:                            atomicio(vwrite, local_fd, data, len) != len) &&
1.21      djm      1130:                            !write_error) {
                   1131:                                write_errno = errno;
                   1132:                                write_error = 1;
                   1133:                                max_req = 0;
                   1134:                        }
1.39      fgsch    1135:                        progress_counter += len;
1.98      djm      1136:                        free(data);
1.1       djm      1137:
1.21      djm      1138:                        if (len == req->len) {
                   1139:                                TAILQ_REMOVE(&requests, req, tq);
1.98      djm      1140:                                free(req);
1.21      djm      1141:                                num_req--;
                   1142:                        } else {
                   1143:                                /* Resend the request for the missing data */
                   1144:                                debug3("Short data block, re-requesting "
1.26      itojun   1145:                                    "%llu -> %llu (%2d)",
1.28      markus   1146:                                    (unsigned long long)req->offset + len,
1.27      itojun   1147:                                    (unsigned long long)req->offset +
                   1148:                                    req->len - 1, num_req);
1.23      djm      1149:                                req->id = conn->msg_id++;
1.21      djm      1150:                                req->len -= len;
                   1151:                                req->offset += len;
1.93      djm      1152:                                send_read_request(conn, req->id,
1.23      djm      1153:                                    req->offset, req->len, handle, handle_len);
1.21      djm      1154:                                /* Reduce the request size */
                   1155:                                if (len < buflen)
                   1156:                                        buflen = MAX(MIN_READ_SIZE, len);
                   1157:                        }
                   1158:                        if (max_req > 0) { /* max_req = 0 iff EOF received */
                   1159:                                if (size > 0 && offset > size) {
                   1160:                                        /* Only one request at a time
                   1161:                                         * after the expected EOF */
                   1162:                                        debug3("Finish at %llu (%2d)",
1.26      itojun   1163:                                            (unsigned long long)offset,
                   1164:                                            num_req);
1.21      djm      1165:                                        max_req = 1;
1.49      djm      1166:                                } else if (max_req <= conn->num_requests) {
1.21      djm      1167:                                        ++max_req;
                   1168:                                }
1.1       djm      1169:                        }
1.21      djm      1170:                        break;
                   1171:                default:
1.33      deraadt  1172:                        fatal("Expected SSH2_FXP_DATA(%u) packet, got %u",
1.1       djm      1173:                            SSH2_FXP_DATA, type);
                   1174:                }
1.21      djm      1175:        }
1.1       djm      1176:
1.39      fgsch    1177:        if (showprogress && size)
                   1178:                stop_progress_meter();
                   1179:
1.21      djm      1180:        /* Sanity check */
                   1181:        if (TAILQ_FIRST(&requests) != NULL)
                   1182:                fatal("Transfer complete, but requests still in queue");
                   1183:
                   1184:        if (read_error) {
1.28      markus   1185:                error("Couldn't read from remote file \"%s\" : %s",
1.21      djm      1186:                    remote_path, fx2txt(status));
1.23      djm      1187:                do_close(conn, handle, handle_len);
1.21      djm      1188:        } else if (write_error) {
                   1189:                error("Couldn't write to \"%s\": %s", local_path,
                   1190:                    strerror(write_errno));
                   1191:                status = -1;
1.23      djm      1192:                do_close(conn, handle, handle_len);
1.21      djm      1193:        } else {
1.23      djm      1194:                status = do_close(conn, handle, handle_len);
1.21      djm      1195:
                   1196:                /* Override umask and utimes if asked */
                   1197:                if (pflag && fchmod(local_fd, mode) == -1)
                   1198:                        error("Couldn't set mode on \"%s\": %s", local_path,
1.37      deraadt  1199:                            strerror(errno));
1.21      djm      1200:                if (pflag && (a->flags & SSH2_FILEXFER_ATTR_ACMODTIME)) {
                   1201:                        struct timeval tv[2];
                   1202:                        tv[0].tv_sec = a->atime;
                   1203:                        tv[1].tv_sec = a->mtime;
                   1204:                        tv[0].tv_usec = tv[1].tv_usec = 0;
                   1205:                        if (utimes(local_path, tv) == -1)
                   1206:                                error("Can't set times on \"%s\": %s",
1.37      deraadt  1207:                                    local_path, strerror(errno));
1.1       djm      1208:                }
1.10      djm      1209:        }
1.5       djm      1210:        close(local_fd);
                   1211:        buffer_free(&msg);
1.98      djm      1212:        free(handle);
1.23      djm      1213:
                   1214:        return(status);
1.1       djm      1215: }
                   1216:
1.89      djm      1217: static int
                   1218: download_dir_internal(struct sftp_conn *conn, char *src, char *dst,
                   1219:     Attrib *dirattrib, int pflag, int printflag, int depth)
                   1220: {
                   1221:        int i, ret = 0;
                   1222:        SFTP_DIRENT **dir_entries;
                   1223:        char *filename, *new_src, *new_dst;
                   1224:        mode_t mode = 0777;
                   1225:
                   1226:        if (depth >= MAX_DIR_DEPTH) {
                   1227:                error("Maximum directory depth exceeded: %d levels", depth);
                   1228:                return -1;
                   1229:        }
                   1230:
                   1231:        if (dirattrib == NULL &&
                   1232:            (dirattrib = do_stat(conn, src, 1)) == NULL) {
                   1233:                error("Unable to stat remote directory \"%s\"", src);
                   1234:                return -1;
                   1235:        }
                   1236:        if (!S_ISDIR(dirattrib->perm)) {
                   1237:                error("\"%s\" is not a directory", src);
                   1238:                return -1;
                   1239:        }
                   1240:        if (printflag)
                   1241:                printf("Retrieving %s\n", src);
                   1242:
                   1243:        if (dirattrib->flags & SSH2_FILEXFER_ATTR_PERMISSIONS)
                   1244:                mode = dirattrib->perm & 01777;
                   1245:        else {
                   1246:                debug("Server did not send permissions for "
                   1247:                    "directory \"%s\"", dst);
                   1248:        }
                   1249:
                   1250:        if (mkdir(dst, mode) == -1 && errno != EEXIST) {
                   1251:                error("mkdir %s: %s", dst, strerror(errno));
                   1252:                return -1;
                   1253:        }
                   1254:
                   1255:        if (do_readdir(conn, src, &dir_entries) == -1) {
                   1256:                error("%s: Failed to get directory contents", src);
                   1257:                return -1;
                   1258:        }
                   1259:
                   1260:        for (i = 0; dir_entries[i] != NULL && !interrupted; i++) {
                   1261:                filename = dir_entries[i]->filename;
                   1262:
                   1263:                new_dst = path_append(dst, filename);
                   1264:                new_src = path_append(src, filename);
                   1265:
                   1266:                if (S_ISDIR(dir_entries[i]->a.perm)) {
                   1267:                        if (strcmp(filename, ".") == 0 ||
                   1268:                            strcmp(filename, "..") == 0)
                   1269:                                continue;
                   1270:                        if (download_dir_internal(conn, new_src, new_dst,
                   1271:                            &(dir_entries[i]->a), pflag, printflag,
                   1272:                            depth + 1) == -1)
                   1273:                                ret = -1;
                   1274:                } else if (S_ISREG(dir_entries[i]->a.perm) ) {
                   1275:                        if (do_download(conn, new_src, new_dst,
                   1276:                            &(dir_entries[i]->a), pflag) == -1) {
                   1277:                                error("Download of file %s to %s failed",
                   1278:                                    new_src, new_dst);
                   1279:                                ret = -1;
                   1280:                        }
                   1281:                } else
                   1282:                        logit("%s: not a regular file\n", new_src);
                   1283:
1.98      djm      1284:                free(new_dst);
                   1285:                free(new_src);
1.89      djm      1286:        }
                   1287:
                   1288:        if (pflag) {
                   1289:                if (dirattrib->flags & SSH2_FILEXFER_ATTR_ACMODTIME) {
                   1290:                        struct timeval tv[2];
                   1291:                        tv[0].tv_sec = dirattrib->atime;
                   1292:                        tv[1].tv_sec = dirattrib->mtime;
                   1293:                        tv[0].tv_usec = tv[1].tv_usec = 0;
                   1294:                        if (utimes(dst, tv) == -1)
                   1295:                                error("Can't set times on \"%s\": %s",
                   1296:                                    dst, strerror(errno));
                   1297:                } else
                   1298:                        debug("Server did not send times for directory "
                   1299:                            "\"%s\"", dst);
                   1300:        }
                   1301:
                   1302:        free_sftp_dirents(dir_entries);
                   1303:
                   1304:        return ret;
                   1305: }
                   1306:
                   1307: int
                   1308: download_dir(struct sftp_conn *conn, char *src, char *dst,
                   1309:     Attrib *dirattrib, int pflag, int printflag)
                   1310: {
                   1311:        char *src_canon;
                   1312:        int ret;
                   1313:
                   1314:        if ((src_canon = do_realpath(conn, src)) == NULL) {
                   1315:                error("Unable to canonicalise path \"%s\"", src);
                   1316:                return -1;
                   1317:        }
                   1318:
                   1319:        ret = download_dir_internal(conn, src_canon, dst,
                   1320:            dirattrib, pflag, printflag, 0);
1.98      djm      1321:        free(src_canon);
1.89      djm      1322:        return ret;
                   1323: }
                   1324:
1.1       djm      1325: int
1.23      djm      1326: do_upload(struct sftp_conn *conn, char *local_path, char *remote_path,
                   1327:     int pflag)
1.1       djm      1328: {
1.80      djm      1329:        int local_fd;
                   1330:        int status = SSH2_FX_OK;
1.22      djm      1331:        u_int handle_len, id, type;
1.100   ! dtucker  1332:        off_t offset, progress_counter;
1.20      djm      1333:        char *handle, *data;
1.1       djm      1334:        Buffer msg;
                   1335:        struct stat sb;
                   1336:        Attrib a;
1.21      djm      1337:        u_int32_t startid;
                   1338:        u_int32_t ackid;
1.22      djm      1339:        struct outstanding_ack {
                   1340:                u_int id;
                   1341:                u_int len;
1.77      djm      1342:                off_t offset;
1.28      markus   1343:                TAILQ_ENTRY(outstanding_ack) tq;
1.22      djm      1344:        };
                   1345:        TAILQ_HEAD(ackhead, outstanding_ack) acks;
1.50      pedro    1346:        struct outstanding_ack *ack = NULL;
1.22      djm      1347:
                   1348:        TAILQ_INIT(&acks);
1.1       djm      1349:
                   1350:        if ((local_fd = open(local_path, O_RDONLY, 0)) == -1) {
                   1351:                error("Couldn't open local file \"%s\" for reading: %s",
                   1352:                    local_path, strerror(errno));
                   1353:                return(-1);
                   1354:        }
                   1355:        if (fstat(local_fd, &sb) == -1) {
                   1356:                error("Couldn't fstat local file \"%s\": %s",
                   1357:                    local_path, strerror(errno));
1.41      djm      1358:                close(local_fd);
                   1359:                return(-1);
                   1360:        }
                   1361:        if (!S_ISREG(sb.st_mode)) {
                   1362:                error("%s is not a regular file", local_path);
1.1       djm      1363:                close(local_fd);
                   1364:                return(-1);
                   1365:        }
                   1366:        stat_to_attrib(&sb, &a);
                   1367:
                   1368:        a.flags &= ~SSH2_FILEXFER_ATTR_SIZE;
                   1369:        a.flags &= ~SSH2_FILEXFER_ATTR_UIDGID;
                   1370:        a.perm &= 0777;
                   1371:        if (!pflag)
                   1372:                a.flags &= ~SSH2_FILEXFER_ATTR_ACMODTIME;
                   1373:
                   1374:        buffer_init(&msg);
                   1375:
                   1376:        /* Send open request */
1.23      djm      1377:        id = conn->msg_id++;
1.1       djm      1378:        buffer_put_char(&msg, SSH2_FXP_OPEN);
                   1379:        buffer_put_int(&msg, id);
                   1380:        buffer_put_cstring(&msg, remote_path);
                   1381:        buffer_put_int(&msg, SSH2_FXF_WRITE|SSH2_FXF_CREAT|SSH2_FXF_TRUNC);
                   1382:        encode_attrib(&msg, &a);
1.93      djm      1383:        send_msg(conn, &msg);
1.33      deraadt  1384:        debug3("Sent message SSH2_FXP_OPEN I:%u P:%s", id, remote_path);
1.1       djm      1385:
                   1386:        buffer_clear(&msg);
                   1387:
1.93      djm      1388:        handle = get_handle(conn, id, &handle_len,
1.88      djm      1389:            "remote open(\"%s\")", remote_path);
1.1       djm      1390:        if (handle == NULL) {
                   1391:                close(local_fd);
                   1392:                buffer_free(&msg);
1.80      djm      1393:                return -1;
1.1       djm      1394:        }
                   1395:
1.21      djm      1396:        startid = ackid = id + 1;
1.23      djm      1397:        data = xmalloc(conn->transfer_buflen);
1.20      djm      1398:
1.1       djm      1399:        /* Read from local and write to remote */
1.100   ! dtucker  1400:        offset = progress_counter = 0;
1.39      fgsch    1401:        if (showprogress)
1.100   ! dtucker  1402:                start_progress_meter(local_path, sb.st_size,
        !          1403:                    &progress_counter);
1.39      fgsch    1404:
1.19      deraadt  1405:        for (;;) {
1.1       djm      1406:                int len;
                   1407:
                   1408:                /*
1.51      deraadt  1409:                 * Can't use atomicio here because it returns 0 on EOF,
1.49      djm      1410:                 * thus losing the last block of the file.
1.51      deraadt  1411:                 * Simulate an EOF on interrupt, allowing ACKs from the
1.49      djm      1412:                 * server to drain.
1.1       djm      1413:                 */
1.80      djm      1414:                if (interrupted || status != SSH2_FX_OK)
1.49      djm      1415:                        len = 0;
                   1416:                else do
1.23      djm      1417:                        len = read(local_fd, data, conn->transfer_buflen);
1.1       djm      1418:                while ((len == -1) && (errno == EINTR || errno == EAGAIN));
                   1419:
                   1420:                if (len == -1)
                   1421:                        fatal("Couldn't read from \"%s\": %s", local_path,
                   1422:                            strerror(errno));
1.21      djm      1423:
                   1424:                if (len != 0) {
1.22      djm      1425:                        ack = xmalloc(sizeof(*ack));
                   1426:                        ack->id = ++id;
                   1427:                        ack->offset = offset;
                   1428:                        ack->len = len;
                   1429:                        TAILQ_INSERT_TAIL(&acks, ack, tq);
                   1430:
1.21      djm      1431:                        buffer_clear(&msg);
                   1432:                        buffer_put_char(&msg, SSH2_FXP_WRITE);
1.22      djm      1433:                        buffer_put_int(&msg, ack->id);
1.21      djm      1434:                        buffer_put_string(&msg, handle, handle_len);
                   1435:                        buffer_put_int64(&msg, offset);
                   1436:                        buffer_put_string(&msg, data, len);
1.93      djm      1437:                        send_msg(conn, &msg);
1.33      deraadt  1438:                        debug3("Sent message SSH2_FXP_WRITE I:%u O:%llu S:%u",
1.37      deraadt  1439:                            id, (unsigned long long)offset, len);
1.22      djm      1440:                } else if (TAILQ_FIRST(&acks) == NULL)
1.1       djm      1441:                        break;
                   1442:
1.22      djm      1443:                if (ack == NULL)
                   1444:                        fatal("Unexpected ACK %u", id);
                   1445:
1.28      markus   1446:                if (id == startid || len == 0 ||
1.23      djm      1447:                    id - ackid >= conn->num_requests) {
1.32      markus   1448:                        u_int r_id;
1.31      djm      1449:
1.22      djm      1450:                        buffer_clear(&msg);
1.93      djm      1451:                        get_msg(conn, &msg);
1.22      djm      1452:                        type = buffer_get_char(&msg);
1.31      djm      1453:                        r_id = buffer_get_int(&msg);
1.22      djm      1454:
                   1455:                        if (type != SSH2_FXP_STATUS)
                   1456:                                fatal("Expected SSH2_FXP_STATUS(%d) packet, "
                   1457:                                    "got %d", SSH2_FXP_STATUS, type);
                   1458:
                   1459:                        status = buffer_get_int(&msg);
                   1460:                        debug3("SSH2_FXP_STATUS %d", status);
                   1461:
                   1462:                        /* Find the request in our queue */
1.53      deraadt  1463:                        for (ack = TAILQ_FIRST(&acks);
1.31      djm      1464:                            ack != NULL && ack->id != r_id;
1.22      djm      1465:                            ack = TAILQ_NEXT(ack, tq))
                   1466:                                ;
                   1467:                        if (ack == NULL)
1.33      deraadt  1468:                                fatal("Can't find request for ID %u", r_id);
1.22      djm      1469:                        TAILQ_REMOVE(&acks, ack, tq);
1.77      djm      1470:                        debug3("In write loop, ack for %u %u bytes at %lld",
                   1471:                            ack->id, ack->len, (long long)ack->offset);
1.21      djm      1472:                        ++ackid;
1.100   ! dtucker  1473:                        progress_counter += ack->len;
1.98      djm      1474:                        free(ack);
1.1       djm      1475:                }
                   1476:                offset += len;
1.77      djm      1477:                if (offset < 0)
                   1478:                        fatal("%s: offset < 0", __func__);
1.1       djm      1479:        }
1.80      djm      1480:        buffer_free(&msg);
                   1481:
1.39      fgsch    1482:        if (showprogress)
                   1483:                stop_progress_meter();
1.98      djm      1484:        free(data);
1.1       djm      1485:
1.80      djm      1486:        if (status != SSH2_FX_OK) {
                   1487:                error("Couldn't write to remote file \"%s\": %s",
                   1488:                    remote_path, fx2txt(status));
                   1489:                status = -1;
                   1490:        }
                   1491:
1.1       djm      1492:        if (close(local_fd) == -1) {
                   1493:                error("Couldn't close local file \"%s\": %s", local_path,
                   1494:                    strerror(errno));
1.5       djm      1495:                status = -1;
1.1       djm      1496:        }
                   1497:
1.10      djm      1498:        /* Override umask and utimes if asked */
                   1499:        if (pflag)
1.23      djm      1500:                do_fsetstat(conn, handle, handle_len, &a);
1.10      djm      1501:
1.80      djm      1502:        if (do_close(conn, handle, handle_len) != SSH2_FX_OK)
                   1503:                status = -1;
1.98      djm      1504:        free(handle);
1.5       djm      1505:
1.80      djm      1506:        return status;
1.1       djm      1507: }
1.89      djm      1508:
                   1509: static int
                   1510: upload_dir_internal(struct sftp_conn *conn, char *src, char *dst,
                   1511:     int pflag, int printflag, int depth)
                   1512: {
                   1513:        int ret = 0, status;
                   1514:        DIR *dirp;
                   1515:        struct dirent *dp;
                   1516:        char *filename, *new_src, *new_dst;
                   1517:        struct stat sb;
                   1518:        Attrib a;
                   1519:
                   1520:        if (depth >= MAX_DIR_DEPTH) {
                   1521:                error("Maximum directory depth exceeded: %d levels", depth);
                   1522:                return -1;
                   1523:        }
                   1524:
                   1525:        if (stat(src, &sb) == -1) {
                   1526:                error("Couldn't stat directory \"%s\": %s",
                   1527:                    src, strerror(errno));
                   1528:                return -1;
                   1529:        }
                   1530:        if (!S_ISDIR(sb.st_mode)) {
                   1531:                error("\"%s\" is not a directory", src);
                   1532:                return -1;
                   1533:        }
                   1534:        if (printflag)
                   1535:                printf("Entering %s\n", src);
                   1536:
                   1537:        attrib_clear(&a);
                   1538:        stat_to_attrib(&sb, &a);
                   1539:        a.flags &= ~SSH2_FILEXFER_ATTR_SIZE;
                   1540:        a.flags &= ~SSH2_FILEXFER_ATTR_UIDGID;
                   1541:        a.perm &= 01777;
                   1542:        if (!pflag)
                   1543:                a.flags &= ~SSH2_FILEXFER_ATTR_ACMODTIME;
                   1544:
                   1545:        status = do_mkdir(conn, dst, &a, 0);
                   1546:        /*
                   1547:         * we lack a portable status for errno EEXIST,
                   1548:         * so if we get a SSH2_FX_FAILURE back we must check
                   1549:         * if it was created successfully.
                   1550:         */
                   1551:        if (status != SSH2_FX_OK) {
                   1552:                if (status != SSH2_FX_FAILURE)
                   1553:                        return -1;
                   1554:                if (do_stat(conn, dst, 0) == NULL)
                   1555:                        return -1;
                   1556:        }
                   1557:
                   1558:        if ((dirp = opendir(src)) == NULL) {
                   1559:                error("Failed to open dir \"%s\": %s", src, strerror(errno));
                   1560:                return -1;
                   1561:        }
                   1562:
                   1563:        while (((dp = readdir(dirp)) != NULL) && !interrupted) {
                   1564:                if (dp->d_ino == 0)
                   1565:                        continue;
                   1566:                filename = dp->d_name;
                   1567:                new_dst = path_append(dst, filename);
                   1568:                new_src = path_append(src, filename);
                   1569:
1.90      dtucker  1570:                if (lstat(new_src, &sb) == -1) {
                   1571:                        logit("%s: lstat failed: %s", filename,
                   1572:                            strerror(errno));
                   1573:                        ret = -1;
                   1574:                } else if (S_ISDIR(sb.st_mode)) {
1.89      djm      1575:                        if (strcmp(filename, ".") == 0 ||
                   1576:                            strcmp(filename, "..") == 0)
                   1577:                                continue;
                   1578:
                   1579:                        if (upload_dir_internal(conn, new_src, new_dst,
1.92      djm      1580:                            pflag, printflag, depth + 1) == -1)
1.89      djm      1581:                                ret = -1;
1.90      dtucker  1582:                } else if (S_ISREG(sb.st_mode)) {
1.89      djm      1583:                        if (do_upload(conn, new_src, new_dst, pflag) == -1) {
                   1584:                                error("Uploading of file %s to %s failed!",
                   1585:                                    new_src, new_dst);
                   1586:                                ret = -1;
                   1587:                        }
                   1588:                } else
                   1589:                        logit("%s: not a regular file\n", filename);
1.98      djm      1590:                free(new_dst);
                   1591:                free(new_src);
1.89      djm      1592:        }
                   1593:
                   1594:        do_setstat(conn, dst, &a);
                   1595:
                   1596:        (void) closedir(dirp);
                   1597:        return ret;
                   1598: }
                   1599:
                   1600: int
                   1601: upload_dir(struct sftp_conn *conn, char *src, char *dst, int printflag,
                   1602:     int pflag)
                   1603: {
                   1604:        char *dst_canon;
                   1605:        int ret;
                   1606:
                   1607:        if ((dst_canon = do_realpath(conn, dst)) == NULL) {
                   1608:                error("Unable to canonicalise path \"%s\"", dst);
                   1609:                return -1;
                   1610:        }
                   1611:
                   1612:        ret = upload_dir_internal(conn, src, dst_canon, pflag, printflag, 0);
1.98      djm      1613:        free(dst_canon);
1.89      djm      1614:        return ret;
                   1615: }
                   1616:
                   1617: char *
                   1618: path_append(char *p1, char *p2)
                   1619: {
                   1620:        char *ret;
                   1621:        size_t len = strlen(p1) + strlen(p2) + 2;
                   1622:
                   1623:        ret = xmalloc(len);
                   1624:        strlcpy(ret, p1, len);
                   1625:        if (p1[0] != '\0' && p1[strlen(p1) - 1] != '/')
                   1626:                strlcat(ret, "/", len);
                   1627:        strlcat(ret, p2, len);
                   1628:
                   1629:        return(ret);
                   1630: }
                   1631: