use getpagesize()

getpagesize() is said to be more portable than sysconf(_SC_PAGESIZE)
to anything Linux.

this patch helps klibc porting effort as the sysconf
multiplex API is not supported there.

also remove comment of the switch to sysconf in mkswap.c.

Signed-off-by: maximilian attems <max@stro.at>

diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c
index 2d082efbc2dab5157caa4647ed83c31d68fa5251..aeb766fb392c1f2e7efef1ff6b4b12bfa233a0ed 100644 (file)
--- a/disk-utils/fsck.cramfs.c
+++ b/disk-utils/fsck.cramfs.c
@@ -675,7 +675,7 @@ int main(int argc, char **argv)
        int start = 0;
        size_t length;
 
-       page_size = sysconf(_SC_PAGESIZE);
+       page_size = getpagesize();
 
        if (argc)
                progname = argv[0];

diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c
index 04d8ab8ec02aa24a27a39ce2ff0b3f154660c5fe..7882e3324674594625f4e999b7da7ead39cba7c2 100644 (file)
--- a/disk-utils/mkfs.cramfs.c
+++ b/disk-utils/mkfs.cramfs.c
@@ -735,7 +735,7 @@ int main(int argc, char **argv)
        u32 crc = crc32(0L, Z_NULL, 0);
        int c;
 
-       blksize = sysconf(_SC_PAGESIZE);
+       blksize = getpagesize();
        total_blocks = 0;
 
        if (argc) {

diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index f7dbdf39903896968b72ec1118776dcc82620e23..9d1ca3d595c3a0f8cc4dbd51a3757f38ad2b40f0 100644 (file)
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -132,10 +132,6 @@ is_sparc64(void) {
  *
  * What to do? Let us allow the user to specify the pagesize explicitly.
  *
- * Update 05-Feb-2007 (kzak):
- *      - use sysconf(_SC_PAGESIZE) to be consistent with the rest of
- *        util-linux code.  It is the standardized and preferred way of
- *        querying page size.
  */
 static int user_pagesize;
 static int pagesize;
@@ -145,7 +141,7 @@ struct swap_header_v1 *p;
 static void
 init_signature_page(void) {
 
-       int kernel_pagesize = pagesize = (int) sysconf(_SC_PAGESIZE);
+       int kernel_pagesize = pagesize = getpagesize();
 
        if (user_pagesize) {
                if ((user_pagesize & (user_pagesize-1)) ||

diff --git a/sys-utils/ipcs.c b/sys-utils/ipcs.c
index 1b3400c186593be277f2b4b425e12eb197c4202c..3738d89b05fc69c1a3f737f655de45324e468f23 100644 (file)
--- a/sys-utils/ipcs.c
+++ b/sys-utils/ipcs.c
@@ -281,7 +281,7 @@ void do_shm (char format)
                printf (_("max seg size (kbytes) = %lu\n"),
                        (unsigned long) (shminfo.shmmax >> 10));
                printf (_("max total shared memory (kbytes) = %llu\n"),
-                       sysconf(_SC_PAGESIZE) / 1024 * (unsigned long long) shminfo.shmall);
+                       getpagesize() / 1024 * (unsigned long long) shminfo.shmall);
                printf (_("min seg size (bytes) = %lu\n"),
                        (unsigned long) shminfo.shmmin);
                return;

diff --git a/tests/helpers/test_sysinfo.c b/tests/helpers/test_sysinfo.c
index 00ee25230fcb32221657c89d86e4ead8c3f21112..4b71955c721d3fc3506d7217c17fe106313e6789 100644 (file)
--- a/tests/helpers/test_sysinfo.c
+++ b/tests/helpers/test_sysinfo.c
@@ -36,7 +36,7 @@ hlp_wordsize(void)
 int
 hlp_pagesize(void)
 {
-       printf("%d\n", (int) sysconf(_SC_PAGESIZE));
+       printf("%d\n", getpagesize());
        return 0;
 }