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

Diff for /src/usr.bin/ssh/sftp-client.h between version 1.38 and 1.39

version 1.38, 2022/09/19 10:43:12 version 1.39, 2023/09/08 05:56:13
Line 64 
Line 64 
  * Initialise a SSH filexfer connection. Returns NULL on error or   * Initialise a SSH filexfer connection. Returns NULL on error or
  * a pointer to a initialized sftp_conn struct on success.   * a pointer to a initialized sftp_conn struct on success.
  */   */
 struct sftp_conn *do_init(int, int, u_int, u_int, u_int64_t);  struct sftp_conn *sftp_init(int, int, u_int, u_int, u_int64_t);
   
 u_int sftp_proto_version(struct sftp_conn *);  u_int sftp_proto_version(struct sftp_conn *);
   
 /* Query server limits */  /* Query server limits */
 int do_limits(struct sftp_conn *, struct sftp_limits *);  int sftp_get_limits(struct sftp_conn *, struct sftp_limits *);
   
 /* Close file referred to by 'handle' */  /* Close file referred to by 'handle' */
 int do_close(struct sftp_conn *, const u_char *, u_int);  int sftp_close(struct sftp_conn *, const u_char *, u_int);
   
 /* Read contents of 'path' to NULL-terminated array 'dir' */  /* Read contents of 'path' to NULL-terminated array 'dir' */
 int do_readdir(struct sftp_conn *, const char *, SFTP_DIRENT ***);  int sftp_readdir(struct sftp_conn *, const char *, SFTP_DIRENT ***);
   
 /* Frees a NULL-terminated array of SFTP_DIRENTs (eg. from do_readdir) */  /* Frees a NULL-terminated array of SFTP_DIRENTs (eg. from sftp_readdir) */
 void free_sftp_dirents(SFTP_DIRENT **);  void sftp_free_dirents(SFTP_DIRENT **);
   
 /* Delete file 'path' */  /* Delete file 'path' */
 int do_rm(struct sftp_conn *, const char *);  int sftp_rm(struct sftp_conn *, const char *);
   
 /* Create directory 'path' */  /* Create directory 'path' */
 int do_mkdir(struct sftp_conn *, const char *, Attrib *, int);  int sftp_mkdir(struct sftp_conn *, const char *, Attrib *, int);
   
 /* Remove directory 'path' */  /* Remove directory 'path' */
 int do_rmdir(struct sftp_conn *, const char *);  int sftp_rmdir(struct sftp_conn *, const char *);
   
 /* Get file attributes of 'path' (follows symlinks) */  /* Get file attributes of 'path' (follows symlinks) */
 Attrib *do_stat(struct sftp_conn *, const char *, int);  int sftp_stat(struct sftp_conn *, const char *, int, Attrib *);
   
 /* Get file attributes of 'path' (does not follow symlinks) */  /* Get file attributes of 'path' (does not follow symlinks) */
 Attrib *do_lstat(struct sftp_conn *, const char *, int);  int sftp_lstat(struct sftp_conn *, const char *, int, Attrib *);
   
 /* Set file attributes of 'path' */  /* Set file attributes of 'path' */
 int do_setstat(struct sftp_conn *, const char *, Attrib *);  int sftp_setstat(struct sftp_conn *, const char *, Attrib *);
   
 /* Set file attributes of open file 'handle' */  /* Set file attributes of open file 'handle' */
 int do_fsetstat(struct sftp_conn *, const u_char *, u_int, Attrib *);  int sftp_fsetstat(struct sftp_conn *, const u_char *, u_int, Attrib *);
   
 /* Set file attributes of 'path', not following symlinks */  /* Set file attributes of 'path', not following symlinks */
 int do_lsetstat(struct sftp_conn *conn, const char *path, Attrib *a);  int sftp_lsetstat(struct sftp_conn *conn, const char *path, Attrib *a);
   
 /* Canonicalise 'path' - caller must free result */  /* Canonicalise 'path' - caller must free result */
 char *do_realpath(struct sftp_conn *, const char *);  char *sftp_realpath(struct sftp_conn *, const char *);
   
 /* Canonicalisation with tilde expansion (requires server extension) */  /* Canonicalisation with tilde expansion (requires server extension) */
 char *do_expand_path(struct sftp_conn *, const char *);  char *sftp_expand_path(struct sftp_conn *, const char *);
   
 /* Returns non-zero if server can tilde-expand paths */  /* Returns non-zero if server can tilde-expand paths */
 int can_expand_path(struct sftp_conn *);  int sftp_can_expand_path(struct sftp_conn *);
   
 /* Get statistics for filesystem hosting file at "path" */  /* Get statistics for filesystem hosting file at "path" */
 int do_statvfs(struct sftp_conn *, const char *, struct sftp_statvfs *, int);  int sftp_statvfs(struct sftp_conn *, const char *, struct sftp_statvfs *, int);
   
 /* Rename 'oldpath' to 'newpath' */  /* Rename 'oldpath' to 'newpath' */
 int do_rename(struct sftp_conn *, const char *, const char *, int);  int sftp_rename(struct sftp_conn *, const char *, const char *, int);
   
 /* Copy 'oldpath' to 'newpath' */  /* Copy 'oldpath' to 'newpath' */
 int do_copy(struct sftp_conn *, const char *, const char *);  int sftp_copy(struct sftp_conn *, const char *, const char *);
   
 /* Link 'oldpath' to 'newpath' */  /* Link 'oldpath' to 'newpath' */
 int do_hardlink(struct sftp_conn *, const char *, const char *);  int sftp_hardlink(struct sftp_conn *, const char *, const char *);
   
 /* Rename 'oldpath' to 'newpath' */  /* Rename 'oldpath' to 'newpath' */
 int do_symlink(struct sftp_conn *, const char *, const char *);  int sftp_symlink(struct sftp_conn *, const char *, const char *);
   
 /* Call fsync() on open file 'handle' */  /* Call fsync() on open file 'handle' */
 int do_fsync(struct sftp_conn *conn, u_char *, u_int);  int sftp_fsync(struct sftp_conn *conn, u_char *, u_int);
   
 /*  /*
  * Download 'remote_path' to 'local_path'. Preserve permissions and times   * Download 'remote_path' to 'local_path'. Preserve permissions and times
  * if 'pflag' is set   * if 'pflag' is set
  */   */
 int do_download(struct sftp_conn *, const char *, const char *, Attrib *,  int sftp_download(struct sftp_conn *, const char *, const char *, Attrib *,
     int, int, int, int);      int, int, int, int);
   
 /*  /*
  * Recursively download 'remote_directory' to 'local_directory'. Preserve   * Recursively download 'remote_directory' to 'local_directory'. Preserve
  * times if 'pflag' is set   * times if 'pflag' is set
  */   */
 int download_dir(struct sftp_conn *, const char *, const char *, Attrib *,  int sftp_download_dir(struct sftp_conn *, const char *, const char *, Attrib *,
     int, int, int, int, int, int);      int, int, int, int, int, int);
   
 /*  /*
  * Upload 'local_path' to 'remote_path'. Preserve permissions and times   * Upload 'local_path' to 'remote_path'. Preserve permissions and times
  * if 'pflag' is set   * if 'pflag' is set
  */   */
 int do_upload(struct sftp_conn *, const char *, const char *,  int sftp_upload(struct sftp_conn *, const char *, const char *,
     int, int, int, int);      int, int, int, int);
   
 /*  /*
  * Recursively upload 'local_directory' to 'remote_directory'. Preserve   * Recursively upload 'local_directory' to 'remote_directory'. Preserve
  * times if 'pflag' is set   * times if 'pflag' is set
  */   */
 int upload_dir(struct sftp_conn *, const char *, const char *,  int sftp_upload_dir(struct sftp_conn *, const char *, const char *,
     int, int, int, int, int, int);      int, int, int, int, int, int);
   
 /*  /*
  * Download a 'from_path' from the 'from' connection and upload it to   * Download a 'from_path' from the 'from' connection and upload it to
  * to 'to' connection at 'to_path'.   * to 'to' connection at 'to_path'.
  */   */
 int  int sftp_crossload(struct sftp_conn *from, struct sftp_conn *to,
 do_crossload(struct sftp_conn *from, struct sftp_conn *to,  
     const char *from_path, const char *to_path,      const char *from_path, const char *to_path,
     Attrib *a, int preserve_flag);      Attrib *a, int preserve_flag);
   
Line 172 
Line 171 
  * Recursively download a directory from 'from_path' from the 'from'   * Recursively download a directory from 'from_path' from the 'from'
  * connection and upload it to 'to' connection at 'to_path'.   * connection and upload it to 'to' connection at 'to_path'.
  */   */
 int crossload_dir(struct sftp_conn *from, struct sftp_conn *to,  int sftp_crossload_dir(struct sftp_conn *from, struct sftp_conn *to,
     const char *from_path, const char *to_path,      const char *from_path, const char *to_path,
     Attrib *dirattrib, int preserve_flag, int print_flag,      Attrib *dirattrib, int preserve_flag, int print_flag,
     int follow_link_flag);      int follow_link_flag);
Line 180 
Line 179 
 /*  /*
  * User/group ID to name translation.   * User/group ID to name translation.
  */   */
 int can_get_users_groups_by_id(struct sftp_conn *conn);  int sftp_can_get_users_groups_by_id(struct sftp_conn *conn);
 int do_get_users_groups_by_id(struct sftp_conn *conn,  int sftp_get_users_groups_by_id(struct sftp_conn *conn,
     const u_int *uids, u_int nuids,      const u_int *uids, u_int nuids,
     const u_int *gids, u_int ngids,      const u_int *gids, u_int ngids,
     char ***usernamesp, char ***groupnamesp);      char ***usernamesp, char ***groupnamesp);
   
 /* Concatenate paths, taking care of slashes. Caller must free result. */  /* Concatenate paths, taking care of slashes. Caller must free result. */
 char *path_append(const char *, const char *);  char *sftp_path_append(const char *, const char *);
   
 /* Make absolute path if relative path and CWD is given. Does not modify  /* Make absolute path if relative path and CWD is given. Does not modify
  * original if the path is already absolute. */   * original if the path is already absolute. */
 char *make_absolute(char *, const char *);  char *sftp_make_absolute(char *, const char *);
   
 /* Check if remote path is directory */  /* Check if remote path is directory */
 int remote_is_dir(struct sftp_conn *conn, const char *path);  int sftp_remote_is_dir(struct sftp_conn *conn, const char *path);
   
 /* Check if local path is directory */  
 int local_is_dir(const char *path);  
   
 /* Check whether path returned from glob(..., GLOB_MARK, ...) is a directory */  /* Check whether path returned from glob(..., GLOB_MARK, ...) is a directory */
 int globpath_is_dir(const char *pathname);  int sftp_globpath_is_dir(const char *pathname);
   
 #endif  #endif
Legend:
Removed from v.1.38  
changed lines
  Added in v.1.39