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

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