[svn] Use the passive FTP transfer mode by default.

[wget] / src / main.c

diff --git a/src/main.c b/src/main.c
index 43772abefa31248312617d241f05b7b192c1845e..eb04478323065848144e0bf40f49f4adce176f55 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -555,7 +555,7 @@ FTP options:\n"),
     N_("\
        --no-glob               turn off FTP file name globbing.\n"),
     N_("\
-       --passive-ftp           use the \"passive\" transfer mode.\n"),
+       --no-passive-ftp        disable the \"passive\" transfer mode.\n"),
     N_("\
        --retr-symlinks         when recursing, get linked-to files (not dir).\n"),
     N_("\
@@ -660,7 +660,7 @@ main (int argc, char *const *argv)
 
 #ifdef WINDOWS
   /* Drop extension (typically .EXE) from executable filename. */
-  windows_main_junk (&argc, (char **) argv, (char **) &exec_name);
+  windows_main (&argc, (char **) argv, (char **) &exec_name);
 #endif
 
   /* Set option defaults; read the system wgetrc and ~/.wgetrc.  */
@@ -712,7 +712,7 @@ main (int argc, char *const *argv)
          break;
        case OPT_FUNCALL:
          {
-           void (*func) PARAMS ((void)) = opt->data;
+           void (*func) PARAMS ((void)) = (void (*) PARAMS ((void))) opt->data;
            func ();
          }
          break;