libbb: remove is_directory's argument which is always NULL

function                                             old     new   delta
send_cgi_and_exit                                    892     890      -2
ln_main                                              447     445      -2
handle_incoming_and_exit                            2784    2780      -4
is_directory                                          66      59      -7
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/6 up/down: 2/-19)             Total: -15 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/coreutils/ln.c b/coreutils/ln.c
index 88a9a8f917097f74da1e93f1a85bc8d18e2ff628..0eb3e6579e71342ac9631b0874987cff57e5eb53 100644 (file)
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -69,8 +69,8 @@ int ln_main(int argc, char **argv)
                src = last;
 
                if (is_directory(src,
-                               (opts & LN_NODEREFERENCE) ^ LN_NODEREFERENCE,
-                               NULL)
+                               (opts & LN_NODEREFERENCE) ^ LN_NODEREFERENCE
+                               )
                ) {
                        src_name = xstrdup(*argv);
                        src = concat_path_file(src, bb_get_last_path_component_strip(src_name));

diff --git a/include/libbb.h b/include/libbb.h
index bc9b7b06df9bab2bd2028040f8692944a9c431cc..22d2a5b2069f3e89aa6020003f7c65bea4c4236b 100644 (file)
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -314,7 +314,7 @@ extern char *strrstr(const char *haystack, const char *needle) FAST_FUNC;
 
 //TODO: supply a pointer to char[11] buffer (avoid statics)?
 extern const char *bb_mode_string(mode_t mode) FAST_FUNC;
-extern int is_directory(const char *name, int followLinks, struct stat *statBuf) FAST_FUNC;
+extern int is_directory(const char *name, int followLinks) FAST_FUNC;
 enum { /* DO NOT CHANGE THESE VALUES!  cp.c, mv.c, install.c depend on them. */
        FILEUTILS_PRESERVE_STATUS = 1 << 0, /* -p */
        FILEUTILS_DEREFERENCE     = 1 << 1, /* !-d */

diff --git a/libbb/isdirectory.c b/libbb/isdirectory.c
index 9861be6f84844203a05114ab748e11f70cb83f44..ba6c52ce8d16fb3d6b33622bddf50f059c780000 100644 (file)
--- a/libbb/isdirectory.c
+++ b/libbb/isdirectory.c
@@ -15,22 +15,17 @@
  * Return TRUE if fileName is a directory.
  * Nonexistent files return FALSE.
  */
-int FAST_FUNC is_directory(const char *fileName, int followLinks, struct stat *statBuf)
+int FAST_FUNC is_directory(const char *fileName, int followLinks)
 {
        int status;
-       struct stat astatBuf;
-
-       if (statBuf == NULL) {
-               /* use auto stack buffer */
-               statBuf = &astatBuf;
-       }
+       struct stat statBuf;
 
        if (followLinks)
-               status = stat(fileName, statBuf);
+               status = stat(fileName, &statBuf);
        else
-               status = lstat(fileName, statBuf);
+               status = lstat(fileName, &statBuf);
 
-       status = (status == 0 && S_ISDIR(statBuf->st_mode));
+       status = (status == 0 && S_ISDIR(statBuf.st_mode));
 
        return status;
 }

diff --git a/networking/httpd.c b/networking/httpd.c
index cda7cc7af528e3ea5000d625f3c5e38065e4e0b4..e9cd213f1fbc8e2434db757873d0b4176424878c 100644 (file)
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1302,7 +1302,7 @@ static void send_cgi_and_exit(
        while ((script = strchr(script + 1, '/')) != NULL) {
                int dir;
                *script = '\0';
-               dir = is_directory(url + 1, /*followlinks:*/ 1, NULL);
+               dir = is_directory(url + 1, /*followlinks:*/ 1);
                *script = '/';
                if (!dir) {
                        /* not directory, found script.cgi/PATH_INFO */
@@ -2048,7 +2048,7 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
 
        /* If URL is a directory, add '/' */
        if (urlp[-1] != '/') {
-               if (is_directory(urlcopy + 1, 1, NULL)) {
+               if (is_directory(urlcopy + 1, /*followlinks:*/ 1)) {
                        found_moved_temporarily = urlcopy;
                }
        }
@@ -2062,7 +2062,7 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
        while (ip_allowed && (tptr = strchr(tptr + 1, '/')) != NULL) {
                /* have path1/path2 */
                *tptr = '\0';
-               if (is_directory(urlcopy + 1, 1, NULL)) {
+               if (is_directory(urlcopy + 1, /*followlinks:*/ 1)) {
                        /* may have subdir config */
                        parse_conf(urlcopy + 1, SUBDIR_PARSE);
                        ip_allowed = checkPermIP();