get_linux_version_code: don't fail on Linux version strints like "3.0-foo"

[oweals/busybox.git] / libbb / isdirectory.c

diff --git a/libbb/isdirectory.c b/libbb/isdirectory.c
index f3caaf178ff62342c227790a0d412fd4c7c5b26a..ba6c52ce8d16fb3d6b33622bddf50f059c780000 100644 (file)
--- a/libbb/isdirectory.c
+++ b/libbb/isdirectory.c
@@ -3,58 +3,29 @@
  * Utility routines.
  *
  * 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.
  *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include <sys/stat.h>
 #include "libbb.h"
 
 /*
- * Return TRUE if a fileName is a directory.
- * Nonexistant files return FALSE.
+ * 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)
 {
        int status;
-       struct stat astatBuf;
-
-       if (statBuf == NULL) {
-           /* set from 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);
 
-       if (status < 0 || !(S_ISDIR(statBuf->st_mode))) {
-           status = FALSE;
-       }
-       else status = TRUE;
+       status = (status == 0 && S_ISDIR(statBuf.st_mode));
 
        return status;
 }
-
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/