=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sftp-glob.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- src/usr.bin/ssh/sftp-glob.c 2001/04/03 13:56:11 1.3 +++ src/usr.bin/ssh/sftp-glob.c 2001/04/05 10:42:53 1.4 @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sftp-glob.c,v 1.3 2001/04/03 13:56:11 stevesk Exp $"); +RCSID("$OpenBSD: sftp-glob.c,v 1.4 2001/04/05 10:42:53 markus Exp $"); #include @@ -73,7 +73,7 @@ return(NULL); memset(&ret, 0, sizeof(ret)); - strlcpy(ret.d_name, od->dir[od->offset++]->filename, + strlcpy(ret.d_name, od->dir[od->offset++]->filename, sizeof(ret.d_name)); return(&ret); @@ -128,7 +128,7 @@ } int -remote_glob(int fd_in, int fd_out, const char *pattern, int flags, +remote_glob(int fd_in, int fd_out, const char *pattern, int flags, const int (*errfunc)(const char *, int), glob_t *pglob) { pglob->gl_opendir = (void*)fudge_opendir; @@ -141,6 +141,6 @@ cur.fd_in = fd_in; cur.fd_out = fd_out; - return(glob(pattern, flags | GLOB_ALTDIRFUNC, (void*)errfunc, + return(glob(pattern, flags | GLOB_ALTDIRFUNC, (void*)errfunc, pglob)); }