- deraadt@cvs.openbsd.org 2001/12/19 07:18:56

[openssh.git] / sftp-glob.c

diff --git a/sftp-glob.c b/sftp-glob.c
index 208efeb1528344f24d660271908aced76dd3eeec..849ac65ed1c873c12e7bef042428055fefbcfd9f 100644 (file)
--- a/sftp-glob.c
+++ b/sftp-glob.c
@@ -23,16 +23,12 @@
  */
 
 #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.9 2001/12/19 07:18:56 deraadt Exp $");
 
-#include "ssh.h"
 #include "buffer.h"
 #include "bufaux.h"
-#include "getput.h"
 #include "xmalloc.h"
 #include "log.h"
-#include "atomicio.h"
-#include "pathnames.h"
 
 #include "sftp.h"
 #include "sftp-common.h"
@@ -49,12 +45,13 @@ static struct {
        int fd_out;
 } cur;
 
-void *fudge_opendir(const char *path)
+static void *
+fudge_opendir(const char *path)
 {
        struct SFTP_OPENDIR *r;
-       
+
        r = xmalloc(sizeof(*r));
-       
+
        if (do_readdir(cur.fd_in, cur.fd_out, (char*)path, &r->dir))
                return(NULL);
 
@@ -63,7 +60,8 @@ void *fudge_opendir(const char *path)
        return((void*)r);
 }
 
-struct dirent *fudge_readdir(struct SFTP_OPENDIR *od)
+static struct dirent *
+fudge_readdir(struct SFTP_OPENDIR *od)
 {
        /* Solaris needs sizeof(dirent) + path length (see below) */
        static char buf[sizeof(struct dirent) + MAXPATHLEN];
@@ -84,7 +82,7 @@ struct dirent *fudge_readdir(struct SFTP_OPENDIR *od)
 #ifdef BROKEN_ONE_BYTE_DIRENT_D_NAME
        strlcpy(ret->d_name, od->dir[od->offset++]->filename, MAXPATHLEN);
 #else
-       strlcpy(ret->d_name, od->dir[od->offset++]->filename, 
+       strlcpy(ret->d_name, od->dir[od->offset++]->filename,
            sizeof(ret->d_name));
 #endif
 #ifdef __GNU_LIBRARY__
@@ -101,16 +99,18 @@ struct dirent *fudge_readdir(struct SFTP_OPENDIR *od)
        return(ret);
 }
 
-void fudge_closedir(struct SFTP_OPENDIR *od)
+static void
+fudge_closedir(struct SFTP_OPENDIR *od)
 {
        free_sftp_dirents(od->dir);
        xfree(od);
 }
 
-void attrib_to_stat(Attrib *a, struct stat *st)
+static void
+attrib_to_stat(Attrib *a, struct stat *st)
 {
        memset(st, 0, sizeof(*st));
-       
+
        if (a->flags & SSH2_FILEXFER_ATTR_SIZE)
                st->st_size = a->size;
        if (a->flags & SSH2_FILEXFER_ATTR_UIDGID) {
@@ -125,44 +125,46 @@ void attrib_to_stat(Attrib *a, struct stat *st)
        }
 }
 
-int fudge_lstat(const char *path, struct stat *st)
+static int
+fudge_lstat(const char *path, struct stat *st)
 {
        Attrib *a;
-       
+
        if (!(a = do_lstat(cur.fd_in, cur.fd_out, (char*)path, 0)))
                return(-1);
-       
+
        attrib_to_stat(a, st);
-       
+
        return(0);
 }
 
-int fudge_stat(const char *path, struct stat *st)
+static int
+fudge_stat(const char *path, struct stat *st)
 {
        Attrib *a;
-       
+
        if (!(a = do_stat(cur.fd_in, cur.fd_out, (char*)path, 0)))
                return(-1);
-       
+
        attrib_to_stat(a, st);
-       
+
        return(0);
 }
 
 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;
-       pglob->gl_closedir = (void*)fudge_closedir;
+       pglob->gl_opendir = fudge_opendir;
+       pglob->gl_readdir = (struct dirent *(*)(void *))fudge_readdir;
+       pglob->gl_closedir = (void (*)(void *))fudge_closedir;
        pglob->gl_lstat = fudge_lstat;
        pglob->gl_stat = fudge_stat;
-       
+
        memset(&cur, 0, sizeof(cur));
        cur.fd_in = fd_in;
        cur.fd_out = fd_out;
 
-       return(glob(pattern, flags | GLOB_ALTDIRFUNC, (void*)errfunc, 
+       return(glob(pattern, flags | GLOB_ALTDIRFUNC, errfunc,
            pglob));
 }