-O2 related refactoring
This commit is contained in:
@ -22,9 +22,13 @@ char* get_mimetype(char *path){
|
||||
FILE *cmd_open = popen(cmd, "r");
|
||||
char *line;
|
||||
size_t size = 0;
|
||||
getline(&line, &size, cmd_open);
|
||||
pclose(cmd_open);
|
||||
return line;
|
||||
if (getline(&line, &size, cmd_open) != -1){
|
||||
pclose(cmd_open);
|
||||
return line;
|
||||
} else {
|
||||
pclose(cmd_open);
|
||||
return "unknown";
|
||||
}
|
||||
}
|
||||
char* preview_file(file *file_current){
|
||||
/* this calls "file" on path */
|
||||
@ -47,10 +51,12 @@ char* text(char *path, unsigned long *file_size){
|
||||
|
||||
char *file_buffer = malloc(*file_size + 1);
|
||||
FILE *fp = fopen(path, "r");
|
||||
fread(file_buffer, *file_size, 1, fp);
|
||||
file_buffer[*file_size] = '\0';
|
||||
|
||||
return file_buffer;
|
||||
if (fread(file_buffer, *file_size, 1, fp) != 0) {
|
||||
file_buffer[*file_size] = '\0';
|
||||
return file_buffer;
|
||||
} else {
|
||||
return "failed reading file";
|
||||
}
|
||||
}
|
||||
char* generic(char *path){
|
||||
char *cmd = concat("file ./\"", path);
|
||||
@ -59,7 +65,11 @@ char* generic(char *path){
|
||||
FILE *cmd_open = popen(cmd, "r");
|
||||
char *line;
|
||||
size_t size = 0;
|
||||
getline(&line, &size, cmd_open);
|
||||
pclose(cmd_open);
|
||||
return line;
|
||||
if (getline(&line, &size, cmd_open) != -1) {
|
||||
pclose(cmd_open);
|
||||
return line;
|
||||
} else {
|
||||
pclose(cmd_open);
|
||||
return "failed executing shell command \"file\"";
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user