X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/faa52bdcc0221de2d8fae950e409a8ac5e05bfcd..b0401b13bb78bacde9d10b00766830cbeb2c90f6:/components/num_files.c?ds=sidebyside diff --git a/components/num_files.c b/components/num_files.c index acf9dfa..86ea064 100644 --- a/components/num_files.c +++ b/components/num_files.c @@ -1,5 +1,4 @@ /* See LICENSE file for copyright and license details. */ -#include #include #include #include @@ -11,16 +10,18 @@ num_files(const char *dir) { struct dirent *dp; DIR *fd; - int num = 0; + int num; - if ((fd = opendir(dir)) == NULL) { - fprintf(stderr, "opendir '%s': %s\n", dir, strerror(errno)); + if (!(fd = opendir(dir))) { + warn("opendir '%s':", dir); return NULL; } - while ((dp = readdir(fd)) != NULL) { - if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, "..")) + num = 0; + while ((dp = readdir(fd))) { + if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, "..")) { continue; /* skip self and parent */ + } num++; }