Returning the correct reply codes for file and directory listings (FTPSERVER-413)
git-svn-id: https://svn.apache.org/repos/asf/mina/ftpserver/trunk@1129318 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core/src/main/java/org/apache/ftpserver/command/impl/STAT.java b/core/src/main/java/org/apache/ftpserver/command/impl/STAT.java
index 744f9e3..6286634 100644
--- a/core/src/main/java/org/apache/ftpserver/command/impl/STAT.java
+++ b/core/src/main/java/org/apache/ftpserver/command/impl/STAT.java
@@ -79,10 +79,17 @@
String dirList = directoryLister.listFiles(parsedArg,
session.getFileSystemView(), LIST_FILE_FORMATER);
+ int replyCode;
+ if(file.isDirectory()) {
+ replyCode = FtpReply.REPLY_212_DIRECTORY_STATUS;
+ } else {
+ replyCode = FtpReply.REPLY_213_FILE_STATUS;
+ }
+
session
.write(new LocalizedFileActionFtpReply(
- FtpReply.REPLY_211_SYSTEM_STATUS_REPLY,
- dirList, file));
+ replyCode,
+ dirList, file));
} catch (FtpException e) {
session
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/StatTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/StatTest.java
index fa271bf..0b02a9e 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/StatTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/StatTest.java
@@ -30,7 +30,7 @@
*/
public class StatTest extends ClientTestTemplate {
- private static final String PATTERN = "^211[-\\s]-rw-------\\s\\s\\s1\\suser\\sgroup\\s{12}0\\s[A-Za-z0-9\\s]{6}\\s\\d\\d:\\d\\d\\stest\\d.txt$";
+ private static final String PATTERN = "^21\\d[-\\s]-rw-------\\s\\s\\s1\\suser\\sgroup\\s{12}0\\s[A-Za-z0-9\\s]{6}\\s\\d\\d:\\d\\d\\stest\\d.txt$";
private static final File TEST_DIR = new File(ROOT_DIR, "test");
private static final File TEST_FILE1 = new File(TEST_DIR, "test1.txt");
@@ -43,7 +43,7 @@
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
- assertEquals(211, client.stat(TEST_DIR.getName()));
+ assertEquals(212, client.stat(TEST_DIR.getName()));
String[] reply = client.getReplyString().split("\r\n");
assertTrue(reply[0], Pattern.matches(PATTERN, reply[0]));
@@ -56,7 +56,7 @@
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
- assertEquals(211, client.stat(TEST_DIR.getName() + "/" + TEST_FILE1.getName()));
+ assertEquals(213, client.stat(TEST_DIR.getName() + "/" + TEST_FILE1.getName()));
String[] reply = client.getReplyString().split("\r\n");
assertTrue(reply[0], Pattern.matches(PATTERN, reply[0]));
