GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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