oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Add extra arguments to recvrequest.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3805 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-11-06 17:52:28 +00:00
parent 065569b696
commit a062a1f934
1 changed files with 143 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
appl/ftp/ftp/cmds.c
View File

@@ -546,14 +546,12 @@ mput(int argc, char **argv)
void void
reget(int argc, char **argv) reget(int argc, char **argv)
{ {
getit(argc, argv, 1, "r+w"); getit(argc, argv, 1, "r+w");
} }
void void
get(int argc, char **argv) get(int argc, char **argv)
{ {
getit(argc, argv, 0, restart_point ? "r+w" : "w" ); getit(argc, argv, 0, restart_point ? "r+w" : "w" );
} }
@@ -658,7 +656,7 @@ usage:
} }
recvrequest("RETR", argv[2], argv[1], mode, recvrequest("RETR", argv[2], argv[1], mode,
argv[1] != oldargv1 || argv[2] != oldargv2); argv[1] != oldargv1 || argv[2] != oldargv2, argv[2] != NULL);
restart_point = 0; restart_point = 0;
return (0); return (0);
} }
@@ -702,7 +700,7 @@ mget(int argc, char **argv)
tp = domap(tp); tp = domap(tp);
} }
recvrequest("RETR", tp, cp, "w", recvrequest("RETR", tp, cp, "w",
tp != cp || !interactive); tp != cp || !interactive, 0);
if (!mflag && fromatty) { if (!mflag && fromatty) {
ointer = interactive; ointer = interactive;
interactive = 1; interactive = 1;
@@ -755,7 +753,7 @@ remglob(char **argv, int doswitch)
pswitch(!proxy); pswitch(!proxy);
} }
for (mode = "w"; *++argv != NULL; mode = "a") for (mode = "w"; *++argv != NULL; mode = "a")
recvrequest ("NLST", temp, *argv, mode, 0); recvrequest ("NLST", temp, *argv, mode, 0, 0);
if (doswitch) { if (doswitch) {
pswitch(!proxy); pswitch(!proxy);
} }
@@ -1113,11 +1111,12 @@ ls(int argc, char **argv)
return; return;
} }
if (strcmp(argv[2], "-") && *argv[2] != '|') if (strcmp(argv[2], "-") && *argv[2] != '|')
if (!globulize(&argv[2]) || !confirm("output to local-file:", argv[2])) { if (!globulize(&argv[2]) || !confirm("output to local-file:",
argv[2])) {
code = -1; code = -1;
return; return;
} }
recvrequest(cmd, argv[2], argv[1], "w", 0); recvrequest(cmd, argv[2], argv[1], "w", 0, 0, 1);
} }
/* /*
@@ -1154,7 +1153,7 @@ usage:
setjmp(jabort); setjmp(jabort);
for (i = 1; mflag && i < argc-1; ++i) { for (i = 1; mflag && i < argc-1; ++i) {
*mode = (i == 1) ? 'w' : 'a'; *mode = (i == 1) ? 'w' : 'a';
recvrequest(cmd, dest, argv[i], mode, 0); recvrequest(cmd, dest, argv[i], mode, 0, 1);
if (!mflag && fromatty) { if (!mflag && fromatty) {
ointer = interactive; ointer = interactive;
interactive = 1; interactive = 1;