diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | scp.c | 18 |
2 files changed, 11 insertions, 12 deletions
@@ -20,6 +20,9 @@ | |||
20 | [compat.c compat.h dh.c dh.h ssh2.h sshconnect2.c sshd.c version.h] | 20 | [compat.c compat.h dh.c dh.h ssh2.h sshconnect2.c sshd.c version.h] |
21 | make dh group exchange more flexible, allow min and max group size, | 21 | make dh group exchange more flexible, allow min and max group size, |
22 | okay markus@, deraadt@ | 22 | okay markus@, deraadt@ |
23 | - stevesk@cvs.openbsd.org 2001/03/28 19:56:23 | ||
24 | [scp.c] | ||
25 | start to sync scp closer to rcp; ok markus@ | ||
23 | 26 | ||
24 | 20010328 | 27 | 20010328 |
25 | - (djm) Reorder tests and library inclusion for Krb4/AFS to try to | 28 | - (djm) Reorder tests and library inclusion for Krb4/AFS to try to |
@@ -4758,4 +4761,4 @@ | |||
4758 | - Wrote replacements for strlcpy and mkdtemp | 4761 | - Wrote replacements for strlcpy and mkdtemp |
4759 | - Released 1.0pre1 | 4762 | - Released 1.0pre1 |
4760 | 4763 | ||
4761 | $Id: ChangeLog,v 1.1031 2001/03/29 00:36:16 mouring Exp $ | 4764 | $Id: ChangeLog,v 1.1032 2001/03/29 00:39:55 mouring Exp $ |
@@ -75,7 +75,7 @@ | |||
75 | */ | 75 | */ |
76 | 76 | ||
77 | #include "includes.h" | 77 | #include "includes.h" |
78 | RCSID("$OpenBSD: scp.c,v 1.62 2001/03/21 12:33:33 markus Exp $"); | 78 | RCSID("$OpenBSD: scp.c,v 1.63 2001/03/28 19:56:23 stevesk Exp $"); |
79 | 79 | ||
80 | #include "xmalloc.h" | 80 | #include "xmalloc.h" |
81 | #include "atomicio.h" | 81 | #include "atomicio.h" |
@@ -202,8 +202,6 @@ typedef struct { | |||
202 | char *buf; | 202 | char *buf; |
203 | } BUF; | 203 | } BUF; |
204 | 204 | ||
205 | extern int iamremote; | ||
206 | |||
207 | BUF *allocbuf(BUF *, int, int); | 205 | BUF *allocbuf(BUF *, int, int); |
208 | char *colon(char *); | 206 | char *colon(char *); |
209 | void lostconn(int); | 207 | void lostconn(int); |
@@ -220,7 +218,6 @@ int pflag, iamremote, iamrecursive, targetshouldbedirectory; | |||
220 | #define CMDNEEDS 64 | 218 | #define CMDNEEDS 64 |
221 | char cmd[CMDNEEDS]; /* must hold "rcp -r -p -d\0" */ | 219 | char cmd[CMDNEEDS]; /* must hold "rcp -r -p -d\0" */ |
222 | 220 | ||
223 | int main(int, char *[]); | ||
224 | int response(void); | 221 | int response(void); |
225 | void rsource(char *, struct stat *); | 222 | void rsource(char *, struct stat *); |
226 | void sink(int, char *[]); | 223 | void sink(int, char *[]); |
@@ -295,7 +292,6 @@ main(argc, argv) | |||
295 | iamremote = 1; | 292 | iamremote = 1; |
296 | tflag = 1; | 293 | tflag = 1; |
297 | break; | 294 | break; |
298 | case '?': | ||
299 | default: | 295 | default: |
300 | usage(); | 296 | usage(); |
301 | } | 297 | } |
@@ -640,7 +636,7 @@ rsource(name, statp) | |||
640 | closedir(dirp); | 636 | closedir(dirp); |
641 | return; | 637 | return; |
642 | } | 638 | } |
643 | while ((dp = readdir(dirp))) { | 639 | while ((dp = readdir(dirp)) != NULL) { |
644 | if (dp->d_ino == 0) | 640 | if (dp->d_ino == 0) |
645 | continue; | 641 | continue; |
646 | if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, "..")) | 642 | if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, "..")) |
@@ -769,7 +765,7 @@ sink(argc, argv) | |||
769 | if (*cp++ != ' ') | 765 | if (*cp++ != ' ') |
770 | SCREWUP("mode not delimited"); | 766 | SCREWUP("mode not delimited"); |
771 | 767 | ||
772 | for (size = 0; *cp >= '0' && *cp <= '9';) | 768 | for (size = 0; isdigit(*cp);) |
773 | size = size * 10 + (*cp++ - '0'); | 769 | size = size * 10 + (*cp++ - '0'); |
774 | if (*cp++ != ' ') | 770 | if (*cp++ != ' ') |
775 | SCREWUP("size not delimited"); | 771 | SCREWUP("size not delimited"); |
@@ -852,7 +848,7 @@ bad: run_err("%s: %s", np, strerror(errno)); | |||
852 | continue; | 848 | continue; |
853 | } else if (j <= 0) { | 849 | } else if (j <= 0) { |
854 | run_err("%s", j ? strerror(errno) : | 850 | run_err("%s", j ? strerror(errno) : |
855 | "dropped connection"); | 851 | "dropped connection"); |
856 | exit(1); | 852 | exit(1); |
857 | } | 853 | } |
858 | amt -= j; | 854 | amt -= j; |
@@ -893,7 +889,7 @@ bad: run_err("%s: %s", np, strerror(errno)); | |||
893 | if (chmod(np, omode)) | 889 | if (chmod(np, omode)) |
894 | #endif /* HAVE_FCHMOD */ | 890 | #endif /* HAVE_FCHMOD */ |
895 | run_err("%s: set mode: %s", | 891 | run_err("%s: set mode: %s", |
896 | np, strerror(errno)); | 892 | np, strerror(errno)); |
897 | } else { | 893 | } else { |
898 | if (!exists && omode != mode) | 894 | if (!exists && omode != mode) |
899 | #ifdef HAVE_FCHMOD | 895 | #ifdef HAVE_FCHMOD |
@@ -902,7 +898,7 @@ bad: run_err("%s: %s", np, strerror(errno)); | |||
902 | if (chmod(np, omode & ~mask)) | 898 | if (chmod(np, omode & ~mask)) |
903 | #endif /* HAVE_FCHMOD */ | 899 | #endif /* HAVE_FCHMOD */ |
904 | run_err("%s: set mode: %s", | 900 | run_err("%s: set mode: %s", |
905 | np, strerror(errno)); | 901 | np, strerror(errno)); |
906 | } | 902 | } |
907 | if (close(ofd) == -1) { | 903 | if (close(ofd) == -1) { |
908 | wrerr = YES; | 904 | wrerr = YES; |
@@ -913,7 +909,7 @@ bad: run_err("%s: %s", np, strerror(errno)); | |||
913 | setimes = 0; | 909 | setimes = 0; |
914 | if (utimes(np, tv) < 0) { | 910 | if (utimes(np, tv) < 0) { |
915 | run_err("%s: set times: %s", | 911 | run_err("%s: set times: %s", |
916 | np, strerror(errno)); | 912 | np, strerror(errno)); |
917 | wrerr = DISPLAYED; | 913 | wrerr = DISPLAYED; |
918 | } | 914 | } |
919 | } | 915 | } |