From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- release/src/router/busybox/libbb/isdirectory.c | 55 +++++--------------------- 1 file changed, 10 insertions(+), 45 deletions(-) (limited to 'release/src/router/busybox/libbb/isdirectory.c') diff --git a/release/src/router/busybox/libbb/isdirectory.c b/release/src/router/busybox/libbb/isdirectory.c index 65f4fee0..28ed3ec2 100644 --- a/release/src/router/busybox/libbb/isdirectory.c +++ b/release/src/router/busybox/libbb/isdirectory.c @@ -2,70 +2,35 @@ /* * Utility routines. * - * Copyright (C) tons of folks. Tracking down who wrote what - * isn't something I'm going to worry about... If you wrote something - * here, please feel free to acknowledge your work. - * - * 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 - * - * Based in part on code from sash, Copyright (c) 1999 by David I. Bell + * 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. * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include -#include #include #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, const int followLinks, struct stat *statBuf) { int status; - int didMalloc = 0; + struct stat astatBuf; if (statBuf == NULL) { - statBuf = (struct stat *)xmalloc(sizeof(struct stat)); - ++didMalloc; + /* use auto stack buffer */ + statBuf = &astatBuf; } - if (followLinks == TRUE) + if (followLinks) status = stat(fileName, statBuf); else 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)); - if (didMalloc) { - free(statBuf); - statBuf = NULL; - } return status; } - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ -- cgit v1.2.3-54-g00ecf