[BACK]Return to sftp-glob.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/sftp-glob.c between version 1.2.4.1 and 1.2.4.2

version 1.2.4.1, 2001/03/21 19:46:28 version 1.2.4.2, 2001/05/07 21:09:34
Line 73 
Line 73 
                 return(NULL);                  return(NULL);
   
         memset(&ret, 0, sizeof(ret));          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));              sizeof(ret.d_name));
   
         return(&ret);          return(&ret);
Line 82 
Line 82 
 void fudge_closedir(struct SFTP_OPENDIR *od)  void fudge_closedir(struct SFTP_OPENDIR *od)
 {  {
         free_sftp_dirents(od->dir);          free_sftp_dirents(od->dir);
         free(od);          xfree(od);
 }  }
   
 void attrib_to_stat(Attrib *a, struct stat *st)  void attrib_to_stat(Attrib *a, struct stat *st)
Line 128 
Line 128 
 }  }
   
 int  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)      int (*errfunc)(const char *, int), glob_t *pglob)
 {  {
         pglob->gl_opendir = (void*)fudge_opendir;          pglob->gl_opendir = (void*)fudge_opendir;
         pglob->gl_readdir = (void*)fudge_readdir;          pglob->gl_readdir = (void*)fudge_readdir;
Line 141 
Line 141 
         cur.fd_in = fd_in;          cur.fd_in = fd_in;
         cur.fd_out = fd_out;          cur.fd_out = fd_out;
   
         return(glob(pattern, flags | GLOB_ALTDIRFUNC, (void*)errfunc,          return(glob(pattern, flags | GLOB_ALTDIRFUNC, (void*)errfunc,
             pglob));              pglob));
 }  }

Legend:
Removed from v.1.2.4.1  
changed lines
  Added in v.1.2.4.2