use the ansi version of deletefile

1 files changed, 27 insertions, 16 deletions

diff --git a/libressl.patch b/libressl.patch
index 037d989..950e48e 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..21b8ce649 100644
+index 6a64836fb..0a9f364e0 100644
 --- a/networking/wget.c
 +++ b/networking/wget.c
 @@ -1,4 +1,3 @@
@@ -120,7 +120,7 @@ index 6a64836fb..21b8ce649 100644
  #if ENABLE_FEATURE_WGET_TIMEOUT
         unsigned timeout_seconds;
         smallint die_if_timed_out;
-@@ -460,6 +462,66 @@ static FILE *open_socket(len_and_sockaddr *lsa)
+@@ -460,6 +462,67 @@ static FILE *open_socket(len_and_sockaddr *lsa)
         return fp;
  }
  
@@ -132,6 +132,7 @@ index 6a64836fb..21b8ce649 100644
 +#include <tls.h>
 +#include <winsock2.h>
 +#include <windows.h>
++#include <fileapi.h>
 +char* gather_certificates(struct tls_config *cfg)
 +{
 +       FILE *pemfile;
@@ -180,14 +181,14 @@ index 6a64836fb..21b8ce649 100644
 +               bb_error_msg_and_die("Failed to read temp ca pem file");
 +       tls_config_set_ca_mem(cfg, pemmem, pemsize);
 +       fclose(pemfile);
-+       DeleteFile(tmpfilename);
++       DeleteFileA(tmpfilename);
 +}
 +#endif
 +
  /* We balk at any control chars in other side's messages.
   * This prevents nasty surprises (e.g. ESC sequences) in "Location:" URLs
   * and error messages.
-@@ -689,6 +751,7 @@ static void reset_beg_range_to_zero(void)
+@@ -689,6 +752,7 @@ static void reset_beg_range_to_zero(void)
  }
  
  #if ENABLE_FEATURE_WGET_OPENSSL
@@ -195,7 +196,7 @@ index 6a64836fb..21b8ce649 100644
  static int spawn_https_helper_openssl(const char *host, unsigned port)
  {
         char *allocated = NULL;
-@@ -698,7 +761,7 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -698,7 +762,7 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
         IF_FEATURE_WGET_HTTPS(volatile int child_failed = 0;)
  
         if (socketpair(AF_UNIX, SOCK_STREAM, 0, sp) != 0)
@@ -204,7 +205,7 @@ index 6a64836fb..21b8ce649 100644
                 bb_simple_perror_msg_and_die("socketpair");
  
         if (!strchr(host, ':'))
-@@ -709,18 +772,18 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -709,18 +773,18 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
         fflush_all();
         pid = xvfork();
         if (pid == 0) {
@@ -229,7 +230,7 @@ index 6a64836fb..21b8ce649 100644
                 xmove_fd(2, 3);
                 xopen("/dev/null", O_RDWR);
                 memset(&argv, 0, sizeof(argv));
-@@ -729,18 +792,18 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -729,18 +793,18 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
                 argv[2] = (char*)"-quiet";
                 argv[3] = (char*)"-connect";
                 argv[4] = (char*)host;
@@ -254,7 +255,7 @@ index 6a64836fb..21b8ce649 100644
                         *argp++ = (char*)"-verify";              //[7]
                         *argp++ = (char*)"100";                  //[8]
                         *argp++ = (char*)"-verify_return_error"; //[9]
-@@ -762,10 +825,10 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -762,10 +826,10 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
  # else
                 bb_perror_msg_and_die("can't execute '%s'", argv[0]);
  # endif
@@ -267,7 +268,7 @@ index 6a64836fb..21b8ce649 100644
         free(servername);
         free(allocated);
         close(sp[1]);
-@@ -777,6 +840,7 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -777,6 +841,7 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
  # endif
         return sp[0];
  }
@@ -275,7 +276,7 @@ index 6a64836fb..21b8ce649 100644
  #endif
  
  #if ENABLE_FEATURE_WGET_HTTPS
-@@ -1151,6 +1215,9 @@ static void download_one_url(const char *url)
+@@ -1151,6 +1216,9 @@ static void download_one_url(const char *url)
         server.user = NULL;
         target.user = NULL;
  
@@ -285,7 +286,7 @@ index 6a64836fb..21b8ce649 100644
         parse_url(url, &target);
  
         /* Use the proxy if necessary */
-@@ -1234,22 +1301,39 @@ static void download_one_url(const char *url)
+@@ -1234,22 +1302,39 @@ static void download_one_url(const char *url)
                         /* openssl-based helper
                          * Inconvenient API since we can't give it an open fd
                          */
@@ -335,7 +336,7 @@ index 6a64836fb..21b8ce649 100644
   socket_opened:
  #elif ENABLE_FEATURE_WGET_HTTPS
                 /* Only internal TLS support is configured */
-@@ -1353,7 +1437,39 @@ static void download_one_url(const char *url)
+@@ -1353,7 +1438,39 @@ static void download_one_url(const char *url)
                         shutdown(fileno(sfp), SHUT_WR);
                 }
  #endif
@@ -376,7 +377,7 @@ index 6a64836fb..21b8ce649 100644
                 /*
                  * Retrieve HTTP response line and check for "200" status code.
                  */
-@@ -1536,6 +1652,8 @@ However, in real world it was observed that some web servers
+@@ -1536,6 +1653,8 @@ However, in real world it was observed that some web servers
                 /* ftpcmd("QUIT", NULL, sfp); - why bother? */
         }
  #endif
@@ -385,15 +386,17 @@ index 6a64836fb..21b8ce649 100644
         fclose(sfp);
  
         free(server.allocated);
-@@ -1691,9 +1809,17 @@ IF_DESKTOP(      "no-parent\0"        No_argument       "\xf0")
+@@ -1690,10 +1809,18 @@ IF_DESKTOP(     "no-parent\0"        No_argument       "\xf0")
+                        xdup2(G.log_fd, STDERR_FILENO);
                 }
         }
- 
+-
++       printf("About to config certificates\n");
 +       G.tlscfg = tls_config_new();
 +       if(G.tlscfg == NULL)
 +               bb_error_msg_and_die("Out of memory 2");
 +       char *pemmem = gather_certificates(G.tlscfg);
-+
++       print("Got to downloading section\n");
         while (*argv)
                 download_one_url(*argv++);
  
@@ -403,6 +406,14 @@ index 6a64836fb..21b8ce649 100644
         if (G.output_fd >= 0)
                 xclose(G.output_fd);
  
+@@ -1704,6 +1831,6 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
+        free(G.extra_headers);
+ #endif
+        FINI_G();
+-
++       printf("Exiting normally\n");
+        return EXIT_SUCCESS;
+ }
 diff --git a/scripts/trylink b/scripts/trylink
 index 2456252a3..6186284f1 100755
 --- a/scripts/trylink