summaryrefslogtreecommitdiff
path: root/scp.c
diff options
context:
space:
mode:
Diffstat (limited to 'scp.c')
-rw-r--r--scp.c39
1 files changed, 1 insertions, 38 deletions
diff --git a/scp.c b/scp.c
index ef8ed9f28..0c4400f67 100644
--- a/scp.c
+++ b/scp.c
@@ -75,7 +75,7 @@
75 */ 75 */
76 76
77#include "includes.h" 77#include "includes.h"
78RCSID("$OpenBSD: scp.c,v 1.66 2001/04/14 17:04:42 stevesk Exp $"); 78RCSID("$OpenBSD: scp.c,v 1.67 2001/04/16 02:31:43 mouring Exp $");
79 79
80#include "xmalloc.h" 80#include "xmalloc.h"
81#include "atomicio.h" 81#include "atomicio.h"
@@ -203,7 +203,6 @@ typedef struct {
203} BUF; 203} BUF;
204 204
205BUF *allocbuf(BUF *, int, int); 205BUF *allocbuf(BUF *, int, int);
206char *colon(char *);
207void lostconn(int); 206void lostconn(int);
208void nospace(void); 207void nospace(void);
209int okname(char *); 208int okname(char *);
@@ -223,7 +222,6 @@ void rsource(char *, struct stat *);
223void sink(int, char *[]); 222void sink(int, char *[]);
224void source(int, char *[]); 223void source(int, char *[]);
225void tolocal(int, char *[]); 224void tolocal(int, char *[]);
226char *cleanhostname(char *);
227void toremote(char *, int, char *[]); 225void toremote(char *, int, char *[]);
228void usage(void); 226void usage(void);
229 227
@@ -345,17 +343,6 @@ main(argc, argv)
345 exit(errs != 0); 343 exit(errs != 0);
346} 344}
347 345
348char *
349cleanhostname(host)
350 char *host;
351{
352 if (*host == '[' && host[strlen(host) - 1] == ']') {
353 host[strlen(host) - 1] = '\0';
354 return (host + 1);
355 } else
356 return host;
357}
358
359void 346void
360toremote(targ, argc, argv) 347toremote(targ, argc, argv)
361 char *targ, *argv[]; 348 char *targ, *argv[];
@@ -1000,30 +987,6 @@ run_err(const char *fmt,...)
1000 } 987 }
1001} 988}
1002 989
1003char *
1004colon(cp)
1005 char *cp;
1006{
1007 int flag = 0;
1008
1009 if (*cp == ':') /* Leading colon is part of file name. */
1010 return (0);
1011 if (*cp == '[')
1012 flag = 1;
1013
1014 for (; *cp; ++cp) {
1015 if (*cp == '@' && *(cp+1) == '[')
1016 flag = 1;
1017 if (*cp == ']' && *(cp+1) == ':' && flag)
1018 return (cp+1);
1019 if (*cp == ':' && !flag)
1020 return (cp);
1021 if (*cp == '/')
1022 return (0);
1023 }
1024 return (0);
1025}
1026
1027void 990void
1028verifydir(cp) 991verifydir(cp)
1029 char *cp; 992 char *cp;