author | zecke <zecke> | 2003-06-13 10:41:14 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-06-13 10:41:14 (UTC) |
commit | 60ba51b33a060dde352caa678f2e337f5f5590f5 (patch) (side-by-side diff) | |
tree | 29da8884e438bb768f2d0a5f41dbaad62ce7776c | |
parent | 3dd3e5caf9ca85c814442b04485f07da060dc257 (diff) | |
download | opie-60ba51b33a060dde352caa678f2e337f5f5590f5.zip opie-60ba51b33a060dde352caa678f2e337f5f5590f5.tar.gz opie-60ba51b33a060dde352caa678f2e337f5f5590f5.tar.bz2 |
fix here as well
-rw-r--r-- | core/opiealarm/opiealarm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/opiealarm/opiealarm.c b/core/opiealarm/opiealarm.c index 072dca7..465e633 100644 --- a/core/opiealarm/opiealarm.c +++ b/core/opiealarm/opiealarm.c @@ -245,60 +245,62 @@ int suspend ( int fix_rtc ) // 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 TIMEFILE if (!( fp = fopen ( TIMEFILE, "r" ))) break; // ( 1, TIMEFILE ); if ( !fgets ( buf, sizeof( buf ) - 1, fp )) break; // ( 1, TIMEFILE ); fclose ( fp ); + fp = 0; alrt = atoi ( buf ); // get the alarm time if ( alrt == 0 ) 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 ); if ( read ( fd, buf, sizeof( unsigned long )) < 0 ) // wait for the RTC alarm irq break; // ( 1, "read rtc alarm" ); // 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 ); + fd = -1; remove_pidfile ( ); return 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 |