slight bit of rearranging to ensure that the rtc time gets set if using -s regardless of whether resumeat contains a valid alarm

1 files changed, 32 insertions, 21 deletions

diff --git a/core/opiealarm/opiealarm.c b/core/opiealarm/opiealarm.c
index bb2e684..5ea24b7 100644
--- a/core/opiealarm/opiealarm.c
+++ b/core/opiealarm/opiealarm.c
@@ -222,19 +222,2 @@ int suspend ( int fix_rtc )
         
-        do { // try/catch simulation
-        
-                // read the wakeup time from /etc/resumeat
-                if (!( fp = fopen ( "/etc/resumeat", "r" ))) 
-                        break; //  ( 1, "/etc/resumeat" );
-        
-                if ( !fgets ( buf, sizeof( buf ) - 1, fp ))
-                        break; //  ( 1, "/etc/resumeat" );
-
-                fclose ( fp );
-        
-                alrt = atoi ( buf ); // get the alarm time
-                if ( alrt == 0 )
-                                break; //  ( 0, "/etc/resumeat contains an invalid time description" );
-                        alrt -= 5;      // wake up 5 sec before the specified time
-                alr = *gmtime ( &alrt );
-
                 time ( &syst );// get the UNIX system time
@@ -242,2 +225,4 @@ int suspend ( int fix_rtc )
                 
+        do {
+                
                 if (( fd = open ( "/dev/misc/rtc", O_RDWR )) < 0 )
@@ -247,4 +232,6 @@ int suspend ( int fix_rtc )
                 memset ( &rtc, 0, sizeof ( struct tm ));    // get the RTC time
+        
                 if ( ioctl ( fd, RTC_RD_TIME, &rtc ) < 0 )
                                 break; //  ( 1, "ioctl RTC_RD_TIME" );  
+        
                 rtct = mktime ( &rtc );
@@ -264,4 +251,22 @@ int suspend ( int fix_rtc )
 
+                // read the wakeup time from /etc/resumeat
+                if (!( fp = fopen ( "/etc/resumeat", "r" ))) 
+                        break; //  ( 1, "/etc/resumeat" );
+        
+                if ( !fgets ( buf, sizeof( buf ) - 1, fp ))
+                        break; //  ( 1, "/etc/resumeat" );
+
+                fclose ( fp );
+        
+                alrt = atoi ( buf ); // get the alarm time
+
+                if ( alrt == 0 )
+                                break; //  ( 0, "/etc/resumeat contains an invalid time description" );
+                        alrt -= 5;      // wake up 5 sec before the specified time
+        
+                alr = *gmtime ( &alrt );
+        
                 if ( ioctl ( fd, RTC_ALM_SET, &alr ) < 0 )  // set RTC alarm time
                                 break; //  ( 1, "ioctl RTC_ALM_SET" );  
+        
                 if ( ioctl ( fd, RTC_AIE_ON, 0 ) < 0 )
@@ -283,8 +288,15 @@ int suspend ( int fix_rtc )
         
-                remove_pidfile ( ); // normal exit
+                remove_pidfile ( );
+                
                         return 0;
                 
-        } while ( 0 );
+        } while ( 0 )
         
-        kill ( parent_pid, SIGUSR1 );  // parent is still running - it can exit now
+        if ( fp != NULL )
+                fclose ( fp );
+        
+        if ( fd != -1 )
+                close ( fd );
+
+        kill ( parent_pid, SIGUSR1 );
 
@@ -295,3 +307,2 @@ int suspend ( int fix_rtc )
 
-
 int onac ( void )