commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwins...@apache.org
Subject svn commit: r161464 - in jakarta/commons/proper/net/trunk/src: java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java test/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java
Date Fri, 15 Apr 2005 14:08:08 GMT
Author: rwinston
Date: Fri Apr 15 07:08:07 2005
New Revision: 161464

URL: http://svn.apache.org/viewcvs?view=rev&rev=161464
Log:
Added support for trailing ACL characters [Bug# 33972]

Modified:
    jakarta/commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
    jakarta/commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java

Modified: jakarta/commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java?view=diff&r1=161463&r2=161464
==============================================================================
--- jakarta/commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
(original)
+++ jakarta/commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
Fri Apr 15 07:08:07 2005
@@ -65,7 +65,7 @@
      */
     private static final String REGEX =
         "([bcdlfmpSs-])"
-        + "(((r|-)(w|-)([xsStTL-]))((r|-)(w|-)([xsStTL-]))((r|-)(w|-)([xsStTL-])))\\s+"
+        +"(((r|-)(w|-)([xsStTL-]))((r|-)(w|-)([xsStTL-]))((r|-)(w|-)([xsStTL-])))\\+?\\s+"
         + "(\\d+)\\s+"
         + "(\\S+)\\s+"
         + "(?:(\\S+)\\s+)?"

Modified: jakarta/commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java?view=diff&r1=161463&r2=161464
==============================================================================
--- jakarta/commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java
(original)
+++ jakarta/commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java
Fri Apr 15 07:08:07 2005
@@ -45,6 +45,7 @@
 
     private static final String[] goodsamples =
     {
+
         "-rw-r--r--   1 500      500            21 Aug  8 14:14 JB3-TES1.gz",
         "-rwxr-xr-x   2 root     root         4096 Mar  2 15:13 zxbox",
         "drwxr-xr-x   2 root     root         4096 Aug 24  2001 zxjdbc",
@@ -70,6 +71,8 @@
         "-rwSr-Sr--   1 500      500             0 Mar 25 08:22 testSuid",
 		"-rwsr-sr--   1 500      500             0 Mar 25 08:23 testSuidExec",
 		"-rwsr-sr--   1 500      500             0 Mar 25 0:23 testSuidExec2",
+        "drwxrwx---+ 23 500     500    0 Jan 10 13:09 testACL",
+
 		"-rw-r--r--   1 1        3518644 May 25 12:12 std"
     };
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message