Log stderr more sanely, fix buffer abuse. It is really sane to use '+=' on

a QString? Do I care? It's C++, let it do what it does best -- hide
implementation details like the fact that some stuff _really_ sucks and
encourage the programmer to do those things :)

2 files changed, 54 insertions, 9 deletions

diff --git a/noncore/settings/sshkeys/sshkeys.cpp b/noncore/settings/sshkeys/sshkeys.cpp
index c5e1170..43e02af 100644
--- a/noncore/settings/sshkeys/sshkeys.cpp
+++ b/noncore/settings/sshkeys/sshkeys.cpp
@@ -46,13 +46,13 @@ SSHKeysApp::SSHKeysApp( QWidget* parent,  const char* name, WFlags fl )
 	connect(RefreshListButton, SIGNAL(clicked()), this, SLOT(doRefreshListButton()));
 	connect(RemoveAllButton, SIGNAL(clicked()), this, SLOT(doRemoveAllButton()));
 
 	connect(&addprocess, SIGNAL(receivedStdout(OProcess*,char*,int)),
 		this, SLOT(log_sshadd_output(OProcess*,char*,int)));
 	connect(&addprocess, SIGNAL(receivedStderr(OProcess*,char*,int)),
-		this, SLOT(log_sshadd_output(OProcess*,char*,int)));
+		this, SLOT(log_sshadd_stderr(OProcess*,char*,int)));
 	connect(&addprocess, SIGNAL(processExited(OProcess*)),
 		this, SLOT(ssh_add_exited(OProcess*)));
 
 	connect(KeyFileName, SIGNAL(textChanged(const QString&)),
 		this, SLOT(add_text_changed(const QString&)));
 
@@ -87,13 +87,13 @@ void SSHKeysApp::doRefreshListButton()
 		t = next;
 	}
 		
 	connect(&sshadd_process, SIGNAL(receivedStdout(OProcess*,char*,int)),
 		this, SLOT(get_list_keys_output(OProcess*,char*,int)));
 	connect(&sshadd_process, SIGNAL(receivedStderr(OProcess*,char*,int)),
-		this, SLOT(log_sshadd_output(OProcess*,char*,int)));
+		this, SLOT(log_sshadd_stderr(OProcess*,char*,int)));
 
 	keystate = KeySize;
 	incoming_keyname="";
 	incoming_keysize="";
 	incoming_keyfingerprint="";
 
@@ -101,12 +101,13 @@ void SSHKeysApp::doRefreshListButton()
 	sshadd_process << "ssh-add" << "-l";
 	bool ret = sshadd_process.start(OProcess::Block, OProcess::AllOutput);
 	if (!ret) {
 		log_text(tr("Error running ssh-add"));
 		return;
 	}
+	flush_sshadd_output();
 	if (sshadd_process.exitStatus() == 2) {
 		setEnabled(FALSE);
 	}
 }
 
 void SSHKeysApp::get_list_keys_output(OProcess *proc, char *buffer, int buflen)
@@ -174,18 +175,55 @@ void SSHKeysApp::get_list_keys_output(OProcess *proc, char *buffer, int buflen)
 			}
 			break;
 		}
 	}
 }
 
+void SSHKeysApp::flush_sshadd_output(void)
+{
+	if (pending_stdout.length()) {
+		log_text(pending_stdout.ascii());
+	}
+	pending_stdout = "";
+
+	if (pending_stderr.length()) {
+		log_text(pending_stderr.ascii());
+	}
+	pending_stderr = "";
+}
+
 void SSHKeysApp::log_sshadd_output(OProcess *proc, char *buffer, int buflen)
 {
-	(void)proc;
-	(void)buflen;
+	(void) proc;
 
-	log_text(buffer);
+	while (buflen) {
+		if (*buffer == '\n') {
+			log_text(pending_stdout);
+			pending_stdout = "";
+		} else {
+			pending_stdout += *buffer;
+		}
+		buffer++;
+		buflen--;
+	}
+}
+
+void SSHKeysApp::log_sshadd_stderr(OProcess *proc, char *buffer, int buflen)
+{
+	(void) proc;
+
+	while (buflen) {
+		if (*buffer == '\n') {
+			log_text(pending_stderr);
+			pending_stderr = "";
+		} else {
+			pending_stderr += *buffer;
+		}
+		buffer++;
+		buflen--;
+	}
 }
 
 void SSHKeysApp::ssh_add_exited(OProcess *proc)
 {
 	(void)proc;
 
@@ -213,23 +251,24 @@ void SSHKeysApp::doAddButton()
 	addprocess.clearArguments();
 	
 	setEnabled(FALSE);
 
 	if (KeyFileName->currentText().length()) {
 		addprocess << "ssh-add" << "--" << KeyFileName->currentText();
-		log_text(QString(tr("Running ssh-add -- ")) + KeyFileName->currentText());
+//		log_text(QString(tr("Running ssh-add -- ")) + KeyFileName->currentText());
 	} else {
 		addprocess << "ssh-add";
-		log_text(tr("Running ssh-add"));
+//		log_text(tr("Running ssh-add"));
 	}
 	bool ret = addprocess.start(OProcess::NotifyOnExit, OProcess::AllOutput);
 	if (!ret) {
 		log_text(tr("Error running ssh-add"));
 		doRefreshListButton();
 		setEnabled(TRUE);
 	}
+	flush_sshadd_output();
 }
 
 void SSHKeysApp::log_text(const char *text)
 {
 	TextOutput->append(text);
 	TextOutput->setCursorPosition(TextOutput->numLines()+1, 0, FALSE);
@@ -239,16 +278,17 @@ void SSHKeysApp::doRemoveAllButton()
 {
 	OProcess sshadd_process;
 
 	connect(&sshadd_process, SIGNAL(receivedStdout(OProcess*,char*,int)),
 		this, SLOT(log_sshadd_output(OProcess*,char*,int)));
 	connect(&sshadd_process, SIGNAL(receivedStderr(OProcess*,char*,int)),
-		this, SLOT(log_sshadd_output(OProcess*,char*,int)));
+		this, SLOT(log_sshadd_stderr(OProcess*,char*,int)));
 
-	log_text(tr("Running ssh-add -D"));
+//	log_text(tr("Running ssh-add -D"));
 	sshadd_process << "ssh-add" << "-D";
 	bool ret = sshadd_process.start(OProcess::Block, OProcess::AllOutput);
 	if (!ret) {
 		log_text(tr("Error running ssh-add"));
 	}
+	flush_sshadd_output();
 	doRefreshListButton();
 }
diff --git a/noncore/settings/sshkeys/sshkeys.h b/noncore/settings/sshkeys/sshkeys.h
index 5e306d1..bbc6993 100644
--- a/noncore/settings/sshkeys/sshkeys.h
+++ b/noncore/settings/sshkeys/sshkeys.h
@@ -32,24 +32,29 @@ class SSHKeysApp : public SSHKeysBase
  public:
 	SSHKeysApp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 	~SSHKeysApp();
 
  private:
 	void log_text(const char *text);
+	void flush_sshadd_output(void);
+
 	enum { Noise, KeyName, KeySize, KeyFingerprint } keystate;
 	QString incoming_keyname;
 	QString incoming_keysize;
 	QString incoming_keyfingerprint;
 	QString incoming_noise;
 	OProcess addprocess;
+	QString pending_stdout;
+	QString pending_stderr;
 
  private slots:
 	void doAddButton();
 	void doRefreshListButton();
 	void doRemoveAllButton();
 	void get_list_keys_output(OProcess *proc, char *buffer, int buflen);
 	void log_sshadd_output(OProcess *proc, char *buffer, int buflen);
+	void log_sshadd_stderr(OProcess *proc, char *buffer, int buflen);
 	void ssh_add_exited(OProcess *proc);
 	void add_text_changed(const QString &text);
 };
 #endif