Ticket #1517: patch

FileZilla/source/FtpListResult.cpp

@@ -160 +160 @@
 
         // VMS style listing with a different field order
         "57-vms-alternate-field-order-file;1   [SUMMARY]    1/3     2-AUG-2006 13:05  (RWE,RWE,RE,)",
+        
+        // Stratus VOS
+        "w          8  90-03-13 10:51:09  week90-03-03",
+        "w          6  90-03-05 10:30:22  week90-02-25",
+        "w          4  90-02-26 10:43:59  week90-02-18",
 
         ""};
 
@@ -506 +511 @@
     nFTPServerType = 0;
     direntry.ownergroup = _T("");
     
+    if (parseAsVOS(lineToParse, linelen, direntry))
+        return TRUE;
+
     if (parseAsUnix(lineToParse, linelen, direntry))
         return TRUE;
     
@@ -1936 +1944 @@
     return TRUE;
 }
 
+BOOL CFtpListResult::parseAsVOS(const char *line, const int linelen, t_directory::t_direntry &direntry)
+{
+    int pos = 0;
+    int tokenlen = 0;
+
+    const char *str = GetNextToken(line, linelen, tokenlen, pos, 0);
+    if (!str)
+        return FALSE;
+    
+    //Set directory and link flags
+    //Always assume links point directories
+    //GUI frontend should try to figure out
+    //to where the link really points
+    if (tokenlen == 1)
+    {
+        switch(str[0]){
+            case 'n':
+            case 'e':
+            case 'r':
+            case 'w': direntry.dir = false; break;
+            case 's':
+            case 'm': direntry.dir = true; break;
+            default: return FALSE;
+        }
+        direntry.bLink = false;
+        copyStr(direntry.permissionstr, 0, str, tokenlen);
+        
+        //Size
+        str = GetNextToken(line, linelen, tokenlen, pos, 0);
+        CString STR = str;
+        if (!str)
+            return FALSE;
+        if (ParseSize(str, tokenlen, direntry.size))
+            direntry.size = direntry.size * 4096; //1 block == 4096 bytes
+        else return FALSE;
+
+        if (!direntry.dir)
+        {
+            // if not a dir the next token is the file organization
+            // it is unused by now
+            str = GetNextToken(line, linelen, tokenlen, pos, 0);
+            if (!str)
+                return FALSE;
+        }
+        str = NULL;
+    }
+    else if(tokenlen == 8)
+    {
+        direntry.dir = true;
+        direntry.bLink = true;
+    }
+    else return FALSE;
+
+    if (str == NULL)
+        str = GetNextToken(line, linelen, tokenlen, pos, 0);
+
+    //Date
+    if (!str)
+        return FALSE;
+        
+    const char *syear = str;
+    int len = tokenlen;
+    
+    const char *smonth = strnchr(syear, len, '-');
+    if (smonth)
+    {
+        smonth++;
+        int len = len - (smonth - syear + 1);
+        const char *sday = strnchr(smonth, len, '-');
+        if (sday)
+        {
+            sday++;
+            direntry.date.year = static_cast<int>(strntoi64(syear, smonth - syear +1));
+            if (direntry.date.year >= 80) direntry.date.year += 1900;
+            else direntry.date.year += 2000;
+            direntry.date.month = static_cast<int>(strntoi64(smonth, sday - smonth + 1));
+            direntry.date.day = static_cast<int>(strntoi64(sday, len - (sday - smonth + 1)));
+            direntry.date.hastime = TRUE;
+        }
+        else
+            return FALSE;
+    }
+    else
+        return FALSE;
+
+    //Time
+    str = GetNextToken(line, linelen, tokenlen, pos, 0);
+    if (!str)
+        return FALSE;
+                    
+    const char *shour = str;
+    len = tokenlen;
+    
+    const char *sminute = strnchr(shour, len, ':');
+    if (sminute)
+    {
+        sminute++;
+        int len = len - (sminute - shour + 1);
+        const char *ssecond = strnchr(sminute, len, ':');
+        if (ssecond)
+        {
+            ssecond++;
+            direntry.date.hour = static_cast<int>(strntoi64(shour, sminute - shour +1));
+            direntry.date.minute = static_cast<int>(strntoi64(sminute, ssecond - sminute + 1));
+            //no second by now
+            //direntry.date.second = static_cast<int>(strntoi64(ssecond, len - (ssecond - sminute + 1)));
+            direntry.date.hasdate = TRUE;
+        }
+        else
+            return FALSE;
+    }
+    else
+        return FALSE;
+
+    //Get filename
+    str = GetNextToken(line, linelen, tokenlen, pos, 1);
+    if (!str)
+        return FALSE;
+
+    //Trim link data from filename
+    if (direntry.bLink)
+    {
+        const char *pos = strnstr(str, tokenlen, " -> ");
+        if (pos)
+        {
+            copyStr(direntry.linkTarget, 0, pos + 4, tokenlen - (pos - str) - 4);
+            tokenlen = pos - str;
+        }
+
+        if (!tokenlen)
+            return FALSE;
+    }
+
+    copyStr(direntry.name, 0, str, tokenlen, true);
+
+    direntry.bUnsure = FALSE;
+    return TRUE;
+}
+
 BOOL CFtpListResult::parseAsOther(const char *line, const int linelen, t_directory::t_direntry &direntry)
 {
     int pos = 0;