Move the method out

1 files changed, 11 insertions, 4 deletions

diff --git a/noncore/settings/sshkeys/sshkeys.cpp b/noncore/settings/sshkeys/sshkeys.cpp
index d8b1014..57118c9 100644
--- a/noncore/settings/sshkeys/sshkeys.cpp
+++ b/noncore/settings/sshkeys/sshkeys.cpp
@@ -1,244 +1,251 @@
 /*
  *  ssh-agent key manipulation utility
  *
  *  (C) 2002 David Woodhouse <dwmw2@infradead.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
 #include "sshkeys.h"
 
 #include <qpe/qpeapplication.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qmultilineedit.h>
 #include <qpushbutton.h>
 #include <qlistview.h>
 #include <qcombobox.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <ctype.h>
 
 using namespace Opie::Core;
-static char *keynames[] = { "identity", "id_rsa", "id_dsa" };
+static const char *keynames[] = { "identity", "id_rsa", "id_dsa" };
 
-SSHKeysApp::SSHKeysApp( QWidget* parent,  const char* name, WFlags fl )
-    : SSHKeysBase( parent, name, fl )
-{
+
+static void detachTerminal() {
     /* If we had a controlling TTY, detach from it.
        This is to ensure that SSH uses ssh-askpass */
     int fd = open("/dev/tty", O_RDONLY);
     if (fd != -1) {
         ioctl(fd, TIOCNOTTY, NULL);
         close(fd);
     }
+}
+
+
+SSHKeysApp::SSHKeysApp( QWidget* parent,  const char* name, WFlags fl )
+    : SSHKeysBase( parent, name, fl )
+{
+    detachTerminal();
+
 
     QCString home = QFile::encodeName( QDir::homeDirPath() );
     unsigned i;
 
     connect(AddButton, SIGNAL(clicked()), this, SLOT(doAddButton()));
     connect(RefreshListButton, SIGNAL(clicked()), this, SLOT(doRefreshListButton()));
     connect(RemoveAllButton, SIGNAL(clicked()), this, SLOT(doRemoveAllButton()));
 
     connect(&addprocess, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
             this, SLOT(log_sshadd_output(Opie::Core::OProcess*,char*,int)));
     connect(&addprocess, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
             this, SLOT(log_sshadd_stderr(Opie::Core::OProcess*,char*,int)));
     connect(&addprocess, SIGNAL(processExited(Opie::Core::OProcess*)),
             this, SLOT(ssh_add_exited(Opie::Core::OProcess*)));
 
     connect(KeyFileName, SIGNAL(textChanged(const QString&)),
         this, SLOT(add_text_changed(const QString&)));
 
     if (home) {
         for (i = 0; i < sizeof(keynames)/sizeof(keynames[0]); i++) {
             char thiskeyname[32];
 
             thiskeyname[31] = 0;
             snprintf(thiskeyname, 31, "%s/.ssh/%s", home.data(), keynames[i]);
             if (!access(thiskeyname, R_OK)) {
                 KeyFileName->insertItem(thiskeyname);
             }
         }
     }
 
     doRefreshListButton();
 }
 
 SSHKeysApp::~SSHKeysApp()
 {
 }
 
 void SSHKeysApp::doRefreshListButton()
 {
     OProcess sshadd_process;
     QListViewItem *t = KeyList->firstChild();
 
     while(t) {
         QListViewItem *next = t->nextSibling();
         KeyList->takeItem(t);
         delete(t);
         t = next;
     }
 
     connect(&sshadd_process, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
             this, SLOT(get_list_keys_output(Opie::Core::OProcess*,char*,int)));
     connect(&sshadd_process, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
             this, SLOT(log_sshadd_stderr(Opie::Core::OProcess*,char*,int)));
 
     keystate = KeySize;
     incoming_keyname="";
     incoming_keysize="";
     incoming_keyfingerprint="";
 
 //    log_text("Running ssh-add -l");
     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)
 {
     int i;
     (void) proc;
 
     for (i=0; i<buflen; i++) {
         switch(keystate) {
         case Noise:
         noise:
             if (buffer[i] == '\n') {
                 log_text(incoming_noise.local8Bit());
                 incoming_noise = "";
                 keystate = KeySize;
             } else {
                 incoming_noise += buffer[i];
             }
             break;
 
         case KeySize:
             if (isdigit(buffer[i])) {
                 incoming_keysize += buffer[i];
             } else if (buffer[i] == ' ') {
                 keystate = KeyFingerprint;
             } else {
                 incoming_keysize = "";
                 incoming_noise = "";
                 keystate = Noise;
                 goto noise;
             }
             break;
 
         case KeyFingerprint:
             if (isxdigit(buffer[i]) || buffer[i] == ':') {
                 incoming_keyfingerprint += buffer[i];
             } else if (buffer[i] == ' ') {
                 keystate = KeyName;
             } else {
                 incoming_keysize = "";
                 incoming_keyfingerprint = "";
                 incoming_noise = "";
                 keystate = Noise;
                 goto noise;
             }
             break;
 
         case KeyName:
             if (buffer[i] == '\n') {
                 /* Wheee. Got one. */
                 KeyList->insertItem(new
                     QListViewItem(KeyList, incoming_keyname, incoming_keysize, incoming_keyfingerprint));
                 incoming_keysize = "";
                 incoming_keyfingerprint = "";
                 incoming_keyname = "";
                 keystate = KeySize;
             } else if (isprint(buffer[i])) {
                 incoming_keyname += buffer[i];
             } else {
                 incoming_keysize = "";
                 incoming_keyfingerprint = "";
                 incoming_noise = "";
                 keystate = Noise;
                 goto noise;
             }
             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;
 
     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;
 
     doRefreshListButton();
     setEnabled(TRUE);
     if (proc->exitStatus() == 2) {