X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/8c0604067586d37324e75ee2939038ecde370fa1..de2fc9aa9e8db8e0258c8328161c6b5eda176a0a:/src/babel.c diff --git a/src/babel.c b/src/babel.c index 3b72537e..87493bca 100644 --- a/src/babel.c +++ b/src/babel.c @@ -33,7 +33,9 @@ #include "gpx.h" #include "babel.h" #include +#ifdef HAVE_SYS_WAIT_H #include +#endif #ifdef HAVE_UNISTD_H #include #endif @@ -51,9 +53,7 @@ gboolean a_babel_convert( VikTrwLayer *vt, const char *babelargs, BabelStatusFun 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); @@ -78,16 +78,84 @@ gboolean a_babel_convert( VikTrwLayer *vt, const char *babelargs, BabelStatusFun * * 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]; @@ -112,12 +180,12 @@ gboolean babel_general_convert_from( VikTrwLayer *vt, BabelStatusFunc cb, gchar fclose(f); f = NULL; ret = TRUE; - } else - ret = FALSE; + } } return ret; } +#endif /* Posix */ gboolean a_babel_convert_from( VikTrwLayer *vt, const char *babelargs, BabelStatusFunc cb, const char *from, gpointer user_data ) { @@ -126,10 +194,9 @@ gboolean a_babel_convert_from( VikTrwLayer *vt, const char *babelargs, BabelStat 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); @@ -148,9 +215,10 @@ gboolean a_babel_convert_from( VikTrwLayer *vt, const char *babelargs, BabelStat 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 ); } } @@ -173,9 +241,7 @@ gboolean a_babel_convert_from_shellcommand ( VikTrwLayer *vt, const char *input_ 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); @@ -201,18 +267,117 @@ gboolean a_babel_convert_from_shellcommand ( VikTrwLayer *vt, const char *input_ 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]; @@ -236,6 +401,7 @@ gboolean babel_general_convert_to( VikTrwLayer *vt, BabelStatusFunc cb, gchar ** return ret; } +#endif /* Posix */ gboolean a_babel_convert_to( VikTrwLayer *vt, const char *babelargs, BabelStatusFunc cb, const char *to, gpointer user_data ) { @@ -244,10 +410,9 @@ gboolean a_babel_convert_to( VikTrwLayer *vt, const char *babelargs, BabelStatus 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); @@ -266,9 +431,10 @@ gboolean a_babel_convert_to( VikTrwLayer *vt, const char *babelargs, BabelStatus 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 ); } }