night0721/ccc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use nftw rather than calculating apparent size manually

Browse source
This commit is contained in:
Night Kaly 2024-03-13 23:51:05 +00:00
parent c6e65fb0dc
commit 5c3c0bf07f
No known key found for this signature in database
GPG key ID: 8E829D3381CFEBBE
2 changed files with 14 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -7,9 +7,10 @@ SRC = ccc.c util.c file.c
# Flags # Flags
LDFLAGS = $(shell pkg-config --libs ncurses) LDFLAGS = $(shell pkg-config --libs ncurses)
CFLAGS = -march=native -mtune=native -O3 -pipe -O3 -s -std=c99 -W -pedantic $(shell pkg-config --cflags ncurses) -Wall -Wextra # -Werror CFLAGS = -march=native -mtune=native -O3 -pipe -O3 -s -std=c99 -pedantic $(shell pkg-config --cflags ncurses) -Wall # -Wextra -Werror
CC=cc CC=cc
PREFIX ?= /usr/local PREFIX ?= /usr/local
CONF = config.h
BINDIR = $(PREFIX)/bin BINDIR = $(PREFIX)/bin
MANDIR = $(PREFIX)/share/man/man1 MANDIR = $(PREFIX)/share/man/man1

49
ccc.c
View file

@ -1,3 +1,4 @@
#define _XOPEN_SOURCE 600
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
@ -6,6 +7,7 @@
#include <dirent.h> /* directories etc. */ #include <dirent.h> /* directories etc. */
#include <sys/stat.h> #include <sys/stat.h>
#include <errno.h> #include <errno.h>
#include <ftw.h>
#include <time.h> #include <time.h>
#include <ncurses.h> #include <ncurses.h>
@ -22,7 +24,7 @@ typedef struct {
/* functions' definitions */ /* functions' definitions */
void list_files(const char *path); void list_files(const char *path);
long long get_directory_size(const char *path); int get_directory_size(const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf);
long add_file_stat(char *filename); long add_file_stat(char *filename);
void highlight_current_line(); void highlight_current_line();
void show_file_content(); void show_file_content();
@ -42,6 +44,8 @@ WINDOW *preview_border;
WINDOW *preview_content; WINDOW *preview_content;
WINDOW *panel; WINDOW *panel;
unsigned long total_dir_size;
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
if (argc > 1 && strcmp(argv[1], "-h") == 0) if (argc > 1 && strcmp(argv[1], "-h") == 0)
@ -260,42 +264,10 @@ void list_files(const char *path)
} }
} }
long long get_directory_size(const char *path) int get_directory_size(const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf)
{ {
DIR *dp; total_dir_size += sb->st_size;
struct dirent *ep; return 0;
struct stat statbuf;
long long total_size = 0;
if ((dp = opendir(path)) != NULL) {
while ((ep = readdir(dp)) != NULL) {
if (strcmp(ep->d_name, ".") == 0 || strcmp(ep->d_name, "..") == 0) {
continue;
}
/* build full path of entry */
char full_path[PATH_MAX];
snprintf(full_path, sizeof(full_path), "%s/%s", path, ep->d_name);
if (lstat(full_path, &statbuf) == -1) {
perror("lstat");
closedir(dp);
return -1;
}
/* recursively calculate its size if it is directory */
if (S_ISDIR(statbuf.st_mode)) {
total_size += get_directory_size(full_path);
} else {
/* else add the size of the file to the total */
total_size += statbuf.st_size;
}
}
closedir(dp);
} else {
perror("ccc");
return -1;
}
return total_size;
} }
/* /*
@ -321,7 +293,10 @@ long add_file_stat(char *filepath)
/* get file size */ /* get file size */
double bytes = file_stat.st_size; double bytes = file_stat.st_size;
if (S_ISDIR(file_stat.st_mode)) { if (S_ISDIR(file_stat.st_mode)) {
bytes = (double) get_directory_size(filepath); /* at most 15 fd opened */
total_dir_size = 0;
nftw(filepath, &get_directory_size, 15, FTW_PHYS);
bytes = total_dir_size;
} }
/* max 25 chars due to long, space, suffix and nul */ /* max 25 chars due to long, space, suffix and nul */
char *size = memalloc(25 * sizeof(char)); char *size = memalloc(25 * sizeof(char));