d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify the ftp directory search code a little and eliminate a warning.

Browse Source
This commit is contained in:
Jordan K. Hubbard 2000-09-19 07:45:08 +00:00
parent 2276cee521
commit a6ee521120
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
release/sysinstall/ftp.c
View File

@ -162,17 +162,15 @@ mediaInitFTP(Device *dev)
* rel. If it succeeds we break out. If it fails, then we go back to
* the base directory and try again. Lots of chdirs, but oh well. :)
*/
fdir = 0;
while (ftp_dirs[fdir] != NULL) {
if (ftpChdir(OpenConn, ftp_dirs[fdir++]) != 0)
for (fdir = 0; ftp_dirs[fdir]; fdir++) {
if (ftpChdir(OpenConn, (char *)ftp_dirs[fdir]) != 0)
continue;
if (ftpChdir(OpenConn, rel) == 0) {
ftpInitted = TRUE;
return TRUE;
}
ftpChdir(OpenConn, "/");
if (dir && *dir != '\0')
ftpChdir(OpenConn, dir);
else /* reset to "root" dir for a fresh try */
ftpChdir(OpenConn, "/");
}
/*

10
usr.sbin/sysinstall/ftp.c
View File

@ -162,17 +162,15 @@ mediaInitFTP(Device *dev)
* rel. If it succeeds we break out. If it fails, then we go back to
* the base directory and try again. Lots of chdirs, but oh well. :)
*/
fdir = 0;
while (ftp_dirs[fdir] != NULL) {
if (ftpChdir(OpenConn, ftp_dirs[fdir++]) != 0)
for (fdir = 0; ftp_dirs[fdir]; fdir++) {
if (ftpChdir(OpenConn, (char *)ftp_dirs[fdir]) != 0)
continue;
if (ftpChdir(OpenConn, rel) == 0) {
ftpInitted = TRUE;
return TRUE;
}
ftpChdir(OpenConn, "/");
if (dir && *dir != '\0')
ftpChdir(OpenConn, dir);
else /* reset to "root" dir for a fresh try */
ftpChdir(OpenConn, "/");
}
/*