Using base::Time::Exploded instead of "tm" (FTP PATCH SET 5)

net/ftp/ftp_directory_parser.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Version: MPL 1.1/GPL 2.0/LGPL 2.1
 //
 // The contents of this file are subject to the Mozilla Public License Version
 // 1.1 (the "License"); you may not use this file except in compliance with
 // the License. You may obtain a copy of the License at
 // http://www.mozilla.org/MPL/
@@ skipping 23 matching lines @@
 // decision by deleting the provisions above and replace them with the notice
 // and other provisions required by the GPL or the LGPL. If you do not delete
 // the provisions above, a recipient may use your version of this file under
 // the terms of any one of the MPL, the GPL or the LGPL.
 
 // Derived from:
 // mozilla/netwerk/streamconv/converters/ParseFTPList.cpp revision 1.10
 
 #include "net/ftp/ftp_directory_parser.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
+
+#include <time.h>
 
 #include "build/build_config.h"
 #include "base/basictypes.h"
 #include "base/string_util.h"
 
+using base::Time;
+
 // #undef anything you don't want to support
 #define SUPPORT_LSL   // /bin/ls -l and dozens of variations therof
 #define SUPPORT_DLS   // /bin/dls format (very, Very, VERY rare)
 #define SUPPORT_EPLF  // Extraordinarily Pathetic List Format
 #define SUPPORT_DOS   // WinNT server in 'site dirstyle' dos
 #define SUPPORT_VMS   // VMS (all: MultiNet, UCX, CMU-IP)
 #define SUPPORT_CMS   // IBM VM/CMS,VM/ESA (z/VM and LISTING forms)
 #define SUPPORT_OS2   // IBM TCP/IP for OS/2 - FTP Server
 #define SUPPORT_W16   // win16 hosts: SuperTCP or NetManage Chameleon
 
@@ skipping 101 matching lines @@
             result->fe_type = FTP_TYPE_DIRECTORY;  // Its a dir.
           else if (*p == 'r')
             result->fe_type = FTP_TYPE_FILE;
           else if (*p == 'm') {
             if (isdigit(line[pos])) {
               while (pos < linelen && isdigit(line[pos]))
                 pos++;
               if (pos < linelen && line[pos] == ',') {
                 uint64 seconds = 0;
                 seconds = StringToInt64(p + 1);
-                time_t tim = static_cast<time_t>(seconds);
-                gmtime_r(&tim, &result->fe_time);
+                Time t = Time::FromTimeT(seconds);
+                t.LocalExplode(&(result->fe_time));
               }
             }
           } else if (*p == 's') {
               if (isdigit(line[pos])) {
                 while (pos < linelen && isdigit(line[pos]))
                   pos++;
                 if (pos < linelen && line[pos] == ',' &&
                     ((&line[pos]) - (p+1)) <
                     static_cast<int>(sizeof(result->fe_size) - 1)) {
                   memcpy(result->fe_size, p + 1,
@@ skipping 277 matching lines @@
           month_num = 0;
           for (pos = 0; pos < (12*3); pos += 3) {
             if (tbuf[0] == month_names[pos+0] &&
                 tbuf[1] == month_names[pos + 1] &&
                 tbuf[2] == month_names[pos + 2])
               break;
             month_num++;
           }
           if (month_num >= 12)
             month_num = 0;
-          result->fe_time.tm_mon  = month_num;
-          result->fe_time.tm_mday = StringToInt(tokens[2]);
-          result->fe_time.tm_year = StringToInt(p + 4);
-          // NSPR wants year as XXXX
+          result->fe_time.month  = month_num + 1;
+          result->fe_time.day_of_month = StringToInt(tokens[2]);
+          result->fe_time.year = StringToInt(p + 4);
 
           p = tokens[3] + 2;
           if (*p == ':')
             p++;
           if (p[2] == ':')
-            result->fe_time.tm_sec = StringToInt(p + 3);
-          result->fe_time.tm_hour = StringToInt(tokens[3]);
-          result->fe_time.tm_min = StringToInt(p);
+            result->fe_time.second = StringToInt(p + 3);
+          result->fe_time.hour = StringToInt(tokens[3]);
+          result->fe_time.minute = StringToInt(p);
           return result->fe_type;
         }  // if (isdigit(*tokens[1]))
         return FTP_TYPE_JUNK;  // junk
       }  // if (lstyle == 'V')
     }  // if (!lstyle && (!state->lstyle || state->lstyle == 'V'))
 #endif  // SUPPORT_VMS
 
 #if defined(SUPPORT_CMS)
     // Virtual Machine/Conversational Monitor System (IBM Mainframe)
     if (!lstyle && (!state->lstyle || state->lstyle == 'C')) {  // VM/CMS
@@ skipping 86 matching lines @@
             lstyle = 0;
         }
       }  // if (lstyle && !state->lstyle)
 
       if (lstyle == 'C') {
         state->parsed_one = 1;
         state->lstyle = lstyle;
 
         p = tokens[tokmarker+4];
         if (toklen[tokmarker+4] == 10) {  // newstyle: YYYY-MM-DD format
-          result->fe_time.tm_year = StringToInt(p + 0) - 1900;
-          result->fe_time.tm_mon  = StringToInt(p + 5) - 1;
-          result->fe_time.tm_mday = StringToInt(p + 8);
+          result->fe_time.year = StringToInt(p + 0);
+          result->fe_time.month  = StringToInt(p + 5);
+          result->fe_time.day_of_month = StringToInt(p + 8);
         } else {  // oldstyle: [M]M/DD/YY format
-            pos = toklen[tokmarker + 4];
-            result->fe_time.tm_mon  = StringToInt(p) - 1;
-            result->fe_time.tm_mday = StringToInt((p + pos)-5);
-            result->fe_time.tm_year = StringToInt((p + pos)-2);
-            if (result->fe_time.tm_year < 70)
-              result->fe_time.tm_year += 100;
+          pos = toklen[tokmarker + 4];
+          result->fe_time.month  = StringToInt(p);
+          result->fe_time.day_of_month = StringToInt((p + pos)-5);
+          result->fe_time.year = StringToInt((p + pos)-2);
+          if (result->fe_time.year < 70)
+            result->fe_time.year += 100;
+          result->fe_time.year += 1900;
         }
         p = tokens[tokmarker + 5];
         pos = toklen[tokmarker + 5];
-        result->fe_time.tm_hour = StringToInt(p);
-        result->fe_time.tm_min = StringToInt((p + pos) - 5);
-        result->fe_time.tm_sec = StringToInt((p + pos) - 2);
+        result->fe_time.hour = StringToInt(p);
+        result->fe_time.minute = StringToInt((p + pos) - 5);
+        result->fe_time.second = StringToInt((p + pos) - 2);
 
         result->fe_cinfs = 1;
         result->fe_fname = tokens[0];
         result->fe_fnlen = toklen[0];
         result->fe_type = FTP_TYPE_FILE;
 
         p = tokens[tokmarker];
         if (toklen[tokmarker] == 3 && *p == 'D' && p[1] == 'I' && p[2] == 'R')
           result->fe_type = FTP_TYPE_DIRECTORY;
 
@@ skipping 82 matching lines @@
                   result->fe_lname = p + 4;
                   result->fe_lnlen = &(line[linelen_sans_wsp])
                     - result->fe_lname;
                   break;
                 }
                 p++;
               }
             }
         }
 
-        result->fe_time.tm_mon = StringToInt(tokens[0]+0);
-        if (result->fe_time.tm_mon != 0) {
-          result->fe_time.tm_mon--;
-          result->fe_time.tm_mday = StringToInt(tokens[0]+3);
-          result->fe_time.tm_year = StringToInt(tokens[0]+6);
-          if (result->fe_time.tm_year < 80)
-            result->fe_time.tm_year += 100;
+        result->fe_time.month = StringToInt(tokens[0] + 0);
+        if (result->fe_time.month != 1) {
+          result->fe_time.month--;
+          result->fe_time.day_of_month = StringToInt(tokens[0] + 3);
+          result->fe_time.year = StringToInt(tokens[0] + 6);
+          if (result->fe_time.year < 80)
+            result->fe_time.year += 100;
+          result->fe_time.year += 1900;
         }
 
-        result->fe_time.tm_hour = StringToInt(tokens[1]+0);
-        result->fe_time.tm_min = StringToInt(tokens[1]+3);
-        if ((tokens[1][5]) == 'P' && result->fe_time.tm_hour < 12)
-          result->fe_time.tm_hour += 12;
+        result->fe_time.hour = StringToInt(tokens[1]+0);
+        result->fe_time.minute = StringToInt(tokens[1]+3);
+        if ((tokens[1][5]) == 'P' && result->fe_time.hour < 12)
+          result->fe_time.hour += 12;
 
         // the caller should do this (if dropping "." and ".." is desired)
         // if (result->fe_type == FTP_TYPE_DIRECTORY && result->fe_fname[0]
         // == '.' &&
         // (result->fe_fnlen == 1 || (result->fe_fnlen == 2 &&
         // result->fe_fname[1] == '.')))
         // return FTP_TYPE_JUNK;
 
         return result->fe_type;
       }  // if (lstyle == 'W' && (!state->lstyle || state->lstyle == lstyle))
@@ skipping 67 matching lines @@
         }
 
         if (result->fe_type != FTP_TYPE_DIRECTORY) {
           pos = toklen[0];
           if (pos > (sizeof(result->fe_size)-1))
             pos = (sizeof(result->fe_size)-1);
           memcpy(result->fe_size, tokens[0], pos);
           result->fe_size[pos] = '\0';
         }
 
-        result->fe_time.tm_mon = StringToInt(&p[35-18]) - 1;
-        result->fe_time.tm_mday = StringToInt(&p[38-18]);
-        result->fe_time.tm_year = StringToInt(&p[41-18]);
-        if (result->fe_time.tm_year < 80)
-          result->fe_time.tm_year += 100;
-        result->fe_time.tm_hour = StringToInt(&p[46-18]);
-        result->fe_time.tm_min = StringToInt(&p[49-18]);
+        result->fe_time.month = StringToInt(&p[35-18]);
+        result->fe_time.day_of_month = StringToInt(&p[38 - 18]);
+        result->fe_time.year = StringToInt(&p[41 - 18]);
+        if (result->fe_time.year < 80)
+          result->fe_time.year += 100;
+        result->fe_time.year += 1900;
+        result->fe_time.hour = StringToInt(&p[46 - 18]);
+        result->fe_time.minute = StringToInt(&p[49 - 18]);
 
         // The caller should do this (if dropping "." and ".." is desired)
         // if (result->fe_type == FTP_TYPE_DIRECTORY &&
         //     result->fe_fname[0] == '.' && (result->fe_fnlen == 1 ||
         //     (result->fe_fnlen == 2 && result->fe_fname[1] == '.')))
         //   return FTP_TYPE_JUNK;
 
         return result->fe_type;
       }  // if (lstyle == 'O')
     }  // if (!lstyle && (!state->lstyle || state->lstyle == 'O'))
@@ skipping 136 matching lines @@
           result->fe_type = FTP_TYPE_FILE;  // (hopefully a regular file)
 
         if (result->fe_type != FTP_TYPE_DIRECTORY) {
           pos = toklen[tokmarker];
           if (pos > (sizeof(result->fe_size)-1))
             pos = (sizeof(result->fe_size)-1);
           memcpy(result->fe_size, tokens[tokmarker], pos);
           result->fe_size[pos] = '\0';
         }
 
-        result->fe_time.tm_mon = month_num;
-        result->fe_time.tm_mday = StringToInt(tokens[tokmarker+2]);
-        if (result->fe_time.tm_mday == 0)
-          result->fe_time.tm_mday++;
+        result->fe_time.month = month_num + 1;
+        result->fe_time.day_of_month = StringToInt(tokens[tokmarker+2]);
+        if (result->fe_time.day_of_month == 0)
+          result->fe_time.day_of_month++;
 
         p = tokens[tokmarker+3];
         pos = (unsigned int)StringToInt(p);
         if (p[1] == ':')  // one digit hour
           p--;
         if (p[2] != ':') {  // year
-          result->fe_time.tm_year = pos;
+          result->fe_time.year = pos;
         } else {
-            result->fe_time.tm_hour = pos;
-            result->fe_time.tm_min = StringToInt(p+3);
+            result->fe_time.hour = pos;
+            result->fe_time.minute = StringToInt(p+3);
             if (p[5] == ':')
-              result->fe_time.tm_sec = StringToInt(p+6);
-
-            if (!state->now_time) {
-              time_t now = time(NULL);
-              state->now_time = now * 1000000;
-              gmtime_r(&now, &state->now_tm);
+              result->fe_time.second = StringToInt(p+6);
+            if (!state->now_tm_valid) {
+              Time t = Time::Now();
+              t.LocalExplode(&state->now_tm);
+              state->now_tm_valid = true;
             }
-
-            result->fe_time.tm_year = state->now_tm.tm_year;
-            if ( (( state->now_tm.tm_mon << 5) + state->now_tm.tm_mday) <
-              ((result->fe_time.tm_mon << 5) + result->fe_time.tm_mday) )
-              result->fe_time.tm_year--;
+            result->fe_time.year = state->now_tm.year;
+            if ( (( state->now_tm.month << 5) + state->now_tm.day_of_month) <
+              ((result->fe_time.month << 5) + result->fe_time.day_of_month) )
+              result->fe_time.year--;
         }  // time/year
 
         result->fe_fname = tokens[tokmarker+4];
         result->fe_fnlen = (&(line[linelen_sans_wsp]))
           - (result->fe_fname);
 
         if (result->fe_type == FTP_TYPE_SYMLINK && result->fe_fnlen > 4) {
           p = result->fe_fname + 1;
           for (pos = 1; pos < (result->fe_fnlen - 4); pos++) {
             if (*p == ' ' && p[1] == '-' && p[2] == '>' && p[3] == ' ') {
@@ skipping 115 matching lines @@
             pos = sizeof(result->fe_size) - 1;
           memcpy(result->fe_size, p, pos);
           result->fe_size[pos] = '\0';
         }
 
         p = tokens[2];
         if (toklen[2] == 3) {  // Chameleon
           tbuf[0] = toupper(p[0]);
           tbuf[1] = tolower(p[1]);
           tbuf[2] = tolower(p[2]);
-          for (pos = 0; pos < (12*3); pos+=3) {
-            if (tbuf[0] == month_names[pos+0] &&
-              tbuf[1] == month_names[pos+1] &&
-              tbuf[2] == month_names[pos+2]) {
-              result->fe_time.tm_mon = pos/3;
-              result->fe_time.tm_mday = StringToInt(tokens[3]);
-              result->fe_time.tm_year = StringToInt(tokens[4]) - 1900;
+          for (pos = 0; pos < (12 * 3); pos += 3) {
+            if (tbuf[0] == month_names[pos + 0] &&
+              tbuf[1] == month_names[pos + 1] &&
+              tbuf[2] == month_names[pos + 2]) {
+              result->fe_time.month = pos / 3 + 1;
+              result->fe_time.day_of_month = StringToInt(tokens[3]);
+              result->fe_time.year = StringToInt(tokens[4]);
               break;
             }
           }
           pos = 5;  // Chameleon toknum of date field
         } else {
-          result->fe_time.tm_mon = StringToInt(p+0)-1;
-          result->fe_time.tm_mday = StringToInt(p+3);
-          result->fe_time.tm_year = StringToInt(p+6);
-          if (result->fe_time.tm_year < 80)  // SuperTCP
-            result->fe_time.tm_year += 100;
-
+          result->fe_time.month = StringToInt(p + 0);
+          result->fe_time.day_of_month = StringToInt(p + 3);
+          result->fe_time.year = StringToInt(p+6);
+          if (result->fe_time.year < 80)  // SuperTCP
+            result->fe_time.year += 100;
+          result->fe_time.year += 1900;
           pos = 3;  // SuperTCP toknum of date field
         }
 
-        result->fe_time.tm_hour = StringToInt(tokens[pos]);
-        result->fe_time.tm_min = StringToInt(&(tokens[pos][toklen[pos]-2]));
+        result->fe_time.hour = StringToInt(tokens[pos]);
+        result->fe_time.minute = StringToInt(&(tokens[pos][toklen[pos]-2]));
 
         // the caller should do this (if dropping "." and ".." is desired)
         // if (result->fe_type == FTP_TYPE_DIRECTORY &&
         //     result->fe_fname[0] == '.' && (result->fe_fnlen == 1 ||
         //     (result->fe_fnlen == 2 && result->fe_fname[1] == '.')))
         //   return FTP_TYPE_JUNK;
 
         return result->fe_type;
       }  // (lstyle == 'w')
     }  // if (!lstyle && (!state->lstyle || state->lstyle == 'w'))
@@ skipping 159 matching lines @@
                   pos--;
                 }
                 p = tokens[month_num];
                 if (isdigit(*tokens[pos])
                   && (toklen[pos] == 1 ||
                   (toklen[pos] == 2 && isdigit(tokens[pos][1])))
                   && toklen[month_num] == 3
                   && isalpha(*p) && isalpha(p[1]) && isalpha(p[2])) {
                   pos = StringToInt(tokens[pos]);
                   if (pos > 0 && pos <= 31) {
-                    result->fe_time.tm_mday = pos;
+                    result->fe_time.day_of_month = pos;
                     month_num = 1;
                     for (pos = 0; pos < (12*3); pos += 3) {
                       if (p[0] == month_names[pos + 0] &&
                         p[1] == month_names[pos + 1] &&
                         p[2] == month_names[pos + 2])
                         break;
                       month_num++;
                     }
                     if (month_num > 12)
-                      result->fe_time.tm_mday = 0;
+                      result->fe_time.day_of_month = 0;
                     else
-                      result->fe_time.tm_mon = month_num - 1;
+                      result->fe_time.month = month_num + 1;
                   }
                 }
-                if (result->fe_time.tm_mday) {
+                if (result->fe_time.day_of_month) {
                   tokmarker += 3;  // skip mday/mon/yrtime (to find " -> ")
                   p = tokens[tokmarker];
 
                   pos = StringToInt(p);
                   if (pos > 24) {
-                    result->fe_time.tm_year = pos - 1900;
+                    result->fe_time.year = pos;
                   } else {
                     if (p[1] == ':')
                       p--;
-                    result->fe_time.tm_hour = pos;
-                    result->fe_time.tm_min = StringToInt(p + 3);
-                    if (!state->now_time) {
-                      time_t now = time(NULL);
-                      state->now_time = now * 1000000;
-                      gmtime_r(&now, &state->now_tm);
+                    result->fe_time.hour = pos;
+                    result->fe_time.minute = StringToInt(p + 3);
+                    if (!state->now_tm_valid) {
+                      Time t = Time::Now();
+                      t.LocalExplode(&state->now_tm);
+                      state->now_tm_valid = true;
                     }
-                    result->fe_time.tm_year = state->now_tm.tm_year;
-                    if ((( state->now_tm.tm_mon << 4) +
-                        state->now_tm.tm_mday) <
-                        ((result->fe_time.tm_mon << 4) +
-                        result->fe_time.tm_mday))
-                      result->fe_time.tm_year--;
+                    result->fe_time.year = state->now_tm.year;
+                    if ((( state->now_tm.month << 4) +
+                        state->now_tm.day_of_month) <
+                        ((result->fe_time.month << 4) +
+                        result->fe_time.day_of_month))
+                      result->fe_time.year--;
                   }  // got year or time
                 }  // got month/mday
             }  // may have year or time
         }  // enough remaining to possibly have date/time
 
         if (numtoks > (tokmarker+2)) {
           pos = tokmarker+1;
           p = tokens[pos];
           if (toklen[pos] == 2 && *p == '-' && p[1] == '>') {
             p = &(tokens[numtoks - 1][toklen[numtoks - 1]]);
@@ skipping 16 matching lines @@
     }  // if (!lstyle && (!state->lstyle || state->lstyle == 'D'))
 #endif
   }  // if (linelen > 0)
 
   if (state->parsed_one || state->lstyle)  // junk if we fail to parse
     return FTP_TYPE_JUNK;  // this time but had previously parsed successfully
   return FTP_TYPE_COMMENT;  // its part of a comment or error message
 }
 
 }  // namespace net