Made resuspend timeout a command line option (-a <seconds>)

2 files changed, 25 insertions, 13 deletions

diff --git a/core/opiealarm/opiealarm.c b/core/opiealarm/opiealarm.c
index 3a06236..ac98832 100644
--- a/core/opiealarm/opiealarm.c
+++ b/core/opiealarm/opiealarm.c
@@ -17,33 +17,33 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
 #include <time.h>
 #include <stdlib.h>
 #include <syslog.h>
 #include <signal.h>
 #include <errno.h>
 #include <string.h>
 
 
         #define PIDFILE "/var/run/opiealarm.pid"
         #define APMFILE         "/proc/apm"
 
 FILE *log; // debug only
 
-int resume ( void );
+int resume ( int resuspend );
 int suspend ( void );
 int main ( int argc, char **argv );
 int fork_with_pidfile ( void );
 int kill_with_pidfile ( void );
 void remove_pidfile ( void );
 void usage ( void );
 void sig_handler ( int sig );
 void error_msg_and_die ( int perr, const char *msg );
 int onac ( void );
 
 static int opiealarm_was_running;
 
 
 void log_msg ( const char *msg )
 {
         if ( log ) {
@@ -60,33 +60,36 @@ void error_msg_and_die ( int perr, const char *msg )
 
                 while ( 1 )     // pretend we are waiting on RTC, so opiealarm -r can kill us
                 sleep ( 1 );
 }
 
 
 void sig_handler ( int sig )
 {
         log_msg ( "GOT SIGNAL -> EXITING\n" );
         fclose ( log );
         remove_pidfile ( );
         exit ( 0 );
 }
 
 void usage ( void )
 {
-        fprintf ( stderr, "Usage: opiealarm -r|-s\n" );
+        fprintf ( stderr, "Usage: opiealarm -r|-s [-a]\n\n" );
+        fprintf ( stderr, "\t-s\tSuspend mode: set RTC alarm\n" );
+        fprintf ( stderr, "\t-r\tResume mode: kill running opiealarm\n" );
+        fprintf ( stderr, "\t-a <x>\tResuspend in <x> seconds (resume mode)\n\n" );
         exit ( 1 );
 }
 
 int fork_with_pidfile ( void )
 {
         FILE *fp;
         pid_t pid;
         
         pid = fork ( );
         
         if ( pid > 0 )
                 exit ( 0 );
         else if ( pid < 0 ) {
                 perror ( "forking failed" );
                 return 0;
         }
@@ -126,64 +129,73 @@ int kill_with_pidfile ( void )
         }
         return 0;
 }
 
 void remove_pidfile ( void )
 {
         unlink ( PIDFILE );
         
         signal ( SIGTERM, SIG_DFL );
                 signal ( SIGINT,  SIG_DFL );
 }
 
 
 int main ( int argc, char **argv ) 
 {
         int mode = 0;
+        int ac_resusp = 0;
         int opt;
 
-        while (( opt = getopt ( argc, argv, "rs" )) != EOF ) {
+        while (( opt = getopt ( argc, argv, "a:rs" )) != EOF ) {
                 switch ( opt ) {
                         case 's':
                                 mode = 's';
                                 break;
                         case 'r':
                                 mode = 'r';
                                 break;
+                        case 'a':
+                                ac_resusp = atoi ( optarg );
+                                if ( ac_resusp < 30 ) {
+                                        ac_resusp = 120;
+                                        
+                                        fprintf ( stderr, "Warning: resuspend timeout must be >= 30 sec. -- now set to 120 sec\n" );
+                                }
+                                break;
                         default:
                                 usage ( );
                 }
                 }
         
         if ( geteuid ( ) != 0 ) {
                 fprintf ( stderr, "You need root priviledges to run opiealarm." );
                 return 2;
         }
         
         if ( !mode )
                 usage ( );
 
         // kill running opiealarm
         opiealarm_was_running = kill_with_pidfile ( );
         remove_pidfile ( );
 
-        if ( mode == 'r' ) 
-                return resume ( );
-        else 
-                return suspend ( );
-
+        switch ( mode ) {
+                case 'r': return resume ( ac_resusp );
+                case 's':
+                default : return suspend ( );
+        }
         return 0;
         }       
                 
 
 int suspend ( void )
 {
         FILE *fp;
         char buf [64];
         time_t t;
         struct tm *tm;
         int fd;
 
         
         if ( !fork_with_pidfile ( ))
                 return 3;
                 
@@ -249,52 +261,52 @@ int suspend ( void )
 static int onac ( void )
 {
         FILE *fp;
         int on = 0;
 
         if (( fp = fopen ( APMFILE, "r" ))) { 
                 int ac = 0;
         
                 if ( fscanf ( fp, "%*[^ ] %*d.%*d 0x%*x 0x%x 0x%*x 0x%*x %*d%% %*i %*c", &ac ) == 1 )
                         on = ( ac == 0x01 ) ? 1 : 0;
 
                 fclose ( fp );
         }
         return on;
 }
 
-int resume ( void )
+int resume ( int resuspend )
 {
         FILE *fp;
 
         // re-suspend when on AC (optional) when woken up via RTC
 
         if ( !opiealarm_was_running ) { // opiealarm -s got it's RTC signal -> wake up by RTC
-                        if ( onac ( )) {
+                        if ( resuspend && onac ( )) {
                         time_t start, now;
                         char *argv [4];
                                                 
                         if ( !fork_with_pidfile ( ))
                                 return 4;
 
-                        // sleep 120sec (not less!)
+                        // sleep <resuspend> sec (not less!)
                         time ( &start );
                         do {
                                 sleep ( 1 );
                                 time ( &now );
-                        } while (( now - start ) < 120 );
+                        } while (( now - start ) < resuspend );
 
                         if ( onac ( )) { // still on ac
                                 // system() without fork
                                 argv[0] = "qcop";
                                 argv[1] = "QPE/Desktop";
                                 argv[2] = "suspend()";
                                 argv[3] = 0;
         
                                 // hard coded for now ...but needed
                                 setenv ( "LOGNAME", "root", 1 );
                                 setenv ( "HOME", "/root", 1 );
                                 setenv ( "LD_LIBRARY_PATH", "/opt/QtPalmtop/lib", 1 );
                                 setenv ( "QTDIR", "/opt/QtPalmtop", 1 );
                         
                                 remove_pidfile ( );
                         
diff --git a/root/etc/resume-scripts/R46opiealarm b/root/etc/resume-scripts/R46opiealarm
index c258047..169dc30 100755
--- a/root/etc/resume-scripts/R46opiealarm
+++ b/root/etc/resume-scripts/R46opiealarm
@@ -1,5 +1,5 @@
 #!/bin/sh
 # Starts opiealarm, which only runs while the iPaq sleeps 
 # and wakes it up when the RTC alarm goes off.
 
-/opt/QtPalmtop/bin/opiealarm -r
+/opt/QtPalmtop/bin/opiealarm -r -a 120