-rw-r--r-- | core/opiealarm/opiealarm.c | 15 |
1 files changed, 8 insertions, 7 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 | |||
@@ -26,6 +26,7 @@ | |||
26 | 26 | ||
27 | 27 | ||
28 | #define PIDFILE "/var/run/opiealarm.pid" | 28 | #define PIDFILE "/var/run/opiealarm.pid" |
29 | #define TIMEFILE "/var/run/resumeat" | ||
29 | #define APMFILE "/proc/apm" | 30 | #define APMFILE "/proc/apm" |
30 | 31 | ||
31 | int resume ( int resuspend ); | 32 | int resume ( int resuspend ); |
@@ -245,23 +246,23 @@ int suspend ( int fix_rtc ) | |||
245 | // if the difference between system and hardware time is more than 3 seconds, | 246 | // if the difference between system and hardware time is more than 3 seconds, |
246 | // we have to set the RTC (hwclock --systohc), or alarms won't work reliably. | 247 | // we have to set the RTC (hwclock --systohc), or alarms won't work reliably. |
247 | 248 | ||
248 | if ( ioctl ( fd, RTC_SET_TIME, &set ) < 0 ) | 249 | if ( ioctl ( fd, RTC_SET_TIME, &set ) < 0 ) |
249 | break; // ( 1, "ioctl RTC_SET_TIME" ); | 250 | break; // ( 1, "ioctl RTC_SET_TIME" ); |
250 | } | 251 | } |
251 | 252 | ||
252 | // read the wakeup time from /etc/resumeat | 253 | // read the wakeup time from TIMEFILE |
253 | if (!( fp = fopen ( "/etc/resumeat", "r" ))) | 254 | if (!( fp = fopen ( TIMEFILE, "r" ))) |
254 | break; // ( 1, "/etc/resumeat" ); | 255 | break; // ( 1, TIMEFILE ); |
255 | 256 | ||
256 | if ( !fgets ( buf, sizeof( buf ) - 1, fp )) | 257 | if ( !fgets ( buf, sizeof( buf ) - 1, fp )) |
257 | break; // ( 1, "/etc/resumeat" ); | 258 | break; // ( 1, TIMEFILE ); |
258 | 259 | ||
259 | fclose ( fp ); | 260 | fclose ( fp ); |
260 | 261 | ||
261 | alrt = atoi ( buf ); // get the alarm time | 262 | alrt = atoi ( buf ); // get the alarm time |
262 | 263 | ||
263 | if ( alrt == 0 ) | 264 | if ( alrt == 0 ) |
264 | break; // ( 0, "/etc/resumeat contains an invalid time description" ); | 265 | break; // ( 0, TIMEFILE " contains an invalid time description" ); |
265 | alrt -= 5; // wake up 5 sec before the specified time | 266 | alrt -= 5; // wake up 5 sec before the specified time |
266 | 267 | ||
267 | alr = *gmtime ( &alrt ); | 268 | alr = *gmtime ( &alrt ); |
@@ -290,7 +291,7 @@ int suspend ( int fix_rtc ) | |||
290 | 291 | ||
291 | return 0; | 292 | return 0; |
292 | 293 | ||
293 | } while ( 0 ) | 294 | } while ( 0 ); |
294 | 295 | ||
295 | if ( fp != NULL ) | 296 | if ( fp != NULL ) |
296 | fclose ( fp ); | 297 | fclose ( fp ); |