Diffstat (limited to 'noncore/net/wellenreiter/gui/main.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/main.cpp | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/noncore/net/wellenreiter/gui/main.cpp b/noncore/net/wellenreiter/gui/main.cpp index 55a5260..dd757b5 100644 --- a/noncore/net/wellenreiter/gui/main.cpp +++ b/noncore/net/wellenreiter/gui/main.cpp | |||
@@ -51,9 +51,23 @@ int main( int argc, char **argv ) | |||
51 | #endif | 51 | #endif |
52 | 52 | ||
53 | a.processEvents(); // show the window before doing the safety checks | 53 | a.processEvents(); // show the window before doing the safety checks |
54 | int result = -1; | 54 | int result = -1; |
55 | static int killed = false; | ||
55 | 56 | ||
57 | bool check = true; | ||
58 | for ( int i = 1; i < argc; ++i ) | ||
59 | { | ||
60 | if ( !strcmp( "-nocheck", argv[i] ) ) | ||
61 | { | ||
62 | qDebug( "-nocheck found" ); | ||
63 | check = false; | ||
64 | break; | ||
65 | } | ||
66 | } | ||
67 | |||
68 | if ( check ) | ||
69 | { | ||
56 | // root check | 70 | // root check |
57 | if ( getuid() ) | 71 | if ( getuid() ) |
58 | { | 72 | { |
59 | qWarning( QObject::tr( "Wellenreiter: trying to run as non-root!" ) ); | 73 | qWarning( QObject::tr( "Wellenreiter: trying to run as non-root!" ) ); |
@@ -65,10 +79,8 @@ int main( int argc, char **argv ) | |||
65 | 79 | ||
66 | // dhcp check - NOT HERE! This really belongs as a static member to OProcess | 80 | // dhcp check - NOT HERE! This really belongs as a static member to OProcess |
67 | // and I want to call it like that: if ( OProcess::isRunning( QString& ) ) ... | 81 | // and I want to call it like that: if ( OProcess::isRunning( QString& ) ) ... |
68 | 82 | ||
69 | static int killed = false; | ||
70 | |||
71 | QString line; | 83 | QString line; |
72 | QDir d = QDir( "/proc" ); | 84 | QDir d = QDir( "/proc" ); |
73 | QStringList dirs = d.entryList( QDir::Dirs ); | 85 | QStringList dirs = d.entryList( QDir::Dirs ); |
74 | QStringList::Iterator it; | 86 | QStringList::Iterator it; |
@@ -96,11 +108,15 @@ int main( int argc, char **argv ) | |||
96 | else | 108 | else |
97 | killed = true; | 109 | killed = true; |
98 | } | 110 | } |
99 | } | 111 | } |
112 | } | ||
100 | 113 | ||
101 | a.exec(); | 114 | a.exec(); |
102 | 115 | ||
116 | if ( check ) | ||
117 | { | ||
118 | |||
103 | if ( killed ) | 119 | if ( killed ) |
104 | { | 120 | { |
105 | result = QMessageBox::warning( w, " - Wellenreiter II - (dhcp)", QObject::tr( "Restart your dhcp client?" ), QMessageBox::Yes, QMessageBox::No ); | 121 | result = QMessageBox::warning( w, " - Wellenreiter II - (dhcp)", QObject::tr( "Restart your dhcp client?" ), QMessageBox::Yes, QMessageBox::No ); |
106 | if ( result == QMessageBox::Yes ) | 122 | if ( result == QMessageBox::Yes ) |
@@ -109,6 +125,7 @@ int main( int argc, char **argv ) | |||
109 | } | 125 | } |
110 | } | 126 | } |
111 | 127 | ||
112 | delete w; | 128 | delete w; |
129 | } | ||
113 | return 0; | 130 | return 0; |
114 | } | 131 | } |