Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/isdirectory.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/isdirectory.c (modified) (4 diffs)

branches/2.2.9/mindi-busybox/libbb/isdirectory.c

@@ -4 +4 @@
  *
  * Based in part on code from sash, Copyright (c) 1999 by David I. Bell
- * Permission has been granted to redistribute this code under the GPL.
+ * Permission has been granted to redistribute this code under GPL.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -13 +13 @@
 
 /*
- * Return TRUE if a fileName is a directory.
+ * Return TRUE if fileName is a directory.
  * Nonexistent files return FALSE.
  */
-int is_directory(const char *fileName, const int followLinks, struct stat *statBuf)
+int FAST_FUNC is_directory(const char *fileName, int followLinks, struct stat *statBuf)
 {
     int status;
@@ -22 +22 @@
 
     if (statBuf == NULL) {
-        /* set from auto stack buffer */
-        statBuf = &astatBuf;
+        /* use auto stack buffer */
+        statBuf = &astatBuf;
     }
 
@@ -31 +31 @@
         status = lstat(fileName, statBuf);
 
-    if (status < 0 || !(S_ISDIR(statBuf->st_mode))) {
-        status = FALSE;
-    }
-    else status = TRUE;
+    status = (status == 0 && S_ISDIR(statBuf->st_mode));
 
     return status;