areadlink: use SIZE_MAX consistently

* modules/areadlink (Depends-on): Add stdint.
* modules/areadlink-with-size (Depends-on): Likewise.
* lib/areadlink-with-size.c (includes): Drop stdio, since stdlib
gives NULL; drop sys/types, since unistd gives size_t; and add
stdint for SIZE_MAX.
(SIZE_MAX): Rely on headers.
* lib/areadlinkat-with-size.c (includes): Drop stdio, sys/types,
and add stdint.
* lib/areadlink.c (includes): Drop sys/types, and add stdint.
(SIZE_MAX): Likewise.
(INITIAL_BUF_SIZE): Turn into enum.
* lib/areadlinkat.c (INITIAL_BUF_SIZE): Likewise.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 3af4f512099c11f1001042751ea2b8bb3e6287e3..3f191977aa722403fa32fb55e0202de6962aff11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2009-10-08  Eric Blake  <ebb9@byu.net>
+
+       areadlink: use SIZE_MAX consistently
+       * modules/areadlink (Depends-on): Add stdint.
+       * modules/areadlink-with-size (Depends-on): Likewise.
+       * lib/areadlink-with-size.c (includes): Drop stdio, since stdlib
+       gives NULL; drop sys/types, since unistd gives size_t; and add
+       stdint for SIZE_MAX.
+       (SIZE_MAX): Rely on headers.
+       * lib/areadlinkat-with-size.c (includes): Drop stdio, sys/types,
+       and add stdint.
+       * lib/areadlink.c (includes): Drop sys/types, and add stdint.
+       (SIZE_MAX): Likewise.
+       (INITIAL_BUF_SIZE): Turn into enum.
+       * lib/areadlinkat.c (INITIAL_BUF_SIZE): Likewise.
+
 2009-10-08  Jim Meyering  <meyering@redhat.com>
 
        areadlinkat: avoid compilation failure

diff --git a/lib/areadlink-with-size.c b/lib/areadlink-with-size.c
index d0bcb70ad5b915d232ed8a8f2ad346ca99cd1c9b..625ddb795eb5290cc3785872d8fdf6b5d7cc45e9 100644 (file)
--- a/lib/areadlink-with-size.c
+++ b/lib/areadlink-with-size.c
@@ -1,7 +1,7 @@
 /* readlink wrapper to return the link name in malloc'd storage.
    Unlike xreadlink and xreadlink_with_size, don't ever call exit.
 
-   Copyright (C) 2001, 2003-2007 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003-2007, 2009 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
@@ -22,16 +22,12 @@
 
 #include "areadlink.h"
 
-#include <stdio.h>
 #include <errno.h>
 #include <limits.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
 
-#ifndef SIZE_MAX
-# define SIZE_MAX ((size_t) -1)
-#endif
 #ifndef SSIZE_MAX
 # define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
 #endif

diff --git a/lib/areadlink.c b/lib/areadlink.c
index 4e770eb4109c54a1f5b87563be8d5c6964a3998b..f6871c572bd958034653e31423860cf7197d5fc2 100644 (file)
--- a/lib/areadlink.c
+++ b/lib/areadlink.c
@@ -1,7 +1,7 @@
 /* areadlink.c -- readlink wrapper to return the link name in malloc'd storage
    Unlike xreadlink and xreadlink_with_size, don't ever call exit.
 
-   Copyright (C) 2001, 2003-2007 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003-2007, 2009 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
@@ -24,20 +24,23 @@
 /* Specification.  */
 #include "areadlink.h"
 
-#include <string.h>
 #include <errno.h>
 #include <limits.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
-#ifndef SIZE_MAX
-# define SIZE_MAX ((size_t) -1)
-#endif
 #ifndef SSIZE_MAX
 # define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
 #endif
 
+/* The initial buffer size for the link value.  A power of 2
+   detects arithmetic overflow earlier, but is not required.  */
+enum {
+  INITIAL_BUF_SIZE = 1024
+};
+
 /* Call readlink to get the symbolic link value of FILENAME.
    Return a pointer to that NUL-terminated string in malloc'd storage.
    If readlink fails, return NULL and set errno.
@@ -47,17 +50,13 @@
 char *
 areadlink (char const *filename)
 {
-  /* The initial buffer size for the link value.  A power of 2
-     detects arithmetic overflow earlier, but is not required.  */
-#define INITIAL_BUF_SIZE 1024
-
   /* Allocate the initial buffer on the stack.  This way, in the common
      case of a symlink of small size, we get away with a single small malloc()
      instead of a big malloc() followed by a shrinking realloc().  */
   char initial_buf[INITIAL_BUF_SIZE];
 
   char *buffer = initial_buf;
-  size_t buf_size = sizeof (initial_buf);
+  size_t buf_size = sizeof initial_buf;
 
   while (1)
     {

diff --git a/lib/areadlinkat-with-size.c b/lib/areadlinkat-with-size.c
index d1abb5b01109dcdae7f0a28df6af4c5676620c5e..4ad76b77c56d8b0c4470036bd6adc2ca1134cb39 100644 (file)
--- a/lib/areadlinkat-with-size.c
+++ b/lib/areadlinkat-with-size.c
@@ -23,10 +23,9 @@
 
 #include "areadlink.h"
 
-#include <stdio.h>
 #include <errno.h>
 #include <limits.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
 

diff --git a/lib/areadlinkat.c b/lib/areadlinkat.c
index 07714d0a9e94c7d37b0482daea3caf49a9d66ed9..f9a3dafbb144478b518264cb5cef6d38abc4f969 100644 (file)
--- a/lib/areadlinkat.c
+++ b/lib/areadlinkat.c
@@ -25,12 +25,11 @@
 /* Specification.  */
 #include "areadlink.h"
 
-#include <string.h>
 #include <errno.h>
 #include <limits.h>
-#include <sys/types.h>
 #include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 #ifndef SSIZE_MAX
@@ -39,6 +38,12 @@
 
 #if HAVE_READLINKAT
 
+/* The initial buffer size for the link value.  A power of 2
+   detects arithmetic overflow earlier, but is not required.  */
+enum {
+  INITIAL_BUF_SIZE = 1024
+};
+
 /* Call readlinkat to get the symbolic link value of FILENAME relative to FD.
    Return a pointer to that NUL-terminated string in malloc'd storage.
    If readlinkat fails, return NULL and set errno (although failure to
@@ -49,17 +54,13 @@
 char *
 areadlinkat (int fd, char const *filename)
 {
-  /* The initial buffer size for the link value.  A power of 2
-     detects arithmetic overflow earlier, but is not required.  */
-# define INITIAL_BUF_SIZE 1024
-
   /* Allocate the initial buffer on the stack.  This way, in the common
      case of a symlink of small size, we get away with a single small malloc()
      instead of a big malloc() followed by a shrinking realloc().  */
   char initial_buf[INITIAL_BUF_SIZE];
 
   char *buffer = initial_buf;
-  size_t buf_size = sizeof (initial_buf);
+  size_t buf_size = sizeof initial_buf;
 
   while (1)
     {

diff --git a/modules/areadlink b/modules/areadlink
index 2acc4a90a80eb291da811c50d0104ad36c958aee..dc7cfe49aeafae3d69d4869b45ae5de5ee4320bc 100644 (file)
--- a/modules/areadlink
+++ b/modules/areadlink
@@ -6,10 +6,11 @@ lib/areadlink.h
 lib/areadlink.c
 
 Depends-on:
+malloc-posix
 readlink
 ssize_t
+stdint
 unistd
-malloc-posix
 
 configure.ac:
 

diff --git a/modules/areadlink-with-size b/modules/areadlink-with-size
index df6db33b0a3a5f1cbbc66a4fde79959288137515..212f8ab77ad040d5d34cc86b3529cab6c264bcba 100644 (file)
--- a/modules/areadlink-with-size
+++ b/modules/areadlink-with-size
@@ -8,6 +8,7 @@ lib/areadlink-with-size.c
 Depends-on:
 readlink
 ssize_t
+stdint
 unistd
 
 configure.ac: