Skip to content

Commit 21be972

Browse files
committed
Merge pull request git-for-windows#1 from dscho/git-for-windows
Assorted fixes for Git for windows
2 parents 532eb38 + c8b1afb commit 21be972

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

winsup/cygwin/DevDocs/how-to-debug-cygwin.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,3 +126,9 @@ set CYGWIN_DEBUG=cat.exe:gdb.exe
126126
program will crash, probably in small_printf. At that point, a 'bt'
127127
command should show you the offending call to strace_printf with the
128128
improper format string.
129+
130+
9. Debug output without strace
131+
132+
If you cannot use gdb, or if the program behaves differently using strace
133+
for whatever reason, you can still use the small_printf() function to
134+
output debugging messages directly to stderr.

winsup/cygwin/msys2_path_conv.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ path_type find_path_start_and_type(const char** src, int recurse, const char* en
399399
}
400400
it = *src;
401401

402-
while (!isalnum(*it) && *it != '/' && *it != '\\' && *it != ':' && *it != '-' && *it != '.') {
402+
while (!isalnum(*it) && !(0x80 & *it) && *it != '/' && *it != '\\' && *it != ':' && *it != '-' && *it != '.') {
403403
recurse = true;
404404
it = ++*src;
405405
if (it == end || *it == '\0') return NONE;

winsup/cygwin/strfuncs.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1146,7 +1146,11 @@ _sys_mbstowcs (mbtowc_p f_mbtowc, wchar_t *dst, size_t dlen, const char *src,
11461146
to store them in a symmetric way. */
11471147
bytes = 1;
11481148
if (dst)
1149+
#ifdef STRICTLY_7BIT_ASCII
11491150
*ptr = L'\xf000' | *pmbs;
1151+
#else
1152+
*ptr = *pmbs;
1153+
#endif
11501154
memset (&ps, 0, sizeof ps);
11511155
}
11521156

0 commit comments

Comments
 (0)