yann@1625: 2009-05-16 Aurelien Jarno yann@1625: yann@1625: * sysdeps/unix/sysv/linux/alpha/getsysstats.c (GET_NPROCS_PARSER): yann@1625: Change parameters and use next_line. yann@1625: yann@1625: ports/sysdeps/unix/sysv/linux/alpha/getsysstats.c | 5 +++-- yann@1625: 1 file changed, 3 insertions(+), 2 deletions(-) yann@1625: yann@1625: diff -durN glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/getsysstats.c glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/getsysstats.c yann@1625: --- glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/getsysstats.c 2009-05-16 10:36:20.000000000 +0200 yann@1625: +++ glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/getsysstats.c 2009-11-13 00:51:07.000000000 +0100 yann@1625: @@ -20,15 +20,16 @@ yann@1625: yann@1625: yann@1625: /* We need to define a special parser for /proc/cpuinfo. */ yann@1625: -#define GET_NPROCS_PARSER(FP, BUFFER, RESULT) \ yann@1625: +#define GET_NPROCS_PARSER(FD, BUFFER, CP, RE, BUFFER_END, RESULT) \ yann@1625: do \ yann@1625: { \ yann@1625: /* Find the line that contains the information about the number of \ yann@1625: active cpus. We don't have to fear extremely long lines since \ yann@1625: the kernel will not generate them. 8192 bytes are really enough. \ yann@1625: If there is no "CPUs ..." line then we are on a UP system. */ \ yann@1625: + char *l; \ yann@1625: (RESULT) = 1; \ yann@1625: - while (fgets_unlocked (BUFFER, sizeof (BUFFER), FP) != NULL) \ yann@1625: + while ((l = next_line (FD, BUFFER, &CP, &RE, BUFFER_END)) != NULL) \ yann@1625: if ((sscanf (BUFFER, "cpus active : %d", &(RESULT)) == 1) \ yann@1625: || (sscanf (BUFFER, "CPUs probed %*d active %d", \ yann@1625: &(RESULT)) == 1)) \ yann@1625: diff -durN glibc-2.10.1.orig/ports/sysdeps/unix/sysv/linux/alpha/getsysstats.c glibc-2.10.1/ports/sysdeps/unix/sysv/linux/alpha/getsysstats.c