gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Portability

Browse Source 
- Modfied diag.cpp to get a clean build on Ubuntu, and the latest gcc.
This commit is contained in:
Paul Beckingham
2010-11-06 17:27:58 -04:00
parent 08bbd38615
commit 73110ae033
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/diag.cpp
View File

@@ -203,38 +203,45 @@ void handleDiagnostics (std::string& outs)
FILE* fp;
if ((fp = popen ("scp 2>&1", "r")))
{
fgets (buffer, 1023, fp);
char* p = fgets (buffer, 1023, fp);
pclose (fp);
std::cout << " scp: "
<< (regexMatch (buffer, "usage") ? "found" : "n/a")
<< "\n";
if (p)
std::cout << " scp: "
<< (regexMatch (buffer, "usage") ? "found" : "n/a")
<< "\n";
}
if ((fp = popen ("rsync --version 2>&1", "r")))
{
fgets (buffer, 1023, fp);
char* p = fgets (buffer, 1023, fp);
pclose (fp);
// rsync version 2.6.9 protocol version 29
matches.clear ();
regexMatch (matches, buffer, "version ([0-9]+\\.[0-9]+\\.[0-9]+)");
std::cout << " rsync: "
<< (matches.size () ? matches[0] : "n/a")
<< "\n";
if (p)
{
matches.clear ();
regexMatch (matches, buffer, "version ([0-9]+\\.[0-9]+\\.[0-9]+)");
std::cout << " rsync: "
<< (matches.size () ? matches[0] : "n/a")
<< "\n";
}
}
if ((fp = popen ("curl --version 2>&1", "r")))
{
fgets (buffer, 1023, fp);
char* p = fgets (buffer, 1023, fp);
pclose (fp);
// curl 7.19.7 (universal-apple-darwin10.0) libcurl/7.19.7 OpenSSL/0.9.8l zlib/1.2.3
matches.clear ();
regexMatch (matches, buffer, "curl ([0-9]+\\.[0-9]+\\.[0-9]+)");
std::cout << " curl: "
<< (matches.size () ? matches[0] : "n/a")
<< "\n";
if (p)
{
matches.clear ();
regexMatch (matches, buffer, "curl ([0-9]+\\.[0-9]+\\.[0-9]+)");
std::cout << " curl: "
<< (matches.size () ? matches[0] : "n/a")
<< "\n";
}
}
std::cout << "\n";