mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2024-12-28 22:25:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move file based detection into separate function

Browse source
This commit is contained in:
Sebastian Ramacher 2014-01-06 01:18:56 +01:00
parent ecf090b9b1
commit 5d2666daf5
1 changed files with 37 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
document.c
View file

@ -708,11 +708,47 @@ cleanup:
return mime_type; return mime_type;
} }
static const char*
guess_type_file(const char* UNUSED(path))
{
return NULL;
}
#else #else
static const char* static const char*
guess_type_magic(const char* UNUSED(path)) { guess_type_magic(const char* UNUSED(path)) {
return NULL; return NULL;
} }
static const char*
guess_type_file(const char* path)
{
GString* command = g_string_new("file -b --mime-type ");
char* tmp = g_shell_quote(path);
g_string_append(command, tmp);
g_free(tmp);
GError* error = NULL;
char* out = NULL;
int ret = 0;
g_spawn_command_line_sync(command->str, &out, NULL, &ret, &error);
g_string_free(command, TRUE);
if (error != NULL) {
girara_warning("failed to execute command: %s", error->message);
g_error_free(error);
g_free(out);
return NULL;
}
if (WEXITSTATUS(ret) != 0) {
girara_warning("file failed with error code: %d", WEXITSTATUS(ret));
g_free(out);
return NULL;
}
g_strdelimit(out, "\n\r", '\0');
return out;
}
#endif #endif
static const char* static const char*
@ -777,38 +813,8 @@ guess_type(const char* path)
if (content_type != NULL) { if (content_type != NULL) {
return content_type; return content_type;
} }
#ifdef WITH_MAGIC
return NULL;
#else
/* and if libmagic is not available, try file as last resort */ /* and if libmagic is not available, try file as last resort */
girara_debug("falling back to file"); return guess_type_file(path);
GString* command = g_string_new("file -b --mime-type ");
char* tmp = g_shell_quote(path);
g_string_append(command, tmp);
g_free(tmp);
GError* error = NULL;
char* out = NULL;
int ret = 0;
g_spawn_command_line_sync(command->str, &out, NULL, &ret, &error);
g_string_free(command, TRUE);
if (error != NULL) {
girara_warning("failed to execute command: %s", error->message);
g_error_free(error);
g_free(out);
return NULL;
}
if (WEXITSTATUS(ret) != 0) {
girara_warning("file failed with error code: %d", WEXITSTATUS(ret));
g_free(out);
return NULL;
}
g_strdelimit(out, "\n\r", '\0');
return out;
#endif
} }
zathura_plugin_t* zathura_plugin_t*