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

Edit config to remove defines

Browse source
This commit is contained in:
Night Kaly 2024-11-13 00:08:32 +00:00
parent fdafdf4b99
commit 600dc69dd6
Signed by: night0721
SSH key fingerprint: SHA256:B/hgVwUoBpx5vdNsXl9w8XwZljA9766uk6T4ubZp5HM
1 changed files with 33 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
ccc.c
View file

@ -34,7 +34,7 @@ void list_files(void);
void show_file_content(void); void show_file_content(void);
void edit_file(void); void edit_file(void);
void toggle_executable(void); void toggle_executable(void);
char *replace_home(char *str); void replace_home(char *str);
int write_last_d(void); int write_last_d(void);
int sort_compare(const void *a, const void *b); int sort_compare(const void *a, const void *b);
void sort_files(void); void sort_files(void);
@ -199,9 +199,9 @@ int main(int argc, char **argv)
} 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[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); 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);
@ -454,22 +454,16 @@ char *check_trash_dir(void)
{ {
char *path = memalloc(PATH_MAX); char *path = memalloc(PATH_MAX);
char *trash_dir;
#ifdef TRASH_DIR
trash_dir = TRASH_DIR;
strcpy(path, trash_dir);
#endif
/* check if there is trash_dir */ /* check if there is trash_dir */
if (trash_dir == NULL) { if (!strcmp(trash_dir, "")) {
wpprintw("Trash directory not defined"); wpprintw("Trash directory not defined");
return NULL; return NULL;
} else { } else {
strcpy(path, trash_dir);
/* if trash_dir has ~ then make it $HOME */ /* if trash_dir has ~ then make it $HOME */
/* use path as trash_dir */ /* use path as trash_dir */
if (trash_dir[0] == '~') { if (path[0] == '~')
path = replace_home(path); replace_home(path);
}
/* if has access to trash_dir */ /* if has access to trash_dir */
if (access(path, F_OK) != 0) { if (access(path, F_OK) != 0) {
@ -988,15 +982,12 @@ void show_file_content(void)
*/ */
void edit_file(void) void edit_file(void)
{ {
#ifdef EDITOR if (editor == NULL) {
char *editor = EDITOR; editor = getenv("EDITOR");
#else
char *editor = getenv("EDITOR");
#endif
if (editor == NULL) { if (editor == NULL) {
wpprintw("$EDITOR not defined"); wpprintw("$EDITOR not defined");
return; return;
}
} else { } else {
char *filename = files->items[sel_file].path; char *filename = files->items[sel_file].path;
@ -1032,35 +1023,34 @@ void toggle_executable(void)
} }
char *replace_home(char *str) void replace_home(char *str)
{ {
char *home = getenv("HOME"); char *home = getenv("HOME");
if (home == NULL) { if (home == NULL) {
wpprintw("$HOME not defined"); wpprintw("$HOME not defined");
return str; return;
} }
char *newstr = memalloc(strlen(str) + strlen(home)); int len = strlen(str) + strlen(home) + 1;
char newstr[len];
/* replace ~ with home */ /* replace ~ with home */
snprintf(newstr, strlen(str) + strlen(home), "%s%s", home, str + 1); snprintf(newstr, len, "%s%s", home, str + 1);
free(str); strcpy(str, newstr);
return newstr;
} }
int write_last_d(void) int write_last_d(void)
{ {
#ifdef LAST_D if (!strcmp(last_d, "")) {
char *last_d = estrdup(LAST_D); strcpy(last_d, getenv("CCC_LAST_D"));
#else if (!strcmp(last_d, "")) {
char *last_d = getenv("CCC_LAST_D");
#endif
if (last_d == NULL) {
wpprintw("$CCC_LAST_D not defined (Press enter to continue)"); wpprintw("$CCC_LAST_D not defined (Press enter to continue)");
return -1; return -1;
} else {
if (last_d[0] == '~') {
last_d = replace_home(last_d);
} }
char *last_ddup = estrdup(last_d); } else {
if (last_d[0] == '~')
replace_home(last_d);
char last_ddup[PATH_MAX];
strcpy(last_ddup, last_d);
char *last_d_dir = strrchr(last_ddup, '/'); char *last_d_dir = strrchr(last_ddup, '/');
if (last_d_dir != NULL) { if (last_d_dir != NULL) {
@ -1074,8 +1064,6 @@ int write_last_d(void)
} }
fwrite(cwd, strlen(cwd), sizeof(char), last_d_file); fwrite(cwd, strlen(cwd), sizeof(char), last_d_file);
fclose(last_d_file); fclose(last_d_file);
free(last_ddup);
free(last_d);
} }
return 0; return 0;
} }
@ -1122,12 +1110,11 @@ char *get_panel_string(char *prompt)
buf[buflen] = '\0'; buf[buflen] = '\0';
} }
} }
char *input = memalloc(PATH_MAX);
if (input[0] == '~') { if (buf[0] == '~')
input = replace_home(input); replace_home(buf);
}
return input; return buf;
} }
void rename_file(void) void rename_file(void)