[commons-net] branch master updated: Fix VMS ftp LIST parsing - allocated part is optional.

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-net.git


The following commit(s) were added to refs/heads/master by this push:
     new 2f9d563  Fix VMS ftp LIST parsing - allocated part is optional.
     new 4a01d55  Merge pull request #47 from bravehorsie/master
2f9d563 is described below

commit 2f9d5639fcc66a240f86bfd6b05048696672bdd6
Author: rogrigor <roman.grigori...@dhl.com>
AuthorDate: Mon Feb 17 13:11:07 2020 +0100

    Fix VMS ftp LIST parsing - allocated part is optional.
    
    Signed-off-by: rogrigor <roman.grigori...@dhl.com>
---
 src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java  | 2 +-
 .../java/org/apache/commons/net/ftp/parser/VMSFTPEntryParserTest.java   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java 
b/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
index 103e6c1..2ac815d 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
@@ -53,7 +53,7 @@ public class VMSFTPEntryParser extends 
ConfigurableFTPFileEntryParserImpl
      */
     private static final String REGEX =
         "(.*?;[0-9]+)\\s*"                                                  
//1  file and version
-        + "(\\d+)/\\d+\\s*"                                                 
//2  size/allocated
+        + "(\\d+)(?:/\\d+)?\\s*"                                               
  //2  size/allocated
         +"(\\S+)\\s+(\\S+)\\s+"                                             
//3+4 date and time
         + "\\[(([0-9$A-Za-z_]+)|([0-9$A-Za-z_]+),([0-9$a-zA-Z_]+))\\]?\\s*" 
//5(6,7,8) owner
         + "\\([a-zA-Z]*,([a-zA-Z]*),([a-zA-Z]*),([a-zA-Z]*)\\)";            
//9,10,11 Permissions (O,G,W)
diff --git 
a/src/test/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParserTest.java 
b/src/test/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParserTest.java
index ec87b22..f54574e 100644
--- a/src/test/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParserTest.java
+++ b/src/test/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParserTest.java
@@ -64,6 +64,7 @@ public class VMSFTPEntryParserTest extends 
FTPParseTestFramework
         "FREEWARE40.DIR;1        27/36"+
         "         16-FEB-1999 10:01:46  [AP_HTTPD,APACHE$WWW                   
            (RWE,RWE,RE,RE)",
         "1-JUN.LIS;1              9/9           2-jun-1998 07:32:04  
[GROUP,OWNER]    (RWED,RWED,RWED,RE)",
+        "ALLOCMISS.COM;1            1         15-AUG-1996 14:10:38  
[POSTWARE,LP]    (RWE,RWE,RWE,RE)"
     };
     // CHECKSTYLE:ON