From 003cf72fe5a18c8fcdae6e7b9191d2d9fcb71cf8 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 18 Jul 2005 03:36:50 +0000 Subject: [PATCH] 2005-07-12 Jakub Jelinek [BZ #1106] * sysdeps/unix/sysv/linux/ia64/has_cpuclock.c: Include not-cancel.h. (has_cpuclock): Use open_not_cancel_2 instead of open, read_not_cancel instead of read and close_not_cancel_no_status instead of close. --- sysdeps/unix/sysv/linux/ia64/has_cpuclock.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sysdeps/unix/sysv/linux/ia64/has_cpuclock.c b/sysdeps/unix/sysv/linux/ia64/has_cpuclock.c index ee19161272..883508a562 100644 --- a/sysdeps/unix/sysv/linux/ia64/has_cpuclock.c +++ b/sysdeps/unix/sysv/linux/ia64/has_cpuclock.c @@ -21,7 +21,7 @@ #include #include #include - +#include static int itc_usable; @@ -31,18 +31,18 @@ has_cpuclock (void) if (__builtin_expect (itc_usable == 0, 0)) { int newval = 1; - int fd = open ("/proc/sal/itc_drift", O_RDONLY); + int fd = open_not_cancel_2 ("/proc/sal/itc_drift", O_RDONLY); if (__builtin_expect (fd != -1, 1)) { char buf[16]; /* We expect the file to contain a single digit followed by a newline. If the format changes we better not rely on the file content. */ - if (read (fd, buf, sizeof buf) != 2 || buf[0] != '0' - || buf[1] != '\n') + if (read_not_cancel (fd, buf, sizeof buf) != 2 + || buf[0] != '0' || buf[1] != '\n') newval = -1; - close (fd); + close_not_cancel_no_status (fd); } itc_usable = newval; -- 2.11.4.GIT