diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2006-08-22 17:42:21 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2006-08-22 17:42:21 +0000 |
| commit | cafb7947b5a1c658a97cfd5251500dbd5f86028c (patch) | |
| tree | b137c42eb7623905b91bb7a3bae1434d1546057f /src | |
| parent | 0797e95b8a8aa6a9dbbd21d60dfbce66a8b67c2e (diff) | |
| download | coreutils-cafb7947b5a1c658a97cfd5251500dbd5f86028c.tar.xz | |
BeOS portability.
* src/uptime.c: Include OS.h if it exists.
(print_uptime): On BeOS, use the get_system_info function (actually a
macro). Loop through utmp entries only if utmp.h or utmpx.h exists.
(uptime): Call read_utmp only if utmp.h or utmpx.h exists.
* m4/boottime.m4 (GNULIB_BOOT_TIME): Test also for utmp.h, utmpx.h,
OS.h. Don't require to have utmp.h or utmpx.h. Enable boottime
support if <OS.h> is found.
Diffstat (limited to 'src')
| -rw-r--r-- | src/uptime.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/uptime.c b/src/uptime.c index bd2b0ec95..6b2a7240a 100644 --- a/src/uptime.c +++ b/src/uptime.c @@ -1,5 +1,5 @@ /* GNU's uptime. - Copyright (C) 1992-2002, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1992-2002, 2004, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,6 +28,10 @@ # include <sys/sysctl.h> #endif +#if HAVE_OS_H +# include <OS.h> +#endif + #include "c-strtod.h" #include "error.h" #include "long-options.h" @@ -90,6 +94,16 @@ print_uptime (size_t n, const STRUCT_UTMP *this) } #endif +#if HAVE_OS_H /* BeOS */ + { + system_info si; + + get_system_info (&si); + boot_time = si.boot_time / 1000000; + } +#endif + +#if HAVE_UTMPX_H || HAVE_UTMP_H /* Loop through all the utmp entries we just read and count up the valid ones, also in the process possibly gleaning boottime. */ while (n--) @@ -99,6 +113,7 @@ print_uptime (size_t n, const STRUCT_UTMP *this) boot_time = UT_TIME_MEMBER (this); ++this; } +#endif time_now = time (NULL); #if defined HAVE_PROC_UPTIME if (uptime == 0) @@ -163,8 +178,10 @@ uptime (const char *filename, int options) size_t n_users; STRUCT_UTMP *utmp_buf; +#if HAVE_UTMPX_H || HAVE_UTMP_H if (read_utmp (filename, &n_users, &utmp_buf, options) != 0) error (EXIT_FAILURE, errno, "%s", filename); +#endif print_uptime (n_users, utmp_buf); } |