* setup.c (processdirlisting): Make "N" option a little less aggressive.

diff --git a/ChangeLog b/ChangeLog
index fc12a50404bec9c547d7b8259e560dcf9a8e78cf..110c218b74f1b22253509a554881dd51fdacf0d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Apr 15 20:05:33 2000  Christopher Faylor <cgf@cygnus.com>
+
+       * setup.c (processdirlisting): Make "N" option a little less aggressive.
+
 Fri Apr 14 11:11:29 2000  Christopher Faylor <cgf@cygnus.com>
 
        * setup.c (tarx): Wait to after tar has completed to reset protections

diff --git a/setup.c b/setup.c
index 1079ab6f6a031a132669eed1d9d127d1f6812df7..12e5f7a8a87953ceefd9ddad2fe230fa0a2863a8 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -618,17 +618,20 @@ processdirlisting (HINTERNET session, const char *urlbase, const char *file)
            {
              int download = 0;
              char *filename = strrchr (url, '/') + 1;
-             if (download_when == NEVER)
-               /* nothing to do */;
-             else if (download_when == ALWAYS || _access (filename, 0) == -1)
+             if (download_when == ALWAYS || _access (filename, 0) == -1)
                download = 1;
              else
                {
                  char text[_MAX_PATH];
                  char *answer;
 
-                 sprintf (text, "Replace %s from the net (ynAN)", filename);
-                 answer = prompt (text, "y");
+                 if (download_when == NEVER)
+                   answer = "N";
+                 else
+                   {
+                     sprintf (text, "Replace %s from the net (ynAN)", filename);
+                     answer = prompt (text, "y");
+                   }
 
                  if (answer)
                    {
@@ -644,6 +647,7 @@ processdirlisting (HINTERNET session, const char *urlbase, const char *file)
                          break;
                        case 'N':
                          download_when = NEVER;
+                         fprintf (stderr, "Skipping %s\n", filename);
                        case 'n':
                        default:
                          download = 0;
@@ -654,7 +658,7 @@ processdirlisting (HINTERNET session, const char *urlbase, const char *file)
 
              if (download)
                {
-                 printf ("Downloading: %s...", url);
+                 printf ("Downloading: %s...", filename);
                  fflush (stdout);
                  if (geturl (session, url, filename, 0))
                    {