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

fix a couple problems with fetch:

Browse Source 
. don't try to interpet a colon in the pathname as a port number
	. don't report an errno message when one don't exist
This commit is contained in:
John-Mark Gurney 1997-03-06 10:01:54 +00:00
parent 643c3932d7
commit c1599df8b3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=23441
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.bin/fetch/ftp.c
View File

@ -26,7 +26,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: ftp.c,v 1.3 1997/02/10 18:49:40 wollman Exp $
* $Id: ftp.c,v 1.4 1997/03/05 18:57:16 fenner Exp $
*/
#include <sys/types.h>
@ -95,7 +95,7 @@ ftp_parse(struct fetch_state *fs, const char *uri)
strncat(hostname, p, q - p);
p = slash;
if (colon && colon + 1 != slash) {
if (colon && colon < slash && colon + 1 != slash) {
unsigned long ul;
char *ep;
@ -103,7 +103,10 @@ ftp_parse(struct fetch_state *fs, const char *uri)
ul = strtoul(colon + 1, &ep, 10);
if (ep != slash || ep == colon + 1 || errno != 0
|| ul < 1 || ul > 65534) {
warn("`%s': invalid port in URL", uri);
if (errno)
warn("`%s': invalid port in URL", uri);
else
warnx("`%s': invalid port in URL", uri);
return EX_USAGE;
}