Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
77ddd4cc
Commit
77ddd4cc
authored
Sep 29, 2012
by
Sven Strickroth
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make it compile with MinGW on Windows
Signed-off-by: Sven Strickroth <email@cs-ware.de>
parent
32a4e3b7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
19 deletions
+7
-19
src/fileops.c
+7
-19
No files found.
src/fileops.c
View file @
77ddd4cc
...
...
@@ -471,21 +471,13 @@ nullterm:
int
find_system_file_using_path
(
git_buf
*
path
,
const
char
*
filename
)
{
size_t
size
=
0
;
wchar_t
*
env
=
NULL
,
*
envOrig
=
NULL
;
wchar_t
*
env
=
NULL
;
struct
win32_path
root
;
_wgetenv_s
(
&
size
,
NULL
,
0
,
L"PATH"
);
if
(
!
size
)
env
=
_wgetenv
(
L"PATH"
);
if
(
!
env
)
return
-
1
;
// make a copy of the content of the environment variable so that we can modify it
envOrig
=
git__calloc
(
size
,
sizeof
(
wchar_t
));
GITERR_CHECK_ALLOC
(
envOrig
);
_wgetenv_s
(
&
size
,
envOrig
,
size
,
L"PATH"
);
env
=
envOrig
;
// search in all paths defined in PATH
while
((
env
=
nextpath
(
env
,
root
.
path
,
MAX_PATH
-
1
))
!=
NULL
&&
*
root
.
path
)
{
...
...
@@ -493,25 +485,20 @@ int find_system_file_using_path(git_buf *path, const char *filename)
// ensure trailing slash
if
(
*
pfin
!=
L'/'
&&
*
pfin
!=
L'\\'
)
wcscpy
_s
(
++
pfin
,
2
,
L"
\\
"
);
// we have enough space left, MAX_PATH - 1 is used in nextpath above
wcscpy
(
++
pfin
,
L"
\\
"
);
// we have enough space left, MAX_PATH - 1 is used in nextpath above
root
.
len
=
(
DWORD
)
wcslen
(
root
.
path
)
+
1
;
if
(
win32_find_file
(
path
,
&
root
,
"git.cmd"
)
==
0
||
win32_find_file
(
path
,
&
root
,
"git.exe"
)
==
0
)
{
// we found the cmd or bin directory of a git installaton
if
(
root
.
len
>
5
)
{
wcscpy
_s
(
root
.
path
+
wcslen
(
root
.
path
)
-
4
,
5
,
L"etc
\\
"
);
wcscpy
(
root
.
path
+
wcslen
(
root
.
path
)
-
4
,
L"etc
\\
"
);
if
(
win32_find_file
(
path
,
&
root
,
filename
)
==
0
)
{
git__free
(
envOrig
);
return
0
;
}
}
}
}
git__free
(
envOrig
);
return
GIT_ENOTFOUND
;
}
...
...
@@ -535,11 +522,12 @@ int find_system_file_using_registry(git_buf *path, const char *filename)
if
(
RegQueryValueExW
(
hKey
,
L"InstallLocation"
,
NULL
,
&
dwType
,(
LPBYTE
)
&
root
.
path
,
&
dwSize
)
==
ERROR_SUCCESS
)
{
// InstallLocation points to the root of the msysgit directory
if
(
wcscat_s
(
root
.
path
,
MAX_PATH
,
L"etc
\\
"
)
)
if
(
dwSize
+
4
>
MAX_PATH
)
// 4 = wcslen(L"etc\\"
)
{
giterr_set
(
GITERR_OS
,
"Cannot locate the system's msysgit directory - path too long"
);
return
-
1
;
}
wcscat
(
root
.
path
,
L"etc
\\
"
);
root
.
len
=
(
DWORD
)
wcslen
(
root
.
path
)
+
1
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment