mirror of
https://gittea.dev/nova/th.git
synced 2025-10-21 10:20:15 -04:00
resolved all compiler warnings so far
This commit is contained in:
11
dir.c
11
dir.c
@@ -28,7 +28,6 @@ linked_dir *current_dir;
|
||||
unsigned long get_dir_size(char *path);
|
||||
void get_dir_content(char *path, unsigned long *dir_file_count, file *dir_content);
|
||||
void print_dir(WINDOW *win, char print_info, unsigned long *dir_file_count, file *dir_content);
|
||||
char recursive_delete(file current_file);
|
||||
|
||||
|
||||
|
||||
@@ -386,7 +385,7 @@ void dir_init(){
|
||||
|
||||
}
|
||||
|
||||
char recursive_delete(file current_file){
|
||||
void recursive_delete(file current_file){
|
||||
if (current_file.file_type & FILE_TYPE_DIR) {
|
||||
unsigned int file_modifiers_tmp = file_modifiers;
|
||||
file_modifiers |= FILE_MODIFIERS_HIDDEN_FILES;
|
||||
@@ -395,14 +394,18 @@ char recursive_delete(file current_file){
|
||||
file *current_dir = malloc(current_file_count * sizeof(file));
|
||||
memset(current_dir, '\0', current_file_count * sizeof(file));
|
||||
get_dir_content(current_file.file_name, ¤t_file_count, current_dir);
|
||||
chdir(current_file.file_name);
|
||||
if (chdir(current_file.file_name) != 0) {
|
||||
return;
|
||||
}
|
||||
unsigned long i;
|
||||
for (i = 0; i < current_file_count; i++) {
|
||||
recursive_delete(current_dir[i]);
|
||||
free(current_dir[i].file_name);
|
||||
}
|
||||
free(current_dir);
|
||||
chdir("..");
|
||||
if (chdir("..") != 0) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
remove(current_file.file_name);
|
||||
file_modifiers = file_modifiers_tmp;
|
||||
|
2
dir.h
2
dir.h
@@ -10,4 +10,4 @@ char update_selected_file();
|
||||
void dir_set_selected_file_current(unsigned long selected_file_current);
|
||||
unsigned long dir_get_selected_file_current();
|
||||
void dir_init();
|
||||
char recursive_delete(file current_file);
|
||||
void recursive_delete(file current_file);
|
||||
|
@@ -813,10 +813,12 @@ void paste(){
|
||||
FILE *cmd_open;
|
||||
while (1) {
|
||||
cmd_open = popen(cmd, "r");
|
||||
getline(&line, &size, cmd_open);
|
||||
int val = getline(&line, &size, cmd_open);
|
||||
|
||||
if (pclose(cmd_open) == 0) {
|
||||
break;
|
||||
} else if (val == 0 || val == -1) {
|
||||
break;
|
||||
}
|
||||
cmd = concat(cmd, "_");
|
||||
}
|
||||
|
Reference in New Issue
Block a user