summaryrefslogtreecommitdiff
authorsandman <sandman>2002-06-26 17:42:48 (UTC)
committer sandman <sandman>2002-06-26 17:42:48 (UTC)
commit1ddf9aa5ffc8dbb4ba290fa6a439b2d7681a0038 (patch) (side-by-side diff)
treed34f5076bfd68ed6bdae0af1a475d9118fef3879
parent18905bcc671622ab11b4e3d4447e4cd34f7308ee (diff)
downloadopie-1ddf9aa5ffc8dbb4ba290fa6a439b2d7681a0038.zip
opie-1ddf9aa5ffc8dbb4ba290fa6a439b2d7681a0038.tar.gz
opie-1ddf9aa5ffc8dbb4ba290fa6a439b2d7681a0038.tar.bz2
The embedix arm-linux-strip does not accept -s but --strip-all (weird)
Fixed a RTC get time ioctl bug in opiealarm.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/opiealarm/Makefile2
-rw-r--r--core/opiealarm/opiealarm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/opiealarm/Makefile b/core/opiealarm/Makefile
index e988abf..f20d451 100644
--- a/core/opiealarm/Makefile
+++ b/core/opiealarm/Makefile
@@ -12,9 +12,9 @@ LDFLAGS:=
all: $(DESTDIR)/opiealarm $(DESTDIR)/opieatd
$(DESTDIR)/opiealarm: opiealarm.c
$(CC) $(CFLAGS) opiealarm.c -o $(DESTDIR)/opiealarm $(LDFLAGS)
- $(STRIP) -s $(DESTDIR)/opiealarm
+ $(STRIP) --strip-all $(DESTDIR)/opiealarm
chmod u+s $(DESTDIR)/opiealarm
chown root $(DESTDIR)/opiealarm 2>/dev/null || echo -e "\nopiealarm must be owned by root to work correctly.\n"
$(DESTDIR)/opieatd: opieatd
diff --git a/core/opiealarm/opiealarm.c b/core/opiealarm/opiealarm.c
index 71367b3..ce0103e 100644
--- a/core/opiealarm/opiealarm.c
+++ b/core/opiealarm/opiealarm.c
@@ -242,9 +242,9 @@ int suspend ( int fix_rtc )
error_msg_and_die ( 1, "/dev/misc/rtc" );
// get RTC time
memset ( &rtc, 0, sizeof ( struct tm ));
- if ( ioctl ( fd, RTC_ALM_SET, &rtc ) < 0 )
+ if ( ioctl ( fd, RTC_RD_TIME, &rtc ) < 0 )
error_msg_and_die ( 1, "ioctl RTC_RD_TIME" );
rtct = mktime ( &rtc );
fprintf ( log, "System time: %02d.%02d.%04d %02d:%02d:%02d DST: %d (TZ: %s, offset: %d)\n", sys. tm_mday, sys. tm_mon + 1, sys. tm_year + 1900, sys. tm_hour, sys. tm_min, sys. tm_sec, sys. tm_isdst, sys. tm_zone, sys. tm_gmtoff );