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

Replace system with execlp and fix indentation

Browse source
This commit is contained in:
Night Kaly 2024-11-06 15:11:32 +00:00
parent d67e01086c
commit 462ce7b792
Signed by: night0721
SSH key fingerprint: SHA256:B/hgVwUoBpx5vdNsXl9w8XwZljA9766uk6T4ubZp5HM
1 changed files with 56 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

101
ccc.c
View file

@ -173,7 +173,7 @@ int main(int argc, char **argv)
/* go back */ /* go back */
case BACKSPACE: case BACKSPACE:
case ARROW_LEFT: case ARROW_LEFT:
case 'h':; case 'h':
/* get parent directory */ /* get parent directory */
strcpy(p_cwd, cwd); strcpy(p_cwd, cwd);
char *last_slash = strrchr(cwd, '/'); char *last_slash = strrchr(cwd, '/');
@ -191,29 +191,29 @@ int main(int argc, char **argv)
case ENTER: case ENTER:
case ARROW_RIGHT: case ARROW_RIGHT:
case 'l': case 'l':
strcpy(p_cwd, cwd); strcpy(p_cwd, cwd);
file c_file = files->items[sel_file]; file c_file = files->items[sel_file];
/* Check if it is directory or a regular file */ /* Check if it is directory or a regular file */
if (c_file.type == DRY) { if (c_file.type == DRY) {
/* Change cwd to directory */ /* Change cwd to directory */
change_dir(c_file.path, 0, 0); change_dir(c_file.path, 0, 0);
} else if (c_file.type == REG) { } else if (c_file.type == REG) {
/* Write opened file to a file for file pickers */ /* Write opened file to a file for file pickers */
if (file_picker) { if (file_picker) {
char *opened_file_path = memalloc(PATH_MAX); char *opened_file_path = memalloc(PATH_MAX);
strcpy(opened_file_path, "~/.cache/ccc/opened_file"); strcpy(opened_file_path, "~/.cache/ccc/opened_file");
opened_file_path = replace_home(opened_file_path); opened_file_path = replace_home(opened_file_path);
FILE *opened_file = fopen(opened_file_path, "w+"); FILE *opened_file = fopen(opened_file_path, "w+");
fprintf(opened_file, "%s\n", c_file.path); fprintf(opened_file, "%s\n", c_file.path);
fclose(opened_file); fclose(opened_file);
cleanup(); cleanup();
run = 0; run = 0;
} else { } else {
edit_file(); edit_file();
} }
} }
break; break;
/* jump up */ /* jump up */
case CTRLU: case CTRLU:
@ -255,9 +255,9 @@ int main(int argc, char **argv)
/* jump to the bottom */ /* jump to the bottom */
case 'G': case 'G':
sel_file = (files->length - 1); sel_file = (files->length - 1);
list_files(); list_files();
break; break;
/* jump to the top */ /* jump to the top */
case 'g': case 'g':
@ -369,34 +369,34 @@ int main(int argc, char **argv)
/* move */ /* move */
case 'm': case 'm':
if (marked->length) { if (marked->length) {
; ;
} }
break; break;
/* copy */ /* copy */
case 'c': case 'c':
if (marked->length) { if (marked->length) {
; ;
} }
break; break;
/* symbolic link */ /* symbolic link */
case 's': case 's':
if (marked->length) { if (marked->length) {
; ;
} }
break; break;
/* bulk rename */ /* bulk rename */
case 'b': case 'b':
if (marked->length) { if (marked->length) {
; ;
} }
break; break;
default: default:
break; break;
} }
} }
@ -1002,8 +1002,19 @@ void edit_file(void)
char command[length]; char command[length];
snprintf(command, length, "%s %s", editor, filename); snprintf(command, length, "%s %s", editor, filename);
system(command); pid_t pid = fork();
list_files(); if (pid == 0) {
/* Child process */
execlp(editor, editor, filename, NULL);
_exit(1); /* Exit if exec fails */
} else if (pid > 0) {
/* Parent process */
waitpid(pid, NULL, 0);
list_files();
} else {
/* Fork failed */
wpprintw("fork failed: %s", strerror(errno));
}
} }
} }