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
@@ -42,94 +42,81 @@
 #include <qtimer.h>
 #include <qfile.h>
 
 /* STD */
 #include <sys/types.h>
 #include <time.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <unistd.h>
 #include <syslog.h>
 #include <sys/wait.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <getopt.h>
 #include <string.h>
 
 using namespace Opie::Core;
 
 int login_main ( int argc, char **argv, pid_t ppid );
 void sigterm ( int sig );
 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 )
 {
     int userExited = 0;
         pid_t ppid = ::getpid ( );
 
         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;
         }
         if ( ::getuid ( ) != 0 ) // qt doesn't really like SUID and
                 ::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 );
 
         //for ( unsigned int i = 0; i < rl. rlim_cur; i++ )
         //      ::close ( i );
 
         ::setpgid ( 0, 0 );
         ::setsid ( );
 
         ::signal ( SIGTERM, sigterm );
         ::signal ( SIGINT, sigterm );
 
         ::openlog ( "opie-login", LOG_CONS, LOG_AUTHPRIV );
         ::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 ( );
 
                 if ( child < 0 ) {
                         ::syslog ( LOG_ERR, "Could not fork GUI process\n" );
                         break;
                 }
                 else if ( child > 0 ) {
                         int status = 0;
                         time_t started = ::time ( 0 );
 
                         while ( ::waitpid ( child, &status, 0 ) < 0 ) { }
 
                         LoginApplication::logout ( );
 
                         if (( ::time ( 0 ) - started ) < 3 ) {
                                 if ( autolog ) {
                                         ::syslog ( LOG_ERR, "Respawning too fast -- disabling auto-login\n" );
                                         autolog = 0;
                                 }
                                 else {
                                         ::syslog ( LOG_ERR, "Respawning too fast -- going down\n" );
                                         break;
                                 }
@@ -173,49 +160,49 @@ int main ( int argc, char **argv )
                                 l-> resize ( app-> desktop ( )-> width ( ), app-> desktop ( )-> height ( ));
                                 l-> show ( );
                                 QTimer::singleShot ( 3000, app, SLOT( quit()));
                                 app-> exec ( );
                                 delete app;
                                 qApp = 0;
                         }
                 }
                 else {
                         if ( !autolog ) {
                 QString confFile=QPEApplication::qpeDir() + "etc/opie-login.conf";
                                 Config cfg ( confFile, Config::File );
                                 cfg. setGroup ( "General" );
                                 QString user = cfg. readEntry ( "AutoLogin" );
 
                                 if ( !user. isEmpty ( ))
                                         autolog = ::strdup ( user. latin1 ( ));
                         }
 
                         if ( autolog && !userExited ) {
 
                 QWSServer::setDesktopBackground( QImage() );
                 ODevice::inst()->setDisplayStatus( true );
                 LoginApplication *app = new LoginApplication ( argc, argv, ppid );
-                LoginApplication::setLoginAs ( autolog );
+                LoginApplication::setLoginAs( autolog );
 
 
                                 if ( LoginApplication::changeIdentity ( ))
                                         ::exit ( LoginApplication::login ( ));
                                 else
                                         ::exit ( 0 );
                         }
                         else  {
                                 ::exit ( login_main ( argc, argv, ppid ));
             }
                 }
         }
         return 0;
 }
 
 void sigterm ( int /*sig*/ )
 {
         ::exit ( 0 );
 }
 
 
 void exit_closelog ( )
 {
         ::closelog ( );