author | sandman <sandman> | 2002-10-29 19:33:49 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-10-29 19:33:49 (UTC) |
commit | 7c340d2a08601f4d27f6d2a407fc0de437b8efad (patch) (unidiff) | |
tree | c6a01ef4e7623ea1da758030e691531f0476885e /core/opie-login/main.cpp | |
parent | 2957aae1073f4c41dd6783c41d1199be71cd9f4a (diff) | |
download | opie-7c340d2a08601f4d27f6d2a407fc0de437b8efad.zip opie-7c340d2a08601f4d27f6d2a407fc0de437b8efad.tar.gz opie-7c340d2a08601f4d27f6d2a407fc0de437b8efad.tar.bz2 |
when quitting opie-login, don't kill the process id returned by getppid(),
but use the previously saved "real" parent pid.
-rw-r--r-- | core/opie-login/main.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp index 579a93a..674829d 100644 --- a/core/opie-login/main.cpp +++ b/core/opie-login/main.cpp | |||
@@ -60,7 +60,7 @@ | |||
60 | 60 | ||
61 | using namespace Opie; | 61 | using namespace Opie; |
62 | 62 | ||
63 | int login_main ( int argc, char **argv ); | 63 | int login_main ( int argc, char **argv, pid_t ppid ); |
64 | void sigterm ( int sig ); | 64 | void sigterm ( int sig ); |
65 | void exit_closelog ( ); | 65 | void exit_closelog ( ); |
66 | 66 | ||
@@ -72,6 +72,9 @@ static struct option long_options [] = { | |||
72 | 72 | ||
73 | int main ( int argc, char **argv ) | 73 | int main ( int argc, char **argv ) |
74 | { | 74 | { |
75 | pid_t ppid = ::getpid ( ); | ||
76 | |||
77 | |||
75 | if ( ::geteuid ( ) != 0 ) { | 78 | if ( ::geteuid ( ) != 0 ) { |
76 | ::fprintf ( stderr, "%s can only be executed by root. (or chmod +s)", argv [0] ); | 79 | ::fprintf ( stderr, "%s can only be executed by root. (or chmod +s)", argv [0] ); |
77 | return 1; | 80 | return 1; |
@@ -183,7 +186,7 @@ int main ( int argc, char **argv ) | |||
183 | ::exit ( 0 ); | 186 | ::exit ( 0 ); |
184 | } | 187 | } |
185 | else | 188 | else |
186 | ::exit ( login_main ( argc, argv )); | 189 | ::exit ( login_main ( argc, argv, ppid )); |
187 | } | 190 | } |
188 | } | 191 | } |
189 | return 0; | 192 | return 0; |
@@ -302,10 +305,10 @@ private: | |||
302 | 305 | ||
303 | 306 | ||
304 | 307 | ||
305 | int login_main ( int argc, char **argv ) | 308 | int login_main ( int argc, char **argv, pid_t ppid ) |
306 | { | 309 | { |
307 | QWSServer::setDesktopBackground( QImage() ); | 310 | QWSServer::setDesktopBackground( QImage() ); |
308 | LoginApplication *app = new LoginApplication ( argc, argv ); | 311 | LoginApplication *app = new LoginApplication ( argc, argv, ppid ); |
309 | 312 | ||
310 | app-> setFont ( QFont ( "Helvetica", 10 )); | 313 | app-> setFont ( QFont ( "Helvetica", 10 )); |
311 | app-> setStyle ( new QPEStyle ( )); | 314 | app-> setStyle ( new QPEStyle ( )); |