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

Readline

Browse source 
- Made use of readline wordexp conditional upon the presence of wordexp.h,
  which is correct, but excludes certain BSDs.
This commit is contained in:
Paul Beckingham 2014-01-12 14:49:42 -05:00
parent b81891c78f
commit cdc0c0a01a
4 changed files with 31 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/shell/Readline.cpp
View file

@ -77,33 +77,49 @@ bool Readline::interactiveMode (const std::istream& in)
////////////////////////////////////////////////////////////////////////////////
Wordexp::Wordexp (const std::string &str)
{
std::string tmpStr(str);
escapeSpecialChars(tmpStr);
wordexp (tmpStr.c_str (), &_p, 0);
_input = str;
escapeSpecialChars(_input);
#ifdef HAVE_WORDEXP_H
wordexp (_input.c_str (), &_p, 0);
#endif
}
////////////////////////////////////////////////////////////////////////////////
Wordexp::~Wordexp ()
{
#ifdef HAVE_WORDEXP_H
wordfree (&_p);
#endif
}
////////////////////////////////////////////////////////////////////////////////
int Wordexp::argc ()
{
#ifdef HAVE_WORDEXP_H
return _p.we_wordc;
#else
return 1;
#endif
}
////////////////////////////////////////////////////////////////////////////////
char** Wordexp::argv ()
{
#ifdef HAVE_WORDEXP_H
return _p.we_wordv;
#else
return (char**)_input.c_str ();
#endif
}
////////////////////////////////////////////////////////////////////////////////
char* Wordexp::argv (int i)
{
#ifdef HAVE_WORDEXP_H
return _p.we_wordv[i];
#else
return (char*)_input.c_str ();
#endif
}
////////////////////////////////////////////////////////////////////////////////

6
src/shell/Readline.h
View file

@ -30,7 +30,9 @@
#include <string>
#include <stdio.h>
#ifdef HAVE_WORDEXP_H
#include <wordexp.h>
#endif
// Static class that offers a C++ API to readline C functions.
class Readline
@ -61,7 +63,11 @@ public:
void escapeSpecialChars(std::string& str);
private:
#ifdef HAVE_WORDEXP_H
wordexp_t _p;
#else
std::string _input;
#endif
};
#endif