Password prompt only once, and before backgrounding.

diff --git a/src/ChangeLog b/src/ChangeLog
index 7c1869b03dab984d5bc48d1a27c2f42872e89c99..5a0a927ee095a7cb19a8a95b8afe5aa5681dc99c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-19  Micah Cowan  <micah@cowan.name>
+
+       * main.c (main): Password prompt should be done only once (not
+       once per argument), and should be done prior to the background
+       fork.
+
 2008-05-17  Steven Schubiger  <schubiger@gmail.com>
 
        * init.c (defaults): Set the preferred IP family to `none' by
@@ -6,6 +12,8 @@
 2008-05-17  Kenny Parnell  <k.parnell@gmail.com>
        (cmd_spec_prefer_family): Initialize prefer_family to prefer_none.
 
+2008-05-17  Micah Cowan  <micah@cowan.name>
+       
        * main.c (main): Handle Ctrl-D on command-line.
 
 2008-05-15  Steven Schubiger  <schubiger@gmail.com>

diff --git a/src/main.c b/src/main.c
index 228bb27fe2ef00dc2171b4e94ec9cebd1e382415..d68cdbd6b937db48b44ca3d20b926c88e27cee08 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -947,6 +947,14 @@ for details.\n\n"));
       exit (1);
     }
 
+  if (opt.ask_passwd)
+    {
+      opt.passwd = prompt_for_password ();
+
+      if (opt.passwd == NULL || opt.passwd[0] == '\0')
+        exit (1);
+    }
+
 #ifdef MSDOS
   if (opt.wdebug)
      dbug_init();
@@ -1030,14 +1038,6 @@ for details.\n\n"));
       char *filename = NULL, *redirected_URL = NULL;
       int dt;
 
-      if (opt.ask_passwd)
-        {
-          opt.passwd = prompt_for_password ();
-
-          if (opt.passwd == NULL || opt.passwd[0] == '\0')
-              exit (1);
-        }
-
       if ((opt.recursive || opt.page_requisites)
           && (url_scheme (*t) != SCHEME_FTP || url_uses_proxy (*t)))
         {