1
0
mirror of https://gittea.dev/nova/th.git synced 2026-01-30 16:50:10 -05:00

Compare commits

...

5 Commits

Author SHA1 Message Date
nova
1f1de78283 -fsanitize=address related stuff 2026-01-17 18:10:01 +01:00
nova
f3a39b0df0 small changes 2026-01-17 17:53:52 +01:00
nova
8734fa6ae4 -fsanitize=address related compiler assisted debugging 2026-01-12 18:35:38 +01:00
nova
66f3f3bef6 small changes 2026-01-05 22:15:11 +01:00
nova
393864c80f better string handling 2025-12-12 20:28:39 +01:00
9 changed files with 130 additions and 134 deletions

View File

@@ -1,5 +1,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include "config.h"
#define concat(out, s1, s2, _free) { \
concat## _free(out, s1, s2); \
@@ -78,3 +80,29 @@ char* smartstrcasestr(const char *haystack, const char *needle){
return ret;
}
char* parse_cmd_char(const char *cmd, const char *path){
char *index = strstr(cmd, SETTINGS_COMMAND_REPLACE_STR);
char *out;
if (index) {
out = malloc(strlen(cmd) + 1 + strlen(path) + 1);
char *o = out;
memcpy(out, cmd, index - cmd);
o += index-cmd;
*o = '\"';
o++;
memcpy(o, path, strlen(path));
o += strlen(path);
*o = '\"';
memcpy(o+1, index + 1, strlen(index+1));
*(o+strlen(index+1)+1) = '\0';
return out;
} else {
concat(out, cmd, " ./\"", 0);
concat(out, out, path, 1);
concat(out, out, "\"", 1);
}
return out;
}

View File

@@ -7,3 +7,5 @@
/*char* concat(const char *s1, const char *s2);*/
char* smartstrcasestr(const char *haystack, const char *needle);
char* parse_cmd_char(const char *cmd, const char *path);

View File

@@ -2,6 +2,8 @@
#define SETTINGS_UEBERZUG_IMAGE_PREVIEW 1 /* 0 is disabled, 1 is enabled, 2 is with caching; depends on ueberzug */
#define SETTINGS_RELOAD_DIR_DELTA 10 /* 0 is disabled, time in seconds between automatic refresh of dir contents */
#define SETTINGS_CURSES_TIMEOUT 100 /* read: inopts(3NCURSES), blocking time between user inputs */
#define SETTINGS_COMMAND_REPLACE_STR "%" /* if a command in any cmd inside this fle contains this string, it will be replaced with the hovered/selected file name
* as of right now, this character cannot be escaped; i.e ``command\% --arg`` will parse into ``command\path_of_hovered_file --arg``*/
/* {{{ */
#ifndef CONFIG_GUARD
@@ -20,9 +22,9 @@ static const mimetype mimetype_default_cmd[] = {
* gives us "image/gif", thusly if we want to open gif in mpv rather than feh,
* we need to define "gif" before "image" */
{ "text", "$EDITOR" },
{ "gif", "mpv --loop-file=\"inf\"" },
{ "image", "feh" },
{ "video", "mpv" },
{ "gif", "nohup mpv --loop-file=\"inf\" % >/dev/null 2>&1 &" },
{ "image", "feh % >/dev/null 2>&1 &" },
{ "video", "nohup mpv % >/dev/null 2>&1 &" },
{ "audio", "mpv" },
{ "pdf", "zathura" },
};
@@ -31,8 +33,8 @@ static const extension file_extension_default_cmd[] = {
* similar to mimetype_default_cmd, however it searches for exact string matches
* and is checked before mimetype_default_cmd */
{ ".exe", "wine"},
{ ".cbz", "mcomix"},
{ ".cbr", "mcomix"},
{ ".cbz", "mcomix % &"},
{ ".cbr", "mcomix % &"},
{ ".json", "$EDITOR"},
{ ".csv", "$EDITOR"},
};

13
dir.c
View File

@@ -139,18 +139,13 @@ void get_dir_content(char *path, unsigned long *dir_file_count, file *dir_conten
}
free(full_path);
free(file);
free(entry[i]);
}
}
qsort(dir_content, *dir_file_count, sizeof(file), order_func);
for (i = 0; i < *dir_file_count; i++) {
free(entry[i]);
}
if (entry != NULL) {
free(entry);
} else {
}
}
@@ -259,7 +254,7 @@ void print_dir(WINDOW *win, char print_info, unsigned long *dir_file_count, file
file_name[printable_size + strlen(extension)-1] = '\0';
file_name[printable_size - 2] = '~';
} else {
file_name = malloc(printable_size-1);
file_name = malloc(printable_size);
memcpy(file_name, dir_content[i].file_name, printable_size);
file_name[printable_size-2] = '~';
file_name[printable_size-1] = '\0';
@@ -320,6 +315,7 @@ void print_dir(WINDOW *win, char print_info, unsigned long *dir_file_count, file
} else {
wattroff(win, COLOR_PAIR(dir_content[i].color_pair));
}
free(file_name);
}
free(bg);
@@ -327,10 +323,11 @@ void print_dir(WINDOW *win, char print_info, unsigned long *dir_file_count, file
char update_selected_file(){
char ret = -1; /* -1 on empty or inaccessible file, 0 on unchanged file, 1 on changed file */
if (selected_file_current >= mid_file_count) {
selected_file_current = mid_file_count-1;
}
if (selected_file_current != selected_file_last) {
if (selected_file_current != selected_file_last && selected_file_last <= mid_file_count) {
mid_content[selected_file_last].status &= ~FILE_STATUS_HOVER;
ret = 1;
} else {

View File

@@ -33,6 +33,7 @@ char* get_mimetype(char *path){
FILE *cmd_open = popen(cmd, "r");
char *line = NULL;
size_t size = 0;
free(cmd);
if (getline(&line, &size, cmd_open) != -1){
pclose(cmd_open);
return line;

View File

@@ -201,7 +201,7 @@ void move_up(unsigned long passes){
current_dir->selected_file_current = selected_file_current;
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK);
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_0);
pthread_mutex_unlock(&mutex_selection);
}
void move_left(unsigned long passes){
@@ -217,7 +217,9 @@ void move_left(unsigned long passes){
selected_file_current = dir_get_selected_file_current();
}
}
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY);
update_selected_file();
current_dir->selected_file_current = selected_file_current;
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_RELOAD_FULL | STATUS_RELOAD_DIRECTORY);
}
void move_right(){
if (mid_content->file_name[0] == '\0') {
@@ -238,9 +240,9 @@ void move_right(){
for (i = 0; i < file_extension_default_count; i++) {
if (strstr(extension, file_extension_default_cmd[i].file_extension)) {
char *cmd;
concat(cmd, file_extension_default_cmd[i].command, " ./\"", 0);
concat(cmd, file_extension_default_cmd[i].command, " ./\'", 0);
concat(cmd, cmd, mid_content[selected_file_current].file_name, 1);
concat(cmd, cmd, "\"", 1);
concat(cmd, cmd, "\'", 1);
if (system(cmd) == -1) {
@@ -248,7 +250,7 @@ void move_right(){
}
curs_set(1); /*for some reason, 1 here turns it invisible once again */
match = 1;
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY | STATUS_UPDATE_SCREEN_RELOAD_FULL);
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_RELOAD_FULL | STATUS_RELOAD_DIRECTORY);
break;
}
}
@@ -257,17 +259,12 @@ void move_right(){
for (i = 0; i < mimetype_default_count; i++) {
if (strstr(mime, mimetype_default_cmd[i].mimetype)) {
char *cmd;
concat(cmd, mimetype_default_cmd[i].command, " ./\"", 0);
concat(cmd, cmd, mid_content[selected_file_current].file_name, 1);
concat(cmd, cmd, "\"", 1);
char *cmd = parse_cmd_char(mimetype_default_cmd[i].command, mid_content[selected_file_current].file_name);
if (system(cmd) == -1) {
/*do nothing*/
}
curs_set(1); /*for some reason, 1 here turns it invisible once again */
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY | STATUS_UPDATE_SCREEN_RELOAD_FULL);
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_RELOAD_FULL | STATUS_RELOAD_DIRECTORY);
break;
}
@@ -276,11 +273,11 @@ void move_right(){
free(mime);
}
update_selected_file();
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY);
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_RELOAD_FULL | STATUS_RELOAD_DIRECTORY);
}
void toggle_hidden_files(){
file_modifiers ^= FILE_MODIFIERS_HIDDEN_FILES;
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK | STATUS_RELOAD_DIRECTORY);
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_RELOAD_FULL | STATUS_RELOAD_DIRECTORY);
}
void toggle_selection(){
pthread_mutex_lock(&mutex_selection);
@@ -296,7 +293,7 @@ void jump_bottom(){
selected_file_current = 0 - 1;
update_selected_file();
current_dir->selected_file_current = selected_file_current;
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_MASK);
status |= (STATUS_RUN_BACKEND | STATUS_UPDATE_SCREEN_0);
pthread_mutex_unlock(&mutex_selection);
}
void jump_top(){
@@ -317,9 +314,9 @@ void open_with(){
mvwin(win_b, terminal_height-6, 0);
wresize(win_b, BTM_WINDOW_HEIGHT_ON_STR_INTERACTION, terminal_width/3); /*the div3 just looks cool*/
concat(btm_buffer, ui_open_with_text_0, " \"", 0);
concat(btm_buffer, ui_open_with_text_0, " \'", 0);
concat(btm_buffer, btm_buffer, mid_content[selected_file_current].file_name, 1);
concat(btm_buffer, btm_buffer, "\" ", 1);
concat(btm_buffer, btm_buffer, "\' ", 1);
concat(btm_buffer, btm_buffer, ui_open_with_text_1, 1);
@@ -334,9 +331,9 @@ void open_with(){
if (err == 0) {
char *cmd;
concat(cmd, str, " ./\"", 0);
concat(cmd, str, " ./\'", 0);
concat(cmd, cmd, mid_content[selected_file_current].file_name, 1);
concat(cmd, cmd, "\"", 1);
concat(cmd, cmd, "\'", 1);
#if SETTINGS_UEBERZUG_IMAGE_PREVIEW != 0
images_clear();
@@ -366,9 +363,9 @@ void rename_hovered(){
mvwin(win_b, terminal_height-6, 0);
wresize(win_b, BTM_WINDOW_HEIGHT_ON_STR_INTERACTION, terminal_width/3); /*the div3 just looks cool*/
concat(btm_buffer, ui_rename_text_0, " \"", 0);
concat(btm_buffer, ui_rename_text_0, " \'", 0);
concat(btm_buffer, btm_buffer, mid_content[selected_file_current].file_name, 1);
concat(btm_buffer, btm_buffer, "\" ", 1);
concat(btm_buffer, btm_buffer, "\' ", 1);
concat(btm_buffer, btm_buffer, ui_rename_text_1, 1);
window_btm(win_b, 1);
@@ -381,10 +378,10 @@ void rename_hovered(){
if (!err) {
char *cmd;
concat(cmd, "mv ./\"", mid_content[selected_file_current].file_name, 0);
concat(cmd, cmd, "\" ./\"", 1);
concat(cmd, "mv ./\'", mid_content[selected_file_current].file_name, 0);
concat(cmd, cmd, "\' ./\'", 1);
concat(cmd, cmd, str, 1);
concat(cmd, cmd, "\"", 1);
concat(cmd, cmd, "\'", 1);
if (system(cmd) == -1) {
FAIL("rename_hovered", "mv or creating subcommand failed");
@@ -411,34 +408,15 @@ void delete(){
char *file_str = "";
for (i = 0; i < mid_file_count; i++) {
if (mid_content[i].status & FILE_STATUS_SELECTED) {
concat(file_str, file_str, "\"", 0);
concat(file_str, file_str, "\'", 0);
concat(file_str, file_str, mid_content[i].file_name, 1);
concat(file_str, file_str, "\" ", 1);
concat(file_str, file_str, "\' ", 1);
hits++;
}
}
werase(win_b);
mvwin(win_b, terminal_height-6, 0);
if (strlen(file_str) < (BTM_WINDOW_HEIGHT_ON_STR_INTERACTION-1) * (terminal_width/3)) {
wresize(win_b, BTM_WINDOW_HEIGHT_ON_STR_INTERACTION, terminal_width/3); /*the div3 just looks cool*/
btm_buffer = malloc(BTM_WINDOW_HEIGHT_ON_STR_INTERACTION * (terminal_width/3));
memset(btm_buffer, ' ', (BTM_WINDOW_HEIGHT_ON_STR_INTERACTION * (terminal_width/3)));
memcpy(btm_buffer, ui_delete_text ,strlen(ui_delete_text));
if (hits) {
memcpy(btm_buffer + strlen(ui_delete_text)+1, file_str, strlen(file_str));
} else {
btm_buffer[strlen(ui_delete_text)+1] = '"';
memcpy(btm_buffer + strlen(ui_delete_text) +1 + sizeof(char), mid_content[selected_file_current].file_name, strlen(mid_content[selected_file_current].file_name));
btm_buffer[strlen(ui_delete_text)+1 + sizeof(char) + strlen(mid_content[selected_file_current].file_name)] = '"';
}
memcpy(btm_buffer + (BTM_WINDOW_HEIGHT_ON_STR_INTERACTION * (terminal_width/3) - (terminal_width/3)) , "(y/N)", strlen("(y/N)"));
btm_buffer[BTM_WINDOW_HEIGHT_ON_STR_INTERACTION * (terminal_width/3)] = '\0';
} else {
/*since more data is present than can be represented using div3, we do the uncool thing*/
wresize(win_b, BTM_WINDOW_HEIGHT_ON_STR_INTERACTION, terminal_width);
btm_buffer = malloc(BTM_WINDOW_HEIGHT_ON_STR_INTERACTION * terminal_width);
memset(btm_buffer, ' ', BTM_WINDOW_HEIGHT_ON_STR_INTERACTION * terminal_width);
@@ -453,8 +431,7 @@ void delete(){
strlen(file_str)));
memcpy(btm_buffer + (BTM_WINDOW_HEIGHT_ON_STR_INTERACTION * terminal_width - terminal_width) , "(y/N)", strlen("(y/N)"));
btm_buffer[BTM_WINDOW_HEIGHT_ON_STR_INTERACTION * terminal_width] = '\0';
}
btm_buffer[BTM_WINDOW_HEIGHT_ON_STR_INTERACTION * terminal_width-1] = '\0';
@@ -653,9 +630,9 @@ void cmd_on_selected(unsigned long passes, int index){
char *file_str = "";
for (i = 0; i < mid_file_count; i++) {
if (mid_content[i].status & FILE_STATUS_SELECTED) {
concat(file_str, file_str, "\"", 0);
concat(file_str, file_str, "\'", 0);
concat(file_str, file_str, mid_content[i].file_name, 1);
concat(file_str, file_str, "\" ", 1);
concat(file_str, file_str, "\' ", 1);
hits++;
}
}
@@ -663,9 +640,9 @@ void cmd_on_selected(unsigned long passes, int index){
if (hits) {
concat(btm_buffer, key_binding[index].black_magic, file_str, 2);
} else {
concat(btm_buffer, key_binding[index].black_magic, "\"", 0);
concat(btm_buffer, key_binding[index].black_magic, "\'", 0);
concat(btm_buffer, btm_buffer, mid_content[selected_file_current].file_name, 1);
concat(btm_buffer, btm_buffer, "\"", 1);
concat(btm_buffer, btm_buffer, "\'", 1);
}
concat(btm_buffer, btm_buffer, "?", 1);
@@ -691,9 +668,9 @@ void cmd_on_selected(unsigned long passes, int index){
for (i = 0; i < mid_file_count; i++) {
if (mid_content[i].status & FILE_STATUS_SELECTED) {
free(cmd);
concat(cmd, (char*)key_binding[index].black_magic, " \"", 0);
concat(cmd, (char*)key_binding[index].black_magic, " \'", 0);
concat(cmd, cmd, mid_content[i].file_name, 1);
concat(cmd, cmd, "\"", 1);
concat(cmd, cmd, "\'", 1);
if (system(cmd) != 0) {
/*do nothing*/
}
@@ -701,9 +678,9 @@ void cmd_on_selected(unsigned long passes, int index){
}
} else {
free(cmd);
concat(cmd, (char*)key_binding[index].black_magic, " \"", 0);
concat(cmd, (char*)key_binding[index].black_magic, " \'", 0);
concat(cmd, cmd, mid_content[selected_file_current].file_name, 1);
concat(cmd, cmd, "\"", 1);
concat(cmd, cmd, "\'", 1);
if (system(cmd) != 0) {
/*do nothing*/
}
@@ -727,15 +704,15 @@ void yank_text(unsigned long passes, int index){
char *cmd;
if (strncmp((char*)key_binding[index].black_magic, "path", 4) == 0) {
char *path=getcwd(NULL, 0);
concat(cmd, "echo \"", path, 0);
concat(cmd, "echo \'", path, 0);
concat(cmd, cmd, "/", 1);
concat(cmd, cmd, mid_content[selected_file_current].file_name, 1);
concat(cmd, cmd, "\" | ", 1);
concat(cmd, cmd, "\' | ", 1);
concat(cmd, cmd, clipboard_cmd, 1);
free(path);
} else {
concat(cmd, "echo \"", mid_content[selected_file_current].file_name, 0);
concat(cmd, cmd, "\" | ", 1);
concat(cmd, "echo \'", mid_content[selected_file_current].file_name, 0);
concat(cmd, cmd, "\' | ", 1);
concat(cmd, cmd, clipboard_cmd, 1);
}
if (system(cmd) == -1) {
@@ -792,17 +769,15 @@ void yank_file(unsigned long passes, int index){
void paste(){
unsigned long i;
for (i = 0; i < yank_files.count; i++) {
/*TODO(2025-08-14T22:10:44) escape path*/
char *cmd;
if (yank_files.status & YANK_COPY) {
concat(cmd, "false | cp -ri ", yank_files.path, 0);
concat(cmd, "false | cp -ri \'", yank_files.path, 0);
} else {
concat(cmd, "mv ", yank_files.path, 0);
concat(cmd, "mv \'", yank_files.path, 0);
}
concat(cmd, cmd, "/", 1);
concat(cmd, cmd, *yank_files.list, 1);
concat(cmd, cmd, " ./", 1);
concat(cmd, cmd, *yank_files.list, 1);
concat(cmd, cmd, "\' ./", 1);
concat(cmd, cmd, " 2>&1", 1);
char *line = malloc(INPUT_BUFFER_SIZE);
FILE *cmd_open;

1
main.c
View File

@@ -91,6 +91,7 @@ int main(){
temp_heigth = terminal_height;
}
if (status & STATUS_RUN_BACKEND) {
free(global_path);
global_path = getcwd(NULL, 0);
pthread_cond_signal(&cond_top);
pthread_cond_signal(&cond_mid);

View File

@@ -118,19 +118,13 @@ int sort_random(const void *file0, const void *file1){
if (!(((file*)file0)->file_type & FILE_TYPE_DIR) && (((file*)file1)->file_type & FILE_TYPE_DIR)) {
return 1;
}
time_t num = (time_t)&seed;
time_t i;
for (i = num%2; i < 6+(((time_t)&seed)%2); i++){
num ^= *seed;
if (num%2) {
num ^= (time_t)&num;
num ^= num << (i + (((time_t)&seed)%5));
} else {
num ^= (time_t)&seed;
num ^= num >> (i + (((time_t)&num)%5));
time_t num = ((time_t)&sort_random)^((time_t)sort_natural);
int i = 1;
for (; i < 6; i++) {
num += *seed;
num ^= num << ((((time_t)&seed)%6)+i);
num ^= num >> ((((time_t)&num)%9)+i);
}
}
num ^= getpid();
return ((num%3) - 1);

View File

@@ -93,9 +93,7 @@ void *thread_mid(){
mid_file_count = 0;
}
pthread_mutex_lock(&mutex_selection);
update_selected_file();
pthread_mutex_unlock(&mutex_selection);
}
btm_status = local_status;
@@ -157,20 +155,11 @@ void *thread_rgt(){
pthread_mutex_lock(&mutex_mid);
char *path;
if (mid_file_count != 0) {
path = malloc(strlen(mid_content[selected_file_current].file_name) + 1);
memcpy(path, mid_content[selected_file_current].file_name, strlen(mid_content[selected_file_current].file_name)+1);
} else {
path = malloc(sizeof(char));
path[0] = '\0';
}
file_current.file_type = mid_content[selected_file_current].file_type;
file_current.file_size = mid_content[selected_file_current].file_size;
file_current.status = mid_content[selected_file_current].status;
char *path = mid_content[selected_file_current].file_name;
memcpy(&file_current, &mid_content[selected_file_current], sizeof(file));
pthread_mutex_unlock(&mutex_mid);
if (mid_content[selected_file_current].permissions & S_IRUSR) {
if (file_current.permissions & S_IRUSR) {
if (file_current.file_type &= FILE_TYPE_DIR) {
#if SETTINGS_UEBERZUG_IMAGE_PREVIEW != 0
images_clear();
@@ -185,6 +174,7 @@ void *thread_rgt(){
free(rgt_content);
rgt_file_count = get_dir_size(path);
if (rgt_file_count) { /* fails if dir empty */
rgt_content = malloc(rgt_file_count * sizeof(file));
memset(rgt_content, '\0', rgt_file_count * sizeof(file));
get_dir_content(path, &rgt_file_count, rgt_content);
@@ -193,6 +183,11 @@ void *thread_rgt(){
free(rgt_buffer);
rgt_buffer = malloc(sizeof(char));
rgt_buffer[0] = '\0';
} else { /* the hovered dir is empty */
rgt_content = malloc(sizeof(file));
rgt_content->file_type = 0;
rgt_content->permissions = mid_content[selected_file_current].permissions;
}
} else if ((status & STATUS_DELTA_TIME) != STATUS_DELTA_TIME) {
unsigned long i = 0;
@@ -225,8 +220,9 @@ void *thread_rgt(){
rgt_buffer = malloc(sizeof(char));
rgt_buffer[0] = '\0';
}
/*
free(path);
*/
pthread_mutex_unlock(&mutex_rgt);
}
@@ -282,6 +278,9 @@ void *thread_btm(){
free(ui_btm_right_block);
if(path) {
free(path);
}
path = getcwd(NULL, 0);
struct statvfs fs;
statvfs(path, &fs);
@@ -338,10 +337,9 @@ void *thread_btm(){
if (buffer_width != terminal_width) {
buffer_width = terminal_width;
free(btm_buffer);
btm_buffer = malloc(buffer_width);
memset(btm_buffer, ' ', buffer_width/2);
btm_buffer = malloc(buffer_width+1);
}
memset(btm_buffer + (buffer_width/2), ' ', buffer_width/2);
memset(btm_buffer, ' ', buffer_width);
btm_buffer[buffer_width] = '\0';
memcpy(btm_buffer + buffer_width - ui_btm_right_block_size, ui_btm_right_block, ui_btm_right_block_size);
@@ -379,13 +377,11 @@ void threading_init(){
mid_content->file_type = 0;
mid_content->file_size = 0;
mid_content->file_name = malloc(sizeof(char));
mid_content->file_name[0] = '\0';
mid_content->file_name = "";
rgt_content->file_type = 0;
rgt_content->file_size = 0;
rgt_content->file_name = malloc(sizeof(char));
rgt_content->file_name[0] = '\0';
rgt_content->file_name = "";
volatile char vol; /* needed to make sure higher optimization steps dont move these around */