1 files changed, 7 insertions, 6 deletions

diff --git a/core/opiealarm/opiealarm.c b/core/opiealarm/opiealarm.c
index 5ea24b7..072dca7 100644
--- a/core/opiealarm/opiealarm.c
+++ b/core/opiealarm/opiealarm.c
@@ -17,24 +17,25 @@
 #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 TIMEFILE    "/var/run/resumeat"
         #define APMFILE         "/proc/apm"
 
 int resume ( int resuspend );
 int suspend ( int fix_rtc );
 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_child ( int sig );
 void sig_handler_parent ( int sig );
 int onac ( void );
@@ -240,37 +241,37 @@ int suspend ( int fix_rtc )
         
                 if ( fix_rtc && (( rtc_sys_diff < -3 ) || ( rtc_sys_diff > 3 ))) {
                                 struct tm set;  
                         set = *gmtime ( &syst );
                 
                         // if the difference between system and hardware time is more than 3 seconds,
                         // we have to set the RTC (hwclock --systohc), or alarms won't work reliably.
 
                         if ( ioctl ( fd, RTC_SET_TIME, &set ) < 0 )
                                 break; //  ( 1, "ioctl RTC_SET_TIME" );
                 }
 
-                // read the wakeup time from /etc/resumeat
-                if (!( fp = fopen ( "/etc/resumeat", "r" ))) 
-                        break; //  ( 1, "/etc/resumeat" );
+                // read the wakeup time from TIMEFILE
+                if (!( fp = fopen ( TIMEFILE, "r" ))) 
+                        break; //  ( 1, TIMEFILE );
         
                 if ( !fgets ( buf, sizeof( buf ) - 1, fp ))
-                        break; //  ( 1, "/etc/resumeat" );
+                        break; //  ( 1, TIMEFILE );
 
                 fclose ( fp );
         
                 alrt = atoi ( buf ); // get the alarm time
 
                 if ( alrt == 0 )
-                                break; //  ( 0, "/etc/resumeat contains an invalid time description" );
+                                break; //  ( 0, TIMEFILE " 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 )
                         break; //  ( 1, "ioctl RTC_AIE_ON" );   // enable RTC alarm irq
 
                 // tell the parent it is safe to exit now .. we have set the RTC alarm
                 kill ( parent_pid, SIGUSR1 );
@@ -281,25 +282,25 @@ int suspend ( int fix_rtc )
                 // iPAQ woke up via RTC irq -- otherwise we would have received a SIGUSR2
                 // from the "resume instance" of opiealarm.
         
                 if ( ioctl ( fd, RTC_AIE_OFF, 0 ) < 0 )     // disable RTC alarm irq
                         break; //  ( 1, "ioctl RTC_AIE_OFF" );
 
                 close ( fd );
                 
                 remove_pidfile ( );
                 
                         return 0;
 
-        } while ( 0 )
+        } while ( 0 );
 
         if ( fp != NULL )
                 fclose ( fp );
         
         if ( fd != -1 )
                 close ( fd );
 
         kill ( parent_pid, SIGUSR1 );
 
                 while ( 1 )         // pretend that we are waiting on RTC, so opiealarm -r can kill us
                 sleep ( 1000 ); // if we don't do this, the "resuspend on AC" would be triggerd
         return 0;