aboutsummaryrefslogtreecommitdiff
path: root/libbb/isdirectory.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-02-25 20:30:24 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-02-25 20:30:24 +0000
commit394eebed6656dfc2e56a79500b602023000ac415 (patch)
treeb5b5858663e7333b9624cb4f329e91ae649f3247 /libbb/isdirectory.c
parent38b8831b3201a9e44cfb156b5b8577e4f5e8d761 (diff)
downloadbusybox-w32-394eebed6656dfc2e56a79500b602023000ac415.tar.gz
busybox-w32-394eebed6656dfc2e56a79500b602023000ac415.tar.bz2
busybox-w32-394eebed6656dfc2e56a79500b602023000ac415.zip
lpd: spool mode added by Vladimir
lpr: more robust error reporting *: introduce and use xchroot libbb: full_read/write now will report partial data counts prior to error isdirectory.c: style fixes lpd_main 249 486 +237 xchroot - 29 +29 get_response_or_say_and_die 110 139 +29 full_write 52 60 +8 full_read 55 63 +8 static.newline 1 - -1 switch_root_main 404 400 -4 chpst_main 1089 1079 -10 getopt32 1370 1359 -11 chroot_main 115 101 -14 ------------------------------------------------------------------------------ (add/remove: 1/1 grow/shrink: 4/4 up/down: 311/-40) Total: 271 bytes text data bss dec hex filename 798472 728 7484 806684 c4f1c busybox_old 798775 728 7484 806987 c504b busybox_unstripped
Diffstat (limited to 'libbb/isdirectory.c')
-rw-r--r--libbb/isdirectory.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/libbb/isdirectory.c b/libbb/isdirectory.c
index b35919869..1d2477f47 100644
--- a/libbb/isdirectory.c
+++ b/libbb/isdirectory.c
@@ -12,7 +12,7 @@
12#include "libbb.h" 12#include "libbb.h"
13 13
14/* 14/*
15 * Return TRUE if a fileName is a directory. 15 * Return TRUE if fileName is a directory.
16 * Nonexistent files return FALSE. 16 * Nonexistent files return FALSE.
17 */ 17 */
18int is_directory(const char *fileName, const int followLinks, struct stat *statBuf) 18int is_directory(const char *fileName, const int followLinks, struct stat *statBuf)
@@ -21,8 +21,8 @@ int is_directory(const char *fileName, const int followLinks, struct stat *statB
21 struct stat astatBuf; 21 struct stat astatBuf;
22 22
23 if (statBuf == NULL) { 23 if (statBuf == NULL) {
24 /* set from auto stack buffer */ 24 /* use auto stack buffer */
25 statBuf = &astatBuf; 25 statBuf = &astatBuf;
26 } 26 }
27 27
28 if (followLinks) 28 if (followLinks)
@@ -30,10 +30,7 @@ int is_directory(const char *fileName, const int followLinks, struct stat *statB
30 else 30 else
31 status = lstat(fileName, statBuf); 31 status = lstat(fileName, statBuf);
32 32
33 if (status < 0 || !(S_ISDIR(statBuf->st_mode))) { 33 status = (status == 0 && S_ISDIR(statBuf->st_mode));
34 status = FALSE;
35 }
36 else status = TRUE;
37 34
38 return status; 35 return status;
39} 36}