Commit eba784d24d12ad7243708d97d80427bbdc9fd2b7
2015-08-05T10:19:06
Fix duplicate basenames to support older VS With Visual Studio versions 2008 and older they ignore the full path to files and only check the basename of the file to find a collision. Additionally, having duplicate basenames can break other build tools like GYP. This fixes https://github.com/libgit2/libgit2/issues/3356
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195
diff --git a/src/path.c b/src/path.c
index 8317aaa..9ce5d29 100644
--- a/src/path.c
+++ b/src/path.c
@@ -10,7 +10,7 @@
#include "repository.h"
#ifdef GIT_WIN32
#include "win32/posix.h"
-#include "win32/buffer.h"
+#include "win32/w32_buffer.h"
#include "win32/w32_util.h"
#include "win32/version.h"
#else
diff --git a/src/util.c b/src/util.c
index b08b2b8..b3929bc 100644
--- a/src/util.c
+++ b/src/util.c
@@ -11,7 +11,7 @@
#include "posix.h"
#ifdef GIT_WIN32
-# include "win32/buffer.h"
+# include "win32/w32_buffer.h"
#endif
#ifdef _MSC_VER
diff --git a/src/win32/buffer.c b/src/win32/buffer.c
deleted file mode 100644
index 7495018..0000000
--- a/src/win32/buffer.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) the libgit2 contributors. All rights reserved.
- *
- * This file is part of libgit2, distributed under the GNU GPL v2 with
- * a Linking Exception. For full terms see the included COPYING file.
- */
-
-#include "common.h"
-#include "buffer.h"
-#include "../buffer.h"
-#include "utf-conv.h"
-
-GIT_INLINE(int) handle_wc_error(void)
-{
- if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
- errno = ENAMETOOLONG;
- else
- errno = EINVAL;
-
- return -1;
-}
-
-int git_buf_put_w(git_buf *buf, const wchar_t *string_w, size_t len_w)
-{
- int utf8_len, utf8_write_len;
- size_t new_size;
-
- if (!len_w)
- return 0;
-
- assert(string_w);
-
- /* Measure the string necessary for conversion */
- if ((utf8_len = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, string_w, len_w, NULL, 0, NULL, NULL)) == 0)
- return 0;
-
- assert(utf8_len > 0);
-
- GITERR_CHECK_ALLOC_ADD(&new_size, buf->size, (size_t)utf8_len);
- GITERR_CHECK_ALLOC_ADD(&new_size, new_size, 1);
-
- if (git_buf_grow(buf, new_size) < 0)
- return -1;
-
- if ((utf8_write_len = WideCharToMultiByte(
- CP_UTF8, WC_ERR_INVALID_CHARS, string_w, len_w, &buf->ptr[buf->size], utf8_len, NULL, NULL)) == 0)
- return handle_wc_error();
-
- assert(utf8_write_len == utf8_len);
-
- buf->size += utf8_write_len;
- buf->ptr[buf->size] = '\0';
- return 0;
-}
-
diff --git a/src/win32/buffer.h b/src/win32/buffer.h
deleted file mode 100644
index 6224398..0000000
--- a/src/win32/buffer.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (C) the libgit2 contributors. All rights reserved.
- *
- * This file is part of libgit2, distributed under the GNU GPL v2 with
- * a Linking Exception. For full terms see the included COPYING file.
- */
-#ifndef INCLUDE_git_win32_buffer_h__
-#define INCLUDE_git_win32_buffer_h__
-
-#include "../buffer.h"
-
-/**
- * Convert a wide character string to UTF-8 and append the results to the
- * buffer.
- */
-int git_buf_put_w(git_buf *buf, const wchar_t *string_w, size_t len_w);
-
-#endif
diff --git a/src/win32/w32_buffer.c b/src/win32/w32_buffer.c
new file mode 100644
index 0000000..9122baa
--- /dev/null
+++ b/src/win32/w32_buffer.c
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#include "common.h"
+#include "w32_buffer.h"
+#include "../buffer.h"
+#include "utf-conv.h"
+
+GIT_INLINE(int) handle_wc_error(void)
+{
+ if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
+ errno = ENAMETOOLONG;
+ else
+ errno = EINVAL;
+
+ return -1;
+}
+
+int git_buf_put_w(git_buf *buf, const wchar_t *string_w, size_t len_w)
+{
+ int utf8_len, utf8_write_len;
+ size_t new_size;
+
+ if (!len_w)
+ return 0;
+
+ assert(string_w);
+
+ /* Measure the string necessary for conversion */
+ if ((utf8_len = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, string_w, len_w, NULL, 0, NULL, NULL)) == 0)
+ return 0;
+
+ assert(utf8_len > 0);
+
+ GITERR_CHECK_ALLOC_ADD(&new_size, buf->size, (size_t)utf8_len);
+ GITERR_CHECK_ALLOC_ADD(&new_size, new_size, 1);
+
+ if (git_buf_grow(buf, new_size) < 0)
+ return -1;
+
+ if ((utf8_write_len = WideCharToMultiByte(
+ CP_UTF8, WC_ERR_INVALID_CHARS, string_w, len_w, &buf->ptr[buf->size], utf8_len, NULL, NULL)) == 0)
+ return handle_wc_error();
+
+ assert(utf8_write_len == utf8_len);
+
+ buf->size += utf8_write_len;
+ buf->ptr[buf->size] = '\0';
+ return 0;
+}
diff --git a/src/win32/w32_buffer.h b/src/win32/w32_buffer.h
new file mode 100644
index 0000000..6224398
--- /dev/null
+++ b/src/win32/w32_buffer.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+#ifndef INCLUDE_git_win32_buffer_h__
+#define INCLUDE_git_win32_buffer_h__
+
+#include "../buffer.h"
+
+/**
+ * Convert a wide character string to UTF-8 and append the results to the
+ * buffer.
+ */
+int git_buf_put_w(git_buf *buf, const wchar_t *string_w, size_t len_w);
+
+#endif