diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2014-12-20 21:18:15 -0600 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2014-12-20 21:18:15 -0600 |
| commit | 0de26b7c4a893ad72708057639cafe0a97ef9496 (patch) | |
| tree | 77e5e95d44ce2c018679ba9c2b7c0fe4f8199f93 | |
| parent | 6afc0bfad921a16711d4dcac90c0eabdf4d12ffa (diff) | |
| parent | 6987a580f7de787cceae242339b78608b2ef9d50 (diff) | |
| download | libgit2-0de26b7c4a893ad72708057639cafe0a97ef9496.tar.gz | |
Merge pull request #2767 from linquize/winpath
More Windows Path checking
| -rw-r--r-- | src/path.c | 2 | ||||
| -rw-r--r-- | tests/path/core.c | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/path.c b/src/path.c index 768a7e188..0bad96242 100644 --- a/src/path.c +++ b/src/path.c @@ -1254,7 +1254,7 @@ GIT_INLINE(bool) verify_dospath( if (len < last || git__strncasecmp(component, dospath, 3) != 0) return true; - if (trailing_num && !git__isdigit(component[3])) + if (trailing_num && (component[3] < '1' || component[3] > '9')) return true; return (len > last && diff --git a/tests/path/core.c b/tests/path/core.c index 85fee820a..5b110f611 100644 --- a/tests/path/core.c +++ b/tests/path/core.c @@ -203,6 +203,9 @@ void test_path_core__isvalid_dos_paths(void) cl_assert_equal_b(true, git_path_isvalid(NULL, "aux.asdf", 0)); cl_assert_equal_b(true, git_path_isvalid(NULL, "aux.asdf\\zippy", 0)); cl_assert_equal_b(true, git_path_isvalid(NULL, "aux:asdf\\foobar", 0)); + cl_assert_equal_b(true, git_path_isvalid(NULL, "con", 0)); + cl_assert_equal_b(true, git_path_isvalid(NULL, "prn", 0)); + cl_assert_equal_b(true, git_path_isvalid(NULL, "nul", 0)); cl_assert_equal_b(false, git_path_isvalid(NULL, "aux", GIT_PATH_REJECT_DOS_PATHS)); cl_assert_equal_b(false, git_path_isvalid(NULL, "aux.", GIT_PATH_REJECT_DOS_PATHS)); @@ -210,6 +213,9 @@ void test_path_core__isvalid_dos_paths(void) cl_assert_equal_b(false, git_path_isvalid(NULL, "aux.asdf", GIT_PATH_REJECT_DOS_PATHS)); cl_assert_equal_b(false, git_path_isvalid(NULL, "aux.asdf\\zippy", GIT_PATH_REJECT_DOS_PATHS)); cl_assert_equal_b(false, git_path_isvalid(NULL, "aux:asdf\\foobar", GIT_PATH_REJECT_DOS_PATHS)); + cl_assert_equal_b(false, git_path_isvalid(NULL, "con", GIT_PATH_REJECT_DOS_PATHS)); + cl_assert_equal_b(false, git_path_isvalid(NULL, "prn", GIT_PATH_REJECT_DOS_PATHS)); + cl_assert_equal_b(false, git_path_isvalid(NULL, "nul", GIT_PATH_REJECT_DOS_PATHS)); cl_assert_equal_b(true, git_path_isvalid(NULL, "aux1", 0)); cl_assert_equal_b(true, git_path_isvalid(NULL, "aux1", GIT_PATH_REJECT_DOS_PATHS)); @@ -225,6 +231,8 @@ void test_path_core__isvalid_dos_paths_withnum(void) cl_assert_equal_b(true, git_path_isvalid(NULL, "com1.asdf", 0)); cl_assert_equal_b(true, git_path_isvalid(NULL, "com1.asdf\\zippy", 0)); cl_assert_equal_b(true, git_path_isvalid(NULL, "com1:asdf\\foobar", 0)); + cl_assert_equal_b(true, git_path_isvalid(NULL, "com1\\foo", 0)); + cl_assert_equal_b(true, git_path_isvalid(NULL, "lpt1", 0)); cl_assert_equal_b(false, git_path_isvalid(NULL, "com1", GIT_PATH_REJECT_DOS_PATHS)); cl_assert_equal_b(false, git_path_isvalid(NULL, "com1.", GIT_PATH_REJECT_DOS_PATHS)); @@ -232,11 +240,18 @@ void test_path_core__isvalid_dos_paths_withnum(void) cl_assert_equal_b(false, git_path_isvalid(NULL, "com1.asdf", GIT_PATH_REJECT_DOS_PATHS)); cl_assert_equal_b(false, git_path_isvalid(NULL, "com1.asdf\\zippy", GIT_PATH_REJECT_DOS_PATHS)); cl_assert_equal_b(false, git_path_isvalid(NULL, "com1:asdf\\foobar", GIT_PATH_REJECT_DOS_PATHS)); + cl_assert_equal_b(false, git_path_isvalid(NULL, "com1/foo", GIT_PATH_REJECT_DOS_PATHS)); + cl_assert_equal_b(false, git_path_isvalid(NULL, "lpt1", GIT_PATH_REJECT_DOS_PATHS)); + cl_assert_equal_b(true, git_path_isvalid(NULL, "com0", 0)); + cl_assert_equal_b(true, git_path_isvalid(NULL, "com0", GIT_PATH_REJECT_DOS_PATHS)); cl_assert_equal_b(true, git_path_isvalid(NULL, "com10", 0)); cl_assert_equal_b(true, git_path_isvalid(NULL, "com10", GIT_PATH_REJECT_DOS_PATHS)); cl_assert_equal_b(true, git_path_isvalid(NULL, "comn", GIT_PATH_REJECT_DOS_PATHS)); cl_assert_equal_b(true, git_path_isvalid(NULL, "com1\\foo", GIT_PATH_REJECT_DOS_PATHS)); + cl_assert_equal_b(true, git_path_isvalid(NULL, "lpt0", GIT_PATH_REJECT_DOS_PATHS)); + cl_assert_equal_b(true, git_path_isvalid(NULL, "lpt10", GIT_PATH_REJECT_DOS_PATHS)); + cl_assert_equal_b(true, git_path_isvalid(NULL, "lptn", GIT_PATH_REJECT_DOS_PATHS)); } void test_path_core__isvalid_nt_chars(void) |