* for an external program that outputs GPX.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "viking.h"
#include "gpx.h"
#include "babel.h"
+#include <stdio.h>
+#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <glib.h>
+#include <glib/gstdio.h>
/* in the future we could have support for other shells (change command strings), or not use a shell at all */
#define BASH_LOCATION "/bin/bash"
gboolean ret = FALSE;
gchar *bargs = g_strconcat(babelargs, " -i gpx", NULL);
- if ((fd_src = g_file_open_tmp("tmp-viking.XXXXXX", &name_src, NULL)) < 0) {
- ret = FALSE;
- } else {
+ if ((fd_src = g_file_open_tmp("tmp-viking.XXXXXX", &name_src, NULL)) >= 0) {
f = fdopen(fd_src, "w");
a_gpx_write_file(vt, f);
fclose(f);
+ f = NULL;
ret = a_babel_convert_from ( vt, bargs, cb, name_src, user_data );
}
g_free(bargs);
- remove(name_src);
+ g_remove(name_src);
g_free(name_src);
return ret;
}
*
* returns TRUE on success
*/
+#ifdef WINDOWS
gboolean babel_general_convert_from( VikTrwLayer *vt, BabelStatusFunc cb, gchar **args, const gchar *name_dst, gpointer user_data )
{
gboolean ret;
+ FILE *f;
+ gchar *cmd;
+ gchar **args2;
+
+ STARTUPINFO si;
+ PROCESS_INFORMATION pi;
+
+
+ ZeroMemory( &si, sizeof(si) );
+ ZeroMemory( &pi, sizeof(pi) );
+ si.cb = sizeof(si);
+ si.dwFlags = STARTF_USESHOWWINDOW;
+ si.wShowWindow = SW_HIDE;
+
+ cmd = g_strjoinv( " ", args);
+ args2 = g_strsplit(cmd, "\\", 0);
+ g_free(cmd);
+ cmd = g_strjoinv( "\\\\", args2);
+ g_free(args2);
+ args2 = g_strsplit(cmd, "/", 0);
+ g_free(cmd);
+ cmd = g_strjoinv( "\\\\", args2);
+
+ if( !CreateProcess(
+ NULL, // No module name (use command line).
+ (LPTSTR)cmd, // Command line.
+ NULL, // Process handle not inheritable.
+ NULL, // Thread handle not inheritable.
+ FALSE, // Set handle inheritance to FALSE.
+ 0, // No creation flags.
+ NULL, // Use parent's environment block.
+ NULL, // Use parent's starting directory.
+ &si, // Pointer to STARTUPINFO structure.
+ &pi ) // Pointer to PROCESS_INFORMATION structure.
+ ){
+ g_warning( "CreateProcess failed");
+ ret = FALSE;
+ }
+ else {
+ WaitForSingleObject(pi.hProcess, INFINITE);
+ WaitForSingleObject(pi.hThread, INFINITE);
+
+ CloseHandle(pi.hThread);
+ CloseHandle(pi.hProcess);
+
+ if ( cb )
+ cb(BABEL_DONE, NULL, user_data);
+
+ f = g_fopen(name_dst, "r");
+ a_gpx_read_file( vt, f );
+ fclose(f);
+ ret = TRUE;
+ }
+
+ g_strfreev( args2 );
+ g_free( cmd );
+
+ return ret;
+}
+/* Windows */
+#else
+/* Posix */
+gboolean babel_general_convert_from( VikTrwLayer *vt, BabelStatusFunc cb, gchar **args, const gchar *name_dst, gpointer user_data )
+{
+ gboolean ret = FALSE;
GPid pid;
- gint babel_stdin, babel_stdout, babel_stderr;
+ GError *error = NULL;
+ gint babel_stdout;
FILE *f;
- if (!g_spawn_async_with_pipes (NULL, args, NULL, 0, NULL, NULL, &pid, &babel_stdin, &babel_stdout, &babel_stderr, NULL)) {
- // if (!g_spawn_async_with_pipes (NULL, args, NULL, 0, NULL, NULL, NULL, &babel_stdin, &babel_stdout, NULL, NULL)) {
+ if (!g_spawn_async_with_pipes (NULL, args, NULL, 0, NULL, NULL, &pid, NULL, &babel_stdout, NULL, &error)) {
+ g_warning("Error : %s", error->message);
+ g_error_free(error);
ret = FALSE;
} else {
gchar line[512];
if ( cb )
cb(BABEL_DONE, NULL, user_data);
fclose(diag);
+ diag = NULL;
waitpid(pid, NULL, 0);
g_spawn_close_pid(pid);
- f = fopen(name_dst, "r");
- a_gpx_read_file ( vt, f );
- fclose(f);
- ret = TRUE;
+ f = g_fopen(name_dst, "r");
+ if (f) {
+ a_gpx_read_file ( vt, f );
+ fclose(f);
+ f = NULL;
+ ret = TRUE;
+ }
}
return ret;
}
+#endif /* Posix */
gboolean a_babel_convert_from( VikTrwLayer *vt, const char *babelargs, BabelStatusFunc cb, const char *from, gpointer user_data )
{
gchar *cmd;
gboolean ret = FALSE;
gchar **args;
+ gint nb_args;
- if ((fd_dst = g_file_open_tmp("tmp-viking.XXXXXX", &name_dst, NULL)) < 0) {
- ret = FALSE;
- } else {
+ if ((fd_dst = g_file_open_tmp("tmp-viking.XXXXXX", &name_dst, NULL)) >= 0) {
gchar *gpsbabel_loc;
close(fd_dst);
if ( unbuffer_loc )
g_free ( unbuffer_loc );
- args = g_strsplit(cmd, " ", 0);
- ret = babel_general_convert_from ( vt, cb, args, name_dst, user_data );
- g_strfreev(args);
+ if ( g_shell_parse_argv(cmd, &nb_args, &args, NULL) ) {
+ ret = babel_general_convert_from ( vt, cb, args, name_dst, user_data );
+ g_strfreev(args);
+ }
g_free ( cmd );
}
}
- remove(name_dst);
+ g_remove(name_dst);
g_free(name_dst);
return ret;
}
gboolean ret = FALSE;
gchar **args;
- if ((fd_dst = g_file_open_tmp("tmp-viking.XXXXXX", &name_dst, NULL)) < 0) {
- ret = FALSE;
- } else {
+ if ((fd_dst = g_file_open_tmp("tmp-viking.XXXXXX", &name_dst, NULL)) >= 0) {
gchar *shell_command;
if ( input_file_type )
shell_command = g_strdup_printf("%s | gpsbabel -i %s -f - -o gpx -F %s", input_cmd, input_file_type, name_dst);
g_free ( shell_command );
}
- remove(name_dst);
+ g_remove(name_dst);
g_free(name_dst);
return ret;
}
+gboolean a_babel_convert_from_url ( VikTrwLayer *vt, const char *url, const char *input_type, BabelStatusFunc cb, gpointer user_data )
+{
+ static DownloadOptions options = {NULL, 0, a_check_html_file};
+ gint fd_src;
+ int fetch_ret;
+ gboolean ret = FALSE;
+ gchar *name_src;
+ gchar *babelargs;
+
+ g_debug("%s: input_type=%s url=%s", __FUNCTION__, input_type, url);
+
+ if ((fd_src = g_file_open_tmp("tmp-viking.XXXXXX", &name_src, NULL)) >= 0) {
+ close(fd_src);
+ g_remove(name_src);
+
+ babelargs = g_strdup_printf(" -i %s", input_type);
+
+ fetch_ret = a_http_download_get_url(url, "", name_src, &options);
+ if (fetch_ret == 0)
+ ret = a_babel_convert_from( vt, babelargs, NULL, name_src, NULL);
+
+ g_remove(name_src);
+ g_free(babelargs);
+ g_free(name_src);
+ }
+
+ return ret;
+}
+
+#ifdef WINDOWS
gboolean babel_general_convert_to( VikTrwLayer *vt, BabelStatusFunc cb, gchar **args, const gchar *name_src, gpointer user_data )
{
gboolean ret;
+ gchar *cmd;
+ gchar **args2;
+
+ if (!a_file_export(vt, name_src, FILE_TYPE_GPX)) {
+ g_warning("%s(): error exporting to %s", __FUNCTION__, name_src);
+ return(FALSE);
+ }
+
+ STARTUPINFO si;
+ PROCESS_INFORMATION pi;
+
+ ZeroMemory( &si, sizeof(si) );
+ ZeroMemory( &pi, sizeof(pi) );
+ si.cb = sizeof(si);
+ si.dwFlags = STARTF_USESHOWWINDOW;
+ si.wShowWindow = SW_HIDE;
+
+
+ cmd = g_strjoinv( " ", args);
+ args2 = g_strsplit(cmd, "\\", 0);
+ cmd = g_strjoinv( "\\\\", args2);
+ g_free(args2);
+ args2 = g_strsplit(cmd, "/", 0);
+ g_free(cmd);
+ cmd = g_strjoinv( "\\\\", args2);
+
+ if( !CreateProcess(
+ NULL, // No module name (use command line).
+ (LPTSTR)cmd, // Command line.
+ NULL, // Process handle not inheritable.
+ NULL, // Thread handle not inheritable.
+ FALSE, // Set handle inheritance to FALSE.
+ 0, // No creation flags.
+ NULL, // Use parent's environment block.
+ NULL, // Use parent's starting directory.
+ &si, // Pointer to STARTUPINFO structure.
+ &pi ) // Pointer to PROCESS_INFORMATION structure.
+ ){
+ g_warning( "CreateProcess failed" );
+ ret = FALSE;
+ }
+ else {
+
+ WaitForSingleObject(pi.hProcess, INFINITE);
+ WaitForSingleObject(pi.hThread, INFINITE);
+
+ CloseHandle(pi.hThread);
+ CloseHandle(pi.hProcess);
+
+ if ( cb )
+ cb(BABEL_DONE, NULL, user_data);
+
+ ret = TRUE;
+ }
+
+ g_strfreev(args2);
+ g_free( cmd );
+
+ return ret;
+}
+/* Windows */
+#else
+/* Posix */
+gboolean babel_general_convert_to( VikTrwLayer *vt, BabelStatusFunc cb, gchar **args, const gchar *name_src, gpointer user_data )
+{
+ gboolean ret = FALSE;
GPid pid;
- gint babel_stdin, babel_stdout, babel_stderr;
+ GError *error = NULL;
+ gint babel_stdout;
if (!a_file_export(vt, name_src, FILE_TYPE_GPX)) {
g_warning("%s(): error exporting to %s", __FUNCTION__, name_src);
return(FALSE);
}
- if (!g_spawn_async_with_pipes (NULL, args, NULL, 0, NULL, NULL, &pid, &babel_stdin, &babel_stdout, &babel_stderr, NULL)) {
+ if (!g_spawn_async_with_pipes (NULL, args, NULL, 0, NULL, NULL, &pid, NULL, &babel_stdout, NULL, &error)) {
+ g_warning("Error : %s", error->message);
+ g_error_free(error);
ret = FALSE;
} else {
gchar line[512];
if ( cb )
cb(BABEL_DONE, NULL, user_data);
fclose(diag);
+ diag = NULL;
waitpid(pid, NULL, 0);
g_spawn_close_pid(pid);
return ret;
}
+#endif /* Posix */
gboolean a_babel_convert_to( VikTrwLayer *vt, const char *babelargs, BabelStatusFunc cb, const char *to, gpointer user_data )
{
gchar *cmd;
gboolean ret = FALSE;
gchar **args;
+ gint nb_args;
- if ((fd_src = g_file_open_tmp("tmp-viking.XXXXXX", &name_src, NULL)) < 0) {
- ret = FALSE;
- } else {
+ if ((fd_src = g_file_open_tmp("tmp-viking.XXXXXX", &name_src, NULL)) >= 0) {
gchar *gpsbabel_loc;
close(fd_src);
if ( unbuffer_loc )
g_free ( unbuffer_loc );
g_debug ( "%s: %s", __FUNCTION__, cmd );
- args = g_strsplit(cmd, " ", 0);
- ret = babel_general_convert_to ( vt, cb, args, name_src, user_data );
- g_strfreev(args);
+ if ( g_shell_parse_argv(cmd, &nb_args, &args, NULL) ) {
+ ret = babel_general_convert_to ( vt, cb, args, name_src, user_data );
+ g_strfreev(args);
+ }
g_free ( cmd );
}
}
- remove(name_src);
+ g_remove(name_src);
g_free(name_src);
return ret;
}
projects / andy / viking.git / blobdiff