nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

patch that keeps the fbrun_history clean by not allowing

Browse source 
duplicates to get placed in the history. Thanks David J Burger
This commit is contained in:
fluxgen 2003-07-10 10:18:08 +00:00
parent 51d5903898
commit 481c0faeb5
1 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
util/fbrun/FbRun.cc
View file

@ -19,7 +19,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: FbRun.cc,v 1.13 2003/06/25 12:01:23 fluxgen Exp $ // $Id: FbRun.cc,v 1.14 2003/07/10 10:18:08 fluxgen Exp $
#include "FbRun.hh" #include "FbRun.hh"
@ -86,12 +86,35 @@ void FbRun::run(const std::string &command) {
// save command history to file // save command history to file
if (m_runtext.size() != 0) { // no need to save empty command if (m_runtext.size() != 0) { // no need to save empty command
// open file in append mode
ofstream outfile(m_history_file.c_str(), ios::app); // don't allow duplicates into the history file, first
if (outfile) // look for a duplicate
outfile<<m_runtext<<endl; if (m_current_history_item < m_history.size()
else && m_runtext == m_history[m_current_history_item]) {
cerr<<"FbRun Warning: Can't write command history to file: "<<m_history_file<<endl; // m_current_history_item is the duplicate
} else {
int i;
for (i = 0; i < m_history.size(); i++)
if (m_runtext == m_history[i]) break;
m_current_history_item = i;
}
// now m_current_history_item points at the duplicate, or
// at m_history.size() if no duplicate
fstream inoutfile(m_history_file.c_str(), ios::in|ios::out);
if (inoutfile) {
int i = 0;
// read past history items before current
for (string line; !inoutfile.eof() && i < m_current_history_item; i++)
getline(inoutfile, line);
// write the history items that come after current
for (i++; i < m_history.size(); i++)
inoutfile<<m_history[i]<<endl;
// and append the current one back to the end
inoutfile<<m_runtext<<endl;
inoutfile.close();
} else
cerr<<"FbRun Warning: Can't write command history to file: "<<m_history_file<<endl;
} }
FbTk::App::instance()->end(); // end application FbTk::App::instance()->end(); // end application
m_end = true; // mark end of processing m_end = true; // mark end of processing