mass change: update copyright years.

[wget] / src / ftp-ls.c

diff --git a/src/ftp-ls.c b/src/ftp-ls.c
index e0b474e18491a30dd0131ad7031f4e00b346bc43..2ff57cc05b2d63c9355a088a100cf81c4d2b0ca7 100644 (file)
--- a/src/ftp-ls.c
+++ b/src/ftp-ls.c
@@ -1,6 +1,7 @@
 /* Parsing FTP `ls' output.
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 /* Parsing FTP `ls' output.
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

-   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 
+   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+   Inc.

 
 This file is part of GNU Wget.
 
 
 This file is part of GNU Wget.
 


@@ -33,9 +34,7 @@ as that of the covered work.  */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>

 #include <errno.h>
 #include <time.h>
 #include "utils.h"
 #include <errno.h>
 #include <time.h>
 #include "utils.h"


@@ -72,13 +71,13 @@ static int
 clean_line(char *line)
 {
   int len = strlen (line);
 clean_line(char *line)
 {
   int len = strlen (line);

-  if (!len) return 0; 
+  if (!len) return 0;

   if (line[len - 1] == '\n')
     line[--len] = '\0';
   if (line[len - 1] == '\n')
     line[--len] = '\0';

-  if (!len) return 0; 
+  if (!len) return 0;

   if (line[len - 1] == '\r')
     line[--len] = '\0';
   if (line[len - 1] == '\r')
     line[--len] = '\0';

-  for ( ; *line ; line++ ) if (*line == '\t') *line = ' '; 
+  for ( ; *line ; line++ ) if (*line == '\t') *line = ' ';

   return len;
 }
 
   return len;
 }
 


@@ -100,7 +99,7 @@ ftp_parse_unix_ls (const char *file, int ignore_perms)
   };
   int next, len, i, error, ignore;
   int year, month, day;         /* for time analysis */
   };
   int next, len, i, error, ignore;
   int year, month, day;         /* for time analysis */

-  int hour, min, sec;
+  int hour, min, sec, ptype;

   struct tm timestruct, *tnow;
   time_t timenow;
 
   struct tm timestruct, *tnow;
   time_t timenow;
 


@@ -183,6 +182,7 @@ ftp_parse_unix_ls (const char *file, int ignore_perms)
                                    treated equally for now.  */
       year = hour = min = sec = 0; /* Silence the compiler.  */
       month = day = 0;
                                    treated equally for now.  */
       year = hour = min = sec = 0; /* Silence the compiler.  */
       month = day = 0;

+      ptype = TT_DAY;

       next = -1;
       /* While there are tokens on the line, parse them.  Next is the
          number of tokens left until the filename.
       next = -1;
       /* While there are tokens on the line, parse them.  Next is the
          number of tokens left until the filename.


@@ -262,6 +262,7 @@ ftp_parse_unix_ls (const char *file, int ignore_perms)
                       /* This means these were hours!  */
                       hour = year;
                       year = 0;
                       /* This means these were hours!  */
                       hour = year;
                       year = 0;

+                      ptype = TT_HOUR_MIN;

                       ++tok;
                       /* Get the minutes...  */
                       for (; c_isdigit (*tok); tok++)
                       ++tok;
                       /* Get the minutes...  */
                       for (; c_isdigit (*tok); tok++)


@@ -414,6 +415,7 @@ ftp_parse_unix_ls (const char *file, int ignore_perms)
       timestruct.tm_yday  = 0;
       timestruct.tm_isdst = -1;
       l->tstamp = mktime (&timestruct); /* store the time-stamp */
       timestruct.tm_yday  = 0;
       timestruct.tm_isdst = -1;
       l->tstamp = mktime (&timestruct); /* store the time-stamp */

+      l->ptype = ptype;

 
       xfree (line);
     }
 
       xfree (line);
     }


@@ -456,7 +458,7 @@ ftp_parse_winnt_ls (const char *file)
       if (len < 40) continue;
       tok = line + 39;
       cur.name = xstrdup(tok);
       if (len < 40) continue;
       tok = line + 39;
       cur.name = xstrdup(tok);

-      DEBUGP(("Name: '%s'\n", cur.name));
+      DEBUGP (("Name: '%s'\n", cur.name));

 
       /* First column: mm-dd-yy. Should atoi() on the month fail, january
          will be assumed.  */
 
       /* First column: mm-dd-yy. Should atoi() on the month fail, january
          will be assumed.  */


@@ -487,9 +489,9 @@ ftp_parse_winnt_ls (const char *file)
       if (hour == 12)  hour  = 0;
       if (*tok == 'P') hour += 12;
 
       if (hour == 12)  hour  = 0;
       if (*tok == 'P') hour += 12;
 

-      DEBUGP(("YYYY/MM/DD HH:MM - %d/%02d/%02d %02d:%02d\n", 
+      DEBUGP (("YYYY/MM/DD HH:MM - %d/%02d/%02d %02d:%02d\n",

               year+1900, month, day, hour, min));
               year+1900, month, day, hour, min));

-      
+

       /* Build the time-stamp (copy & paste from above) */
       timestruct.tm_sec   = 0;
       timestruct.tm_min   = min;
       /* Build the time-stamp (copy & paste from above) */
       timestruct.tm_sec   = 0;
       timestruct.tm_min   = min;


@@ -501,8 +503,9 @@ ftp_parse_winnt_ls (const char *file)
       timestruct.tm_yday  = 0;
       timestruct.tm_isdst = -1;
       cur.tstamp = mktime (&timestruct); /* store the time-stamp */
       timestruct.tm_yday  = 0;
       timestruct.tm_isdst = -1;
       cur.tstamp = mktime (&timestruct); /* store the time-stamp */

+      cur.ptype = TT_HOUR_MIN;

 
 

-      DEBUGP(("Timestamp: %ld\n", cur.tstamp));
+      DEBUGP (("Timestamp: %ld\n", cur.tstamp));

 
       /* Third column: Either file length, or <DIR>. We also set the
          permissions (guessed as 0644 for plain files and 0755 for
 
       /* Third column: Either file length, or <DIR>. We also set the
          permissions (guessed as 0644 for plain files and 0755 for


@@ -517,7 +520,7 @@ ftp_parse_winnt_ls (const char *file)
           cur.type  = FT_DIRECTORY;
           cur.size  = 0;
           cur.perms = 0755;
           cur.type  = FT_DIRECTORY;
           cur.size  = 0;
           cur.perms = 0755;

-          DEBUGP(("Directory\n"));
+          DEBUGP (("Directory\n"));

         }
       else
         {
         }
       else
         {


@@ -530,7 +533,7 @@ ftp_parse_winnt_ls (const char *file)
           else
             cur.size = size;
           cur.perms = 0644;
           else
             cur.size = size;
           cur.perms = 0644;

-          DEBUGP(("File, size %s bytes\n", number_to_static_string (cur.size)));
+          DEBUGP (("File, size %s bytes\n", number_to_static_string (cur.size)));

         }
 
       cur.linkto = NULL;
         }
 
       cur.linkto = NULL;


@@ -567,7 +570,7 @@ ftp_parse_winnt_ls (const char *file)
    more or less.  (Different VMS FTP servers may have different headers,
    and may not supply the same data, but all should be subsets of this.)
 
    more or less.  (Different VMS FTP servers may have different headers,
    and may not supply the same data, but all should be subsets of this.)
 

-   VMS normally provides local (server) time and date information. 
+   VMS normally provides local (server) time and date information.

    Define the logical name or environment variable
    "WGET_TIMEZONE_DIFFERENTIAL" (seconds) to adjust the receiving local
    times if different from the remote local times.
    Define the logical name or environment variable
    "WGET_TIMEZONE_DIFFERENTIAL" (seconds) to adjust the receiving local
    times if different from the remote local times.


@@ -748,7 +751,7 @@ ftp_parse_vms_ls (const char *file)
 
       tok = strtok(line, " ");
       if (tok == NULL) tok = line;
 
       tok = strtok(line, " ");
       if (tok == NULL) tok = line;

-      DEBUGP(("file name:   '%s'\n", tok));
+      DEBUGP (("file name:   '%s'\n", tok));

 
       /* Stripping the version number on a VMS system would be wrong.
          It may be foolish on a non-VMS system, too, but that's someone
 
       /* Stripping the version number on a VMS system would be wrong.
          It may be foolish on a non-VMS system, too, but that's someone


@@ -762,7 +765,7 @@ ftp_parse_vms_ls (const char *file)
       */
 
 #if (!defined( __VMS) && !defined( PRESERVE_VMS_VERSIONS))
       */
 
 #if (!defined( __VMS) && !defined( PRESERVE_VMS_VERSIONS))

-      for (p = tok+ strlen( tok); (--p > tok) && c_isdigit( *p); );
+      for (p = tok + strlen (tok); (--p > tok) && c_isdigit( *p); );

       if ((*p == ';') && (*(p- 1) != '^'))
         {
           *p = '\0';
       if ((*p == ';') && (*(p- 1) != '^'))
         {
           *p = '\0';


@@ -770,11 +773,11 @@ ftp_parse_vms_ls (const char *file)
 #endif /* (!defined( __VMS) && !defined( PRESERVE_VMS_VERSIONS)) */
 
       /* 2005-02-23 SMS.
 #endif /* (!defined( __VMS) && !defined( PRESERVE_VMS_VERSIONS)) */
 
       /* 2005-02-23 SMS.

-         Eliminate "^" escape characters from ODS5 extended file name. 
+         Eliminate "^" escape characters from ODS5 extended file name.

          (A caret is invalid in an ODS2 name, so this is always safe.)
       */
          (A caret is invalid in an ODS2 name, so this is always safe.)
       */

-      eat_carets( tok);
-      DEBUGP(("file name-^: '%s'\n", tok));
+      eat_carets (tok);
+      DEBUGP (("file name-^: '%s'\n", tok));

 
       /* Differentiate between a directory and any other file.  A VMS
          listing may not include file protections (permissions).  Set a
 
       /* Differentiate between a directory and any other file.  A VMS
          listing may not include file protections (permissions).  Set a


@@ -783,29 +786,29 @@ ftp_parse_vms_ls (const char *file)
          ".DIR;1" file type and version number, as the plain name is
          what will work in a CWD command.
       */
          ".DIR;1" file type and version number, as the plain name is
          what will work in a CWD command.
       */

-      len = strlen( tok);
-      if (!strncasecmp( (tok+ (len- 4)), ".DIR", 4))
+      len = strlen (tok);
+      if (!strncasecmp((tok + (len - 4)), ".DIR", 4))

         {
         {

-          *(tok+ (len -= 4)) = '\0'; /* Discard ".DIR". */
+          *(tok+ (len - 4)) = '\0'; /* Discard ".DIR". */

           cur.type  = FT_DIRECTORY;
           cur.perms = VMS_DEFAULT_PROT_DIR;
           cur.type  = FT_DIRECTORY;
           cur.perms = VMS_DEFAULT_PROT_DIR;

-          DEBUGP(("Directory (nv)\n"));
+          DEBUGP (("Directory (nv)\n"));

         }
         }

-      else if (!strncasecmp( (tok+ (len- 6)), ".DIR;1", 6))
+      else if (!strncasecmp ((tok + (len - 6)), ".DIR;1", 6))

         {
         {

-          *(tok+ (len -= 6)) = '\0'; /* Discard ".DIR;1". */
+          *(tok+ (len - 6)) = '\0'; /* Discard ".DIR;1". */

           cur.type  = FT_DIRECTORY;
           cur.perms = VMS_DEFAULT_PROT_DIR;
           cur.type  = FT_DIRECTORY;
           cur.perms = VMS_DEFAULT_PROT_DIR;

-          DEBUGP(("Directory (v)\n"));
+          DEBUGP (("Directory (v)\n"));

         }
       else
         {
           cur.type  = FT_PLAINFILE;
           cur.perms = VMS_DEFAULT_PROT_FILE;
         }
       else
         {
           cur.type  = FT_PLAINFILE;
           cur.perms = VMS_DEFAULT_PROT_FILE;

-          DEBUGP(("File\n"));
+          DEBUGP (("File\n"));

         }
         }

-      cur.name = xstrdup(tok);
-      DEBUGP(("Name: '%s'\n", cur.name));
+      cur.name = xstrdup (tok);
+      DEBUGP (("Name: '%s'\n", cur.name));

 
       /* Null the date and time string. */
       *date_str = '\0';
 
       /* Null the date and time string. */
       *date_str = '\0';


@@ -817,21 +820,21 @@ ftp_parse_vms_ls (const char *file)
          hence useless for an integrity check based on byte-count.
          Set size to unknown.
       */
          hence useless for an integrity check based on byte-count.
          Set size to unknown.
       */

-      cur.size  = 0;
+      cur.size = 0;

 
       /* Get token 2, if any.  A long name may force all other data onto
          a second line.  If needed, read the second line.
       */
 
 
       /* Get token 2, if any.  A long name may force all other data onto
          a second line.  If needed, read the second line.
       */
 

-      tok = strtok(NULL, " ");
-      if (tok == NULL) 
+      tok = strtok (NULL, " ");
+      if (tok == NULL)

         {
         {

-          DEBUGP(("Getting additional line.\n"));
+          DEBUGP (("Getting additional line.\n"));

           xfree (line);
           line = read_whole_line (fp);
           if (!line)
             {
           xfree (line);
           line = read_whole_line (fp);
           if (!line)
             {

-              DEBUGP(("EOF.  Leaving listing parser.\n"));
+              DEBUGP (("EOF.  Leaving listing parser.\n"));

               break;
             }
 
               break;
             }
 


@@ -839,15 +842,15 @@ ftp_parse_vms_ls (const char *file)
              line (and we may be confused).
           */
           if (i <= 0)
              line (and we may be confused).
           */
           if (i <= 0)

-           {
+            {

               /* Blank line.  End of significant file listing. */
               /* Blank line.  End of significant file listing. */

-              DEBUGP(("Blank line.  Leaving listing parser.\n"));
+              DEBUGP (("Blank line.  Leaving listing parser.\n"));

               xfree (line); /* Free useless line storage. */
               xfree (line); /* Free useless line storage. */

-             break;
-           }
+              break;
+            }

           else if (line[ 0] != ' ')
             {
           else if (line[ 0] != ' ')
             {

-              DEBUGP(("Non-blank in column 1.  Must be a new file name?\n"));
+              DEBUGP (("Non-blank in column 1.  Must be a new file name?\n"));

               continue;
             }
           else
               continue;
             }
           else


@@ -856,7 +859,7 @@ ftp_parse_vms_ls (const char *file)
               if (tok == NULL)
                 {
                   /* Unexpected non-empty but apparently blank line. */
               if (tok == NULL)
                 {
                   /* Unexpected non-empty but apparently blank line. */

-                  DEBUGP(("Null token.  Leaving listing parser.\n"));
+                  DEBUGP (("Null token.  Leaving listing parser.\n"));

                   xfree (line); /* Free useless line storage. */
                   break;
                 }
                   xfree (line); /* Free useless line storage. */
                   break;
                 }


@@ -871,87 +874,87 @@ ftp_parse_vms_ls (const char *file)
          Time:       HH:MM or HH:MM:SS or HH:MM:SS.CC
          Owner:      [user] or [user,group]
          Protection: (ppp,ppp,ppp,ppp) (where "ppp" is "RWED" or some
          Time:       HH:MM or HH:MM:SS or HH:MM:SS.CC
          Owner:      [user] or [user,group]
          Protection: (ppp,ppp,ppp,ppp) (where "ppp" is "RWED" or some

-                     subset thereof, for System, Owner, Group, World.
+         subset thereof, for System, Owner, Group, World.

 
          If permission is lacking, info may be replaced by the string:
          "No privilege for attempted operation".
       */
       while (tok != NULL)
 
          If permission is lacking, info may be replaced by the string:
          "No privilege for attempted operation".
       */
       while (tok != NULL)

-       {
-         DEBUGP (("Token: >%s<: ", tok));
+        {
+          DEBUGP (("Token: >%s<: ", tok));

 
 

-         if ((strlen( tok) < 12) && (strchr( tok, '-') != NULL))
-           {
-             /* Date. */
-             DEBUGP (("Date.\n"));
-             strcpy( date_str, tok);
-             strcat( date_str, " ");
-           }
-         else if ((strlen( tok) < 12) && (strchr( tok, ':') != NULL))
-           {
-             /* Time. */
-             DEBUGP (("Time. "));
-             strncat( date_str,
-              tok,
-              (sizeof( date_str)- strlen( date_str)- 1));
-             DEBUGP (("Date time: >%s<\n", date_str));
-           }
-         else if (strchr( tok, '[') != NULL)
-           {
-             /* Owner.  (Ignore.) */
-             DEBUGP (("Owner.\n"));
-           }
-         else if (strchr( tok, '(') != NULL)
-           {
-             /* Protections (permissions). */
-             perms = 0;
-             j = 0;
-             for (i = 0; i < strlen( tok); i++)
-               {
-                 switch (tok[ i])
-                   {
-                     case '(':
-                       break;
-                     case ')':
-                       break;
-                     case ',':
-                       if (j == 0)
-                         {
-                           perms = 0;
-                           j = 1;
-                         }
-                       else
-                         {
-                           perms <<= 3;
-                         }
-                       break;
-                   case 'R':
-                     perms |= 4;
-                     break;
-                   case 'W':
-                     perms |= 2;
-                     break;
-                   case 'E':
-                     perms |= 1;
-                     break;
-                   case 'D':
-                     perms |= 2;
-                     break;
-                   }
-               }
-             cur.perms = perms;
-             DEBUGP (("Prot.  perms = %0o.\n", cur.perms));
-           }
-         else
-           {
-             /* Nondescript.  Probably size(s), probably in blocks. 
+          if ((strlen (tok) < 12) && (strchr( tok, '-') != NULL))
+            {
+              /* Date. */
+              DEBUGP (("Date.\n"));
+              strcpy( date_str, tok);
+              strcat( date_str, " ");
+            }
+          else if ((strlen (tok) < 12) && (strchr( tok, ':') != NULL))
+            {
+              /* Time. */
+              DEBUGP (("Time. "));
+              strncat( date_str,
+                       tok,
+                       (sizeof( date_str)- strlen (date_str) - 1));
+              DEBUGP (("Date time: >%s<\n", date_str));
+            }
+          else if (strchr ( tok, '[') != NULL)
+            {
+              /* Owner.  (Ignore.) */
+              DEBUGP (("Owner.\n"));
+            }
+          else if (strchr (tok, '(') != NULL)
+            {
+              /* Protections (permissions). */
+              perms = 0;
+              j = 0;
+              for (i = 0; i < strlen( tok); i++)
+                {
+                  switch (tok[ i])
+                    {
+                    case '(':
+                      break;
+                    case ')':
+                      break;
+                    case ',':
+                      if (j == 0)
+                        {
+                          perms = 0;
+                          j = 1;
+                        }
+                      else
+                        {
+                          perms <<= 3;
+                        }
+                      break;
+                    case 'R':
+                      perms |= 4;
+                      break;
+                    case 'W':
+                      perms |= 2;
+                      break;
+                    case 'E':
+                      perms |= 1;
+                      break;
+                    case 'D':
+                      perms |= 2;
+                      break;
+                    }
+                }
+              cur.perms = perms;
+              DEBUGP (("Prot.  perms = %0o.\n", cur.perms));
+            }
+          else
+            {
+              /* Nondescript.  Probably size(s), probably in blocks.

                  Could be "No privilege ..." message.  (Ignore.)
               */
                  Could be "No privilege ..." message.  (Ignore.)
               */

-             DEBUGP (("Ignored (size?).\n"));
-           }
+              DEBUGP (("Ignored (size?).\n"));
+            }

 
 

-         tok = strtok (NULL, " ");
-       }
+          tok = strtok (NULL, " ");
+        }

 
       /* Tokens exhausted.  Interpret the data, and fill in the
          structure.
 
       /* Tokens exhausted.  Interpret the data, and fill in the
          structure.


@@ -967,26 +970,22 @@ ftp_parse_vms_ls (const char *file)
       /* Convert struct tm local time to time_t local time. */
       timenow = mktime (timestruct);
       /* Offset local time according to environment variable (seconds). */
       /* Convert struct tm local time to time_t local time. */
       timenow = mktime (timestruct);
       /* Offset local time according to environment variable (seconds). */

-      if ((tok = getenv( "WGET_TIMEZONE_DIFFERENTIAL")) != NULL)
+      if ((tok = getenv ( "WGET_TIMEZONE_DIFFERENTIAL")) != NULL)

         {
         {

-          dt = atoi( tok);
+          dt = atoi (tok);

           DEBUGP (("Time differential = %d.\n", dt));
         }
       else
           DEBUGP (("Time differential = %d.\n", dt));
         }
       else

-        {
-          dt = 0;
-        }
+        dt = 0;

 
       if (dt >= 0)
 
       if (dt >= 0)

-        {
-          timenow += dt;
-        }
+        timenow += dt;

       else
       else

-        {
-          timenow -= (-dt);
-        }
+        timenow -= (-dt);
+

       cur.tstamp = timenow; /* Store the time-stamp. */
       cur.tstamp = timenow; /* Store the time-stamp. */

-      DEBUGP(("Timestamp: %ld\n", cur.tstamp));
+      DEBUGP (("Timestamp: %ld\n", cur.tstamp));
+      cur.ptype = TT_HOUR_MIN;

 
       /* Add the data for this item to the linked list, */
       if (!dir)
 
       /* Add the data for this item to the linked list, */
       if (!dir)


@@ -1134,7 +1133,7 @@ ftp_index (const char *file, struct url *u, struct fileinfo *f)
 
           fprintf (fp, "%d %s %02d ", ptm->tm_year + 1900, months[ptm->tm_mon],
                   ptm->tm_mday);
 
           fprintf (fp, "%d %s %02d ", ptm->tm_year + 1900, months[ptm->tm_mon],
                   ptm->tm_mday);

-          if (ptm->tm_hour)
+          if (f->ptype == TT_HOUR_MIN)

             fprintf (fp, "%02d:%02d  ", ptm->tm_hour, ptm->tm_min);
           else
             fprintf (fp, "       ");
             fprintf (fp, "%02d:%02d  ", ptm->tm_hour, ptm->tm_min);
           else
             fprintf (fp, "       ");