!176 修复wget命令异常

Merge pull request !176 from 张吉东/wget_update

Author: openharmony_ci

generated/globals.h

@@ -1159,7 +1159,7 @@ struct wget_data {
 char*filename;
 longredirects;
 
-intsock;
+intsock, https;
 char*url;
 #ifCFG_WGET_LIBTLS
 structtls*tls;

toys/pending/wget.c

@@ -78,12 +78,13 @@ config WGET_OPENSSL
 
 #defineWGET_IS_HTTP (strncmp(TT.url, "http://", 7) == 0)
 #defineWGET_IS_HTTPS (WGET_SSL && (strncmp(TT.url, "https://", 8) == 0))
+#defineHTTPS (WGET_SSL && TT.https)
 
 GLOBALS(
 char*filename;
 longredirects;
 
-intsock;
+intsock, https;
 char*url;
 #ifCFG_WGET_LIBTLS
 structtls*tls;
@@ -103,30 +104,25 @@ static char *wget_strncaseafter(char *haystack, char *needle)
 // get http info in URL
 staticvoidwget_info(char*url, char**host, char**port, char**path)
 {
-*host=strafter(url, "://");
-*path=strchr(*host, '/');
-
-if ((*path=strchr(*host, '/'))) {
-**path='\0';
-*path=*path+1;
- } else {
-*path="";
- }
-
-if ( *host[0] =='['&&strchr(*host, ']') ) { // IPv6
-*port=strafter(*host, "]:");
-*host=*host+1;
-strchr(*host, ']')[0] ='\0';
- } else { // IPv4
-if ((*port=strchr(*host, ':'))) {
-**port='\0';
-*port=*port+1;
- }
+char*ss=url;
+
+// Must start with case insensitive http:// or https://
+if (strncasecmp(url, "http", 4)) url=0;
+else {
+url+=4;
+if ((TT.https=WGET_SSL&&toupper(*url=='s'))) url++;
+if (!strstart(&url, "://")) url=0;
  }
-
-if (!*port&&WGET_IS_HTTP) *port="80";
-elseif (!*port&&WGET_IS_HTTPS) *port="443";
-elseif (!*port) error_exit("unsupported protocol");
+if (!url) error_exit("unsupported protocol: %s", ss);
+if ((*path=strchr(*host=url, '/'))) *((*path)++) =0;
+else*path="";
+
+// Get port number and trim literal IPv6 addresses
+if (**host=='['&& (ss=strchr(++*host, ']'))) {
+*ss++=0;
+*port= (*ss==':') ? ++ss : 0;
+ } elseif ((*port=strchr(*host, ':'))) *((*port)++) =0;
+if (!*port) *port=HTTPS ? "443" : "80";
 }
 
 staticvoidwget_connect(char*host, char*port)