From: tboegi@web.de
To: git@vger.kernel.org, svnpenn@gmail.com
Cc: "Torsten Bögershausen" <tboegi@web.de>
Subject: [PATCH v1/RFC 1/1] 'git clone <url> C:\cygwin\home\USER\repo' is working (again)
Date: Mon, 26 Nov 2018 18:32:52 +0100 [thread overview]
Message-ID: <20181126173252.1558-1-tboegi@web.de> (raw)
In-Reply-To: <5bf18396.1c69fb81.20780.2b1d@mx.google.com>
From: Torsten Bögershausen <tboegi@web.de>
A regression for cygwin users was introduced with commit 05b458c,
"real_path: resolve symlinks by hand".
In the the commit message we read:
The current implementation of real_path uses chdir() in order to resolve
symlinks. Unfortunately this isn't thread-safe as chdir() affects a
process as a whole...
The old (and non-thread-save) OS calls chdir()/pwd() had been
replaced by a string operation.
The cygwin layer "knows" that "C:\cygwin" is an absolute path,
but the new string operation does not.
"git clone <url> C:\cygwin\home\USER\repo" fails like this:
fatal: Invalid path '/home/USER/repo/C:\cygwin\home\USER\repo'
The solution is to implement has_dos_drive_prefix(), skip_dos_drive_prefix()
is_dir_sep(), offset_1st_component() and convert_slashes() for cygwin
in the same way as it is done in 'Git for Windows' in compat/mingw.[ch]
Reported-By: Steven Penny <svnpenn@gmail.com>
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
---
This is the first vesion of a patch.
Is there a chance that you test it ?
abspath.c | 2 +-
compat/cygwin.c | 18 ++++++++++++++----
compat/cygwin.h | 32 ++++++++++++++++++++++++++++++++
3 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/abspath.c b/abspath.c
index 9857985329..77a281f789 100644
--- a/abspath.c
+++ b/abspath.c
@@ -55,7 +55,7 @@ static void get_root_part(struct strbuf *resolved, struct strbuf *remaining)
strbuf_reset(resolved);
strbuf_add(resolved, remaining->buf, offset);
-#ifdef GIT_WINDOWS_NATIVE
+#if defined(GIT_WINDOWS_NATIVE) || defined(__CYGWIN__)
convert_slashes(resolved->buf);
#endif
strbuf_remove(remaining, 0, offset);
diff --git a/compat/cygwin.c b/compat/cygwin.c
index b9862d606d..c4a10cb5a1 100644
--- a/compat/cygwin.c
+++ b/compat/cygwin.c
@@ -1,19 +1,29 @@
#include "../git-compat-util.h"
#include "../cache.h"
+int cygwin_skip_dos_drive_prefix(char **path)
+{
+ int ret = has_dos_drive_prefix(*path);
+ *path += ret;
+ return ret;
+}
+
int cygwin_offset_1st_component(const char *path)
{
- const char *pos = path;
+ char *pos = (char *)path;
+
/* unc paths */
- if (is_dir_sep(pos[0]) && is_dir_sep(pos[1])) {
+ if (!skip_dos_drive_prefix(&pos) &&
+ is_dir_sep(pos[0]) && is_dir_sep(pos[1])) {
/* skip server name */
- pos = strchr(pos + 2, '/');
+ pos = strpbrk(pos + 2, "\\/");
if (!pos)
return 0; /* Error: malformed unc path */
do {
pos++;
- } while (*pos && pos[0] != '/');
+ } while (*pos && !is_dir_sep(*pos));
}
+
return pos + is_dir_sep(*pos) - path;
}
diff --git a/compat/cygwin.h b/compat/cygwin.h
index 8e52de4644..46f29c0a90 100644
--- a/compat/cygwin.h
+++ b/compat/cygwin.h
@@ -1,2 +1,34 @@
+#define has_dos_drive_prefix(path) \
+ (isalpha(*(path)) && (path)[1] == ':' ? 2 : 0)
+
+
+int cygwin_offset_1st_component(const char *path);
+#define offset_1st_component cygwin_offset_1st_component
+
+
+#define has_dos_drive_prefix(path) \
+ (isalpha(*(path)) && (path)[1] == ':' ? 2 : 0)
+int cygwin_skip_dos_drive_prefix(char **path);
+#define skip_dos_drive_prefix cygwin_skip_dos_drive_prefix
+static inline int cygwin_is_dir_sep(int c)
+{
+ return c == '/' || c == '\\';
+}
+#define is_dir_sep cygwin_is_dir_sep
+static inline char *cygwin_find_last_dir_sep(const char *path)
+{
+ char *ret = NULL;
+ for (; *path; ++path)
+ if (is_dir_sep(*path))
+ ret = (char *)path;
+ return ret;
+}
+static inline void convert_slashes(char *path)
+{
+ for (; *path; path++)
+ if (*path == '\\')
+ *path = '/';
+}
+#define find_last_dir_sep cygwin_find_last_dir_sep
int cygwin_offset_1st_component(const char *path);
#define offset_1st_component cygwin_offset_1st_component
--
2.19.0.271.gfe8321ec05
next prev parent reply other threads:[~2018-11-26 17:32 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-18 15:21 Cygwin Git with Windows paths Steven Penny
2018-11-18 15:41 ` Torsten Bögershausen
2018-11-18 16:23 ` Steven Penny
2018-11-18 17:15 ` Torsten Bögershausen
2018-11-18 17:34 ` Steven Penny
2018-11-18 18:28 ` Torsten Bögershausen
2018-11-18 19:00 ` Steven Penny
2018-11-19 0:06 ` Junio C Hamano
2018-11-19 2:11 ` Randall S. Becker
2018-11-19 3:33 ` Junio C Hamano
2018-11-19 5:20 ` Torsten Bögershausen
2018-11-20 0:17 ` Steven Penny
2018-11-20 10:36 ` Torsten Bögershausen
2018-11-20 12:51 ` Steven Penny
2018-11-19 12:22 ` Randall S. Becker
2018-11-26 17:32 ` tboegi [this message]
2018-11-27 0:35 ` [PATCH v1/RFC 1/1] 'git clone <url> C:\cygwin\home\USER\repo' is working (again) Steven Penny
2018-11-27 1:16 ` Junio C Hamano
2018-11-27 2:49 ` Steven Penny
2018-11-27 5:23 ` Junio C Hamano
2018-11-27 6:20 ` Steven Penny
2018-11-27 12:55 ` Johannes Schindelin
2018-11-28 4:10 ` Junio C Hamano
2018-11-28 5:55 ` J.H. van de Water
2018-11-28 8:46 ` Johannes Schindelin
2018-11-28 9:01 ` Houder
2018-11-28 9:35 ` Johannes Schindelin
2018-11-27 20:10 ` Achim Gratz
2018-11-27 12:49 ` Johannes Schindelin
2018-11-28 4:12 ` Junio C Hamano
2018-11-27 20:05 ` Achim Gratz
2018-12-07 17:04 ` [PATCH v2 1/3] git " tboegi
2018-12-07 21:53 ` Johannes Schindelin
2018-12-08 0:49 ` Steven Penny
2018-12-10 8:46 ` Johannes Schindelin
2018-12-10 12:45 ` Steven Penny
2018-12-11 13:39 ` Johannes Schindelin
2018-12-12 0:42 ` Steven Penny
2018-12-12 7:29 ` Johannes Sixt
2018-12-12 12:40 ` Steven Penny
2018-12-13 3:52 ` Junio C Hamano
2018-12-12 13:33 ` Johannes Schindelin
2018-12-12 3:47 ` Elijah Newren
2018-12-12 13:57 ` Johannes Schindelin
2018-12-07 17:04 ` [PATCH v2 2/3] offset_1st_component(), dos_drive_prefix() return size_t tboegi
2018-12-07 17:05 ` [PATCH v2 3/3] Refactor mingw_cygwin_offset_1st_component() tboegi
2018-12-07 22:18 ` Johannes Schindelin
2018-12-08 15:11 ` [PATCH v3 1/1] git clone <url> C:\cygwin\home\USER\repo' is working (again) tboegi
2018-12-08 16:24 ` Steven Penny
2018-12-09 1:39 ` Junio C Hamano
2018-12-10 8:32 ` Johannes Schindelin
2018-12-11 6:12 ` Torsten Bögershausen
2018-12-11 13:28 ` Johannes Schindelin
2018-12-11 18:55 ` Torsten Bögershausen
2018-12-15 4:33 ` [PATCH v4 " tboegi
2019-05-02 7:48 ` Achim Gratz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181126173252.1558-1-tboegi@web.de \
--to=tboegi@web.de \
--cc=git@vger.kernel.org \
--cc=svnpenn@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).