Module Name: src Committed By: riz Date: Tue Jan 26 01:30:41 UTC 2016
Modified Files: src/crypto/external/bsd/openssh/dist [netbsd-7-0]: sftp.c Log Message: Pull up following revision(s) (requested by snj in ticket #1066): crypto/external/bsd/openssh/dist/sftp.c: revision 1.17 PR/50564: Rin Okuyama: sftp: filename completion is broken To generate a diff of this commit: cvs rdiff -u -r1.12.4.1 -r1.12.4.1.2.1 \ src/crypto/external/bsd/openssh/dist/sftp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/crypto/external/bsd/openssh/dist/sftp.c diff -u src/crypto/external/bsd/openssh/dist/sftp.c:1.12.4.1 src/crypto/external/bsd/openssh/dist/sftp.c:1.12.4.1.2.1 --- src/crypto/external/bsd/openssh/dist/sftp.c:1.12.4.1 Thu Apr 30 06:07:30 2015 +++ src/crypto/external/bsd/openssh/dist/sftp.c Tue Jan 26 01:30:40 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: sftp.c,v 1.12.4.1 2015/04/30 06:07:30 riz Exp $ */ +/* $NetBSD: sftp.c,v 1.12.4.1.2.1 2016/01/26 01:30:40 riz Exp $ */ /* $OpenBSD: sftp.c,v 1.170 2015/01/20 23:14:00 deraadt Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <d...@openbsd.org> @@ -17,7 +17,7 @@ */ #include "includes.h" -__RCSID("$NetBSD: sftp.c,v 1.12.4.1 2015/04/30 06:07:30 riz Exp $"); +__RCSID("$NetBSD: sftp.c,v 1.12.4.1.2.1 2016/01/26 01:30:40 riz Exp $"); #include <sys/param.h> /* MIN MAX */ #include <sys/types.h> #include <sys/ioctl.h> @@ -1845,8 +1845,8 @@ complete_match(EditLine *el, struct sftp if (remote != LOCAL) { tmp = make_absolute(tmp, remote_path); remote_glob(conn, tmp, GLOB_DOOFFS|GLOB_MARK, NULL, &g); + } else glob(tmp, GLOB_LIMIT|GLOB_DOOFFS|GLOB_MARK, NULL, &g); - } /* Determine length of pwd so we can trim completion display */ for (hadglob = tmplen = pwdlen = 0; tmp[tmplen] != 0; tmplen++) {