autologin: remove processing of command line arguments in favour of deciding

based on an entry in the opie-login.conf file

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
@@ -60,43 +60,24 @@ 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 );
 
@@ -106,12 +87,18 @@ int main ( int argc, char **argv )
 	::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;
@@ -191,13 +178,13 @@ int main ( int argc, char **argv )
 
 			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 );