Merge pull request #15 from piotr-marendowski/feature

Feature
This commit is contained in:
Piotr Marendowski 2024-03-14 20:42:09 +00:00 committed by GitHub
commit e48871e04e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 286 additions and 84 deletions

View file

@ -3,11 +3,11 @@
TARGET = ccc TARGET = ccc
MANPAGE = ccc.1 MANPAGE = ccc.1
SRC = ccc.c util.c file.c SRC = ccc.c util.c file.c config.h
# 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 -pedantic $(shell pkg-config --cflags ncurses) -Wall # -Wextra -Werror CFLAGS = -march=native -mtune=native -O3 -pipe -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 CONF = config.h
@ -36,5 +36,3 @@ uninstall:
clean: clean:
$(RM) $(TARGET) $(RM) $(TARGET)
ccc.o: $(CONF)

269
ccc.c
View file

@ -1,4 +1,5 @@
#define _XOPEN_SOURCE 600 #define _XOPEN_SOURCE 600
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
@ -23,12 +24,15 @@ typedef struct {
} WIN_STRUCT; } WIN_STRUCT;
/* functions' definitions */ /* functions' definitions */
void list_files(const char *path); void change_dir(const char *buf);
int mkdir_p(const char *destdir);
void populate_files(const char *path);
int get_directory_size(const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf); 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 *filepath, int ftype);
void highlight_current_line(); void highlight_current_line();
void show_file_content(); void show_file_content();
void edit_file(); void edit_file();
void wpprintw(const char *line);
void init_windows(); void init_windows();
void draw_border_title(WINDOW *window, bool active); void draw_border_title(WINDOW *window, bool active);
@ -56,11 +60,13 @@ int main(int argc, char** argv)
die("ccc: No tty detected. ccc requires an interactive shell to run.\n"); die("ccc: No tty detected. ccc requires an interactive shell to run.\n");
/* initialize screen, don't print special chars, /* initialize screen, don't print special chars,
* make ctrl + c work, don't show cursor */ * make ctrl + c work, don't show cursor
* enable arrow keys */
initscr(); initscr();
noecho(); noecho();
cbreak(); cbreak();
curs_set(0); curs_set(0);
keypad(stdscr, TRUE);
/* check terminal has colors */ /* check terminal has colors */
if (!has_colors()) { if (!has_colors()) {
@ -71,8 +77,15 @@ int main(int argc, char** argv)
start_color(); start_color();
} }
init_pair(1, COLOR_BLUE, -1); /* foreground, background */ /* colors */
init_pair(2, COLOR_CYAN, -1); /* active color */ init_pair(1, COLOR_BLACK, -1); /* */
init_pair(2, COLOR_RED, -1); /* */
init_pair(3, COLOR_GREEN, -1); /* LNK */
init_pair(4, COLOR_YELLOW, -1); /* BLK */
init_pair(5, COLOR_BLUE, -1); /* DIR */
init_pair(6, COLOR_MAGENTA, -1); /* */
init_pair(7, COLOR_CYAN, -1); /* */
init_pair(8, COLOR_WHITE, -1); /* REG */
half_width = COLS / 2; half_width = COLS / 2;
init_windows(); init_windows();
@ -81,59 +94,55 @@ int main(int argc, char** argv)
cwd = memalloc(PATH_MAX * sizeof(char)); cwd = memalloc(PATH_MAX * sizeof(char));
getcwd(cwd, PATH_MAX); getcwd(cwd, PATH_MAX);
list_files(cwd); populate_files(cwd);
highlight_current_line(); highlight_current_line();
/* set window name */ /* set window name */
printf("%c]2;ccc: %s%c", ESC, cwd, ESC); printf("%c]2;ccc: %s%c", ESC, cwd, ESC);
int ch, second; int ch, ch2;
while (1) { while (1) {
if (COLS < 80 || LINES < 24) { if (COLS < 80 || LINES < 24) {
endwin(); endwin();
die("ccc: Terminal size needs to be at least 80x24\n"); die("ccc: Terminal size needs to be at least 80x24\n");
} }
ch = getch(); ch = getch();
/* printf("%d ",ch); */
switch (ch) { switch (ch) {
/* quit */ /* quit */
case 'q': case 'q':
endwin(); endwin();
return 0; return 0;
/* reload */ /* reload using z */
case '.': case 'z':
clear_files(); change_dir(cwd);
list_files(cwd);
current_selection = 0;
highlight_current_line();
break; break;
/* go back */ /* go back by backspace or h or left arrow */
case 'h': case BACKSPACE:
clear_files(); case LEFT:
case 'h':;
/* get parent directory */ /* get parent directory */
char *last_slash = strrchr(cwd, '/'); char *last_slash = strrchr(cwd, '/');
if (last_slash != NULL) { if (last_slash != NULL) {
*last_slash = '\0'; *last_slash = '\0';
list_files(cwd); change_dir(cwd);
current_selection = 0;
highlight_current_line();
} }
break; break;
/* enter directory/open a file */ /* enter directory/open a file using enter or l or right arrow */
case ENTER:
case RIGHT:
case 'l':; case 'l':;
file *file = get_file(current_selection); file *file = get_file(current_selection);
if (file != NULL) { if (file != NULL) {
/* check if it is directory or regular file */ /* check if it is directory or regular file */
if (strncmp(file->type, "DIR", 3) == 0) { if (strncmp(file->type, "DIR", 3) == 0) {
/* change cwd to directory */ /* change cwd to directory */
strcpy(cwd, file->path); change_dir(file->path);
clear_files(); } else if (strncmp(file->type, "REG", 3) == 0) {
list_files(cwd); edit_file();
current_selection = 0;
highlight_current_line();
} }
} }
break; break;
@ -144,7 +153,7 @@ int main(int argc, char** argv)
*/ */
/* jump up (ctrl u)*/ /* jump up (ctrl u)*/
case '\x15': case CTRLU:
if ((current_selection - JUMP_NUM) > 0) if ((current_selection - JUMP_NUM) > 0)
current_selection -= JUMP_NUM; current_selection -= JUMP_NUM;
else else
@ -153,7 +162,8 @@ int main(int argc, char** argv)
highlight_current_line(); highlight_current_line();
break; break;
/* go up */ /* go up by k or up arrow */
case UP:
case 'k': case 'k':
if (current_selection > 0) if (current_selection > 0)
current_selection--; current_selection--;
@ -162,7 +172,7 @@ int main(int argc, char** argv)
break; break;
/* jump down (ctrl d)*/ /* jump down (ctrl d)*/
case '\x04': case CTRLD:
if ((current_selection + JUMP_NUM) < (files_len() - 1)) if ((current_selection + JUMP_NUM) < (files_len() - 1))
current_selection += JUMP_NUM; current_selection += JUMP_NUM;
else else
@ -171,7 +181,8 @@ int main(int argc, char** argv)
highlight_current_line(); highlight_current_line();
break; break;
/* go down */ /* go down by j or down arrow */
case DOWN:
case 'j': case 'j':
if (current_selection < (files_len() - 1)) if (current_selection < (files_len() - 1))
current_selection++; current_selection++;
@ -187,8 +198,8 @@ int main(int argc, char** argv)
/* jump to the top */ /* jump to the top */
case 'g': case 'g':
second = getch(); ch2 = getch();
switch (second) { switch (ch2) {
case 'g': case 'g':
current_selection = 0; current_selection = 0;
highlight_current_line(); highlight_current_line();
@ -197,11 +208,46 @@ int main(int argc, char** argv)
break; break;
} }
break; break;
case 'e':
edit_file(); /* ~ to go home */
case TILDE:;
char *home = getenv("HOME");
if (home == NULL) {
wpprintw("$HOME is not defined");
} else {
change_dir(home);
}
break; break;
case 27: /* esc */
/* t to go to trash dir */
case 't':;
char *trash_dir = getenv("CCC_TRASH");
if (trash_dir == NULL) {
wpprintw("$CCC_TRASH is not defined");
} else {
if (access(trash_dir, F_OK) != 0) {
/* create the directory with 755 perm if it doesn't exit */
if (mkdir_p(trash_dir) == -1) {
switch (errno) {
case EACCES:
wpprintw("Parent directory does not allow write permission or one of directory does not allow search access");
}
}
}
change_dir(trash_dir);
}
break; break;
/* mark files by space */
case SPACE:
add_file_stat(get_filepath(current_selection), 1);
highlight_current_line();
break;
/* escape */
case ESC:
break;
case KEY_RESIZE: case KEY_RESIZE:
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
delwin(windows[i].window); delwin(windows[i].window);
@ -220,17 +266,76 @@ int main(int argc, char** argv)
} }
/* /*
* Read the provided directory and list all files to window 0 * Change directory in window
*/
void change_dir(const char *buf)
{
strcpy(cwd, buf);
clear_files();
populate_files(cwd);
current_selection = 0;
highlight_current_line();
}
/*
* Recursively create directory by creating each subdirectory
*/
int mkdir_p(const char *destdir)
{
char *path = memalloc(PATH_MAX * sizeof(char));
strcpy(path, destdir);
if (destdir[0] == '~') {
char *home = getenv("HOME");
if (home == NULL) {
wpprintw("$HOME is not defined");
return -1;
}
/* replace ~ with home */
memmove(path + strlen(home), path + 1, strlen(path));
memcpy(path, home, strlen(home));
}
char *token = strtok(path, "/");
char dir_path[PATH_MAX] = "";
/* fix first / is not appearing in string */
if (path[0] == '/') {
strcat(dir_path, "/");
}
while (token != NULL) {
strcat(dir_path, token);
strcat(dir_path, "/");
if (mkdir(dir_path, 0755) == -1) {
struct stat st;
if (stat(dir_path, &st) == 0 && S_ISDIR(st.st_mode)) {
/* Directory already exists, continue to the next dir */
token = strtok(NULL, "/");
continue;
}
perror("ccc");
free(path);
return -1;
}
token = strtok(NULL, "/");
}
free(path);
return 0;
}
/*
* Read the provided directory and add all files in directory to linked list
* ep->d_name -> filename * ep->d_name -> filename
*/ */
void list_files(const char *path) void populate_files(const char *path)
{ {
DIR *dp; DIR *dp;
struct dirent *ep; struct dirent *ep;
draw_border_title(directory_border, true); draw_border_title(directory_border, true);
if ((dp = opendir(path)) != NULL) { if ((dp = opendir(path)) != NULL) {
int count = 0;
/* clear directory window to ready for printing */ /* clear directory window to ready for printing */
wclear(directory_content); wclear(directory_content);
@ -248,12 +353,7 @@ void list_files(const char *path)
strcat(filename, "/"); strcat(filename, "/");
strcat(filename, ep->d_name); /* add file name */ strcat(filename, ep->d_name); /* add file name */
long index = add_file_stat(filename); add_file_stat(filename, 0);
char *line = get_line(index);
mvwprintw(directory_content, count, 0, "%s", line);
free(line);
count++;
} }
free(filename); free(filename);
} }
@ -273,14 +373,15 @@ int get_directory_size(const char *fpath, const struct stat *sb, int typeflag, s
/* /*
* Get file's last modified time, size, type * Get file's last modified time, size, type
* Add that file into list * Add that file into list
* ftype: 0->dir files, 0->marked
*/ */
long add_file_stat(char *filepath) long add_file_stat(char *filepath, int ftype)
{ {
struct stat file_stat; struct stat file_stat;
if (stat(filepath, &file_stat) == -1) { if (stat(filepath, &file_stat) == -1) {
/* can't be triggered ? */ /* can't be triggered ? */
if (errno == EACCES) { if (errno == EACCES) {
return add_file(filepath, "", ""); return add_file(filepath, "", "", 8);
} }
} }
@ -289,7 +390,6 @@ long add_file_stat(char *filepath)
/* format last modified time to a string */ /* format last modified time to a string */
strftime(time, 20, "%Y-%m-%d %H:%M", localtime(&file_stat.st_mtime)); strftime(time, 20, "%Y-%m-%d %H:%M", localtime(&file_stat.st_mtime));
/* 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)) {
@ -298,7 +398,7 @@ long add_file_stat(char *filepath)
nftw(filepath, &get_directory_size, 15, FTW_PHYS); nftw(filepath, &get_directory_size, 15, FTW_PHYS);
bytes = total_dir_size; bytes = total_dir_size;
} }
/* max 25 chars due to long, space, suffix and nul */ /* max 25 chars due to long, space, suffix and null */
char *size = memalloc(25 * sizeof(char)); char *size = memalloc(25 * sizeof(char));
int unit = 0; int unit = 0;
const char* units[] = {" B", "KiB", "MiB", "GiB", "TiB", "PiB"}; const char* units[] = {" B", "KiB", "MiB", "GiB", "TiB", "PiB"};
@ -309,25 +409,42 @@ long add_file_stat(char *filepath)
/* 4 sig fig, limiting characters to have better format */ /* 4 sig fig, limiting characters to have better format */
sprintf(size, "%-6.4g %-3s", bytes, units[unit]); sprintf(size, "%-6.4g %-3s", bytes, units[unit]);
/* get file type */ /* get file type and color */
char *type = memalloc(4 * sizeof(char)); /* 3 chars for type */ char *type = memalloc(4 * sizeof(char)); /* 4 chars for type */
int color;
if (S_ISDIR(file_stat.st_mode)) { if (S_ISDIR(file_stat.st_mode)) {
strcpy(type, "DIR"); /* directory */ strcpy(type, "DIR"); /* directory type */
color = 5; /* blue color */
} else if (S_ISREG(file_stat.st_mode)) { } else if (S_ISREG(file_stat.st_mode)) {
strcpy(type, "REG"); /* regular file */ strcpy(type, "REG"); /* regular file */
color = 8; /* white color */
} else if (S_ISLNK(file_stat.st_mode)) { } else if (S_ISLNK(file_stat.st_mode)) {
strcpy(type, "LNK"); /* symbolic link */ strcpy(type, "LNK"); /* symbolic link */
color = 3; /* green color */
} else if (S_ISCHR(file_stat.st_mode)) { } else if (S_ISCHR(file_stat.st_mode)) {
strcpy(type, "CHR"); /* character device */ strcpy(type, "CHR"); /* character device */
color = 8; /* white color */
} else if (S_ISSOCK(file_stat.st_mode)) { } else if (S_ISSOCK(file_stat.st_mode)) {
strcpy(type, "SOC"); /* socket */ strcpy(type, "SOC"); /* socket */
color = 8; /* white color */
} else if (S_ISBLK(file_stat.st_mode)) { } else if (S_ISBLK(file_stat.st_mode)) {
strcpy(type, "BLK"); /* block device */ strcpy(type, "BLK"); /* block device */
color = 4; /* yellow color */
} else if (S_ISFIFO(file_stat.st_mode)) { } else if (S_ISFIFO(file_stat.st_mode)) {
strcpy(type, "FIF"); /* FIFO */ strcpy(type, "FIF"); /* FIFO */
color = 8; /* white color */
} else {
color = 8; /* white color */
} }
/* don't know how to handle socket, block device, character device and FIFO */ /* don't know how to handle socket, block device, character device and FIFO */
if (ftype == 1) {
long index = add_marked(filepath, type);
free(type);
free(size);
free(time);
return index;
}
char *total_stat = memalloc(45 * sizeof(char)); char *total_stat = memalloc(45 * sizeof(char));
snprintf(total_stat, 45, "%-18s %-10s", time, size); snprintf(total_stat, 45, "%-18s %-10s", time, size);
total_stat[strlen(total_stat)] = '\0'; total_stat[strlen(total_stat)] = '\0';
@ -335,13 +452,14 @@ long add_file_stat(char *filepath)
free(time); free(time);
free(size); free(size);
long index = add_file(filepath, total_stat, type); long index = add_file(filepath, total_stat, type, color);
free(total_stat); free(total_stat);
free(type); free(type);
return index; return index;
} }
/* /*
* Highlight current line by reversing the color * Highlight current line by reversing the color
*/ */
@ -355,6 +473,13 @@ void highlight_current_line()
/* calculate range of files to show */ /* calculate range of files to show */
long range = files_len(); long range = files_len();
/* not highlight if no files in directory */
if (range == 0) {
wprintw(preview_content, "empty directory");
wrefresh(preview_content);
return;
}
if (range > LINES - 3) { if (range > LINES - 3) {
/* if there is more files than lines available to display*/ /* if there is more files than lines available to display*/
/* shrink range to avaiable lines to display */ /* shrink range to avaiable lines to display */
@ -367,20 +492,34 @@ void highlight_current_line()
for (long i = overflow; i < range; i++) { for (long i = overflow; i < range; i++) {
if ((overflow == 0 && i == current_selection) || (overflow != 0 && i == current_selection)) { if ((overflow == 0 && i == current_selection) || (overflow != 0 && i == current_selection)) {
wattron(directory_content, A_REVERSE); wattron(directory_content, A_REVERSE);
wattron(directory_content, COLOR_PAIR(1));
/* update the panel */ /* update the panel */
wclear(panel); wclear(panel);
long num_marked = marked_len();
if (num_marked > 0) {
/* Determine length of formatted string */
int m_len = snprintf(NULL, 0, "(%ld selected)", num_marked);
char *selected = memalloc((m_len + 1) * sizeof(char));
snprintf(selected, m_len + 1, "(%ld selected)", num_marked);
wprintw(panel, "(%ld/%ld) %s %s", current_selection + 1, files_len(), selected, cwd);
} else {
wprintw(panel, "(%ld/%ld) %s", current_selection + 1, files_len(), cwd); wprintw(panel, "(%ld/%ld) %s", current_selection + 1, files_len(), cwd);
} }
}
/* print the actual filename and stats */ /* print the actual filename and stats */
char *line = get_line(i); char *line = get_line(i);
int color = get_color(i);
/* print the whole directory with colors */
wattron(directory_content, COLOR_PAIR(color));
if (overflow > 0) if (overflow > 0)
mvwprintw(directory_content, line_count, 0, "%s", line); mvwprintw(directory_content, line_count, 0, "%s", line);
else else
mvwprintw(directory_content, i, 0, "%s", line); mvwprintw(directory_content, i, 0, "%s", line);
wattroff(directory_content, A_REVERSE); wattroff(directory_content, A_REVERSE);
wattroff(directory_content, COLOR_PAIR(1)); wattroff(directory_content, COLOR_PAIR(color));
free(line); free(line);
line_count++; line_count++;
} }
@ -426,9 +565,7 @@ void edit_file()
{ {
char *editor = getenv("EDITOR"); char *editor = getenv("EDITOR");
if (editor == NULL) { if (editor == NULL) {
wclear(panel); wpprintw("Cannot get EDITOR variable, is it defined?");
wprintw(panel, "Cannot get EDITOR variable, is it defined?");
wrefresh(panel);
return; return;
} else { } else {
def_prog_mode(); /* save the tty modes */ def_prog_mode(); /* save the tty modes */
@ -444,6 +581,16 @@ void edit_file()
} }
} }
/*
* Print line to panel
*/
void wpprintw(const char *line)
{
wclear(panel);
wprintw(panel, "%s", line);
wrefresh(panel);
}
void init_windows() void init_windows()
{ {
/*------------------------------+ /*------------------------------+
@ -482,9 +629,9 @@ void draw_border_title(WINDOW *window, bool active)
{ {
/* turn on color depends on active */ /* turn on color depends on active */
if (active) { if (active) {
wattron(window, COLOR_PAIR(2)); wattron(window, COLOR_PAIR(7));
} else { } else {
wattron(window, COLOR_PAIR(1)); wattron(window, COLOR_PAIR(5));
} }
/* draw top border */ /* draw top border */
mvwaddch(window, 0, 0, ACS_ULCORNER); /* upper left corner */ mvwaddch(window, 0, 0, ACS_ULCORNER); /* upper left corner */
@ -503,9 +650,9 @@ void draw_border_title(WINDOW *window, bool active)
/* turn color off after turning it on */ /* turn color off after turning it on */
if (active) { if (active) {
wattroff(window, COLOR_PAIR(2)); wattroff(window, COLOR_PAIR(7));
} else { } else {
wattroff(window, COLOR_PAIR(1)); wattroff(window, COLOR_PAIR(5));
} }
wrefresh(window); /* Refresh the window to see the colored border and title */ wrefresh(window); /* Refresh the window to see the colored border and title */
} }

View file

@ -1,3 +1,13 @@
#define CTRLD 0x04
#define ENTER 0xA
#define CTRLU 0x15
#define ESC 0x1B /* \e or \033 */ #define ESC 0x1B /* \e or \033 */
#define SPACE 0x20
#define TILDE 0x7E
#define DOWN 0x102
#define UP 0x103
#define LEFT 0x104
#define RIGHT 0x105
#define BACKSPACE 0x107
#define PH 1 /* panel height */ #define PH 1 /* panel height */
#define JUMP_NUM 14 /* how long ctrl + u/d jump are */ #define JUMP_NUM 14 /* how long ctrl + u/d jump are */

63
file.c
View file

@ -9,7 +9,7 @@ typedef struct file {
char *path; char *path;
char *stats; char *stats;
char *type; char *type;
/* put some more useful stat here */ int color;
struct file *next; struct file *next;
} file; } file;
@ -65,20 +65,24 @@ void clear_marked()
} }
} }
long add_file(char *filepath, char *stats, char *type) long add_file(char *filepath, char *stats, char *type, int color)
{ {
file *current = files; file *current = files;
file *new_file = memalloc(sizeof(file)); file *new_file = memalloc(sizeof(file));
char *buf = strdup(filepath); char *buf = strdup(filepath);
char *buf2 = strdup(stats); char *buf2 = strdup(stats);
char *buf3 = strdup(type); char *buf3 = strdup(type);
if (buf == NULL || buf2 == NULL || buf3 == NULL) { int buf4 = color;
if (buf == NULL || buf2 == NULL || buf3 == NULL)
perror("ccc"); perror("ccc");
}
new_file->path = buf; new_file->path = buf;
new_file->stats = buf2; new_file->stats = buf2;
new_file->type = buf3; new_file->type = buf3;
new_file->color = buf4;
new_file->next = NULL; new_file->next = NULL;
if (current == NULL) { if (current == NULL) {
files = new_file; files = new_file;
return 0; return 0;
@ -92,6 +96,31 @@ long add_file(char *filepath, char *stats, char *type)
return index; return index;
} }
long add_marked(char *filepath, char *type)
{
file *current = marked;
file *new_file = memalloc(sizeof(file));
char *buf = strdup(filepath);
char *buf2 = strdup(type);
if (buf == NULL || buf2 == NULL) {
perror("ccc");
}
new_file->path = buf;
new_file->type = buf2;
new_file->next = NULL;
if (current == NULL) {
marked = new_file;
return 0;
}
long index = 1;
while (current->next != NULL) {
current = current->next;
index++;
}
current->next = new_file;
return index;
}
file *get_file(long index) file *get_file(long index)
{ {
file *current = files; file *current = files;
@ -121,6 +150,20 @@ char *get_filepath(long index)
} }
} }
int get_color(long index)
{
file *file = get_file(index);
if (file != NULL) {
int color = file->color;
if (!color) {
perror("ccc");
}
return color;
} else {
return 8; /* white */
}
}
/* /*
* Construct a formatted line for display * Construct a formatted line for display
*/ */
@ -129,14 +172,16 @@ char *get_line(long index)
file *file = get_file(index); file *file = get_file(index);
if (file != NULL) { if (file != NULL) {
char *name = strdup(file->path); char *name = strdup(file->path);
name = basename(name);
char *stats = strdup(file->stats); char *stats = strdup(file->stats);
if (name == NULL || stats == NULL) { size_t length = strlen(name) + strlen(stats) + 2; /* one for space and one for null */
perror("ccc");
}
size_t length = strlen(name) + strlen(stats) + 2; /* one for space and one for nul */
char *line = memalloc(length * sizeof(char)); char *line = memalloc(length * sizeof(char));
name = basename(name);
if (name == NULL || stats == NULL)
perror("ccc");
snprintf(line, length, "%s %s", stats, name); snprintf(line, length, "%s %s", stats, name);
return line; return line;
} else { } else {
return NULL; return NULL;

6
file.h
View file

@ -5,7 +5,7 @@ typedef struct file {
char *path; char *path;
char *stats; char *stats;
char *type; char *type;
// put some more useful stat here int color;
struct file *next; struct file *next;
} file; } file;
@ -13,9 +13,11 @@ long files_len();
long marked_len(); long marked_len();
void clear_files(); void clear_files();
void clear_marked(); void clear_marked();
long add_file(char *filename, char *time, char *type); long add_file(char *filepath, char *stats, char *type, int color);
long add_marked(char *filepath, char *type);
file *get_file(long index); file *get_file(long index);
char *get_filepath(long index); char *get_filepath(long index);
int get_color(long index);
char *get_line(long index); char *get_line(long index);
#endif #endif