diff options
Diffstat (limited to 'sftp.c')
-rw-r--r-- | sftp.c | 29 |
1 files changed, 15 insertions, 14 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp.c,v 1.174 2016/05/25 23:48:45 schwarze Exp $ */ | 1 | /* $OpenBSD: sftp.c,v 1.175 2016/07/22 03:47:36 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -337,7 +337,7 @@ local_do_ls(const char *args) | |||
337 | 337 | ||
338 | /* Strip one path (usually the pwd) from the start of another */ | 338 | /* Strip one path (usually the pwd) from the start of another */ |
339 | static char * | 339 | static char * |
340 | path_strip(char *path, char *strip) | 340 | path_strip(const char *path, const char *strip) |
341 | { | 341 | { |
342 | size_t len; | 342 | size_t len; |
343 | 343 | ||
@@ -355,7 +355,7 @@ path_strip(char *path, char *strip) | |||
355 | } | 355 | } |
356 | 356 | ||
357 | static char * | 357 | static char * |
358 | make_absolute(char *p, char *pwd) | 358 | make_absolute(char *p, const char *pwd) |
359 | { | 359 | { |
360 | char *abs_str; | 360 | char *abs_str; |
361 | 361 | ||
@@ -553,7 +553,7 @@ parse_no_flags(const char *cmd, char **argv, int argc) | |||
553 | } | 553 | } |
554 | 554 | ||
555 | static int | 555 | static int |
556 | is_dir(char *path) | 556 | is_dir(const char *path) |
557 | { | 557 | { |
558 | struct stat sb; | 558 | struct stat sb; |
559 | 559 | ||
@@ -565,7 +565,7 @@ is_dir(char *path) | |||
565 | } | 565 | } |
566 | 566 | ||
567 | static int | 567 | static int |
568 | remote_is_dir(struct sftp_conn *conn, char *path) | 568 | remote_is_dir(struct sftp_conn *conn, const char *path) |
569 | { | 569 | { |
570 | Attrib *a; | 570 | Attrib *a; |
571 | 571 | ||
@@ -579,7 +579,7 @@ remote_is_dir(struct sftp_conn *conn, char *path) | |||
579 | 579 | ||
580 | /* Check whether path returned from glob(..., GLOB_MARK, ...) is a directory */ | 580 | /* Check whether path returned from glob(..., GLOB_MARK, ...) is a directory */ |
581 | static int | 581 | static int |
582 | pathname_is_dir(char *pathname) | 582 | pathname_is_dir(const char *pathname) |
583 | { | 583 | { |
584 | size_t l = strlen(pathname); | 584 | size_t l = strlen(pathname); |
585 | 585 | ||
@@ -587,8 +587,8 @@ pathname_is_dir(char *pathname) | |||
587 | } | 587 | } |
588 | 588 | ||
589 | static int | 589 | static int |
590 | process_get(struct sftp_conn *conn, char *src, char *dst, char *pwd, | 590 | process_get(struct sftp_conn *conn, const char *src, const char *dst, |
591 | int pflag, int rflag, int resume, int fflag) | 591 | const char *pwd, int pflag, int rflag, int resume, int fflag) |
592 | { | 592 | { |
593 | char *abs_src = NULL; | 593 | char *abs_src = NULL; |
594 | char *abs_dst = NULL; | 594 | char *abs_dst = NULL; |
@@ -673,8 +673,8 @@ out: | |||
673 | } | 673 | } |
674 | 674 | ||
675 | static int | 675 | static int |
676 | process_put(struct sftp_conn *conn, char *src, char *dst, char *pwd, | 676 | process_put(struct sftp_conn *conn, const char *src, const char *dst, |
677 | int pflag, int rflag, int resume, int fflag) | 677 | const char *pwd, int pflag, int rflag, int resume, int fflag) |
678 | { | 678 | { |
679 | char *tmp_dst = NULL; | 679 | char *tmp_dst = NULL; |
680 | char *abs_dst = NULL; | 680 | char *abs_dst = NULL; |
@@ -784,7 +784,8 @@ sdirent_comp(const void *aa, const void *bb) | |||
784 | 784 | ||
785 | /* sftp ls.1 replacement for directories */ | 785 | /* sftp ls.1 replacement for directories */ |
786 | static int | 786 | static int |
787 | do_ls_dir(struct sftp_conn *conn, char *path, char *strip_path, int lflag) | 787 | do_ls_dir(struct sftp_conn *conn, const char *path, |
788 | const char *strip_path, int lflag) | ||
788 | { | 789 | { |
789 | int n; | 790 | int n; |
790 | u_int c = 1, colspace = 0, columns = 1; | 791 | u_int c = 1, colspace = 0, columns = 1; |
@@ -869,8 +870,8 @@ do_ls_dir(struct sftp_conn *conn, char *path, char *strip_path, int lflag) | |||
869 | 870 | ||
870 | /* sftp ls.1 replacement which handles path globs */ | 871 | /* sftp ls.1 replacement which handles path globs */ |
871 | static int | 872 | static int |
872 | do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path, | 873 | do_globbed_ls(struct sftp_conn *conn, const char *path, |
873 | int lflag) | 874 | const char *strip_path, int lflag) |
874 | { | 875 | { |
875 | char *fname, *lname; | 876 | char *fname, *lname; |
876 | glob_t g; | 877 | glob_t g; |
@@ -954,7 +955,7 @@ do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path, | |||
954 | } | 955 | } |
955 | 956 | ||
956 | static int | 957 | static int |
957 | do_df(struct sftp_conn *conn, char *path, int hflag, int iflag) | 958 | do_df(struct sftp_conn *conn, const char *path, int hflag, int iflag) |
958 | { | 959 | { |
959 | struct sftp_statvfs st; | 960 | struct sftp_statvfs st; |
960 | char s_used[FMT_SCALED_STRSIZE]; | 961 | char s_used[FMT_SCALED_STRSIZE]; |