summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/opie-login/main.cpp29
1 files changed, 8 insertions, 21 deletions
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index 711bedc..554efd3 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -64,10 +64,4 @@ void sigint ( int sig );
void exit_closelog ( );
-static struct option long_options [] = {
- { "autologin", 1, 0, 'a' },
- { 0, 0, 0, 0 }
-};
-
-
int main ( int argc, char **argv )
{
@@ -76,5 +70,5 @@ int main ( int argc, char **argv )
if ( ::geteuid ( ) != 0 ) {
- ::fprintf ( stderr, "%s can only be executed by root. (or chmod +s)", argv [0] );
+ ::fprintf ( stderr, "%s can only be executed by root. (or chmod +s)\n", argv [0] );
return 1;
}
@@ -82,17 +76,4 @@ int main ( int argc, char **argv )
::setuid ( 0 ); // messes up things like config files
- char *autolog = 0;
- int c;
- while (( c = ::getopt_long ( argc, argv, "a:", long_options, 0 )) != -1 ) {
- switch ( c ) {
- case 'a':
- autolog = optarg;
- break;
- default:
- ::fprintf ( stderr, "Usage: %s [-a|--autologin=<user>]\n", argv [0] );
- return 2;
- }
- }
-
// struct rlimit rl;
// ::getrlimit ( RLIMIT_NOFILE, &rl );
@@ -110,4 +91,10 @@ int main ( int argc, char **argv )
::atexit ( exit_closelog );
+ const char* autolog = 0;
+ Config c( "opie-login" );
+ c.setGroup( "autologin" );
+ QString entry = c.readEntry( "user", "" );
+ if ( !entry.isEmpty() ) autolog = ::strdup( (const char*) entry );
+
while ( true ) {
pid_t child = ::fork ( );
@@ -195,5 +182,5 @@ int main ( int argc, char **argv )
ODevice::inst()->setDisplayStatus( true );
LoginApplication *app = new LoginApplication ( argc, argv, ppid );
- LoginApplication::setLoginAs ( autolog );
+ LoginApplication::setLoginAs( autolog );