debugging

1 files changed, 245 insertions, 1 deletions

diff --git a/libressl.patch b/libressl.patch
index 4c0fe3a..cb233da 100644
--- a/libressl.patch
+++ b/libressl.patch
@@ -135,7 +135,7 @@ index 9f1dd67ec..7e8da6df2 100644
  static void tls_xwrite(tls_state_t *tls, int len)
  {
 diff --git a/networking/wget.c b/networking/wget.c
-index 6a64836fb..e3d4b73c5 100644
+index 6a64836fb..7ca84e645 100644
 --- a/networking/wget.c
 +++ b/networking/wget.c
 @@ -689,6 +689,7 @@ static void reset_beg_range_to_zero(void)
@@ -182,6 +182,250 @@ index 6a64836fb..e3d4b73c5 100644
  #endif
  
  #if ENABLE_FEATURE_WGET_HTTPS
+@@ -1151,6 +1181,7 @@ static void download_one_url(const char *url)
+        server.user = NULL;
+        target.user = NULL;
+ 
++       printf("wget download_one_url 1\n");
+        parse_url(url, &target);
+ 
+        /* Use the proxy if necessary */
+@@ -1172,6 +1203,7 @@ static void download_one_url(const char *url)
+                        server.host = target.host;
+                }
+        }
++       printf("wget download_one_url 2\n");
+ 
+        if (ENABLE_FEATURE_IPV6)
+                strip_ipv6_scope_id(target.host);
+@@ -1191,6 +1223,7 @@ static void download_one_url(const char *url)
+                        G.fname_out = fname_out_alloc = xstrdup(G.fname_out);
+                }
+        }
++       printf("wget download_one_url 3\n");
+ #if ENABLE_FEATURE_WGET_STATUSBAR
+        G.curfile = bb_get_last_path_component_nostrip(G.fname_out);
+ #endif
+@@ -1206,15 +1239,19 @@ static void download_one_url(const char *url)
+                 * We are not sure it exists on remote side */
+        }
+ 
++       printf("wget download_one_url 4\n");
+        redir_limit = 16;
+  resolve_lsa:
++       printf("wget download_one_url 5\n");
+        lsa = xhost2sockaddr(server.host, server.port);
+        if (!(option_mask32 & WGET_OPT_QUIET)) {
+                char *s = xmalloc_sockaddr2dotted(&lsa->u.sa);
+                fprintf(stderr, "Connecting to %s (%s)\n", server.host, s);
+                free(s);
+        }
++       printf("wget download_one_url 6\n");
+  establish_session:
++       printf("wget download_one_url 7\n");
+        /*G.content_len = 0; - redundant, got_clen = 0 is enough */
+        G.got_clen = 0;
+        G.chunked = 0;
+@@ -1229,37 +1266,48 @@ static void download_one_url(const char *url)
+ 
+                /* Open socket to http(s) server */
+ #if ENABLE_FEATURE_WGET_OPENSSL
++               printf("wget download_one_url 8\n");
+                /* openssl (and maybe internal TLS) support is configured */
+                if (server.protocol == P_HTTPS) {
+                        /* openssl-based helper
+                         * Inconvenient API since we can't give it an open fd
+                         */
++                       printf("wget download_one_url 9\n");
+                        int fd = spawn_https_helper_openssl(server.host, server.port);
++                       printf("wget download_one_url 10\n");
+ # if ENABLE_FEATURE_WGET_HTTPS
+                        if (fd < 0) { /* no openssl? try internal */
++                               printf("wget download_one_url 11\n");
+                                sfp = open_socket(lsa);
+                                spawn_ssl_client(server.host, fileno(sfp), /*flags*/ 0);
+                                goto socket_opened;
++                               printf("wget download_one_url 12\n");
+                        }
+ # else
+                        /* We don't check for exec("openssl") failure in this case */
+ # endif
++                       printf("wget download_one_url 13\n");
+                        sfp = fdopen(fd, "r+");
+                        if (!sfp)
+                                bb_die_memory_exhausted();
++                       printf("wget download_one_url 14\n");
+                        goto socket_opened;
+                }
++               printf("wget download_one_url 15\n");
+                sfp = open_socket(lsa);
+  socket_opened:
+ #elif ENABLE_FEATURE_WGET_HTTPS
+                /* Only internal TLS support is configured */
++               printf("wget download_one_url 16\n");
+                sfp = open_socket(lsa);
+                if (server.protocol == P_HTTPS)
+                        spawn_ssl_client(server.host, fileno(sfp), /*flags*/ 0);
+ #else
++               printf("wget download_one_url 17\n");
+                /* ssl (https) support is not configured */
+                sfp = open_socket(lsa);
+ #endif
++               printf("wget download_one_url 18\n");
+                /* Send HTTP request */
+                if (use_proxy) {
+                        SENDFMT(sfp, "GET %s://%s/%s HTTP/1.1\r\n",
+@@ -1270,6 +1318,7 @@ static void download_one_url(const char *url)
+                                (option_mask32 & WGET_OPT_POST) ? "POST" : "GET",
+                                target.path);
+                }
++               printf("wget download_one_url 19\n");
+                if (!USR_HEADER_HOST)
+                        SENDFMT(sfp, "Host: %s\r\n", target.host);
+                if (!USR_HEADER_USER_AGENT)
+@@ -1280,6 +1329,7 @@ static void download_one_url(const char *url)
+                 */
+                SENDFMT(sfp, "Connection: close\r\n");
+ 
++               printf("wget download_one_url 20\n");
+ #if ENABLE_FEATURE_WGET_AUTHENTICATION
+                if (target.user && !USR_HEADER_AUTH) {
+                        SENDFMT(sfp, "Proxy-Authorization: Basic %s\r\n"+6,
+@@ -1291,6 +1341,7 @@ static void download_one_url(const char *url)
+                }
+ #endif
+ 
++               printf("wget download_one_url 21\n");
+                if (G.beg_range != 0 && !USR_HEADER_RANGE)
+                        SENDFMT(sfp, "Range: bytes=%"OFF_FMT"u-\r\n", G.beg_range);
+ 
+@@ -1300,6 +1351,7 @@ static void download_one_url(const char *url)
+                        fputs(G.extra_headers, sfp);
+                }
+ 
++               printf("wget download_one_url 22\n");
+                if (option_mask32 & WGET_OPT_POST_FILE) {
+                        int fd = xopen_stdin(G.post_file);
+                        G.post_data = xmalloc_read(fd, NULL);
+@@ -1314,15 +1366,18 @@ static void download_one_url(const char *url)
+                                );
+                        }
+ # if ENABLE_PLATFORM_MINGW32
++                       printf("wget download_one_url 23\n");
+                        if (!USR_HEADER_CONTENT_LENGTH)
+                                SENDFMT(sfp, "Content-Length: %u\r\n",
+                                        (int)strlen(G.post_data)
+                                );
++                       printf("wget download_one_url 24\n");
+                        SENDFMT(sfp,
+                                "\r\n"
+                                "%s",
+                                G.post_data
+                        );
++                       printf("wget download_one_url 25\n");
+                } else
+ # else
+                        SENDFMT(sfp,
+@@ -1338,6 +1393,7 @@ static void download_one_url(const char *url)
+                        SENDFMT(sfp, "\r\n");
+                }
+ 
++               printf("wget download_one_url 26\n");
+                fflush(sfp);
+ 
+ /* Tried doing this unconditionally.
+@@ -1358,6 +1414,7 @@ static void download_one_url(const char *url)
+                 * Retrieve HTTP response line and check for "200" status code.
+                 */
+  read_response:
++               printf("wget download_one_url 27\n");
+                fgets_trim_sanitize(sfp, "  %s\n");
+ 
+                str = G.wget_buf;
+@@ -1441,6 +1498,7 @@ However, in real world it was observed that some web servers
+                /*
+                 * Retrieve HTTP headers.
+                 */
++               printf("wget download_one_url 28\n");
+                while ((str = get_sanitized_hdr(sfp)) != NULL) {
+                        static const char keywords[] ALIGN1 =
+                                "content-length\0""transfer-encoding\0""location\0";
+@@ -1497,6 +1555,7 @@ However, in real world it was observed that some web servers
+                                goto establish_session;
+                        }
+                }
++               printf("wget download_one_url 29\n");
+ //             if (status >= 300)
+ //                     bb_error_msg_and_die("bad redirection (no Location: header from server)");
+ 
+@@ -1514,6 +1573,7 @@ However, in real world it was observed that some web servers
+ 
+        free(lsa);
+ 
++               printf("wget download_one_url 30\n");
+        if (!(option_mask32 & WGET_OPT_SPIDER)) {
+                if (G.output_fd < 0)
+                        G.output_fd = xopen(G.fname_out, G.o_flags);
+@@ -1536,6 +1596,7 @@ However, in real world it was observed that some web servers
+                /* ftpcmd("QUIT", NULL, sfp); - why bother? */
+        }
+ #endif
++       printf("wget download_one_url 31\n");
+        fclose(sfp);
+ 
+        free(server.allocated);
+@@ -1544,11 +1605,13 @@ However, in real world it was observed that some web servers
+        free(target.user);
+        free(fname_out_alloc);
+        free(redirected_path);
++       printf("wget download_one_url 32\n");
+ }
+ 
+ int wget_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+ int wget_main(int argc UNUSED_PARAM, char **argv)
+ {
++       printf("wget main 1\n");
+ #if ENABLE_FEATURE_WGET_LONG_OPTIONS
+        static const char wget_longopts[] ALIGN1 =
+                /* name, has_arg, val */
+@@ -1590,6 +1653,7 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
+ #endif
+ 
+        INIT_G();
++       printf("wget main 2\n");
+ 
+ #if ENABLE_FEATURE_WGET_TIMEOUT
+        G.timeout_seconds = 900;
+@@ -1626,6 +1690,8 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
+                IF_FEATURE_WGET_LONG_OPTIONS(, &G.post_data)
+                IF_FEATURE_WGET_LONG_OPTIONS(, &G.post_file)
+        );
++
++       printf("wget main 3\n");
+ #if 0 /* option bits debug */
+        if (option_mask32 & WGET_OPT_RETRIES) bb_error_msg("-t NUM");
+        if (option_mask32 & WGET_OPT_nsomething) bb_error_msg("-nsomething");
+@@ -1670,6 +1736,7 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
+        }
+ #endif
+ 
++       printf("wget main 4\n");
+        G.output_fd = -1;
+        G.o_flags = O_WRONLY | O_CREAT | O_TRUNC | O_EXCL;
+        if (G.fname_out) { /* -O FILE ? */
+@@ -1691,8 +1758,11 @@ IF_DESKTOP(      "no-parent\0"        No_argument       "\xf0")
+                }
+        }
+ 
+-       while (*argv)
++       printf("wget main 5\n");
++       while (*argv) {
++               printf("wget main 5-%s\n",argv);
+                download_one_url(*argv++);
++       }
+ 
+        if (G.output_fd >= 0)
+                xclose(G.output_fd);
 diff --git a/scripts/trylink b/scripts/trylink
 index 2456252a3..6186284f1 100755
 --- a/scripts/trylink