diff options
author | Damien Miller <djm@mindrot.org> | 2003-06-04 22:51:08 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-06-04 22:51:08 +1000 |
commit | 65d1f5765ff9b6b50a0ea97a2cc47fe4115f8972 (patch) | |
tree | df5c03f9ce99b07363a2ff294e7fdc667c72edf6 | |
parent | 9fc7c699af19977dbb5984374076821bf1f0fd13 (diff) |
- djm@cvs.openbsd.org 2003/06/04 12:18:49
[scp.c]
ansify; ok markus@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | scp.c | 39 |
2 files changed, 15 insertions, 29 deletions
@@ -17,6 +17,9 @@ | |||
17 | - djm@cvs.openbsd.org 2003/06/04 12:03:59 | 17 | - djm@cvs.openbsd.org 2003/06/04 12:03:59 |
18 | [serverloop.c] | 18 | [serverloop.c] |
19 | remove bitrotten commet; ok markus@ | 19 | remove bitrotten commet; ok markus@ |
20 | - djm@cvs.openbsd.org 2003/06/04 12:18:49 | ||
21 | [scp.c] | ||
22 | ansify; ok markus@ | ||
20 | - (djm) Update to fix of bug #584: lock card before return. | 23 | - (djm) Update to fix of bug #584: lock card before return. |
21 | From larsch@trustcenter.de | 24 | From larsch@trustcenter.de |
22 | 25 | ||
@@ -447,4 +450,4 @@ | |||
447 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 450 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
448 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 451 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
449 | 452 | ||
450 | $Id: ChangeLog,v 1.2777 2003/06/04 12:50:54 djm Exp $ | 453 | $Id: ChangeLog,v 1.2778 2003/06/04 12:51:08 djm Exp $ |
@@ -71,7 +71,7 @@ | |||
71 | */ | 71 | */ |
72 | 72 | ||
73 | #include "includes.h" | 73 | #include "includes.h" |
74 | RCSID("$OpenBSD: scp.c,v 1.103 2003/06/03 02:56:16 millert Exp $"); | 74 | RCSID("$OpenBSD: scp.c,v 1.104 2003/06/04 12:18:49 djm Exp $"); |
75 | 75 | ||
76 | #include "xmalloc.h" | 76 | #include "xmalloc.h" |
77 | #include "atomicio.h" | 77 | #include "atomicio.h" |
@@ -202,9 +202,7 @@ void toremote(char *, int, char *[]); | |||
202 | void usage(void); | 202 | void usage(void); |
203 | 203 | ||
204 | int | 204 | int |
205 | main(argc, argv) | 205 | main(int argc, char **argv) |
206 | int argc; | ||
207 | char *argv[]; | ||
208 | { | 206 | { |
209 | int ch, fflag, tflag, status; | 207 | int ch, fflag, tflag, status; |
210 | double speed; | 208 | double speed; |
@@ -349,9 +347,7 @@ main(argc, argv) | |||
349 | } | 347 | } |
350 | 348 | ||
351 | void | 349 | void |
352 | toremote(targ, argc, argv) | 350 | toremote(char *targ, int argc, char **argv) |
353 | char *targ, *argv[]; | ||
354 | int argc; | ||
355 | { | 351 | { |
356 | int i, len; | 352 | int i, len; |
357 | char *bp, *host, *src, *suser, *thost, *tuser; | 353 | char *bp, *host, *src, *suser, *thost, *tuser; |
@@ -439,9 +435,7 @@ toremote(targ, argc, argv) | |||
439 | } | 435 | } |
440 | 436 | ||
441 | void | 437 | void |
442 | tolocal(argc, argv) | 438 | tolocal(int argc, char **argv) |
443 | int argc; | ||
444 | char *argv[]; | ||
445 | { | 439 | { |
446 | int i, len; | 440 | int i, len; |
447 | char *bp, *host, *src, *suser; | 441 | char *bp, *host, *src, *suser; |
@@ -490,9 +484,7 @@ tolocal(argc, argv) | |||
490 | } | 484 | } |
491 | 485 | ||
492 | void | 486 | void |
493 | source(argc, argv) | 487 | source(int argc, char **argv) |
494 | int argc; | ||
495 | char *argv[]; | ||
496 | { | 488 | { |
497 | struct stat stb; | 489 | struct stat stb; |
498 | static BUF buffer; | 490 | static BUF buffer; |
@@ -600,9 +592,7 @@ next: (void) close(fd); | |||
600 | } | 592 | } |
601 | 593 | ||
602 | void | 594 | void |
603 | rsource(name, statp) | 595 | rsource(char *name, struct stat *statp) |
604 | char *name; | ||
605 | struct stat *statp; | ||
606 | { | 596 | { |
607 | DIR *dirp; | 597 | DIR *dirp; |
608 | struct dirent *dp; | 598 | struct dirent *dp; |
@@ -709,9 +699,7 @@ bwlimit(int amount) | |||
709 | } | 699 | } |
710 | 700 | ||
711 | void | 701 | void |
712 | sink(argc, argv) | 702 | sink(int argc, char **argv) |
713 | int argc; | ||
714 | char *argv[]; | ||
715 | { | 703 | { |
716 | static BUF buffer; | 704 | static BUF buffer; |
717 | struct stat stb; | 705 | struct stat stb; |
@@ -1050,8 +1038,7 @@ run_err(const char *fmt,...) | |||
1050 | } | 1038 | } |
1051 | 1039 | ||
1052 | void | 1040 | void |
1053 | verifydir(cp) | 1041 | verifydir(char *cp) |
1054 | char *cp; | ||
1055 | { | 1042 | { |
1056 | struct stat stb; | 1043 | struct stat stb; |
1057 | 1044 | ||
@@ -1065,8 +1052,7 @@ verifydir(cp) | |||
1065 | } | 1052 | } |
1066 | 1053 | ||
1067 | int | 1054 | int |
1068 | okname(cp0) | 1055 | okname(char *cp0) |
1069 | char *cp0; | ||
1070 | { | 1056 | { |
1071 | int c; | 1057 | int c; |
1072 | char *cp; | 1058 | char *cp; |
@@ -1096,9 +1082,7 @@ bad: fprintf(stderr, "%s: invalid user name\n", cp0); | |||
1096 | } | 1082 | } |
1097 | 1083 | ||
1098 | BUF * | 1084 | BUF * |
1099 | allocbuf(bp, fd, blksize) | 1085 | allocbuf(BUF *bp, int fd, int blksize) |
1100 | BUF *bp; | ||
1101 | int fd, blksize; | ||
1102 | { | 1086 | { |
1103 | size_t size; | 1087 | size_t size; |
1104 | #ifdef HAVE_STRUCT_STAT_ST_BLKSIZE | 1088 | #ifdef HAVE_STRUCT_STAT_ST_BLKSIZE |
@@ -1126,8 +1110,7 @@ allocbuf(bp, fd, blksize) | |||
1126 | } | 1110 | } |
1127 | 1111 | ||
1128 | void | 1112 | void |
1129 | lostconn(signo) | 1113 | lostconn(int signo) |
1130 | int signo; | ||
1131 | { | 1114 | { |
1132 | if (!iamremote) | 1115 | if (!iamremote) |
1133 | write(STDERR_FILENO, "lost connection\n", 16); | 1116 | write(STDERR_FILENO, "lost connection\n", 16); |