OSDN Git Service

updated wingit and fixed bug in new PATH init code (used wrong function for tchar...
[tortoisegit/TortoiseGitJp.git] / src / Git / Git.cpp
1 #include "StdAfx.h"\r
2 #include "Git.h"\r
3 #include "atlconv.h"\r
4 #include "GitRev.h"\r
5 #include "registry.h"\r
6 #include "GitConfig.h"\r
7 \r
8 \r
9 static LPTSTR nextpath(LPCTSTR src, LPTSTR dst, UINT maxlen)\r
10 {\r
11         LPCTSTR orgsrc;\r
12 \r
13         while (*src == _T(';'))\r
14                 src++;\r
15 \r
16         orgsrc = src;\r
17 \r
18         if (!--maxlen)\r
19                 goto nullterm;\r
20 \r
21         while (*src && *src != _T(';'))\r
22         {\r
23                 if (*src != _T('"'))\r
24                 {\r
25                         *dst++ = *src++;\r
26                         if (!--maxlen)\r
27                         {\r
28                                 orgsrc = src;\r
29                                 goto nullterm;\r
30                         }\r
31                 }\r
32                 else\r
33                 {\r
34                         src++;\r
35                         while (*src && *src != _T('"'))\r
36                         {\r
37                                 *dst++ = *src++;\r
38                                 if (!--maxlen)\r
39                                 {\r
40                                         orgsrc = src;\r
41                                         goto nullterm;\r
42                                 }\r
43                         }\r
44 \r
45                         if (*src)\r
46                                 src++;\r
47                 }\r
48         }\r
49 \r
50         while (*src == _T(';'))\r
51                 src++;\r
52 \r
53 nullterm:\r
54 \r
55         *dst = 0;\r
56 \r
57         return (orgsrc != src) ? (LPTSTR)src : NULL;\r
58 }\r
59 \r
60 static inline BOOL FileExists(LPCTSTR lpszFileName)\r
61 {\r
62         struct _stat st;\r
63         return _tstat(lpszFileName, &st) == 0;\r
64 }\r
65 \r
66 static BOOL FindGitPath()\r
67 {\r
68         size_t size;\r
69         _tgetenv_s(&size, NULL, 0, _T("PATH"));\r
70 \r
71         if (!size)\r
72         {\r
73                 return FALSE;\r
74         }\r
75 \r
76         TCHAR *env = (TCHAR*)alloca(size * sizeof(TCHAR));\r
77         _tgetenv_s(&size, env, size, _T("PATH"));\r
78 \r
79         TCHAR buf[_MAX_PATH];\r
80 \r
81         // search in all paths defined in PATH\r
82         while ((env = nextpath(env, buf, _MAX_PATH-1)) && *buf)\r
83         {\r
84                 TCHAR *pfin = buf + _tcslen(buf)-1;\r
85 \r
86                 // ensure trailing slash\r
87                 if (*pfin != _T('/') && *pfin != _T('\\'))\r
88                         _tcscpy(++pfin, _T("\\"));\r
89 \r
90                 const int len = _tcslen(buf);\r
91 \r
92                 if ((len + 7) < _MAX_PATH)\r
93                         _tcscpy(pfin+1, _T("git.exe"));\r
94                 else\r
95                         break;\r
96 \r
97                 if ( FileExists(buf) )\r
98                 {\r
99                         // dir found\r
100                         return TRUE;\r
101                 }\r
102         }\r
103 \r
104         return FALSE;\r
105 }\r
106 \r
107 \r
108 #define MAX_DIRBUFFER 1000\r
109 CString CGit::ms_LastMsysGitDir;\r
110 CGit g_Git;\r
111 CGit::CGit(void)\r
112 {\r
113         GetCurrentDirectory(MAX_DIRBUFFER,m_CurrentDir.GetBuffer(MAX_DIRBUFFER));\r
114 \r
115         // make sure git/bin is in PATH before wingit.dll gets (delay) loaded by wgInit()\r
116         if ( !CheckMsysGitDir() )\r
117         {\r
118                 // TODO\r
119         }\r
120 \r
121         if ( !wgInit() )\r
122         {\r
123                 // TODO\r
124         }\r
125 }\r
126 \r
127 CGit::~CGit(void)\r
128 {\r
129 }\r
130 \r
131 static char g_Buffer[4096];\r
132 \r
133 int CGit::RunAsync(CString cmd,PROCESS_INFORMATION *piOut,HANDLE *hReadOut,CString *StdioFile)\r
134 {\r
135         SECURITY_ATTRIBUTES sa;\r
136         HANDLE hRead, hWrite;\r
137         HANDLE hStdioFile = NULL;\r
138 \r
139         sa.nLength = sizeof(SECURITY_ATTRIBUTES);\r
140         sa.lpSecurityDescriptor=NULL;\r
141         sa.bInheritHandle=TRUE;\r
142         if(!CreatePipe(&hRead,&hWrite,&sa,0))\r
143         {\r
144                 return GIT_ERROR_OPEN_PIP;\r
145         }\r
146         \r
147         if(StdioFile)\r
148         {\r
149                 hStdioFile=CreateFile(*StdioFile,GENERIC_WRITE,FILE_SHARE_READ   |   FILE_SHARE_WRITE,   \r
150                         &sa,CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL);  \r
151         }\r
152 \r
153         STARTUPINFO si;\r
154         PROCESS_INFORMATION pi;\r
155         si.cb=sizeof(STARTUPINFO);\r
156         GetStartupInfo(&si);\r
157 \r
158         si.hStdError=hWrite;\r
159         if(StdioFile)\r
160                 si.hStdOutput=hStdioFile;\r
161         else\r
162                 si.hStdOutput=hWrite;\r
163 \r
164         si.wShowWindow=SW_HIDE;\r
165         si.dwFlags=STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;\r
166 \r
167         if(!CreateProcess(NULL,(LPWSTR)cmd.GetString(), NULL,NULL,TRUE,NULL,NULL,(LPWSTR)m_CurrentDir.GetString(),&si,&pi))\r
168         {\r
169                 LPVOID lpMsgBuf;\r
170                 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,\r
171                         NULL,GetLastError(),MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),\r
172                         (LPTSTR)&lpMsgBuf,\r
173                         0,NULL);\r
174                 return GIT_ERROR_CREATE_PROCESS;\r
175         }\r
176         \r
177         CloseHandle(hWrite);\r
178         if(piOut)\r
179                 *piOut=pi;\r
180         if(hReadOut)\r
181                 *hReadOut=hRead;\r
182         \r
183         return 0;\r
184 \r
185 }\r
186 //Must use sperate function to convert ANSI str to union code string\r
187 //Becuase A2W use stack as internal convert buffer. \r
188 void CGit::StringAppend(CString *str,BYTE *p,int code,int length)\r
189 {\r
190      //USES_CONVERSION;\r
191          //str->Append(A2W_CP((LPCSTR)p,code));\r
192         WCHAR * buf;\r
193 \r
194         int len ;\r
195         if(length<0)\r
196                 len= strlen((const char*)p);\r
197         else\r
198                 len=length;\r
199         //if (len==0)\r
200         //      return ;\r
201         //buf = new WCHAR[len*4 + 1];\r
202         buf = str->GetBuffer(len*4+1+str->GetLength())+str->GetLength();\r
203         SecureZeroMemory(buf, (len*4 + 1)*sizeof(WCHAR));\r
204         MultiByteToWideChar(code, 0, (LPCSTR)p, len, buf, len*4);\r
205         str->ReleaseBuffer();\r
206         //str->Append(buf);\r
207         //delete buf;\r
208 }       \r
209 BOOL CGit::IsInitRepos()\r
210 {\r
211         CString cmdout;\r
212         cmdout.Empty();\r
213         if(g_Git.Run(_T("git.exe rev-parse --revs-only HEAD"),&cmdout,CP_UTF8))\r
214         {\r
215         //      CMessageBox::Show(NULL,cmdout,_T("TortoiseGit"),MB_OK);\r
216                 return TRUE;\r
217         }\r
218         if(cmdout.IsEmpty())\r
219                 return TRUE;\r
220 \r
221         return FALSE;\r
222 }\r
223 int CGit::Run(CString cmd,BYTE_VECTOR *vector)\r
224 {\r
225         PROCESS_INFORMATION pi;\r
226         HANDLE hRead;\r
227         if(RunAsync(cmd,&pi,&hRead))\r
228                 return GIT_ERROR_CREATE_PROCESS;\r
229 \r
230         DWORD readnumber;\r
231         BYTE data;\r
232         while(ReadFile(hRead,&data,1,&readnumber,NULL))\r
233         {\r
234                 //g_Buffer[readnumber]=0;\r
235                 vector->push_back(data);\r
236 //              StringAppend(output,g_Buffer,codes);\r
237         }\r
238 \r
239         \r
240         CloseHandle(pi.hThread);\r
241 \r
242         WaitForSingleObject(pi.hProcess, INFINITE);\r
243         DWORD exitcode =0;\r
244 \r
245         if(!GetExitCodeProcess(pi.hProcess,&exitcode))\r
246         {\r
247                 return GIT_ERROR_GET_EXIT_CODE;\r
248         }\r
249 \r
250         CloseHandle(pi.hProcess);\r
251 \r
252         CloseHandle(hRead);\r
253         return exitcode;\r
254 \r
255 }\r
256 int CGit::Run(CString cmd, CString* output,int code)\r
257 {\r
258         BYTE_VECTOR vector;\r
259         int ret;\r
260         ret=Run(cmd,&vector);\r
261 \r
262         if(ret)\r
263                 return ret;\r
264         \r
265         vector.push_back(0);\r
266         \r
267         StringAppend(output,&(vector[0]),code);\r
268         return 0;\r
269 }\r
270 \r
271 CString CGit::GetUserName(void)\r
272 {\r
273         CString UserName;\r
274         Run(_T("git.exe config user.name"),&UserName,CP_UTF8);\r
275         return UserName;\r
276 }\r
277 CString CGit::GetUserEmail(void)\r
278 {\r
279         CString UserName;\r
280         Run(_T("git.exe config user.email"),&UserName,CP_UTF8);\r
281         return UserName;\r
282 }\r
283 \r
284 CString CGit::GetCurrentBranch(void)\r
285 {\r
286         CString output;\r
287         //Run(_T("git.exe branch"),&branch);\r
288 \r
289         int ret=g_Git.Run(_T("git.exe branch"),&output,CP_UTF8);\r
290         if(!ret)\r
291         {               \r
292                 int pos=0;\r
293                 CString one;\r
294                 while( pos>=0 )\r
295                 {\r
296                         //i++;\r
297                         one=output.Tokenize(_T("\n"),pos);\r
298                         //list.push_back(one.Right(one.GetLength()-2));\r
299                         if(one[0] == _T('*'))\r
300                                 return one.Right(one.GetLength()-2);\r
301                 }\r
302         }\r
303         return CString("");\r
304 }\r
305 \r
306 int CGit::BuildOutputFormat(CString &format,bool IsFull)\r
307 {\r
308         CString log;\r
309         log.Format(_T("#<%c>%%x00"),LOG_REV_ITEM_BEGIN);\r
310         format += log;\r
311         if(IsFull)\r
312         {\r
313                 log.Format(_T("#<%c>%%an%%x00"),LOG_REV_AUTHOR_NAME);\r
314                 format += log;\r
315                 log.Format(_T("#<%c>%%ae%%x00"),LOG_REV_AUTHOR_EMAIL);\r
316                 format += log;\r
317                 log.Format(_T("#<%c>%%ai%%x00"),LOG_REV_AUTHOR_DATE);\r
318                 format += log;\r
319                 log.Format(_T("#<%c>%%cn%%x00"),LOG_REV_COMMIT_NAME);\r
320                 format += log;\r
321                 log.Format(_T("#<%c>%%ce%%x00"),LOG_REV_COMMIT_EMAIL);\r
322                 format += log;\r
323                 log.Format(_T("#<%c>%%ci%%x00"),LOG_REV_COMMIT_DATE);\r
324                 format += log;\r
325                 log.Format(_T("#<%c>%%s%%x00"),LOG_REV_COMMIT_SUBJECT);\r
326                 format += log;\r
327                 log.Format(_T("#<%c>%%b%%x00"),LOG_REV_COMMIT_BODY);\r
328                 format += log;\r
329         }\r
330         log.Format(_T("#<%c>%%m%%H%%x00"),LOG_REV_COMMIT_HASH);\r
331         format += log;\r
332         log.Format(_T("#<%c>%%P%%x00"),LOG_REV_COMMIT_PARENT);\r
333         format += log;\r
334 \r
335         if(IsFull)\r
336         {\r
337                 log.Format(_T("#<%c>%%x00"),LOG_REV_COMMIT_FILE);\r
338                 format += log;\r
339         }\r
340         return 0;\r
341 }\r
342 \r
343 int CGit::GetLog(BYTE_VECTOR& logOut, CString &hash,  CTGitPath *path ,int count,int mask)\r
344 {\r
345 \r
346         CString cmd;\r
347         CString log;\r
348         CString num;\r
349         CString since;\r
350 \r
351         CString file;\r
352 \r
353         if(path)\r
354                 file.Format(_T(" -- \"%s\""),path->GetGitPathString());\r
355         \r
356         if(count>0)\r
357                 num.Format(_T("-n%d"),count);\r
358 \r
359         CString param;\r
360 \r
361         if(mask& LOG_INFO_STAT )\r
362                 param += _T(" --numstat ");\r
363         if(mask& LOG_INFO_FILESTATE)\r
364                 param += _T(" --raw ");\r
365 \r
366         if(mask& LOG_INFO_FULLHISTORY)\r
367                 param += _T(" --full-history ");\r
368 \r
369         if(mask& LOG_INFO_BOUNDARY)\r
370                 param += _T(" --left-right --boundary ");\r
371 \r
372         if(mask& CGit::LOG_INFO_ALL_BRANCH)\r
373                 param += _T(" --all ");\r
374 \r
375         if(mask& CGit::LOG_INFO_DETECT_COPYRENAME)\r
376                 param += _T(" -C ");\r
377         \r
378         if(mask& CGit::LOG_INFO_DETECT_RENAME )\r
379                 param += _T(" -M ");\r
380 \r
381         param+=hash;\r
382 \r
383         cmd.Format(_T("git.exe log %s -z --topo-order --parents %s --pretty=format:\""),\r
384                                 num,param);\r
385 \r
386         BuildOutputFormat(log,!(mask&CGit::LOG_INFO_ONLY_HASH));\r
387 \r
388         cmd += log;\r
389         cmd += CString(_T("\"  "))+hash+file;\r
390 \r
391         return Run(cmd,&logOut);\r
392 }\r
393 \r
394 #if 0\r
395 int CGit::GetShortLog(CString &logOut,CTGitPath * path, int count)\r
396 {\r
397         CString cmd;\r
398         CString log;\r
399         int n;\r
400         if(count<0)\r
401                 n=100;\r
402         else\r
403                 n=count;\r
404         cmd.Format(_T("git.exe log --left-right --boundary --topo-order -n%d --pretty=format:\""),n);\r
405         BuildOutputFormat(log,false);\r
406         cmd += log+_T("\"");\r
407         if (path)\r
408                 cmd+= _T("  -- \"")+path->GetGitPathString()+_T("\"");\r
409         //cmd += CString(_T("\" HEAD~40..HEAD"));\r
410         return Run(cmd,&logOut);\r
411 }\r
412 #endif\r
413 \r
414 #define BUFSIZE 512\r
415 void GetTempPath(CString &path)\r
416 {\r
417         TCHAR lpPathBuffer[BUFSIZE];\r
418         DWORD dwRetVal;\r
419         DWORD dwBufSize=BUFSIZE;\r
420         dwRetVal = GetTempPath(dwBufSize,     // length of the buffer\r
421                            lpPathBuffer); // buffer for path \r
422     if (dwRetVal > dwBufSize || (dwRetVal == 0))\r
423     {\r
424         path=_T("");\r
425     }\r
426         path.Format(_T("%s"),lpPathBuffer);\r
427 }\r
428 CString GetTempFile()\r
429 {\r
430         TCHAR lpPathBuffer[BUFSIZE];\r
431         DWORD dwRetVal;\r
432     DWORD dwBufSize=BUFSIZE;\r
433         TCHAR szTempName[BUFSIZE];  \r
434         UINT uRetVal;\r
435 \r
436         dwRetVal = GetTempPath(dwBufSize,     // length of the buffer\r
437                            lpPathBuffer); // buffer for path \r
438     if (dwRetVal > dwBufSize || (dwRetVal == 0))\r
439     {\r
440         return _T("");\r
441     }\r
442          // Create a temporary file. \r
443     uRetVal = GetTempFileName(lpPathBuffer, // directory for tmp files\r
444                               TEXT("Patch"),  // temp file name prefix \r
445                               0,            // create unique name \r
446                               szTempName);  // buffer for name \r
447 \r
448 \r
449     if (uRetVal == 0)\r
450     {\r
451         return _T("");\r
452     }\r
453 \r
454         return CString(szTempName);\r
455 \r
456 }\r
457 \r
458 int CGit::RunLogFile(CString cmd,CString &filename)\r
459 {\r
460         STARTUPINFO si;\r
461         PROCESS_INFORMATION pi;\r
462         si.cb=sizeof(STARTUPINFO);\r
463         GetStartupInfo(&si);\r
464 \r
465         SECURITY_ATTRIBUTES   psa={sizeof(psa),NULL,TRUE};;   \r
466         psa.bInheritHandle=TRUE;   \r
467     \r
468         HANDLE   houtfile=CreateFile(filename,GENERIC_WRITE,FILE_SHARE_READ   |   FILE_SHARE_WRITE,   \r
469                         &psa,CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL);   \r
470 \r
471 \r
472         si.wShowWindow=SW_HIDE;\r
473         si.dwFlags=STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;\r
474         si.hStdOutput   =   houtfile; \r
475         \r
476         if(!CreateProcess(NULL,(LPWSTR)cmd.GetString(), NULL,NULL,TRUE,NULL,NULL,(LPWSTR)m_CurrentDir.GetString(),&si,&pi))\r
477         {\r
478                 LPVOID lpMsgBuf;\r
479                 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,\r
480                         NULL,GetLastError(),MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),\r
481                         (LPTSTR)&lpMsgBuf,\r
482                         0,NULL);\r
483                 return GIT_ERROR_CREATE_PROCESS;\r
484         }\r
485         \r
486         WaitForSingleObject(pi.hProcess,INFINITE);   \r
487         \r
488         CloseHandle(pi.hThread);\r
489         CloseHandle(pi.hProcess);\r
490         CloseHandle(houtfile);\r
491         return GIT_SUCCESS;\r
492         return 0;\r
493 }\r
494 \r
495 git_revnum_t CGit::GetHash(CString &friendname)\r
496 {\r
497         // NOTE: could replace this with wgGetRevisionID call\r
498 \r
499         CString cmd;\r
500         CString out;\r
501         cmd.Format(_T("git.exe rev-parse %s" ),friendname);\r
502         Run(cmd,&out,CP_UTF8);\r
503         int pos=out.ReverseFind(_T('\n'));\r
504         if(pos>0)\r
505                 return out.Left(pos);\r
506         return out;\r
507 }\r
508 \r
509 int CGit::GetTagList(STRING_VECTOR &list)\r
510 {\r
511         int ret;\r
512         CString cmd,output;\r
513         cmd=_T("git.exe tag -l");\r
514         int i=0;\r
515         ret=g_Git.Run(cmd,&output,CP_UTF8);\r
516         if(!ret)\r
517         {               \r
518                 int pos=0;\r
519                 CString one;\r
520                 while( pos>=0 )\r
521                 {\r
522                         i++;\r
523                         one=output.Tokenize(_T("\n"),pos);\r
524                         list.push_back(one);\r
525                 }\r
526         }\r
527         return ret;\r
528 }\r
529 \r
530 int CGit::GetBranchList(STRING_VECTOR &list,int *current,BRANCH_TYPE type)\r
531 {\r
532         int ret;\r
533         CString cmd,output;\r
534         cmd=_T("git.exe branch");\r
535 \r
536         if(type==(BRANCH_LOCAL|BRANCH_REMOTE))\r
537                 cmd+=_T(" -a");\r
538         else if(type==BRANCH_REMOTE)\r
539                 cmd+=_T(" -r");\r
540 \r
541         int i=0;\r
542         ret=g_Git.Run(cmd,&output,CP_UTF8);\r
543         if(!ret)\r
544         {               \r
545                 int pos=0;\r
546                 CString one;\r
547                 while( pos>=0 )\r
548                 {\r
549                         i++;\r
550                         one=output.Tokenize(_T("\n"),pos);\r
551                         list.push_back(one.Right(one.GetLength()-2));\r
552                         if(one[0] == _T('*'))\r
553                                 if(current)\r
554                                         *current=i;\r
555                 }\r
556         }\r
557         return ret;\r
558 }\r
559 \r
560 int CGit::GetRemoteList(STRING_VECTOR &list)\r
561 {\r
562         int ret;\r
563         CString cmd,output;\r
564         cmd=_T("git.exe config  --get-regexp remote.*.url");\r
565         ret=g_Git.Run(cmd,&output,CP_UTF8);\r
566         if(!ret)\r
567         {\r
568                 int pos=0;\r
569                 CString one;\r
570                 while( pos>=0 )\r
571                 {\r
572                         one=output.Tokenize(_T("\n"),pos);\r
573                         int start=one.Find(_T("."),0);\r
574                         if(start>0)\r
575                         {\r
576                                 CString url;\r
577                                 url=one.Right(one.GetLength()-start-1);\r
578                                 one=url;\r
579                                 one=one.Left(one.Find(_T("."),0));\r
580                                 list.push_back(one);\r
581                         }\r
582                 }\r
583         }\r
584         return ret;\r
585 }\r
586 \r
587 int CGit::GetMapHashToFriendName(MAP_HASH_NAME &map)\r
588 {\r
589         int ret;\r
590         CString cmd,output;\r
591         cmd=_T("git show-ref -d");\r
592         ret=g_Git.Run(cmd,&output,CP_UTF8);\r
593         if(!ret)\r
594         {\r
595                 int pos=0;\r
596                 CString one;\r
597                 while( pos>=0 )\r
598                 {\r
599                         one=output.Tokenize(_T("\n"),pos);\r
600                         int start=one.Find(_T(" "),0);\r
601                         if(start>0)\r
602                         {\r
603                                 CString name;\r
604                                 name=one.Right(one.GetLength()-start-1);\r
605 \r
606                                 CString hash;\r
607                                 hash=one.Left(start);\r
608 \r
609                                 map[hash].push_back(name);\r
610                         }\r
611                 }\r
612         }\r
613         return ret;\r
614 }\r
615 \r
616 BOOL CGit::CheckMsysGitDir()\r
617 {\r
618         static BOOL bInitialized = FALSE;\r
619 \r
620         if (bInitialized)\r
621         {\r
622                 return TRUE;\r
623         }\r
624 \r
625         TCHAR *oldpath,*home;\r
626         size_t size;\r
627 \r
628         // set HOME if not set already\r
629         _tgetenv_s(&size, NULL, 0, _T("HOME"));\r
630         if (!size)\r
631         {\r
632                 _tdupenv_s(&home,&size,_T("USERPROFILE")); \r
633                 _tputenv_s(_T("HOME"),home);\r
634                 free(home);\r
635         }\r
636 \r
637         // search PATH if git/bin directory is alredy present\r
638         if ( FindGitPath() )\r
639         {\r
640                 bInitialized = TRUE;\r
641                 return TRUE;\r
642         }\r
643 \r
644         // add git/bin path to PATH\r
645 \r
646         CRegString msysdir=CRegString(REG_MSYSGIT_PATH,_T(""),FALSE,HKEY_LOCAL_MACHINE);\r
647         CString str=msysdir;\r
648         if(str.IsEmpty())\r
649         {\r
650                 CRegString msysinstalldir=CRegString(REG_MSYSGIT_INSTALL,_T(""),FALSE,HKEY_LOCAL_MACHINE);\r
651                 str=msysinstalldir;\r
652                 if ( !str.IsEmpty() )\r
653                 {\r
654                         str += (str[str.GetLength()-1] != '\\') ? "\\bin" : "bin";\r
655                         msysdir=str;\r
656                         msysdir.write();\r
657                 }\r
658                 else\r
659                 {\r
660                         return false;\r
661                 }\r
662         }\r
663         //CGit::m_MsysGitPath=str;\r
664 \r
665         //set path\r
666 \r
667         _tdupenv_s(&oldpath,&size,_T("PATH")); \r
668 \r
669         CString path;\r
670         path.Format(_T("%s;%s"),oldpath,str);\r
671 \r
672         _tputenv_s(_T("PATH"),path);\r
673 \r
674         free(oldpath);\r
675 \r
676         if( !FindGitPath() )\r
677         {\r
678                 return false;\r
679         }\r
680         else\r
681         {\r
682                 bInitialized = TRUE;\r
683                 return true;\r
684         }\r
685 }