Delete temporary files after done.bug/tempfile

1 files changed, 23 insertions, 12 deletions

diff --git a/libressl.patch b/libressl.patch
index 0b4ea90..22b4089 100644
--- a/libressl.patch
+++ b/libressl.patch
@@ -102,7 +102,7 @@ index 9f1dd67ec..60e1afe99 100644
  static void tls_xwrite(tls_state_t *tls, int len)
  {
 diff --git a/networking/wget.c b/networking/wget.c
-index 6a64836fb..ba818a97b 100644
+index 6a64836fb..2d9847114 100644
 --- a/networking/wget.c
 +++ b/networking/wget.c
 @@ -1,4 +1,3 @@
@@ -270,7 +270,15 @@ index 6a64836fb..ba818a97b 100644
  #endif
  
  #if ENABLE_FEATURE_WGET_HTTPS
-@@ -1151,6 +1210,9 @@ static void download_one_url(const char *url)
+@@ -1139,6 +1198,7 @@ static void download_one_url(const char *url)
+        bool use_proxy;                 /* Use proxies if env vars are set  */
+        int redir_limit;
+        len_and_sockaddr *lsa;
++       char *sfp_name, *dfp_name;
+        FILE *sfp;                      /* socket to web/ftp server         */
+        FILE *dfp;                      /* socket to ftp server (data)      */
+        char *fname_out_alloc;
+@@ -1151,6 +1211,9 @@ static void download_one_url(const char *url)
         server.user = NULL;
         target.user = NULL;
  
@@ -280,7 +288,7 @@ index 6a64836fb..ba818a97b 100644
         parse_url(url, &target);
  
         /* Use the proxy if necessary */
-@@ -1234,22 +1296,46 @@ static void download_one_url(const char *url)
+@@ -1234,22 +1297,44 @@ static void download_one_url(const char *url)
                         /* openssl-based helper
                          * Inconvenient API since we can't give it an open fd
                          */
@@ -302,15 +310,14 @@ index 6a64836fb..ba818a97b 100644
 +                               bb_error_msg_and_die("Out of memory 1");
 +                       if(tls_configure(ctx,G.tlscfg) != 0)
 +                               bb_error_msg_and_die("Failed to configure client");
-+                       char *sfp_name = _tempnam(NULL,"l4w");
++                       sfp_name = _tempnam(NULL,"l4w");
 +                       if(sfp_name == NULL)
 +                               bb_error_msg_and_die("Failed to generate tmpfile name for sfp");
 +                       printf("Source file name:%s\n",sfp_name);
 +                       sfp = fopen(sfp_name, "w+");
 +                       if(sfp == NULL)
 +                               bb_error_msg_and_die("Failed to open source tempfile %d: %s", errno, strerror(errno));
-+                       free(sfp_name);
-+                       char *dfp_name = _tempnam(NULL,"l4w");
++                       dfp_name = _tempnam(NULL,"l4w");
 +                       if(dfp_name == NULL)
 +                               bb_error_msg_and_die("Failed to generate tmpfile name for dfp");
 +                       dfp = fopen(dfp_name, "w+");
@@ -318,7 +325,6 @@ index 6a64836fb..ba818a97b 100644
 +                       //dfp = tmpfile();
 +                       if(dfp == NULL)
 +                               bb_error_msg_and_die("Failed to open source tempfile %d: %s", errno, strerror(errno));
-+                       free(dfp_name);
 +                       if(tls_connect(ctx, servername, NULL) != 0)
 +                               bb_error_msg_and_die("Failed to connect: %s", tls_error(ctx));
 +                       free(allocated);
@@ -337,7 +343,7 @@ index 6a64836fb..ba818a97b 100644
   socket_opened:
  #elif ENABLE_FEATURE_WGET_HTTPS
                 /* Only internal TLS support is configured */
-@@ -1353,7 +1439,42 @@ static void download_one_url(const char *url)
+@@ -1353,7 +1438,44 @@ static void download_one_url(const char *url)
                         shutdown(fileno(sfp), SHUT_WR);
                 }
  #endif
@@ -376,12 +382,14 @@ index 6a64836fb..ba818a97b 100644
 +                       bb_error_msg_and_die("tls read error: %s", tls_error(ctx));
 +               rewind(dfp);
 +               fclose(sfp);
++               DeleteFile(sfp_name);
++               free(sfp_name);
 +               sfp = dfp;
 +               printf("finished in/out exchange\n");
                 /*
                  * Retrieve HTTP response line and check for "200" status code.
                  */
-@@ -1474,7 +1595,7 @@ However, in real world it was observed that some web servers
+@@ -1474,7 +1596,7 @@ However, in real world it was observed that some web servers
                         if (key == KEY_location && status >= 300) {
                                 if (--redir_limit == 0)
                                         bb_simple_error_msg_and_die("too many redirections");
@@ -390,7 +398,7 @@ index 6a64836fb..ba818a97b 100644
                                 if (str[0] == '/') {
                                         free(redirected_path);
                                         target.path = redirected_path = xstrdup(str + 1);
-@@ -1536,6 +1657,10 @@ However, in real world it was observed that some web servers
+@@ -1536,7 +1658,13 @@ However, in real world it was observed that some web servers
                 /* ftpcmd("QUIT", NULL, sfp); - why bother? */
         }
  #endif
@@ -399,9 +407,12 @@ index 6a64836fb..ba818a97b 100644
 +               tls_close(ctx);
 +       printf("Cleaned up connection\n");
         fclose(sfp);
++       DeleteFile(dfp_name);
++       free(dfp_name);
  
         free(server.allocated);
-@@ -1690,9 +1815,18 @@ IF_DESKTOP(      "no-parent\0"        No_argument       "\xf0")
+        free(target.allocated);
+@@ -1690,9 +1818,18 @@ IF_DESKTOP(      "no-parent\0"        No_argument       "\xf0")
                         xdup2(G.log_fd, STDERR_FILENO);
                 }
         }
@@ -421,7 +432,7 @@ index 6a64836fb..ba818a97b 100644
  
         if (G.output_fd >= 0)
                 xclose(G.output_fd);
-@@ -1704,6 +1838,6 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
+@@ -1704,6 +1841,6 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
         free(G.extra_headers);
  #endif
         FINI_G();