=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sftp-glob.c,v retrieving revision 1.2.4.1 retrieving revision 1.2.4.2 diff -u -r1.2.4.1 -r1.2.4.2 --- src/usr.bin/ssh/sftp-glob.c 2001/03/21 19:46:28 1.2.4.1 +++ src/usr.bin/ssh/sftp-glob.c 2001/05/07 21:09:34 1.2.4.2 @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sftp-glob.c,v 1.2.4.1 2001/03/21 19:46:28 jason Exp $"); +RCSID("$OpenBSD: sftp-glob.c,v 1.2.4.2 2001/05/07 21:09:34 jason 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); @@ -82,7 +82,7 @@ void fudge_closedir(struct SFTP_OPENDIR *od) { free_sftp_dirents(od->dir); - free(od); + xfree(od); } void attrib_to_stat(Attrib *a, struct stat *st) @@ -128,8 +128,8 @@ } int -remote_glob(int fd_in, int fd_out, const char *pattern, int flags, - const int (*errfunc)(const char *, int), glob_t *pglob) +remote_glob(int fd_in, int fd_out, const char *pattern, int flags, + int (*errfunc)(const char *, int), glob_t *pglob) { pglob->gl_opendir = (void*)fudge_opendir; pglob->gl_readdir = (void*)fudge_readdir; @@ -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)); }