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

Don't retrieve files that start with ..' or /' without asking.

Browse Source 
Reverse test in confirm() to check for `y' rather than not `n'.  Use
mkstemp.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3807 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-11-06 19:44:24 +00:00
parent 773d8d8a06
commit 6ed1298d81
1 changed files with 70 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -562,10 +562,12 @@ int
getit(int argc, char **argv, int restartit, char *mode) getit(int argc, char **argv, int restartit, char *mode)
{ {
int loc = 0; int loc = 0;
int local_given = 1;
char *oldargv1, *oldargv2; char *oldargv1, *oldargv2;
if (argc == 2) { if (argc == 2) {
argc++; argc++;
local_given = 0;
argv[2] = argv[1]; argv[2] = argv[1];
loc++; loc++;
} }
@@ -656,7 +658,7 @@ usage:
} }
recvrequest("RETR", argv[2], argv[1], mode, recvrequest("RETR", argv[2], argv[1], mode,
argv[1] != oldargv1 || argv[2] != oldargv2, argv[2] != NULL); argv[1] != oldargv1 || argv[2] != oldargv2, local_given);
restart_point = 0; restart_point = 0;
return (0); return (0);
} }
@@ -718,61 +720,78 @@ mget(int argc, char **argv)
char * char *
remglob(char **argv, int doswitch) remglob(char **argv, int doswitch)
{ {
char temp[16]; char temp[16];
static char buf[MaxPathLen]; static char buf[MaxPathLen];
static FILE *ftemp = NULL; static FILE *ftemp = NULL;
static char **args; static char **args;
int oldverbose, oldhash; int oldverbose, oldhash;
char *cp, *mode; char *cp, *mode;
if (!mflag) { if (!mflag) {
if (!doglob) {
args = NULL;
}
else {
if (ftemp) {
fclose(ftemp);
ftemp = NULL;
}
}
return (NULL);
}
if (!doglob) { if (!doglob) {
if (args == NULL) args = NULL;
args = argv;
if ((cp = *++args) == NULL)
args = NULL;
return (cp);
} }
if (ftemp == NULL) { else {
strcpy(temp, _PATH_TMP_XXX); if (ftemp) {
mktemp(temp);
oldverbose = verbose, verbose = 0;
oldhash = hash, hash = 0;
if (doswitch) {
pswitch(!proxy);
}
for (mode = "w"; *++argv != NULL; mode = "a")
recvrequest ("NLST", temp, *argv, mode, 0, 0);
if (doswitch) {
pswitch(!proxy);
}
verbose = oldverbose; hash = oldhash;
ftemp = fopen(temp, "r");
unlink(temp);
if (ftemp == NULL) {
printf("can't find list of remote files, oops\n");
return (NULL);
}
}
if (fgets(buf, sizeof (buf), ftemp) == NULL) {
fclose(ftemp); fclose(ftemp);
ftemp = NULL; ftemp = NULL;
return (NULL); }
} }
if ((cp = strchr(buf, '\n')) != NULL) return (NULL);
*cp = '\0'; }
return (buf); if (!doglob) {
if (args == NULL)
args = argv;
if ((cp = *++args) == NULL)
args = NULL;
return (cp);
}
if (ftemp == NULL) {
int fd;
strcpy(temp, _PATH_TMP_XXX);
fd = mkstemp(temp);
if(fd < 0){
warn("unable to create temporary file %s", temp);
return NULL;
}
close(fd);
oldverbose = verbose, verbose = 0;
oldhash = hash, hash = 0;
if (doswitch) {
pswitch(!proxy);
}
for (mode = "w"; *++argv != NULL; mode = "a")
recvrequest ("NLST", temp, *argv, mode, 0, 0);
if (doswitch) {
pswitch(!proxy);
}
verbose = oldverbose; hash = oldhash;
ftemp = fopen(temp, "r");
unlink(temp);
if (ftemp == NULL) {
printf("can't find list of remote files, oops\n");
return (NULL);
}
}
next:
if (fgets(buf, sizeof (buf), ftemp) == NULL) {
fclose(ftemp);
ftemp = NULL;
return (NULL);
}
if ((cp = strchr(buf, '\n')) != NULL)
*cp = '\0';
if(strncmp(buf, "../", 3) == 0 || *buf == '/'){
if(interactive == 0){
printf("Ignoring remote globbed file `%s'\n", buf);
goto next;
}
if(!confirm(buf, *buf == '/' ?
" - retrieve file starting with `/'" :
" - retrieve file starting with `..'"))
goto next;
}
return (buf);
} }
char * char *
@@ -1484,7 +1503,7 @@ confirm(char *cmd, char *file)
fflush(stdout); fflush(stdout);
if (fgets(line, sizeof line, stdin) == NULL) if (fgets(line, sizeof line, stdin) == NULL)
return (0); return (0);
return (*line != 'n' && *line != 'N'); return (*line == 'y' || *line == 'Y');
} }
void void