diff --git a/src/parser.js b/src/parser.js index 474e239..f51edd6 100644 --- a/src/parser.js +++ b/src/parser.js @@ -39,7 +39,7 @@ var RE_UnixEntry = new RegExp( // year (for non-recent standard format) // or time (for numeric or recent standard format) - + "(\\d+(?::\\d+)?)\\s*" + + "(\\d+(?::\\d+)?)\\s" //+ "(\\S*)(\\s*.*)" + "(.*)" diff --git a/test/parser.test.js b/test/parser.test.js index 2684c56..7e3cc19 100644 --- a/test/parser.test.js +++ b/test/parser.test.js @@ -497,7 +497,8 @@ drwx------ 2 1001 1001 4096 Oct 19 16:17 project2\r\n"; -drwxr-x--- 2 userName alternc 4096 Aug 22 03:45 .\r\n\ -drwxr-x--- 5 userName alternc 4096 Aug 22 03:45 ..\r\n\ --rw-r----- 1 userName alternc 460 Aug 22 03:45 test1\r\n\ ---rw-r----- 1 userName alternc 560 Aug 22 03:47 test2\r\n"; +--rw-r----- 1 userName alternc 560 Aug 22 03:47 test2\r\n\ +--rw-r----- 1 userName alternc 560 Aug 22 03:49 spaceTest \n"; var unixEntries2 = [ { @@ -538,6 +539,28 @@ drwx------ 2 1001 1001 4096 Oct 19 16:17 project2\r\n"; groupWritePerm: false, groupExecPerm: false, + otherReadPerm: false, + otherWritePerm: false, + otherExecPerm: false + }, + { + //Testing for whitespace at start and end of line, valid in unix + //line: --rw-r----- 1 userName alternc 560 Aug 22 03:49 spaceTest " + type: 0, + size: 560, + name: " spaceTest ", + time: +new Date("Aug 22 03:49 " + new Date().getFullYear()), + owner: "userName", + group: "alternc", + + userReadPerm: true, + userWritePerm: true, + userExecPerm: false, + + groupReadPerm: true, + groupWritePerm: false, + groupExecPerm: false, + otherReadPerm: false, otherWritePerm: false, otherExecPerm: false