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

Diff for /src/usr.bin/ssh/sftp.c between version 1.174 and 1.175

version 1.174, 2016/05/25 23:48:45 version 1.175, 2016/07/22 03:47:36
Line 315 
Line 315 
   
 /* Strip one path (usually the pwd) from the start of another */  /* Strip one path (usually the pwd) from the start of another */
 static char *  static char *
 path_strip(char *path, char *strip)  path_strip(const char *path, const char *strip)
 {  {
         size_t len;          size_t len;
   
Line 333 
Line 333 
 }  }
   
 static char *  static char *
 make_absolute(char *p, char *pwd)  make_absolute(char *p, const char *pwd)
 {  {
         char *abs_str;          char *abs_str;
   
Line 531 
Line 531 
 }  }
   
 static int  static int
 is_dir(char *path)  is_dir(const char *path)
 {  {
         struct stat sb;          struct stat sb;
   
Line 543 
Line 543 
 }  }
   
 static int  static int
 remote_is_dir(struct sftp_conn *conn, char *path)  remote_is_dir(struct sftp_conn *conn, const char *path)
 {  {
         Attrib *a;          Attrib *a;
   
Line 557 
Line 557 
   
 /* Check whether path returned from glob(..., GLOB_MARK, ...) is a directory */  /* Check whether path returned from glob(..., GLOB_MARK, ...) is a directory */
 static int  static int
 pathname_is_dir(char *pathname)  pathname_is_dir(const char *pathname)
 {  {
         size_t l = strlen(pathname);          size_t l = strlen(pathname);
   
Line 565 
Line 565 
 }  }
   
 static int  static int
 process_get(struct sftp_conn *conn, char *src, char *dst, char *pwd,  process_get(struct sftp_conn *conn, const char *src, const char *dst,
     int pflag, int rflag, int resume, int fflag)      const char *pwd, int pflag, int rflag, int resume, int fflag)
 {  {
         char *abs_src = NULL;          char *abs_src = NULL;
         char *abs_dst = NULL;          char *abs_dst = NULL;
Line 651 
Line 651 
 }  }
   
 static int  static int
 process_put(struct sftp_conn *conn, char *src, char *dst, char *pwd,  process_put(struct sftp_conn *conn, const char *src, const char *dst,
     int pflag, int rflag, int resume, int fflag)      const char *pwd, int pflag, int rflag, int resume, int fflag)
 {  {
         char *tmp_dst = NULL;          char *tmp_dst = NULL;
         char *abs_dst = NULL;          char *abs_dst = NULL;
Line 762 
Line 762 
   
 /* sftp ls.1 replacement for directories */  /* sftp ls.1 replacement for directories */
 static int  static int
 do_ls_dir(struct sftp_conn *conn, char *path, char *strip_path, int lflag)  do_ls_dir(struct sftp_conn *conn, const char *path,
       const char *strip_path, int lflag)
 {  {
         int n;          int n;
         u_int c = 1, colspace = 0, columns = 1;          u_int c = 1, colspace = 0, columns = 1;
Line 847 
Line 848 
   
 /* sftp ls.1 replacement which handles path globs */  /* sftp ls.1 replacement which handles path globs */
 static int  static int
 do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path,  do_globbed_ls(struct sftp_conn *conn, const char *path,
     int lflag)      const char *strip_path, int lflag)
 {  {
         char *fname, *lname;          char *fname, *lname;
         glob_t g;          glob_t g;
Line 932 
Line 933 
 }  }
   
 static int  static int
 do_df(struct sftp_conn *conn, char *path, int hflag, int iflag)  do_df(struct sftp_conn *conn, const char *path, int hflag, int iflag)
 {  {
         struct sftp_statvfs st;          struct sftp_statvfs st;
         char s_used[FMT_SCALED_STRSIZE];          char s_used[FMT_SCALED_STRSIZE];
Legend:
Removed from v.1.174  
changed lines
  Added in v.1.175