OpenBSD CVS

CVS log for src/usr.bin/ssh/sftp.c


[BACK] Up to [local] / src / usr.bin / ssh

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.238 / (download) - annotate - [select for diffs], Tue Apr 30 06:16:55 2024 UTC (2 weeks, 2 days ago) by djm
Branch: MAIN
CVS Tags: HEAD
Changes since 1.237: +4 -2 lines
Diff to previous 1.237 (colored)

flush stdout after writing "sftp>" prompt when not using editline.

From Alpine Linux via GHPR480

Revision 1.237 / (download) - annotate - [select for diffs], Thu Feb 1 02:37:33 2024 UTC (3 months, 2 weeks ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5
Changes since 1.236: +22 -22 lines
Diff to previous 1.236 (colored)

whitespace

Revision 1.236 / (download) - annotate - [select for diffs], Sun Sep 10 23:12:32 2023 UTC (8 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_7_4_BASE, OPENBSD_7_4
Changes since 1.235: +8 -8 lines
Diff to previous 1.235 (colored)

rename remote_glob() -> sftp_glob() to match other API

Revision 1.235 / (download) - annotate - [select for diffs], Fri Sep 8 05:56:13 2023 UTC (8 months, 1 week ago) by djm
Branch: MAIN
Changes since 1.234: +68 -56 lines
Diff to previous 1.234 (colored)

the sftp code was one of my first contributions to OpenSSH and it
shows - the function names are terrible.

Rename do_blah() to sftp_blah() to make them less so.

Completely mechanical except for sftp_stat() and sftp_lstat() which
change from returning a pointer to a static variable (error-prone) to
taking a pointer to a caller-provided receiver.

Revision 1.234 / (download) - annotate - [select for diffs], Wed Apr 12 08:53:54 2023 UTC (13 months ago) by jsg
Branch: MAIN
Changes since 1.233: +2 -2 lines
Diff to previous 1.233 (colored)

fix double words
ok dtucker@

Revision 1.233 / (download) - annotate - [select for diffs], Thu Apr 6 03:12:32 2023 UTC (13 months, 1 week ago) by djm
Branch: MAIN
Changes since 1.232: +2 -2 lines
Diff to previous 1.232 (colored)

don't care about glob() return value here.

Revision 1.232 / (download) - annotate - [select for diffs], Fri Mar 31 04:45:08 2023 UTC (13 months, 2 weeks ago) by dtucker
Branch: MAIN
Changes since 1.231: +2 -2 lines
Diff to previous 1.231 (colored)

Explictly ignore return codes where we don't check them.  From Dmitry
Belyavskiy via github PR#238, ok djm@

Revision 1.231 / (download) - annotate - [select for diffs], Wed Mar 29 00:59:08 2023 UTC (13 months, 2 weeks ago) by dtucker
Branch: MAIN
Changes since 1.230: +3 -1 lines
Diff to previous 1.230 (colored)

Plug another potential mem leak in process_put.  It allocates abs_dst
inside a loop but only frees it on exit, so free inside the loop if
necessary.  Coverity CID 291837, ok djm@

Revision 1.230 / (download) - annotate - [select for diffs], Tue Mar 28 07:44:32 2023 UTC (13 months, 2 weeks ago) by dtucker
Branch: MAIN
Changes since 1.229: +9 -7 lines
Diff to previous 1.229 (colored)

Plug more mem leaks in sftp by making make_absolute_pwd_glob work in
the same way as make_absolute: you pass it a dynamically allocated string
and it either returns it, or frees it and allocates a new one.
Patch from emaste at freebsd.org and https://reviews.freebsd.org/D37253
ok djm@

Revision 1.229 / (download) - annotate - [select for diffs], Sun Mar 12 09:41:18 2023 UTC (14 months ago) by dtucker
Branch: MAIN
CVS Tags: OPENBSD_7_3_BASE, OPENBSD_7_3
Changes since 1.228: +2 -2 lines
Diff to previous 1.228 (colored)

calloc can return NULL but xcalloc cannot.  From Coverity CID 291881,
ok djm@

Revision 1.228 / (download) - annotate - [select for diffs], Wed Mar 8 06:21:32 2023 UTC (14 months, 1 week ago) by dtucker
Branch: MAIN
Changes since 1.227: +4 -2 lines
Diff to previous 1.227 (colored)

Plug mem leak.  Coverity CID 405196, ok djm@

Revision 1.227 / (download) - annotate - [select for diffs], Wed Mar 8 04:43:12 2023 UTC (14 months, 1 week ago) by guenther
Branch: MAIN
Changes since 1.226: +1 -6 lines
Diff to previous 1.226 (colored)

Delete obsolete /* ARGSUSED */ lint comments.

ok miod@ millert@

Revision 1.226 / (download) - annotate - [select for diffs], Mon Feb 27 22:12:40 2023 UTC (14 months, 2 weeks ago) by dtucker
Branch: MAIN
Changes since 1.225: +2 -1 lines
Diff to previous 1.225 (colored)

Plug mem leak on globbed ls error path. Spotted by Coverity, ok deraadt@

Revision 1.225 / (download) - annotate - [select for diffs], Thu Jan 5 05:49:13 2023 UTC (16 months, 1 week ago) by djm
Branch: MAIN
Changes since 1.224: +3 -2 lines
Diff to previous 1.224 (colored)

suppress "Connection closed" message when in quiet mode

Revision 1.224 / (download) - annotate - [select for diffs], Fri Dec 16 06:52:48 2022 UTC (17 months ago) by jmc
Branch: MAIN
Changes since 1.223: +2 -2 lines
Diff to previous 1.223 (colored)

add -X to usage();

Revision 1.223 / (download) - annotate - [select for diffs], Fri Dec 16 03:40:03 2022 UTC (17 months ago) by djm
Branch: MAIN
Changes since 1.222: +28 -3 lines
Diff to previous 1.222 (colored)

add a -X option to both scp(1) and sftp(1) to allow control over
some SFTP protocol knobs: the copy buffer length and the number of
inflight requests, both of which are used during upload/download.

Previously these could be controlled in sftp(1) using the -b/-R options.
This makes them available in both SFTP protocol clients using the same
option character sequence.

ok dtucker@

Revision 1.222 / (download) - annotate - [select for diffs], Mon Sep 19 10:46:00 2022 UTC (19 months, 3 weeks ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_7_2_BASE, OPENBSD_7_2
Changes since 1.221: +12 -4 lines
Diff to previous 1.221 (colored)

use users-groups-by-id@openssh.com sftp-server extension (when
available) to fill in user/group names for directory listings.
Implement a client-side cache of see uid/gid=>user/group names.
ok markus@

Revision 1.221 / (download) - annotate - [select for diffs], Mon Sep 19 10:41:58 2022 UTC (19 months, 3 weeks ago) by djm
Branch: MAIN
Changes since 1.220: +3 -3 lines
Diff to previous 1.220 (colored)

extend sftp-common.c:extend ls_file() to support supplied user/group
names; ok markus@

Revision 1.220 / (download) - annotate - [select for diffs], Fri Sep 16 03:33:14 2022 UTC (20 months ago) by djm
Branch: MAIN
Changes since 1.219: +69 -46 lines
Diff to previous 1.219 (colored)

sftp: Be a bit more clever about completions

There are commands (e.g. "get" or "put") that accept two
arguments, a local path and a remote path. However, the way
current completion is written doesn't take this distinction into
account and always completes remote or local paths.

By expanding CMD struct and "cmds" array this distinction can be
reflected and with small adjustment to completer code the correct
path can be completed.

By Michal Privoznik, ok dtucker@

Revision 1.219 / (download) - annotate - [select for diffs], Fri Sep 16 03:13:34 2022 UTC (20 months ago) by djm
Branch: MAIN
Changes since 1.218: +2 -2 lines
Diff to previous 1.218 (colored)

sftp: Don't attempt to complete arguments for non-existent commands

If user entered a non-existent command (e.g. because they made a
typo) there is no point in trying to complete its arguments. Skip
calling complete_match() if that's the case.

From Michal Privoznik

Revision 1.218 / (download) - annotate - [select for diffs], Tue Jun 28 06:09:14 2022 UTC (22 months, 2 weeks ago) by jmc
Branch: MAIN
Changes since 1.217: +2 -2 lines
Diff to previous 1.217 (colored)

reflect the update to -D arg name in usage();

Revision 1.217 / (download) - annotate - [select for diffs], Mon Jun 27 21:41:55 2022 UTC (22 months, 2 weeks ago) by djm
Branch: MAIN
Changes since 1.216: +9 -7 lines
Diff to previous 1.216 (colored)

allow arguments to sftp -D option, e.g.
sftp -D "/usr/libexec/sftp-server -el debug3"

ok markus@

Revision 1.216 / (download) - annotate - [select for diffs], Fri May 13 06:31:50 2022 UTC (2 years ago) by djm
Branch: MAIN
Changes since 1.215: +5 -5 lines
Diff to previous 1.215 (colored)

arrange for scp, when in sftp mode, to not ftruncate(3) files early

previous behavious of unconditionally truncating the destination file
would cause "scp ~/foo localhost:" and "scp localhost:foo ~/" to
delete all the contents of their destination.

spotted by solene@ sthen@, also bz3431; ok dtucker@

Revision 1.215 / (download) - annotate - [select for diffs], Sun May 8 22:32:36 2022 UTC (2 years ago) by djm
Branch: MAIN
Changes since 1.214: +38 -11 lines
Diff to previous 1.214 (colored)

When performing operations that glob(3) a remote path, ensure that the
implicit working directory used to construct that path escapes glob(3)
characters.

This prevents glob characters from being processed in places they
shouldn't, e.g. "cd /tmp/a*/", "get *.txt" should have the get operation
treat the path "/tmp/a*" literally and not attempt to expand it.

Reported by Lusia Kundel; ok markus@

Revision 1.214 / (download) - annotate - [select for diffs], Thu Mar 31 03:07:03 2022 UTC (2 years, 1 month ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_7_1_BASE, OPENBSD_7_1
Changes since 1.213: +15 -1 lines
Diff to previous 1.213 (colored)

add a sftp client "cp" command that supports server-side copying
of files. Useful for this task and for testing the copy-data
extension. Patch from Mike Frysinger; ok dtucker@

Revision 1.213 / (download) - annotate - [select for diffs], Fri Mar 18 02:50:21 2022 UTC (2 years, 2 months ago) by djm
Branch: MAIN
Changes since 1.212: +2 -4 lines
Diff to previous 1.212 (colored)

remove blank line

Revision 1.212 / (download) - annotate - [select for diffs], Sat Sep 11 09:05:50 2021 UTC (2 years, 8 months ago) by schwarze
Branch: MAIN
CVS Tags: OPENBSD_7_0_BASE, OPENBSD_7_0
Changes since 1.211: +12 -12 lines
Diff to previous 1.211 (colored)

Do not ignore SIGINT while waiting for input if editline(3) is not used.
Instead, in non-interactive mode, exit sftp(1), like for other serious errors.
As pointed out by dtucker@, when compiled without editline(3) support in
portable OpenSSH, the el == NULL branch is also used for interactive mode.
In that case, discard the input line and provide a fresh prompt to the user
just like in the case where editline(3) is used.
OK djm@

Revision 1.211 / (download) - annotate - [select for diffs], Thu Aug 12 09:59:00 2021 UTC (2 years, 9 months ago) by schwarze
Branch: MAIN
Changes since 1.210: +21 -3 lines
Diff to previous 1.210 (colored)

In the editline(3) branch of the sftp(1) event loop, handle SIGINT
rather than ignoring it, such that the user can use Ctrl-C to discard
the currently edited command line and get a fresh prompt, just like
in ftp(1), bc(1), and in shells.

It is critical to not use ssl_signal() for this particular case
because that function unconditionally sets SA_RESTART, but here we
need the signal to interrupt the read(2) in the el_gets(3) event loop.

OK dtucker@ deraadt@

Revision 1.210 / (download) - annotate - [select for diffs], Sat Aug 7 00:12:09 2021 UTC (2 years, 9 months ago) by djm
Branch: MAIN
Changes since 1.209: +5 -3 lines
Diff to previous 1.209 (colored)

make scp(1) in SFTP mode follow symlinks like traditional scp(1)
ok markus@

Revision 1.209 / (download) - annotate - [select for diffs], Sat Apr 3 06:58:30 2021 UTC (3 years, 1 month ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_6_9_BASE, OPENBSD_6_9
Changes since 1.208: +2 -2 lines
Diff to previous 1.208 (colored)

typos in comments; GHPR#180 from Ville Skyttä

Revision 1.208 / (download) - annotate - [select for diffs], Sat Apr 3 06:18:41 2021 UTC (3 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.207: +2 -2 lines
Diff to previous 1.207 (colored)

highly polished whitespace, mostly fixing spaces-for-tab and bad
indentation on continuation lines. Prompted by GHPR#185

Revision 1.207 / (download) - annotate - [select for diffs], Wed Mar 31 22:16:34 2021 UTC (3 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.206: +3 -6 lines
Diff to previous 1.206 (colored)

Use new limits@openssh.com protocol extension to let the client select
good limits based on what the server supports. Split the download and
upload buffer sizes to allow them to be chosen independently.

In practice (and assuming upgraded sftp/sftp-server at each end), this
increases the download buffer 32->64KiB and the upload buffer
32->255KiB.

Patches from Mike Frysinger; ok dtucker@

Revision 1.206 / (download) - annotate - [select for diffs], Fri Jan 8 02:44:14 2021 UTC (3 years, 4 months ago) by djm
Branch: MAIN
Changes since 1.205: +7 -4 lines
Diff to previous 1.205 (colored)

don't try to use timespeccmp(3) directly as a qsort(3) comparison
function - it returns 0/1 and not the -1/0/1 that qsort expectes.

fixes sftp "ls -ltr" under some circumstances.

Based on patch by Masahiro Matsuya via bz3248.

Revision 1.205 / (download) - annotate - [select for diffs], Fri Dec 4 02:41:10 2020 UTC (3 years, 5 months ago) by djm
Branch: MAIN
Changes since 1.204: +5 -53 lines
Diff to previous 1.204 (colored)

shuffle a few utility functions into sftp-client.c; from Jakub Jelen

Revision 1.204 / (download) - annotate - [select for diffs], Thu Oct 29 02:52:43 2020 UTC (3 years, 6 months ago) by djm
Branch: MAIN
Changes since 1.203: +2 -2 lines
Diff to previous 1.203 (colored)

whitespace; no code change

Revision 1.203 / (download) - annotate - [select for diffs], Sun Oct 18 11:32:02 2020 UTC (3 years, 6 months ago) by djm
Branch: MAIN
Changes since 1.202: +2 -2 lines
Diff to previous 1.202 (colored)

use the new variant log macros instead of prepending __func__ and
appending ssh_err(r) manually; ok markus@

Revision 1.202 / (download) - annotate - [select for diffs], Sun Oct 4 03:04:02 2020 UTC (3 years, 7 months ago) by dtucker
Branch: MAIN
Changes since 1.201: +6 -6 lines
Diff to previous 1.201 (colored)

Allow full range of UIDs and GIDs for sftp chown and chgrp on 32bit
platforms instead of being limited by LONG_MAX.  bz#3206, found by
booking00 at sina.cn, ok markus@

Revision 1.201 / (download) - annotate - [select for diffs], Mon Aug 3 02:43:41 2020 UTC (3 years, 9 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_6_8_BASE, OPENBSD_6_8
Changes since 1.200: +7 -4 lines
Diff to previous 1.200 (colored)

allow -A to explicitly enable agent forwarding in scp and sftp. The
default remains to not forward an agent, even when ssh_config enables
it. ok jmc dtucker markus

Revision 1.200 / (download) - annotate - [select for diffs], Fri Apr 3 05:53:52 2020 UTC (4 years, 1 month ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_6_7_BASE, OPENBSD_6_7
Changes since 1.199: +2 -2 lines
Diff to previous 1.199 (colored)

sort -N and add it to usage();

Revision 1.199 / (download) - annotate - [select for diffs], Fri Apr 3 04:34:15 2020 UTC (4 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.198: +9 -3 lines
Diff to previous 1.198 (colored)

Add a flag to re-enable verbose output when in batch mode;
requested in bz3135; ok dtucker

Revision 1.198 / (download) - annotate - [select for diffs], Wed Feb 26 11:46:51 2020 UTC (4 years, 2 months ago) by dtucker
Branch: MAIN
Changes since 1.197: +4 -7 lines
Diff to previous 1.197 (colored)

Have sftp reject "-1" in the same way as ssh(1) and scp(1) do instead
of accepting and silently ignoring it since protocol 1 support has
been removed.  Spotted by shivakumar2696 at gmail.com, ok deraadt@

Revision 1.197 / (download) - annotate - [select for diffs], Thu Jan 23 07:10:22 2020 UTC (4 years, 3 months ago) by dtucker
Branch: MAIN
Changes since 1.196: +13 -13 lines
Diff to previous 1.196 (colored)

Replace all calls to signal(2) with a wrapper around sigaction(2).
This wrapper blocks all other signals during the handler preventing
races between handlers, and sets SA_RESTART which should reduce the
potential for short read/write operations.

Revision 1.196 / (download) - annotate - [select for diffs], Fri Nov 1 03:54:33 2019 UTC (4 years, 6 months ago) by djm
Branch: MAIN
Changes since 1.195: +7 -4 lines
Diff to previous 1.195 (colored)

fix a race condition in the SIGCHILD handler that could turn in
to a kill(-1); bz3084, reported by Gao Rui, ok dtucker@

Revision 1.195 / (download) - annotate - [select for diffs], Wed Oct 2 00:42:30 2019 UTC (4 years, 7 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_6_6_BASE, OPENBSD_6_6
Changes since 1.194: +1 -2 lines
Diff to previous 1.194 (colored)

remove some duplicate #includes

Revision 1.194 / (download) - annotate - [select for diffs], Wed Jul 10 07:04:27 2019 UTC (4 years, 10 months ago) by tb
Branch: MAIN
Changes since 1.193: +2 -2 lines
Diff to previous 1.193 (colored)

Fix a typo and make <esc><right> move right to the closest end of a word
just like <esc><left> moves left to the closest beginning of a word.

ok djm

Revision 1.193 / (download) - annotate - [select for diffs], Wed Jun 19 20:12:44 2019 UTC (4 years, 10 months ago) by jmc
Branch: MAIN
Changes since 1.192: +5 -5 lines
Diff to previous 1.192 (colored)

from tim:
- for reput, it is remote-path which is optional, not local-path
- sync help

from deraadt:
- prefer -R and undocument -r (but add a comment for future editors)

from schwarze:
- prefer -p and undocument -P (as above. the comment was schwarze's too)

more:
- add the -f flag to reput and reget
- sort help (i can;t remember who suggested this originally)

djm and deraadt were ok with earlier versions of this;
tim and schwarze ok

Revision 1.192 / (download) - annotate - [select for diffs], Fri Jun 7 03:47:12 2019 UTC (4 years, 11 months ago) by dtucker
Branch: MAIN
Changes since 1.191: +11 -6 lines
Diff to previous 1.191 (colored)

Check for user@host when parsing sftp target.  This allows user@[1.2.3.4]
to work without a path in addition to with one.  bz#2999, ok djm@

Revision 1.191 / (download) - annotate - [select for diffs], Thu Jun 6 05:13:13 2019 UTC (4 years, 11 months ago) by otto
Branch: MAIN
Changes since 1.190: +1 -2 lines
Diff to previous 1.190 (colored)

Replace calls to ssh_malloc_init() by a static init of malloc_options.
Prepares for changes in the way malloc is initialized.  ok guenther@ dtucker@

Revision 1.190 / (download) - annotate - [select for diffs], Mon Jan 21 22:50:42 2019 UTC (5 years, 3 months ago) by tb
Branch: MAIN
CVS Tags: OPENBSD_6_5_BASE, OPENBSD_6_5
Changes since 1.189: +7 -7 lines
Diff to previous 1.189 (colored)

Add a -J option as a shortcut for -o Proxyjump= to scp(1) and sftp(1)
to match ssh(1)'s interface.

ok djm

Revision 1.189 / (download) - annotate - [select for diffs], Wed Jan 16 23:23:45 2019 UTC (5 years, 4 months ago) by djm
Branch: MAIN
Changes since 1.188: +35 -8 lines
Diff to previous 1.188 (colored)

Add "-h" flag to sftp chown/chgrp/chmod commands to request they do
not follow symlinks. Requires recently-committed lsetstat@openssh.com
extension on the server side.

ok markus@ dtucker@

Revision 1.188 / (download) - annotate - [select for diffs], Fri Nov 16 03:26:01 2018 UTC (5 years, 6 months ago) by djm
Branch: MAIN
Changes since 1.187: +4 -4 lines
Diff to previous 1.187 (colored)

use path_absolute() for pathname checks; from Manoj Ampalam

Revision 1.187 / (download) - annotate - [select for diffs], Fri Nov 16 02:30:20 2018 UTC (5 years, 6 months ago) by djm
Branch: MAIN
Changes since 1.186: +31 -25 lines
Diff to previous 1.186 (colored)

support a prefix of '@' to suppress echo of sftp batch commands;
bz#2926; ok dtucker@

Revision 1.186 / (download) - annotate - [select for diffs], Fri Sep 7 04:26:56 2018 UTC (5 years, 8 months ago) by dtucker
Branch: MAIN
CVS Tags: OPENBSD_6_4_BASE, OPENBSD_6_4
Changes since 1.185: +3 -1 lines
Diff to previous 1.185 (colored)

Add FALLTHROUGH comments where appropriate.  Patch from jjelen at redhat
via bz#2687.

Revision 1.185 / (download) - annotate - [select for diffs], Thu Apr 26 14:47:03 2018 UTC (6 years ago) by bluhm
Branch: MAIN
Changes since 1.184: +6 -4 lines
Diff to previous 1.184 (colored)

Since the previous commit, ssh regress test sftp-chroot was failing.
The sftp program terminated with the wrong exit code as sftp called
fatal() instad of exit(0).  So when the sigchld handler waits for
the child, remember that it was found.  Then don't expect that
main() can wait again.
OK dtucker@

Revision 1.184 / (download) - annotate - [select for diffs], Fri Apr 13 05:04:12 2018 UTC (6 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.183: +20 -1 lines
Diff to previous 1.183 (colored)

notify user immediately when underlying ssh process dies;
patch from Thomas Kuthan in bz2719; ok dtucker@

Revision 1.183 / (download) - annotate - [select for diffs], Tue Apr 10 00:10:49 2018 UTC (6 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.182: +2 -2 lines
Diff to previous 1.182 (colored)

lots of typos in comments/docs. Patch from Karsten Weiss after checking
with codespell tool (https://github.com/lucasdemarchi/codespell)

Revision 1.182 / (download) - annotate - [select for diffs], Fri Nov 3 03:46:52 2017 UTC (6 years, 6 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_6_3_BASE, OPENBSD_6_3
Changes since 1.181: +21 -11 lines
Diff to previous 1.181 (colored)

allow "cd" and "lcd" commands with no explicit path argument.
lcd will change to the local user's home directory as usual.
cd will change to the starting directory for session (because the
protocol offers no way to obtain the remote user's home directory).
bz#2760 ok dtucker@

Revision 1.181 / (download) - annotate - [select for diffs], Sat Oct 21 23:06:24 2017 UTC (6 years, 6 months ago) by millert
Branch: MAIN
Changes since 1.180: +31 -27 lines
Diff to previous 1.180 (colored)

Add URI support to ssh, sftp and scp.  For example ssh://user@host
or sftp://user@host/path.  The connection parameters described in
draft-ietf-secsh-scp-sftp-ssh-uri-04 are not implemented since the
ssh fingerprint format in the draft uses md5 with no way to specify
the hash function type.  OK djm@

Revision 1.180 / (download) - annotate - [select for diffs], Sat Jun 10 06:33:34 2017 UTC (6 years, 11 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_6_2_BASE, OPENBSD_6_2
Changes since 1.179: +47 -3 lines
Diff to previous 1.179 (colored)

implement sorting for globbed ls; bz#2649 ok dtucker@

Revision 1.179 / (download) - annotate - [select for diffs], Tue May 2 08:54:19 2017 UTC (7 years ago) by djm
Branch: MAIN
Changes since 1.178: +2 -2 lines
Diff to previous 1.178 (colored)

remove -1 / -2 options; pointed out by jmc@

Revision 1.178 / (download) - annotate - [select for diffs], Wed Feb 15 01:46:47 2017 UTC (7 years, 3 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_6_1_BASE, OPENBSD_6_1
Changes since 1.177: +24 -16 lines
Diff to previous 1.177 (colored)

fix division by zero crash in "df" output when server returns zero
total filesystem blocks/inodes. Spotted by Guido Vranken; ok dtucker@

Revision 1.177 / (download) - annotate - [select for diffs], Tue Oct 18 12:41:22 2016 UTC (7 years, 6 months ago) by millert
Branch: MAIN
Changes since 1.176: +16 -1 lines
Diff to previous 1.176 (colored)

Install a signal handler for tty-generated signals and wait for the
ssh child to suspend before suspending sftp.  This lets ssh restore
the terminal mode as needed when it is suspended at the password
prompt.  OK dtucker@

Revision 1.176 / (download) - annotate - [select for diffs], Mon Sep 12 01:22:38 2016 UTC (7 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.175: +9 -10 lines
Diff to previous 1.175 (colored)

Add MAXIMUM(), MINIMUM(), and ROUNDUP() to misc.h, then use those definitions
rather than pulling <sys/param.h> and unknown namespace pollution.
ok djm markus dtucker

Revision 1.175 / (download) - annotate - [select for diffs], Fri Jul 22 03:47:36 2016 UTC (7 years, 9 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE, OPENBSD_6_0
Changes since 1.174: +15 -14 lines
Diff to previous 1.174 (colored)

constify a few functions' arguments; patch from Jakub Jelen bz#2581

Revision 1.174 / (download) - annotate - [select for diffs], Wed May 25 23:48:45 2016 UTC (7 years, 11 months ago) by schwarze
Branch: MAIN
Changes since 1.173: +26 -20 lines
Diff to previous 1.173 (colored)

To prevent screwing up terminal settings when printing to the
terminal, for ASCII and UTF-8, escape bytes not forming characters
and bytes forming non-printable characters with vis(3) VIS_OCTAL.
For other character sets, abort printing of the current string in
these cases.  In particular,
* let scp(1) respect the local user's LC_CTYPE locale(1);
* sanitize data received from the remote host;
* sanitize filenames, usernames, and similar data even locally;
* take character display widths into account for the progressmeter.

This is believed to be sufficient to keep the local terminal safe
on OpenBSD, but bad things can still happen on other systems with
state-dependent locales because many places in the code print
unencoded ASCII characters into the output stream.

Using feedback from djm@ and martijn@,
various aspects discussed with many others.

deraadt@ says it should go in now, i probably already hesitated too long

Revision 1.173 / (download) - annotate - [select for diffs], Fri Apr 8 08:19:17 2016 UTC (8 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.172: +4 -4 lines
Diff to previous 1.172 (colored)

whitespace at EOL

Revision 1.172 / (download) - annotate - [select for diffs], Mon Feb 15 09:47:49 2016 UTC (8 years, 3 months ago) by dtucker
Branch: MAIN
CVS Tags: OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.171: +2 -1 lines
Diff to previous 1.171 (colored)

Add a function to enable security-related malloc_options.  With and ok
deraadt@, something similar has been in the snaps for a while.

Revision 1.171 / (download) - annotate - [select for diffs], Thu Aug 20 22:32:42 2015 UTC (8 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.170: +3 -3 lines
Diff to previous 1.170 (colored)

Do not cast result of malloc/calloc/realloc* if stdlib.h is in scope
ok krw millert

Revision 1.170 / (download) - annotate - [select for diffs], Tue Jan 20 23:14:00 2015 UTC (9 years, 3 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8, OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.169: +4 -3 lines
Diff to previous 1.169 (colored)

Reduce use of <sys/param.h> and transition to <limits.h> throughout.
ok djm markus

Revision 1.169 / (download) - annotate - [select for diffs], Wed Jan 14 13:54:13 2015 UTC (9 years, 4 months ago) by djm
Branch: MAIN
Changes since 1.168: +3 -2 lines
Diff to previous 1.168 (colored)

update sftp client and server to new buffer API.
pretty much just mechanical changes; with & ok markus

Revision 1.168 / (download) - annotate - [select for diffs], Wed Nov 26 18:34:51 2014 UTC (9 years, 5 months ago) by millert
Branch: MAIN
Changes since 1.167: +3 -3 lines
Diff to previous 1.167 (colored)

Prefer setvbuf() to setlinebuf() for portability; ok deraadt@

Revision 1.167 / (download) - annotate - [select for diffs], Mon Oct 6 00:47:15 2014 UTC (9 years, 7 months ago) by djm
Branch: MAIN
Changes since 1.166: +6 -6 lines
Diff to previous 1.166 (colored)

correct options in usage(); from mancha1 AT zoho.com

Revision 1.166 / (download) - annotate - [select for diffs], Wed Aug 20 01:28:55 2014 UTC (9 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.165: +2 -2 lines
Diff to previous 1.165 (colored)

djm how did you make a typo like that...

Revision 1.165 / (download) - annotate - [select for diffs], Tue Aug 19 23:57:18 2014 UTC (9 years, 8 months ago) by djm
Branch: MAIN
Changes since 1.164: +4 -1 lines
Diff to previous 1.164 (colored)

~-expand lcd paths

Revision 1.164 / (download) - annotate - [select for diffs], Wed Jul 9 01:45:10 2014 UTC (9 years, 10 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6
Changes since 1.163: +16 -8 lines
Diff to previous 1.163 (colored)

more useful error message when GLOB_NOSPACE occurs;
bz#2254, patch from Orion Poplawski

Revision 1.163 / (download) - annotate - [select for diffs], Mon May 5 07:02:30 2014 UTC (10 years ago) by logan
Branch: MAIN
Changes since 1.162: +2 -2 lines
Diff to previous 1.162 (colored)

Zap extra whitespace.

OK from djm@ and dtucker@

Revision 1.162 / (download) - annotate - [select for diffs], Tue Apr 29 20:36:51 2014 UTC (10 years ago) by dtucker
Branch: MAIN
Changes since 1.161: +2 -2 lines
Diff to previous 1.161 (colored)

Don't attempt to append a nul quote char to the filename.  Should prevent
fatal'ing with "el_insertstr failed" when there's a single quote char
somewhere in the string.  bz#2238, ok markus@

Revision 1.161 / (download) - annotate - [select for diffs], Tue Apr 29 19:58:50 2014 UTC (10 years ago) by dtucker
Branch: MAIN
Changes since 1.160: +2 -2 lines
Diff to previous 1.160 (colored)

Move nulling of variable next to where it's freed.  ok markus@

Revision 1.160 / (download) - annotate - [select for diffs], Tue Apr 22 10:07:12 2014 UTC (10 years ago) by logan
Branch: MAIN
Changes since 1.159: +3 -3 lines
Diff to previous 1.159 (colored)

Sort the sftp command list.

OK from djm@

Revision 1.159 / (download) - annotate - [select for diffs], Mon Apr 21 14:36:16 2014 UTC (10 years ago) by logan
Branch: MAIN
Changes since 1.158: +23 -15 lines
Diff to previous 1.158 (colored)

Implement sftp upload resume support.

OK from djm@, with input from guenther@, mlarkin@ and
okan@

Revision 1.158 / (download) - annotate - [select for diffs], Wed Nov 20 20:54:10 2013 UTC (10 years, 5 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_5_BASE, OPENBSD_5_5
Changes since 1.157: +2 -2 lines
Diff to previous 1.157 (colored)

unsigned casts for ctype macros where neccessary
ok guenther millert markus

Revision 1.157 / (download) - annotate - [select for diffs], Thu Oct 17 07:35:48 2013 UTC (10 years, 7 months ago) by jmc
Branch: MAIN
Changes since 1.156: +2 -2 lines
Diff to previous 1.156 (colored)

tweak previous;

Revision 1.156 / (download) - annotate - [select for diffs], Thu Oct 17 00:30:13 2013 UTC (10 years, 7 months ago) by djm
Branch: MAIN
Changes since 1.155: +40 -25 lines
Diff to previous 1.155 (colored)

fsync@openssh.com protocol extension for sftp-server
client support to allow calling fsync() faster successful transfer
patch mostly by imorgan AT nas.nasa.gov; bz#1798
"fine" markus@ "grumble OK" deraadt@ "doesn't sound bad to me" millert@

Revision 1.155 / (download) - annotate - [select for diffs], Sat Aug 31 00:13:54 2013 UTC (10 years, 8 months ago) by djm
Branch: MAIN
Changes since 1.154: +3 -1 lines
Diff to previous 1.154 (colored)

make ^w match ksh behaviour (delete previous word instead of entire line)

Revision 1.154 / (download) - annotate - [select for diffs], Fri Aug 9 03:56:42 2013 UTC (10 years, 9 months ago) by djm
Branch: MAIN
Changes since 1.153: +6 -1 lines
Diff to previous 1.153 (colored)

enable ctrl-left-arrow and ctrl-right-arrow to move forward/back a word;
matching ksh's relatively recent change.

Revision 1.153 / (download) - annotate - [select for diffs], Fri Aug 9 03:37:25 2013 UTC (10 years, 9 months ago) by djm
Branch: MAIN
Changes since 1.152: +29 -1 lines
Diff to previous 1.152 (colored)

do getopt parsing for all sftp commands (with an empty optstring for
commands without arguments) to ensure consistent behaviour

Revision 1.152 / (download) - annotate - [select for diffs], Thu Aug 8 05:04:03 2013 UTC (10 years, 9 months ago) by djm
Branch: MAIN
Changes since 1.151: +32 -3 lines
Diff to previous 1.151 (colored)

add a "-l" flag for the rename command to force it to use the silly
standard SSH_FXP_RENAME command instead of the POSIX-rename- like
posix-rename@openssh.com extension.

intended for use in regress tests, so no documentation.

Revision 1.151 / (download) - annotate - [select for diffs], Thu Aug 8 04:52:04 2013 UTC (10 years, 9 months ago) by djm
Branch: MAIN
Changes since 1.150: +3 -2 lines
Diff to previous 1.150 (colored)

fix two year old regression: symlinking a file would incorrectly
canonicalise the target path. bz#2129 report from delphij AT freebsd.org

Revision 1.150 / (download) - annotate - [select for diffs], Wed Aug 7 06:24:51 2013 UTC (10 years, 9 months ago) by jmc
Branch: MAIN
Changes since 1.149: +2 -2 lines
Diff to previous 1.149 (colored)

sort -a;

Revision 1.149 / (download) - annotate - [select for diffs], Tue Aug 6 23:03:49 2013 UTC (10 years, 9 months ago) by djm
Branch: MAIN
Changes since 1.148: +54 -52 lines
Diff to previous 1.148 (colored)

fix some whitespace at EOL

make list of commands an enum rather than a long list of defines

add -a to usage()

Revision 1.148 / (download) - annotate - [select for diffs], Thu Jul 25 00:56:52 2013 UTC (10 years, 9 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE, OPENBSD_5_4
Changes since 1.147: +50 -26 lines
Diff to previous 1.147 (colored)

sftp support for resuming partial downloads; patch mostly by Loganaden
Velvindron/AfriNIC with some tweaks by me; feedback and ok dtucker@
"Just be careful" deraadt@

Revision 1.147 / (download) - annotate - [select for diffs], Fri Jul 12 00:20:00 2013 UTC (10 years, 10 months ago) by djm
Branch: MAIN
Changes since 1.146: +3 -2 lines
Diff to previous 1.146 (colored)

fix pointer-signedness warnings from clang/llvm-3.3; "seems nice" deraadt@

Revision 1.146 / (download) - annotate - [select for diffs], Tue Jun 4 20:42:36 2013 UTC (10 years, 11 months ago) by dtucker
Branch: MAIN
Changes since 1.145: +11 -5 lines
Diff to previous 1.145 (colored)

Make sftp's libedit interface marginally multibyte aware by building up the
quoted string by character instead of by byte.  Prevents failures when linked
against a libedit built with wide character support (bz#1990).  "looks ok" djm

Revision 1.145 / (download) - annotate - [select for diffs], Fri May 17 00:13:14 2013 UTC (11 years ago) by djm
Branch: MAIN
Changes since 1.144: +44 -48 lines
Diff to previous 1.144 (colored)

bye, bye xfree(); ok markus@

Revision 1.144 / (download) - annotate - [select for diffs], Thu May 16 09:08:41 2013 UTC (11 years ago) by dtucker
Branch: MAIN
Changes since 1.143: +2 -2 lines
Diff to previous 1.143 (colored)

Fix some "unused result" warnings found via clang and -portable.  ok markus@

Revision 1.143 / (download) - annotate - [select for diffs], Thu Apr 18 02:16:07 2013 UTC (11 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.142: +24 -10 lines
Diff to previous 1.142 (colored)

make "sftp -q" do what it says on the sticker: hush everything but errors;
ok dtucker@

Revision 1.142 / (download) - annotate - [select for diffs], Fri Feb 8 00:41:12 2013 UTC (11 years, 3 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_5_3_BASE, OPENBSD_5_3
Changes since 1.141: +2 -2 lines
Diff to previous 1.141 (colored)

fix NULL deref when built without libedit and control characters
entered as command; debugging and patch from Iain Morgan an
Loganaden Velvindron in bz#1956

Revision 1.141 / (download) - annotate - [select for diffs], Fri Oct 5 12:34:39 2012 UTC (11 years, 7 months ago) by markus
Branch: MAIN
Changes since 1.140: +2 -2 lines
Diff to previous 1.140 (colored)

fix signed vs unsigned warning; feedback & ok: djm@

Revision 1.140 / (download) - annotate - [select for diffs], Fri Sep 21 10:55:04 2012 UTC (11 years, 7 months ago) by dtucker
Branch: MAIN
Changes since 1.139: +15 -3 lines
Diff to previous 1.139 (colored)

Fix handling of filenames containing escaped globbing characters and escape
"#" and "*".  Patch from Jean-Marc Robert via tech@, ok djm.

Revision 1.139 / (download) - annotate - [select for diffs], Fri Sep 21 10:53:07 2012 UTC (11 years, 7 months ago) by dtucker
Branch: MAIN
Changes since 1.138: +6 -3 lines
Diff to previous 1.138 (colored)

Fix improper handling of absolute paths when PWD is part of the completed
path.  Patch from Jean-Marc Robert via tech@, ok djm.

Revision 1.138 / (download) - annotate - [select for diffs], Tue Sep 18 10:36:12 2012 UTC (11 years, 8 months ago) by dtucker
Branch: MAIN
Changes since 1.137: +5 -1 lines
Diff to previous 1.137 (colored)

Add bounds check on sftp tab-completion.  Part of a patch from from Jean-Marc
Robert via tech@, ok djm

Revision 1.137 / (download) - annotate - [select for diffs], Mon Sep 17 09:54:44 2012 UTC (11 years, 8 months ago) by djm
Branch: MAIN
Changes since 1.136: +2 -1 lines
Diff to previous 1.136 (colored)

an XXX for later

Revision 1.136 / (download) - annotate - [select for diffs], Fri Jun 22 14:36:33 2012 UTC (11 years, 10 months ago) by dtucker
Branch: MAIN
CVS Tags: OPENBSD_5_2_BASE, OPENBSD_5_2
Changes since 1.135: +2 -3 lines
Diff to previous 1.135 (colored)

Remove unused variable leftover from tab-completion changes.
From Steve.McClellan at radisys com, ok markus@

Revision 1.135 / (download) - annotate - [select for diffs], Fri Apr 20 03:24:23 2012 UTC (12 years ago) by djm
Branch: MAIN
Changes since 1.134: +3 -3 lines
Diff to previous 1.134 (colored)

setlinebuf(3) is more readable than setvbuf(.., _IOLBF, ...)

Revision 1.134 / (download) - annotate - [select for diffs], Wed Nov 16 12:24:28 2011 UTC (12 years, 6 months ago) by oga
Branch: MAIN
CVS Tags: OPENBSD_5_1_BASE, OPENBSD_5_1
Changes since 1.133: +4 -2 lines
Diff to previous 1.133 (colored)

Don't leak list in complete_cmd_parse if there are no commands found.

Discovered when I was ``borrowing'' this code for something else.

ok djm@

Revision 1.133 / (download) - annotate - [select for diffs], Thu Sep 22 06:29:03 2011 UTC (12 years, 7 months ago) by djm
Branch: MAIN
Changes since 1.132: +3 -2 lines
Diff to previous 1.132 (colored)

don't let remote_glob() implicitly sort its results in do_globbed_ls() -
in all likelihood, they will be resorted anyway

Revision 1.132 / (download) - annotate - [select for diffs], Sat Dec 4 00:18:01 2010 UTC (13 years, 5 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_5_0_BASE, OPENBSD_5_0, OPENBSD_4_9_BASE, OPENBSD_4_9
Changes since 1.131: +43 -10 lines
Diff to previous 1.131 (colored)

add a protocol extension to support a hard link operation. It is
available through the "ln" command in the client. The old "ln"
behaviour of creating a symlink is available using its "-s" option
or through the preexisting "symlink" command; based on a patch from
miklos AT szeredi.hu in bz#1555; ok markus@

Revision 1.131 / (download) - annotate - [select for diffs], Sat Oct 23 22:06:12 2010 UTC (13 years, 6 months ago) by sthen
Branch: MAIN
Changes since 1.130: +3 -2 lines
Diff to previous 1.130 (colored)

escape '[' in filename tab-completion; fix a type while there.
ok djm@

Revision 1.130 / (download) - annotate - [select for diffs], Tue Oct 5 05:13:18 2010 UTC (13 years, 7 months ago) by djm
Branch: MAIN
Changes since 1.129: +2 -2 lines
Diff to previous 1.129 (colored)

use default shell /bin/sh if $SHELL is ""; ok markus@

Revision 1.129 / (download) - annotate - [select for diffs], Sun Sep 26 22:26:33 2010 UTC (13 years, 7 months ago) by djm
Branch: MAIN
Changes since 1.128: +8 -10 lines
Diff to previous 1.128 (colored)

when performing an "ls" in columnated (short) mode, only call
ioctl(TIOCGWINSZ) once to get the window width instead of per-
filename

Revision 1.128 / (download) - annotate - [select for diffs], Sat Sep 25 09:30:16 2010 UTC (13 years, 7 months ago) by djm
Branch: MAIN
Changes since 1.127: +19 -37 lines
Diff to previous 1.127 (colored)

make use of new glob(3) GLOB_KEEPSTAT extension to save extra server
rountrips to fetch per-file stat(2) information.

Revision 1.127 / (download) - annotate - [select for diffs], Thu Sep 23 13:34:43 2010 UTC (13 years, 7 months ago) by jmc
Branch: MAIN
Changes since 1.126: +2 -2 lines
Diff to previous 1.126 (colored)

add [-l limit] to usage();

Revision 1.126 / (download) - annotate - [select for diffs], Wed Sep 22 22:58:51 2010 UTC (13 years, 7 months ago) by djm
Branch: MAIN
Changes since 1.125: +12 -3 lines
Diff to previous 1.125 (colored)

add an option per-read/write callback to atomicio

factor out bandwidth limiting code from scp(1) into a generic bandwidth
limiter that can be attached using the atomicio callback mechanism

add a bandwidth limit option to sftp(1) using the above

"very nice" markus@

Revision 1.125 / (download) - annotate - [select for diffs], Fri Jun 18 00:58:39 2010 UTC (13 years, 11 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_4_8_BASE, OPENBSD_4_8
Changes since 1.124: +2 -2 lines
Diff to previous 1.124 (colored)

unbreak ls in working directories that contains globbing characters in
their pathnames. bz#1655 reported by vgiffin AT apple.com

Revision 1.124 / (download) - annotate - [select for diffs], Wed May 5 04:22:09 2010 UTC (14 years ago) by dtucker
Branch: MAIN
Changes since 1.123: +3 -1 lines
Diff to previous 1.123 (colored)

restore mput and mget which got lost in the tab-completion changes.
found by Kenneth Whitaker, ok djm@

Revision 1.123 / (download) - annotate - [select for diffs], Wed Jan 27 19:21:39 2010 UTC (14 years, 3 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE, OPENBSD_4_7
Changes since 1.122: +2 -2 lines
Diff to previous 1.122 (colored)

add missing "p" flag to getopt optstring;
bz#1704 from imorgan AT nas.nasa.gov

Revision 1.122 / (download) - annotate - [select for diffs], Fri Jan 15 00:05:22 2010 UTC (14 years, 4 months ago) by guenther
Branch: MAIN
Changes since 1.121: +4 -2 lines
Diff to previous 1.121 (colored)

Reset SIGTERM to SIG_DFL before executing ssh, so that even if sftp
inherited SIGTERM as ignored it will still be able to kill the ssh it
starts.

ok dtucker@

Revision 1.121 / (download) - annotate - [select for diffs], Wed Jan 13 12:48:34 2010 UTC (14 years, 4 months ago) by jmc
Branch: MAIN
Changes since 1.120: +4 -4 lines
Diff to previous 1.120 (colored)

sftp.1: put ls -h in the right place
sftp.c: as above, plus add -p to get/put, and shorten their arg names
to keep the help usage nicely aligned

ok djm

Revision 1.120 / (download) - annotate - [select for diffs], Wed Jan 13 04:10:50 2010 UTC (14 years, 4 months ago) by djm
Branch: MAIN
Changes since 1.119: +3 -6 lines
Diff to previous 1.119 (colored)

don't append a space after inserting a completion of a directory (i.e.
a path ending in '/') for a slightly better user experience; ok dtucker@

Revision 1.119 / (download) - annotate - [select for diffs], Wed Jan 13 01:40:16 2010 UTC (14 years, 4 months ago) by djm
Branch: MAIN
Changes since 1.118: +21 -16 lines
Diff to previous 1.118 (colored)

support '-h' (human-readable units) for sftp's ls command, just like
ls(1); ok dtucker@

Revision 1.118 / (download) - annotate - [select for diffs], Sat Jan 9 11:13:02 2010 UTC (14 years, 4 months ago) by dtucker
Branch: MAIN
Changes since 1.117: +6 -5 lines
Diff to previous 1.117 (colored)

Prevent sftp from derefing a null pointer when given a "-" without a command.
Also, allow whitespace to follow a "-".  bz#1691, path from Colin Watson via
Debian.  ok djm@ deraadt@

Revision 1.117 / (download) - annotate - [select for diffs], Fri Jan 8 21:50:49 2010 UTC (14 years, 4 months ago) by dtucker
Branch: MAIN
Changes since 1.116: +3 -3 lines
Diff to previous 1.116 (colored)

Fix two warnings: possibly used unitialized and use a nul byte instead of
NULL pointer.  ok djm@

Revision 1.116 / (download) - annotate - [select for diffs], Mon Jan 4 02:03:57 2010 UTC (14 years, 4 months ago) by djm
Branch: MAIN
Changes since 1.115: +434 -50 lines
Diff to previous 1.115 (colored)

Implement tab-completion of commands, local and remote filenames for sftp.
Hacked on and off for some time by myself, mouring, Carlos Silva (via 2009
Google Summer of Code) and polished to a fine sheen by myself again.
It should deal more-or-less correctly with the ikky corner-cases presented
by quoted filenames, but the UI could still be slightly improved.
In particular, it is quite slow for remote completion on large directories.
bz#200; ok markus@

Revision 1.115 / (download) - annotate - [select for diffs], Sun Dec 20 07:28:36 2009 UTC (14 years, 4 months ago) by guenther
Branch: MAIN
Changes since 1.114: +4 -2 lines
Diff to previous 1.114 (colored)

When passing user-controlled options with arguments to other programs,
pass the option and option argument as separate argv entries and
not smashed into one (e.g., as -l foo and not -lfoo).  Also, always
pass a "--" argument to stop option parsing, so that a positional
argument that starts with a '-' isn't treated as an option.  This
fixes some error cases as well as the handling of hostnames and
filenames that start with a '-'.

Based on a diff by halex@
ok halex@ djm@ deraadt@

Revision 1.114 / (download) - annotate - [select for diffs], Sun Dec 6 23:53:54 2009 UTC (14 years, 5 months ago) by dtucker
Branch: MAIN
Changes since 1.113: +4 -4 lines
Diff to previous 1.113 (colored)

fix potential divide-by-zero in sftp's "df" output when talking to a server
that reports zero files on the filesystem (Unix filesystems always have at
least the root inode).  From Steve McClellan at radisys, ok djm@

Revision 1.113 / (download) - annotate - [select for diffs], Sun Nov 22 13:18:00 2009 UTC (14 years, 5 months ago) by halex
Branch: MAIN
Changes since 1.112: +3 -2 lines
Diff to previous 1.112 (colored)

make passing of zero-length arguments to ssh safe by
passing "-<switch>" "<value>" rather than "-<switch><value>"

ok dtucker@, guenther@, djm@

Revision 1.112 / (download) - annotate - [select for diffs], Fri Nov 20 00:54:01 2009 UTC (14 years, 5 months ago) by djm
Branch: MAIN
Changes since 1.111: +21 -19 lines
Diff to previous 1.111 (colored)

bz#1588 change "Connecting to host..." message to "Connected to host."
and delay it until after the sftp protocol connection has been established.
Avoids confusing sequence of messages when the underlying ssh connection
experiences problems. ok dtucker@

Revision 1.111 / (download) - annotate - [select for diffs], Tue Aug 18 18:36:21 2009 UTC (14 years, 9 months ago) by djm
Branch: MAIN
Changes since 1.110: +111 -106 lines
Diff to previous 1.110 (colored)

recursive transfer support for get/put and on the commandline
work mostly by carlosvsilvapt@gmail.com for the Google Summer of Code
with some tweaks by me; "go for it" deraadt@

Revision 1.110 / (download) - annotate - [select for diffs], Thu Aug 13 13:39:54 2009 UTC (14 years, 9 months ago) by jmc
Branch: MAIN
Changes since 1.109: +5 -3 lines
Diff to previous 1.109 (colored)

sync synopsis and usage();

Revision 1.109 / (download) - annotate - [select for diffs], Thu Aug 13 01:11:19 2009 UTC (14 years, 9 months ago) by djm
Branch: MAIN
Changes since 1.108: +7 -3 lines
Diff to previous 1.108 (colored)

Swizzle options: "-P sftp_server_path" moves to "-D sftp_server_path",
add "-P port" to match scp(1). Fortunately, the -P option is only really
used by our regression scripts.

part of larger patch from carlosvsilvapt@gmail.com for his Google Summer
of Code work; ok deraadt markus

Revision 1.108 / (download) - annotate - [select for diffs], Wed Aug 12 00:13:00 2009 UTC (14 years, 9 months ago) by djm
Branch: MAIN
Changes since 1.107: +36 -21 lines
Diff to previous 1.107 (colored)

support most of scp(1)'s commandline arguments in sftp(1), as a first
step towards making sftp(1) a drop-in replacement for scp(1).
One conflicting option (-P) has not been changed, pending further
discussion.

Patch from carlosvsilvapt@gmail.com as part of his work in the
Google Summer of Code

Revision 1.107 / (download) - annotate - [select for diffs], Mon Feb 2 11:15:14 2009 UTC (15 years, 3 months ago) by dtucker
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE, OPENBSD_4_6, OPENBSD_4_5_BASE, OPENBSD_4_5
Changes since 1.106: +3 -3 lines
Diff to previous 1.106 (colored)

Initialize a few variables to prevent spurious "may be used uninitialized"
warnings from newer gcc's.  ok djm@

Revision 1.106 / (download) - annotate - [select for diffs], Tue Dec 9 15:35:00 2008 UTC (15 years, 5 months ago) by sobrado
Branch: MAIN
Changes since 1.105: +32 -31 lines
Diff to previous 1.105 (colored)

update for the synopses displayed by the 'help' command, there are a
few missing flags; add 'bye' to the output of 'help'; sorting and spacing.

jmc@ suggested replacing .Oo/.Oc with a single .Op macro.

ok jmc@

Revision 1.105 / (download) - annotate - [select for diffs], Tue Dec 9 03:04:39 2008 UTC (15 years, 5 months ago) by djm
Branch: MAIN
Changes since 1.104: +3 -3 lines
Diff to previous 1.104 (colored)

correct sftp(1) and corresponding usage syntax;
bz#1518 patch from imorgan AT nas.nasa.gov; ok deraadt@ improved diff jmc@

Revision 1.104 / (download) - annotate - [select for diffs], Tue Dec 9 02:39:59 2008 UTC (15 years, 5 months ago) by djm
Branch: MAIN
Changes since 1.103: +7 -5 lines
Diff to previous 1.103 (colored)

Deal correctly with failures in remote stat() operation in sftp,
correcting fail-on-error behaviour in batchmode. bz#1541 report and
fix from anedvedicky AT gmail.com; ok markus@

Revision 1.103 / (download) - annotate - [select for diffs], Sun Jul 13 22:16:03 2008 UTC (15 years, 10 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_4_4_BASE, OPENBSD_4_4
Changes since 1.102: +2 -2 lines
Diff to previous 1.102 (colored)

increase number of piplelined requests so they properly fill the
(recently increased) channel window. prompted by rapier AT psc.edu;
ok markus@

Revision 1.102 / (download) - annotate - [select for diffs], Sat Jun 21 07:46:46 2008 UTC (15 years, 10 months ago) by martynas
Branch: MAIN
Changes since 1.101: +7 -7 lines
Diff to previous 1.101 (colored)

use optopt to get invalid flag, instead of return value of getopt,
which is always '?';  ok djm@

Revision 1.101 / (download) - annotate - [select for diffs], Sun Jun 8 20:15:29 2008 UTC (15 years, 11 months ago) by dtucker
Branch: MAIN
Changes since 1.100: +2 -2 lines
Diff to previous 1.100 (colored)

Have the sftp client store the statvfs replies in wire format,
which prevents problems when the server's native sizes exceed the
client's.

Also extends the sizes of the remaining 32bit wire format to 64bit,
they're specified as unsigned long in the standard.

Revision 1.100 / (download) - annotate - [select for diffs], Fri Apr 18 12:32:11 2008 UTC (16 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.99: +107 -5 lines
Diff to previous 1.99 (colored)

introduce sftp extension methods statvfs@openssh.com and
fstatvfs@openssh.com that implement statvfs(2)-like operations,
based on a patch from miklos AT szeredi.hu (bz#1399)

also add a "df" command to the sftp client that uses the
statvfs@openssh.com to produce a df(1)-like display of filesystem
space and inode utilisation

ok markus@

Revision 1.99 / (download) - annotate - [select for diffs], Sun Jan 20 00:38:30 2008 UTC (16 years, 4 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_4_3_BASE, OPENBSD_4_3
Changes since 1.98: +10 -14 lines
Diff to previous 1.98 (colored)

When uploading, correctly handle the case of an unquoted filename with
glob metacharacters that match a file exactly but not as a glob, e.g. a
file called "[abcd]". report and test cases from duncan2nd AT gmx.de

Revision 1.98 / (download) - annotate - [select for diffs], Wed Dec 12 05:04:03 2007 UTC (16 years, 5 months ago) by djm
Branch: MAIN
Changes since 1.97: +3 -1 lines
Diff to previous 1.97 (colored)

unbreak lls command and add a regress test that would have caught the
breakage; spotted by mouring@

Revision 1.97 / (download) - annotate - [select for diffs], Wed Oct 24 03:30:02 2007 UTC (16 years, 6 months ago) by djm
Branch: MAIN
Changes since 1.96: +277 -172 lines
Diff to previous 1.96 (colored)

rework argument splitting and parsing to cope correctly with common shell
escapes and make handling of escaped characters consistent with sh(1) and
between sftp commands (especially between ones that glob their arguments
and ones that don't).
parse command flags using getopt(3) rather than hand-rolled parsers.
ok dtucker@

Revision 1.96 / (download) - annotate - [select for diffs], Wed Jan 3 04:09:15 2007 UTC (17 years, 4 months ago) by stevesk
Branch: MAIN
CVS Tags: OPENBSD_4_2_BASE, OPENBSD_4_2, OPENBSD_4_1_BASE, OPENBSD_4_1
Changes since 1.95: +3 -1 lines
Diff to previous 1.95 (colored)

ARGSUSED for lint

Revision 1.95 / (download) - annotate - [select for diffs], Wed Jan 3 03:01:40 2007 UTC (17 years, 4 months ago) by stevesk
Branch: MAIN
Changes since 1.94: +2 -2 lines
Diff to previous 1.94 (colored)

spaces

Revision 1.94 / (download) - annotate - [select for diffs], Thu Nov 23 01:35:11 2006 UTC (17 years, 5 months ago) by ray
Branch: MAIN
Changes since 1.93: +3 -3 lines
Diff to previous 1.93 (colored)

Don't access buf[strlen(buf) - 1] for zero-length strings.

``ok by me'' djm@.

Revision 1.66.2.3 / (download) - annotate - [select for diffs], Wed Nov 8 00:44:05 2006 UTC (17 years, 6 months ago) by brad
Branch: OPENBSD_3_8
Changes since 1.66.2.2: +4 -3 lines
Diff to previous 1.66.2.2 (colored) to branchpoint 1.66 (colored) next main 1.67 (colored)

upgrade to OpenSSH 4.5

Revision 1.91.4.1 / (download) - annotate - [select for diffs], Wed Nov 8 00:42:10 2006 UTC (17 years, 6 months ago) by brad
Branch: OPENBSD_4_0
Changes since 1.91: +4 -3 lines
Diff to previous 1.91 (colored) next main 1.92 (colored)

upgrade to OpenSSH 4.5

Revision 1.75.2.2 / (download) - annotate - [select for diffs], Wed Nov 8 00:17:14 2006 UTC (17 years, 6 months ago) by brad
Branch: OPENBSD_3_9
Changes since 1.75.2.1: +4 -3 lines
Diff to previous 1.75.2.1 (colored) to branchpoint 1.75 (colored) next main 1.76 (colored)

upgrade to OpenSSH 4.5

Revision 1.66.2.2 / (download) - annotate - [select for diffs], Fri Oct 6 03:19:33 2006 UTC (17 years, 7 months ago) by brad
Branch: OPENBSD_3_8
Changes since 1.66.2.1: +22 -19 lines
Diff to previous 1.66.2.1 (colored) to branchpoint 1.66 (colored)

upgrade to OpenSSH 4.4

Revision 1.93 / (download) - annotate - [select for diffs], Sat Sep 30 17:48:22 2006 UTC (17 years, 7 months ago) by ray
Branch: MAIN
Changes since 1.92: +2 -1 lines
Diff to previous 1.92 (colored)

Clear errno before calling the strtol functions.

From Paul Stoeber <x0001 at x dot de1 dot cc>.

OK deraadt@.

Revision 1.75.2.1 / (download) - annotate - [select for diffs], Sat Sep 30 04:06:51 2006 UTC (17 years, 7 months ago) by brad
Branch: OPENBSD_3_9
Changes since 1.75: +17 -20 lines
Diff to previous 1.75 (colored)

upgrade to OpenSSH 4.4

Revision 1.92 / (download) - annotate - [select for diffs], Tue Sep 19 05:52:23 2006 UTC (17 years, 8 months ago) by otto
Branch: MAIN
Changes since 1.91: +3 -3 lines
Diff to previous 1.91 (colored)

Use S_IS* macros insted of masking with S_IF* flags. The latter may
have multiple bits set, which lead to surprising results. Spotted by
Paul Stoeber, more to come. ok millert@ pedro@ jaredy@ djm@

Revision 1.91 / (download) - annotate - [select for diffs], Thu Aug 3 03:34:42 2006 UTC (17 years, 9 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_4_0_BASE
Branch point for: OPENBSD_4_0
Changes since 1.90: +4 -4 lines
Diff to previous 1.90 (colored)

almost entirely get rid of the culture of ".h files that include .h files"
ok djm, sort of ok stevesk
makes the pain stop in one easy step

Revision 1.90 / (download) - annotate - [select for diffs], Tue Aug 1 23:22:47 2006 UTC (17 years, 9 months ago) by stevesk
Branch: MAIN
Changes since 1.89: +2 -1 lines
Diff to previous 1.89 (colored)

move #include <stdio.h> out of includes.h

Revision 1.89 / (download) - annotate - [select for diffs], Wed Jul 26 13:57:17 2006 UTC (17 years, 9 months ago) by stevesk
Branch: MAIN
Changes since 1.88: +2 -1 lines
Diff to previous 1.88 (colored)

move #include <stdlib.h> out of includes.h

Revision 1.88 / (download) - annotate - [select for diffs], Wed Jul 26 02:35:17 2006 UTC (17 years, 9 months ago) by stevesk
Branch: MAIN
Changes since 1.87: +2 -1 lines
Diff to previous 1.87 (colored)

move #include <sys/param.h> out of includes.h

Revision 1.87 / (download) - annotate - [select for diffs], Sat Jul 22 20:48:23 2006 UTC (17 years, 9 months ago) by stevesk
Branch: MAIN
Changes since 1.86: +2 -1 lines
Diff to previous 1.86 (colored)

move #include <string.h> out of includes.h

Revision 1.86 / (download) - annotate - [select for diffs], Mon Jul 17 01:31:09 2006 UTC (17 years, 10 months ago) by stevesk
Branch: MAIN
Changes since 1.85: +2 -1 lines
Diff to previous 1.85 (colored)

move #include <unistd.h> out of includes.h

Revision 1.85 / (download) - annotate - [select for diffs], Tue Jul 11 20:07:25 2006 UTC (17 years, 10 months ago) by stevesk
Branch: MAIN
Changes since 1.84: +2 -1 lines
Diff to previous 1.84 (colored)

move #include <errno.h> out of includes.h; ok markus@

Revision 1.84 / (download) - annotate - [select for diffs], Mon Jul 10 16:01:57 2006 UTC (17 years, 10 months ago) by stevesk
Branch: MAIN
Changes since 1.83: +1 -2 lines
Diff to previous 1.83 (colored)

buffer.h only needed in sftp-common.h and remove some unneeded
user includes; ok djm@

Revision 1.83 / (download) - annotate - [select for diffs], Sat Jul 8 21:47:12 2006 UTC (17 years, 10 months ago) by stevesk
Branch: MAIN
Changes since 1.82: +2 -1 lines
Diff to previous 1.82 (colored)

move #include <sys/socket.h> out of includes.h

Revision 1.82 / (download) - annotate - [select for diffs], Wed May 17 12:43:34 2006 UTC (18 years ago) by markus
Branch: MAIN
Changes since 1.81: +2 -3 lines
Diff to previous 1.81 (colored)

fix leak; coverity via Kylene Jo Hall

Revision 1.81 / (download) - annotate - [select for diffs], Thu Apr 20 21:53:44 2006 UTC (18 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.80: +1 -12 lines
Diff to previous 1.80 (colored)

Switch from using pipes to socketpairs for communication between
sftp/scp and ssh, and between sshd and its subprocesses. This saves
a file descriptor per session and apparently makes userland ppp over
ssh work; ok markus@ deraadt@

Revision 1.80 / (download) - annotate - [select for diffs], Mon Mar 27 23:15:46 2006 UTC (18 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.79: +2 -2 lines
Diff to previous 1.79 (colored)

always use a format string for addargs; spotted by mouring@

Revision 1.79 / (download) - annotate - [select for diffs], Sat Mar 25 13:17:02 2006 UTC (18 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.78: +1 -0 lines
Diff to previous 1.78 (colored)

Put $OpenBSD$ tags back (as comments) to replace the RCSID()s that
Theo nuked - our scripts to sync -portable need them in the files

Revision 1.78 / (download) - annotate - [select for diffs], Sat Mar 25 01:30:23 2006 UTC (18 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.77: +1 -1 lines
Diff to previous 1.77 (colored)

"abormally" is a perfectly cromulent word, but "abnormally" is better

Revision 1.77 / (download) - annotate - [select for diffs], Sun Mar 19 18:51:18 2006 UTC (18 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.76: +0 -1 lines
Diff to previous 1.76 (colored)

RCSID() can die

Revision 1.76 / (download) - annotate - [select for diffs], Sun Mar 19 02:22:56 2006 UTC (18 years, 2 months ago) by djm
Branch: MAIN
Changes since 1.75: +4 -1 lines
Diff to previous 1.75 (colored)

more memory leaks detected by Coverity via elad AT netbsd.org;
deraadt@ ok

Revision 1.75 / (download) - annotate - [select for diffs], Mon Feb 20 17:19:54 2006 UTC (18 years, 2 months ago) by stevesk
Branch: MAIN
CVS Tags: OPENBSD_3_9_BASE
Branch point for: OPENBSD_3_9
Changes since 1.74: +2 -1 lines
Diff to previous 1.74 (colored)

move #include <sys/stat.h> out of includes.h; ok markus@

Revision 1.74 / (download) - annotate - [select for diffs], Mon Feb 20 17:02:44 2006 UTC (18 years, 2 months ago) by stevesk
Branch: MAIN
Changes since 1.73: +2 -1 lines
Diff to previous 1.73 (colored)

move #include <signal.h> out of includes.h; ok markus@

Revision 1.73 / (download) - annotate - [select for diffs], Fri Feb 10 01:44:27 2006 UTC (18 years, 3 months ago) by stevesk
Branch: MAIN
Changes since 1.72: +3 -1 lines
Diff to previous 1.72 (colored)

move #include <sys/wait.h> out of includes.h; ok markus@

Revision 1.72 / (download) - annotate - [select for diffs], Fri Feb 10 00:27:13 2006 UTC (18 years, 3 months ago) by stevesk
Branch: MAIN
Changes since 1.71: +2 -1 lines
Diff to previous 1.71 (colored)

move #include <sys/ioctl.h> out of includes.h; ok markus@

Revision 1.71 / (download) - annotate - [select for diffs], Wed Feb 8 12:15:27 2006 UTC (18 years, 3 months ago) by stevesk
Branch: MAIN
Changes since 1.70: +2 -1 lines
Diff to previous 1.70 (colored)

move #include <paths.h> out of includes.h; ok markus@

Revision 1.66.2.1 / (download) - annotate - [select for diffs], Fri Feb 3 03:01:57 2006 UTC (18 years, 3 months ago) by brad
Branch: OPENBSD_3_8
Changes since 1.66: +11 -3 lines
Diff to previous 1.66 (colored)

upgrade to OpenSSH 4.3

Revision 1.63.2.2 / (download) - annotate - [select for diffs], Fri Feb 3 02:53:45 2006 UTC (18 years, 3 months ago) by brad
Branch: OPENBSD_3_7
Changes since 1.63.2.1: +11 -3 lines
Diff to previous 1.63.2.1 (colored) to branchpoint 1.63 (colored) next main 1.64 (colored)

upgrade to OpenSSH 4.3

Revision 1.70 / (download) - annotate - [select for diffs], Tue Jan 31 10:19:02 2006 UTC (18 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.69: +5 -3 lines
Diff to previous 1.69 (colored)

fix local arbitrary command execution vulnerability on local/local and
remote/remote copies (CVE-2006-0225, bz #1094), patch by
t8m AT centrum.cz, polished by dtucker@ and myself; ok markus@

Revision 1.69 / (download) - annotate - [select for diffs], Tue Dec 6 22:38:27 2005 UTC (18 years, 5 months ago) by reyk
Branch: MAIN
Changes since 1.68: +2 -1 lines
Diff to previous 1.68 (colored)

Add support for tun(4) forwarding over OpenSSH, based on an idea and
initial channel code bits by markus@. This is a simple and easy way to
use OpenSSH for ad hoc virtual private network connections, e.g.
administrative tunnels or secure wireless access. It's based on a new
ssh channel and works similar to the existing TCP forwarding support,
except that it depends on the tun(4) network interface on both ends of
the connection for layer 2 or layer 3 tunneling. This diff also adds
support for LocalCommand in the ssh(1) client.

ok djm@, markus@, jmc@ (manpages), tested and discussed with others

Revision 1.68 / (download) - annotate - [select for diffs], Mon Oct 31 06:15:04 2005 UTC (18 years, 6 months ago) by dtucker
Branch: MAIN
Changes since 1.67: +3 -1 lines
Diff to previous 1.67 (colored)

Fix sorting with "ls -1" command. From Robert Tsai, "looks right" deraadt@

Revision 1.67 / (download) - annotate - [select for diffs], Tue Sep 13 23:40:07 2005 UTC (18 years, 8 months ago) by djm
Branch: MAIN
Changes since 1.66: +4 -1 lines
Diff to previous 1.66 (colored)

ensure that stdio fds are attached; ok deraadt@

Revision 1.63.2.1 / (download) - annotate - [select for diffs], Sun Sep 4 18:40:06 2005 UTC (18 years, 8 months ago) by brad
Branch: OPENBSD_3_7
Changes since 1.63: +26 -13 lines
Diff to previous 1.63 (colored)

upgrade to OpenSSH 4.2

Revision 1.56.2.3 / (download) - annotate - [select for diffs], Fri Sep 2 03:45:00 2005 UTC (18 years, 8 months ago) by brad
Branch: OPENBSD_3_6
Changes since 1.56.2.2: +26 -13 lines
Diff to previous 1.56.2.2 (colored) to branchpoint 1.56 (colored) next main 1.57 (colored)

upgrade to OpenSSH 4.2

Revision 1.66 / (download) - annotate - [select for diffs], Mon Aug 8 13:22:48 2005 UTC (18 years, 9 months ago) by jaredy
Branch: MAIN
CVS Tags: OPENBSD_3_8_BASE
Branch point for: OPENBSD_3_8
Changes since 1.65: +19 -7 lines
Diff to previous 1.65 (colored)

sftp prompt enhancements:
- in non-interactive mode, do not print an empty prompt at the end
  before finishing
- print newline after EOF in editline mode
- call el_end() in editline mode

ok dtucker djm

Revision 1.65 / (download) - annotate - [select for diffs], Sun Jul 17 07:17:55 2005 UTC (18 years, 10 months ago) by djm
Branch: MAIN
Changes since 1.64: +2 -2 lines
Diff to previous 1.64 (colored)

knf says that a 2nd level indent is four (not three or five) spaces

Revision 1.64 / (download) - annotate - [select for diffs], Fri Jun 17 02:44:33 2005 UTC (18 years, 11 months ago) by djm
Branch: MAIN
Changes since 1.63: +7 -6 lines
Diff to previous 1.63 (colored)

make this -Wsign-compare clean; ok avsm@ markus@

Revision 1.56.2.2 / (download) - annotate - [select for diffs], Sun Jun 5 02:22:39 2005 UTC (18 years, 11 months ago) by brad
Branch: OPENBSD_3_6
Changes since 1.56.2.1: +2 -2 lines
Diff to previous 1.56.2.1 (colored) to branchpoint 1.56 (colored)

upgrade to OpenSSH 4.1

Revision 1.63 / (download) - annotate - [select for diffs], Thu Mar 10 22:01:05 2005 UTC (19 years, 2 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_7_BASE
Branch point for: OPENBSD_3_7
Changes since 1.62: +2 -2 lines
Diff to previous 1.62 (colored)

spacing

Revision 1.45.2.2 / (download) - annotate - [select for diffs], Thu Mar 10 17:15:04 2005 UTC (19 years, 2 months ago) by brad
Branch: OPENBSD_3_5
Changes since 1.45.2.1: +71 -23 lines
Diff to previous 1.45.2.1 (colored) to branchpoint 1.45 (colored) next main 1.46 (colored)

upgrade to OpenSSH 4.0

Revision 1.56.2.1 / (download) - annotate - [select for diffs], Thu Mar 10 16:28:28 2005 UTC (19 years, 2 months ago) by brad
Branch: OPENBSD_3_6
Changes since 1.56: +71 -23 lines
Diff to previous 1.56 (colored)

upgrade to OpenSSH 4.0

Revision 1.62 / (download) - annotate - [select for diffs], Sun Feb 20 22:59:06 2005 UTC (19 years, 2 months ago) by djm
Branch: MAIN
Changes since 1.61: +2 -1 lines
Diff to previous 1.61 (colored)

turn on ssh batch mode when in sftp batch mode, patch from jdmossh AT nand.net;
ok markus@

Revision 1.61 / (download) - annotate - [select for diffs], Mon Jan 24 10:22:06 2005 UTC (19 years, 3 months ago) by dtucker
Branch: MAIN
Changes since 1.60: +4 -2 lines
Diff to previous 1.60 (colored)

Have scp and sftp wait for the spawned ssh to exit before they exit
themselves.  This prevents ssh from being unable to restore terminal
modes (not normally a problem on OpenBSD but common with -Portable
on POSIX platforms).  From peak at argo.troja.mff.cuni.cz (bz#950);
ok djm@ markus@

Revision 1.60 / (download) - annotate - [select for diffs], Fri Dec 10 03:10:42 2004 UTC (19 years, 5 months ago) by fgsch
Branch: MAIN
Changes since 1.59: +16 -11 lines
Diff to previous 1.59 (colored)

- fix globbed ls for paths the same lenght as the globbed path when
  we have a unique matching.
- fix globbed ls in case of a directory when we have a unique matching.
- as a side effect, if the path does not exist error (used to silently ignore).
- don't do extra do_lstat() if we only have one matching file.

djm@ ok

Revision 1.59 / (download) - annotate - [select for diffs], Mon Nov 29 07:41:24 2004 UTC (19 years, 5 months ago) by djm
Branch: MAIN
Changes since 1.58: +4 -2 lines
Diff to previous 1.58 (colored)

Some small fixes from moritz@jodeit.org. ok deraadt@

Revision 1.58 / (download) - annotate - [select for diffs], Thu Nov 25 22:22:14 2004 UTC (19 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.57: +5 -2 lines
Diff to previous 1.57 (colored)

leak; from mpech

Revision 1.57 / (download) - annotate - [select for diffs], Fri Nov 5 12:19:56 2004 UTC (19 years, 6 months ago) by djm
Branch: MAIN
Changes since 1.56: +45 -10 lines
Diff to previous 1.56 (colored)

command editing and history support via libedit; ok markus@
thanks to hshoexer@ and many testers on tech@ too

Revision 1.37.2.2 / (download) - annotate - [select for diffs], Thu Aug 19 22:37:32 2004 UTC (19 years, 9 months ago) by brad
Branch: OPENBSD_3_4
Changes since 1.37.2.1: +141 -50 lines
Diff to previous 1.37.2.1 (colored) to branchpoint 1.37 (colored) next main 1.38 (colored)

upgrade to OpenSSH 3.9

Revision 1.45.2.1 / (download) - annotate - [select for diffs], Thu Aug 19 04:13:27 2004 UTC (19 years, 9 months ago) by brad
Branch: OPENBSD_3_5
Changes since 1.45: +137 -49 lines
Diff to previous 1.45 (colored)

upgrade to OpenSSH 3.9

Revision 1.56 / (download) - annotate - [select for diffs], Sun Jul 11 17:48:47 2004 UTC (19 years, 10 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_6_BASE
Branch point for: OPENBSD_3_6
Changes since 1.55: +4 -4 lines
Diff to previous 1.55 (colored)

spaces

Revision 1.55 / (download) - annotate - [select for diffs], Fri Jun 25 23:21:38 2004 UTC (19 years, 10 months ago) by djm
Branch: MAIN
Changes since 1.54: +2 -2 lines
Diff to previous 1.54 (colored)

bz #875: fix bad escape char error message; reported by f_mohr AT yahoo.de

Revision 1.54 / (download) - annotate - [select for diffs], Tue Jun 22 01:16:39 2004 UTC (19 years, 10 months ago) by djm
Branch: MAIN
Changes since 1.53: +12 -3 lines
Diff to previous 1.53 (colored)

don't show .files by default in ls, add -a option to turn them back on;
ok markus

Revision 1.53 / (download) - annotate - [select for diffs], Mon Jun 21 22:30:45 2004 UTC (19 years, 10 months ago) by djm
Branch: MAIN
Changes since 1.52: +29 -29 lines
Diff to previous 1.52 (colored)

prefix ls option flags with LS_

Revision 1.52 / (download) - annotate - [select for diffs], Mon Jun 21 22:04:50 2004 UTC (19 years, 10 months ago) by djm
Branch: MAIN
Changes since 1.51: +45 -7 lines
Diff to previous 1.51 (colored)

introduce sorting for ls, same options as /bin/ls; ok markus@

Revision 1.51 / (download) - annotate - [select for diffs], Mon Jun 21 17:36:31 2004 UTC (19 years, 10 months ago) by avsm
Branch: MAIN
Changes since 1.50: +4 -4 lines
Diff to previous 1.50 (colored)

make ssh -Wshadow clean, no functional changes
markus@ ok

Revision 1.50 / (download) - annotate - [select for diffs], Sun Jun 20 18:53:39 2004 UTC (19 years, 11 months ago) by djm
Branch: MAIN
Changes since 1.49: +25 -14 lines
Diff to previous 1.49 (colored)

make "ls -l" listings print user/group names, add "ls -n" to show uid/gid
(like /bin/ls); idea & ok markus@

Revision 1.49 / (download) - annotate - [select for diffs], Fri Jun 18 06:13:25 2004 UTC (19 years, 11 months ago) by dtucker
Branch: MAIN
Changes since 1.48: +2 -2 lines
Diff to previous 1.48 (colored)

Use execvp instead of execv so sftp -S ssh works.  "makes sense" markus@

Revision 1.48 / (download) - annotate - [select for diffs], Thu Jun 3 12:22:20 2004 UTC (19 years, 11 months ago) by pedro
Branch: MAIN
Changes since 1.47: +2 -2 lines
Diff to previous 1.47 (colored)

initialize pointers, ok markus@

Revision 1.47 / (download) - annotate - [select for diffs], Wed May 26 08:59:57 2004 UTC (19 years, 11 months ago) by djm
Branch: MAIN
Changes since 1.46: +3 -3 lines
Diff to previous 1.46 (colored)

exit -> _exit in forked child on error; from andrushock AT korovino.net

Revision 1.46 / (download) - annotate - [select for diffs], Wed May 19 12:17:33 2004 UTC (20 years ago) by djm
Branch: MAIN
Changes since 1.45: +47 -17 lines
Diff to previous 1.45 (colored)

gracefully abort transfers on receipt of SIGINT, also ignore SIGINT while
waiting for a command; ok markus@

Revision 1.34.2.2 / (download) - annotate - [select for diffs], Thu Mar 4 18:18:16 2004 UTC (20 years, 2 months ago) by brad
Branch: OPENBSD_3_3
Changes since 1.34.2.1: +1200 -41 lines
Diff to previous 1.34.2.1 (colored) to branchpoint 1.34 (colored) next main 1.35 (colored)

upgrade to OpenSSH 3.8upgrade to OpenSSH 3.8upgrade to OpenSSH 3.8

Revision 1.45 / (download) - annotate - [select for diffs], Wed Mar 3 09:31:20 2004 UTC (20 years, 2 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_3_5_BASE
Branch point for: OPENBSD_3_5
Changes since 1.44: +5 -2 lines
Diff to previous 1.44 (colored)

Fix initialisation of progress meter; ok markus@

Revision 1.37.2.1 / (download) - annotate - [select for diffs], Sat Feb 28 03:51:34 2004 UTC (20 years, 2 months ago) by brad
Branch: OPENBSD_3_4
Changes since 1.37: +1200 -41 lines
Diff to previous 1.37 (colored)

upgrade to OpenSSH 3.8

Revision 1.44 / (download) - annotate - [select for diffs], Tue Feb 17 11:03:08 2004 UTC (20 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.43: +1162 -4 lines
Diff to previous 1.43 (colored)

sftp.c and sftp-int.c, together at last; ok markus@

Revision 1.43 / (download) - annotate - [select for diffs], Tue Feb 17 07:17:29 2004 UTC (20 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.42: +3 -2 lines
Diff to previous 1.42 (colored)

Remove useless headers; ok deraadt@

Revision 1.42 / (download) - annotate - [select for diffs], Tue Feb 17 05:39:51 2004 UTC (20 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.41: +12 -20 lines
Diff to previous 1.41 (colored)

switch to license.template for code written by me (belated, I know...)

Revision 1.41 / (download) - annotate - [select for diffs], Tue Jan 27 10:08:10 2004 UTC (20 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.40: +6 -6 lines
Diff to previous 1.40 (colored)

reorder parsing so user:skey@host:file works (bugzilla #777)
patch from admorten AT umich.edu; ok markus@

Revision 1.40 / (download) - annotate - [select for diffs], Wed Jan 21 03:07:59 2004 UTC (20 years, 4 months ago) by djm
Branch: MAIN
Changes since 1.39: +4 -2 lines
Diff to previous 1.39 (colored)

initialise infile in main, rather than statically - from portable

Revision 1.39 / (download) - annotate - [select for diffs], Tue Jan 13 09:25:05 2004 UTC (20 years, 4 months ago) by djm
Branch: MAIN
Changes since 1.38: +16 -12 lines
Diff to previous 1.38 (colored)

Tidy sftp batchmode handling, eliminate junk to stderr (bugzilla #754) and
enable use of "-b -" to accept batchfile from stdin; ok markus@

Revision 1.38 / (download) - annotate - [select for diffs], Wed Oct 8 08:27:36 2003 UTC (20 years, 7 months ago) by jmc
Branch: MAIN
Changes since 1.37: +7 -5 lines
Diff to previous 1.37 (colored)

scp and sftp: add options list and sort options. options list requested
by deraadt@
sshd: use same format as ssh
ssh: remove wrong option from list
sftp-server: Subsystem is documented in ssh_config(5), not sshd(8)

ok deraadt@ markus@

Revision 1.31.2.2 / (download) - annotate - [select for diffs], Tue Sep 16 21:20:27 2003 UTC (20 years, 8 months ago) by brad
Branch: OPENBSD_3_2
Changes since 1.31.2.1: +22 -13 lines
Diff to previous 1.31.2.1 (colored) to branchpoint 1.31 (colored) next main 1.32 (colored)

upgrade to OpenSSH 3.7

Revision 1.34.2.1 / (download) - annotate - [select for diffs], Tue Sep 16 20:50:43 2003 UTC (20 years, 8 months ago) by brad
Branch: OPENBSD_3_3
Changes since 1.34: +22 -13 lines
Diff to previous 1.34 (colored)

upgrade to OpenSSH 3.7

Revision 1.37 / (download) - annotate - [select for diffs], Thu Jul 10 20:05:55 2003 UTC (20 years, 10 months ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_3_4_BASE
Branch point for: OPENBSD_3_4
Changes since 1.36: +4 -3 lines
Diff to previous 1.36 (colored)

sync usage with manpage, add missing -R

Revision 1.36 / (download) - annotate - [select for diffs], Wed Jun 4 12:41:22 2003 UTC (20 years, 11 months ago) by djm
Branch: MAIN
Changes since 1.35: +19 -9 lines
Diff to previous 1.35 (colored)

kill ssh process on receipt of signal; ok markus@

Revision 1.35 / (download) - annotate - [select for diffs], Thu May 15 03:44:00 2003 UTC (21 years ago) by mouring
Branch: MAIN
Changes since 1.34: +1 -3 lines
Diff to previous 1.34 (colored)

Teach ls how to display multiple column display and allow users to return
to single column format via 'ls -1'.  OK @djm

Revision 1.29.2.3 / (download) - annotate - [select for diffs], Thu Apr 3 22:35:17 2003 UTC (21 years, 1 month ago) by miod
Branch: OPENBSD_3_1
Changes since 1.29.2.2: +8 -5 lines
Diff to previous 1.29.2.2 (colored) to branchpoint 1.29 (colored) next main 1.30 (colored)

Merge OpenSSH 3.6.1

Revision 1.31.2.1 / (download) - annotate - [select for diffs], Tue Apr 1 00:12:14 2003 UTC (21 years, 1 month ago) by margarida
Branch: OPENBSD_3_2
Changes since 1.31: +8 -5 lines
Diff to previous 1.31 (colored)

Update to OpenSSH 3.6

Revision 1.34 / (download) - annotate - [select for diffs], Fri Jan 10 08:19:07 2003 UTC (21 years, 4 months ago) by fgsch
Branch: MAIN
CVS Tags: OPENBSD_3_3_BASE
Branch point for: OPENBSD_3_3
Changes since 1.33: +3 -0 lines
Diff to previous 1.33 (colored)

sftp progress meter support.
original diffs by Nils Nordman <nino at nforced dot com> via markus@, merged
to -current by me, djm@ ok.

Revision 1.33 / (download) - annotate - [select for diffs], Wed Jan 8 23:53:26 2003 UTC (21 years, 4 months ago) by djm
Branch: MAIN
Changes since 1.32: +4 -4 lines
Diff to previous 1.32 (colored)

Cleanup error handling for batchmode
Allow blank lines and comments in input
Ability to suppress abort on error in batchmode ("-put blah")

Fixes mindrot bug #452; markus@ ok

Revision 1.32 / (download) - annotate - [select for diffs], Wed Nov 27 17:53:35 2002 UTC (21 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.31: +2 -2 lines
Diff to previous 1.31 (colored)

allow usernames with embedded '@', e.g. scp user@vhost@realhost:file /tmp;
http://bugzilla.mindrot.org/show_bug.cgi?id=447; ok mouring@, millert@

Revision 1.21.2.4 / (download) - annotate - [select for diffs], Fri Oct 11 14:53:07 2002 UTC (21 years, 7 months ago) by miod
Branch: OPENBSD_3_0
Changes since 1.21.2.3: +1 -2 lines
Diff to previous 1.21.2.3 (colored) to branchpoint 1.21 (colored) next main 1.22 (colored)

Update to OpenSSH 3.5

Revision 1.29.2.2 / (download) - annotate - [select for diffs], Fri Oct 11 14:51:52 2002 UTC (21 years, 7 months ago) by miod
Branch: OPENBSD_3_1
Changes since 1.29.2.1: +1 -2 lines
Diff to previous 1.29.2.1 (colored) to branchpoint 1.29 (colored)

Update to OpenSSH 3.5

Revision 1.31 / (download) - annotate - [select for diffs], Thu Jul 25 01:16:59 2002 UTC (21 years, 9 months ago) by mouring
Branch: MAIN
CVS Tags: OPENBSD_3_2_BASE
Branch point for: OPENBSD_3_2
Changes since 1.30: +1 -2 lines
Diff to previous 1.30 (colored)

FallBackToRsh does not exist anywhere else.  Remove it from here.  OK deraadt.

Revision 1.21.2.3 / (download) - annotate - [select for diffs], Wed Jun 26 18:22:36 2002 UTC (21 years, 10 months ago) by miod
Branch: OPENBSD_3_0
Changes since 1.21.2.2: +4 -1 lines
Diff to previous 1.21.2.2 (colored) to branchpoint 1.21 (colored)

There was an update to OpenSSH 3.4, and people rejoiced.

Revision 1.29.2.1 / (download) - annotate - [select for diffs], Wed Jun 26 15:30:39 2002 UTC (21 years, 10 months ago) by jason
Branch: OPENBSD_3_1
Changes since 1.29: +4 -1 lines
Diff to previous 1.29 (colored)

Pull in OpenSSH-3.4

Revision 1.30 / (download) - annotate - [select for diffs], Sun Jun 23 09:30:14 2002 UTC (21 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.29: +4 -1 lines
Diff to previous 1.29 (colored)

bunch of u_int vs int stuff

Revision 1.15.2.3 / (download) - annotate - [select for diffs], Sun Jun 2 22:56:11 2002 UTC (21 years, 11 months ago) by miod
Branch: OPENBSD_2_9
Changes since 1.15.2.2: +12 -9 lines
Diff to previous 1.15.2.2 (colored) to branchpoint 1.15 (colored) next main 1.16 (colored)

Upgrade to OpenSSH 3.2.3.

Except for improbable compilation error fixes, this should be the last
commit made to the 2.9-STABLE branche. Have fun upgrading.

Revision 1.21.2.2 / (download) - annotate - [select for diffs], Fri May 17 00:03:24 2002 UTC (22 years ago) by miod
Branch: OPENBSD_3_0
Changes since 1.21.2.1: +12 -9 lines
Diff to previous 1.21.2.1 (colored) to branchpoint 1.21 (colored)

Update OpenSSH to version 3.2.2.

Revision 1.29 / (download) - annotate - [select for diffs], Tue Apr 2 17:37:48 2002 UTC (22 years, 1 month ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_3_1_BASE
Branch point for: OPENBSD_3_1
Changes since 1.28: +3 -2 lines
Diff to previous 1.28 (colored)

always call log_init()

Revision 1.28 / (download) - annotate - [select for diffs], Sat Mar 30 18:51:15 2002 UTC (22 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.27: +5 -3 lines
Diff to previous 1.27 (colored)

check waitpid for EINTR; based on patch from peter@ifm.liu.se

Revision 1.27 / (download) - annotate - [select for diffs], Tue Mar 19 10:49:35 2002 UTC (22 years, 2 months ago) by markus
Branch: MAIN
Changes since 1.26: +6 -6 lines
Diff to previous 1.26 (colored)

KNF whitespace

Revision 1.15.2.2 / (download) - annotate - [select for diffs], Sat Mar 9 00:20:45 2002 UTC (22 years, 2 months ago) by miod
Branch: OPENBSD_2_9
Changes since 1.15.2.1: +74 -46 lines
Diff to previous 1.15.2.1 (colored) to branchpoint 1.15 (colored)

Merge OpenSSH 3.1, keeping /etc as configuration files directory.
(i.e. OpenSSH 3.1 + openbsd29_3.1.patch)

Revision 1.7.2.6 / (download) - annotate - [select for diffs], Fri Mar 8 17:04:43 2002 UTC (22 years, 2 months ago) by brad
Branch: OPENBSD_2_8
Changes since 1.7.2.5: +74 -46 lines
Diff to previous 1.7.2.5 (colored) next main 1.8 (colored)

Merge OpenSSH 3.1.

Revision 1.21.2.1 / (download) - annotate - [select for diffs], Thu Mar 7 17:37:47 2002 UTC (22 years, 2 months ago) by jason
Branch: OPENBSD_3_0
Changes since 1.21: +74 -46 lines
Diff to previous 1.21 (colored)

Update to OpenSSH-3.1 on 3.0-stable branch

Revision 1.26 / (download) - annotate - [select for diffs], Tue Feb 12 12:32:27 2002 UTC (22 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.25: +9 -2 lines
Diff to previous 1.25 (colored)

Perform multiple overlapping read/write requests in file transfer. Mostly
done by Tobias Ringstrom <tori@ringstrom.mine.nu>; ok markus@

Revision 1.25 / (download) - annotate - [select for diffs], Wed Feb 6 14:27:23 2002 UTC (22 years, 3 months ago) by mpech
Branch: MAIN
Changes since 1.24: +6 -4 lines
Diff to previous 1.24 (colored)

sync usage() with manual.

markus@ ok

Revision 1.24 / (download) - annotate - [select for diffs], Tue Feb 5 00:00:46 2002 UTC (22 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.23: +10 -3 lines
Diff to previous 1.23 (colored)

Add "-B" option to specify copy buffer length (default 32k); ok markus@

Revision 1.23 / (download) - annotate - [select for diffs], Mon Feb 4 21:53:12 2002 UTC (22 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.22: +55 -43 lines
Diff to previous 1.22 (colored)

Add "-P" option to directly connect to a local sftp-server. Should be useful
for regression testing; ok markus@

Revision 1.22 / (download) - annotate - [select for diffs], Wed Dec 19 07:18:56 2001 UTC (22 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.21: +3 -3 lines
Diff to previous 1.21 (colored)

basic KNF done while i was looking for something else

Revision 1.15.2.1 / (download) - annotate - [select for diffs], Thu Sep 27 19:03:55 2001 UTC (22 years, 7 months ago) by jason
Branch: OPENBSD_2_9
Changes since 1.15: +39 -97 lines
Diff to previous 1.15 (colored)

Pull in OpenSSH-2.9.9

Revision 1.7.2.5 / (download) - annotate - [select for diffs], Thu Sep 27 00:15:42 2001 UTC (22 years, 7 months ago) by miod
Branch: OPENBSD_2_8
Changes since 1.7.2.4: +39 -97 lines
Diff to previous 1.7.2.4 (colored)

Pull in OpenSSH 2.9.9 to the 2.8 branch.

Revision 1.21 / (download) - annotate - [select for diffs], Wed Sep 19 19:24:19 2001 UTC (22 years, 8 months ago) by stevesk
Branch: MAIN
CVS Tags: OPENBSD_3_0_BASE
Branch point for: OPENBSD_3_0
Changes since 1.20: +2 -1 lines
Diff to previous 1.20 (colored)

add ClearAllForwardings ssh option and set it in scp and sftp; ok markus@

Revision 1.20 / (download) - annotate - [select for diffs], Mon Sep 17 20:38:09 2001 UTC (22 years, 8 months ago) by stevesk
Branch: MAIN
Changes since 1.19: +3 -3 lines
Diff to previous 1.19 (colored)

cleanup and document -1, -s and -S; ok markus@

Revision 1.19 / (download) - annotate - [select for diffs], Mon Sep 17 17:57:57 2001 UTC (22 years, 8 months ago) by stevesk
Branch: MAIN
Changes since 1.18: +7 -4 lines
Diff to previous 1.18 (colored)

add -Fssh_config option; ok markus@

Revision 1.18 / (download) - annotate - [select for diffs], Sat Jun 23 15:12:20 2001 UTC (22 years, 10 months ago) by itojun
Branch: MAIN
Changes since 1.17: +3 -3 lines
Diff to previous 1.17 (colored)

more strict prototypes.  raise warning level in Makefile.inc.  markus ok'ed
TODO; cleanup headers

Revision 1.17 / (download) - annotate - [select for diffs], Tue May 8 19:45:25 2001 UTC (23 years ago) by mouring
Branch: MAIN
Changes since 1.16: +30 -91 lines
Diff to previous 1.16 (colored)

Use addargs() in sftp plus some clean up of addargs().  OK Markus

Revision 1.7.2.4 / (download) - annotate - [select for diffs], Mon May 7 21:09:35 2001 UTC (23 years ago) by jason
Branch: OPENBSD_2_8
Changes since 1.7.2.3: +19 -11 lines
Diff to previous 1.7.2.3 (colored)

Pull in OpenSSH-2.9 to 2.8 branch.

Revision 1.16 / (download) - annotate - [select for diffs], Thu May 3 23:09:53 2001 UTC (23 years ago) by mouring
Branch: MAIN
Changes since 1.15: +2 -3 lines
Diff to previous 1.15 (colored)

Move colon() and cleanhost() to misc.c where I should I have put it in
the first place

Revision 1.15 / (download) - annotate - [select for diffs], Mon Apr 16 02:31:44 2001 UTC (23 years, 1 month ago) by mouring
Branch: MAIN
CVS Tags: OPENBSD_2_9_BASE
Branch point for: OPENBSD_2_9
Changes since 1.14: +5 -3 lines
Diff to previous 1.14 (colored)

IPv6 support for sftp (which I bungled in my last patch) which is
borrowed from scp.c.  Thanks to Markus@ for pointing it out.

Revision 1.14 / (download) - annotate - [select for diffs], Thu Apr 12 23:17:54 2001 UTC (23 years, 1 month ago) by mouring
Branch: MAIN
Changes since 1.13: +13 -7 lines
Diff to previous 1.13 (colored)

Add support for:
	sftp [user@]host[:file [file]]	- Fetch remote file(s)
	sftp [user@]host[:dir[/]]	- Start in remote dir/
OK deraadt@

Revision 1.13 / (download) - annotate - [select for diffs], Sun Apr 8 20:52:55 2001 UTC (23 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.12: +2 -2 lines
Diff to previous 1.12 (colored)

do not modify an actual argv[] entry

Revision 1.12 / (download) - annotate - [select for diffs], Thu Apr 5 10:42:54 2001 UTC (23 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.11: +3 -3 lines
Diff to previous 1.11 (colored)

fix whitespace: unexpand + trailing spaces.

Revision 1.7.2.3 / (download) - annotate - [select for diffs], Wed Mar 21 19:46:29 2001 UTC (23 years, 2 months ago) by jason
Branch: OPENBSD_2_8
Changes since 1.7.2.2: +24 -20 lines
Diff to previous 1.7.2.2 (colored)

Pull in OpenSSH-2.5.2 for 2.8 branch.

Revision 1.11.2.2 / (download) - annotate - [select for diffs], Wed Mar 21 18:53:07 2001 UTC (23 years, 2 months ago) by jason
Branch: OPENBSD_2_7
Changes since 1.11.2.1: +24 -20 lines
Diff to previous 1.11.2.1 (colored) next main 1.12 (colored)

Pull in OpenSSH-2.5.2 for 2.7 branch.

Revision 1.11.2.1 / (download) - annotate - [select for diffs], Mon Mar 12 15:44:15 2001 UTC (23 years, 2 months ago) by jason
Branch: OPENBSD_2_7
Changes since 1.11: +20 -24 lines
Diff to previous 1.11 (colored)

OpenSSH-2.5.1 for 2.7 patch branch

Revision 1.11 / (download) - annotate - [select for diffs], Wed Mar 7 10:11:23 2001 UTC (23 years, 2 months ago) by djm
Branch: MAIN
Branch point for: OPENBSD_2_7
Changes since 1.10: +1 -3 lines
Diff to previous 1.10 (colored)

Support for new draft (draft-ietf-secsh-filexfer-01). New symlink handling
functions and small protocol change.

Revision 1.10 / (download) - annotate - [select for diffs], Tue Mar 6 06:11:44 2001 UTC (23 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.9: +15 -3 lines
Diff to previous 1.9 (colored)

sftp -b batchfile; mouring@etoh.eviladmin.org

Revision 1.9 / (download) - annotate - [select for diffs], Sat Mar 3 23:52:22 2001 UTC (23 years, 2 months ago) by markus
Branch: MAIN
Changes since 1.8: +10 -13 lines
Diff to previous 1.8 (colored)

clean up arg processing. based on work by Christophe_Moret@hp.com

Revision 1.8 / (download) - annotate - [select for diffs], Wed Feb 28 05:36:28 2001 UTC (23 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.7: +1 -4 lines
Diff to previous 1.7 (colored)

do not kill the subprocess on termination (we will see if this helps things
or hurts things)

Revision 1.7.2.2 / (download) - annotate - [select for diffs], Mon Feb 19 17:19:25 2001 UTC (23 years, 3 months ago) by jason
Branch: OPENBSD_2_8
Changes since 1.7.2.1: +0 -0 lines
Diff to previous 1.7.2.1 (colored)

Pull in OpenSSH-2.5.1

Revision 1.7.2.1 / (download) - annotate - [select for diffs], Fri Feb 16 20:13:16 2001 UTC (23 years, 3 months ago) by jason
Branch: OPENBSD_2_8
Changes since 1.7: +1 -1 lines
Diff to previous 1.7 (colored)

Pull in OpenSSH 2.5.0

Revision 1.7 / (download) - annotate - [select for diffs], Thu Feb 8 00:04:52 2001 UTC (23 years, 3 months ago) by markus
Branch: MAIN
Branch point for: OPENBSD_2_8
Changes since 1.6: +34 -10 lines
Diff to previous 1.6 (colored)

allow sftp over ssh protocol 1; ok djm@

Revision 1.6 / (download) - annotate - [select for diffs], Wed Feb 7 22:27:18 2001 UTC (23 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.5: +4 -2 lines
Diff to previous 1.5 (colored)

Don't forward agent and X11 in sftp. Suggestion from Roumen Petrov
<roumen.petrov@skalasoft.com>

Revision 1.5 / (download) - annotate - [select for diffs], Tue Feb 6 23:53:54 2001 UTC (23 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.4: +2 -1 lines
Diff to previous 1.4 (colored)

Fix -o option under getopt; ok markus@

Revision 1.4 / (download) - annotate - [select for diffs], Tue Feb 6 22:06:21 2001 UTC (23 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.3: +3 -2 lines
Diff to previous 1.3 (colored)

Wait for ssh subprocess at exit

Revision 1.3 / (download) - annotate - [select for diffs], Tue Feb 6 22:05:25 2001 UTC (23 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.2: +30 -21 lines
Diff to previous 1.2 (colored)

Use getopt to process commandline arguments

Revision 1.2 / (download) - annotate - [select for diffs], Sun Feb 4 15:32:25 2001 UTC (23 years, 3 months ago) by stevesk
Branch: MAIN
Changes since 1.1: +3 -3 lines
Diff to previous 1.1 (colored)

unexpand and remove end-of-line whitespace; ok markus@

Revision 1.1 / (download) - annotate - [select for diffs], Sun Feb 4 11:11:54 2001 UTC (23 years, 3 months ago) by djm
Branch: MAIN

Basic interactive sftp client; ok theo@

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.