Merge lp:~cpatulea/oah/linkwrapper into lp:oah

Proposed by Catalin Patulea
Status: Merged
Approved by: Haakon Sporsheim
Approved revision: not available
Merged at revision: 68
Proposed branch: lp:~cpatulea/oah/linkwrapper
Merge into: lp:oah
Diff against target: 15 lines (+5/-0)
1 file modified
linkwrapper/linkwrapper.cpp (+5/-0)
To merge this branch: bzr merge lp:~cpatulea/oah/linkwrapper
Reviewer Review Type Date Requested Status
Haakon Sporsheim Approve
Review via email: mp+17083@code.launchpad.net

Commit message

Merge fix for required OAH_INSTALLED_PATH.

To post a comment you must log in.
Revision history for this message
Haakon Sporsheim (ieei) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'linkwrapper/linkwrapper.cpp'
2--- linkwrapper/linkwrapper.cpp 2009-06-10 21:17:30 +0000
3+++ linkwrapper/linkwrapper.cpp 2010-01-10 01:07:14 +0000
4@@ -179,6 +179,11 @@
5 {
6 TCHAR oah_installed_path[MAX_PATH+1];
7 DWORD len = GetEnvironmentVariable(_T("OAH_INSTALLED_PATH"), &oah_installed_path[1], MAX_PATH);
8+ if (len == 0)
9+ {
10+ std::cout << "OAH linkwrapper requires OAH_INSTALLED_PATH environment variable." << std::endl;
11+ return 1;
12+ }
13 oah_installed_path[0] = _T('"');
14 oah_installed_path[len+1] = 0;
15 if (len > 0) _tcscat(oah_installed_path, _T("bin\\"));

Subscribers

People subscribed via source and target branches