Cursors!

[andy/viking.git] / src / babel.c

diff --git a/src/babel.c b/src/babel.c
index c89d34934ab0fdde3117fed877c827a7de1ec7ce..62a608b8694953420db1b86a487ff07d2b7836e8 100644 (file)
--- a/src/babel.c
+++ b/src/babel.c
@@ -22,7 +22,7 @@
 #include "viking.h"
 #include "gpx.h"
 #include "babel.h"
-#include "sys/wait.h"
+#include <sys/wait.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"
@@ -33,7 +33,7 @@ gboolean a_babel_convert( VikTrwLayer *vt, const char *babelargs, BabelStatusFun
   FILE *f;
   gchar *name_src;
   gboolean ret = FALSE;
-  gchar *bargs = g_strconcat(babelargs, " -i gpx");
+  gchar *bargs = g_strconcat(babelargs, " -i gpx", NULL);
 
   if ((fd_src = g_file_open_tmp("tmp-viking.XXXXXX", &name_src, NULL)) < 0) {
     ret = FALSE;
@@ -105,7 +105,7 @@ gboolean a_babel_convert_from( VikTrwLayer *vt, const char *babelargs, BabelStat
     if (gpsbabel_loc ) {
       gchar *unbuffer_loc = g_find_program_in_path("unbuffer");
       cmd = g_strdup_printf ( "%s%s%s %s -o gpx %s %s",
-                             unbuffer_loc,
+                             unbuffer_loc ? unbuffer_loc : "",
                              unbuffer_loc ? " " : "",
                              gpsbabel_loc,
                              babelargs,
@@ -138,7 +138,7 @@ gboolean a_babel_convert_from_shellcommand ( VikTrwLayer *vt, const char *input_
     ret = FALSE;
   } else {
     gchar *shell_command = g_strdup_printf("%s | gpsbabel -i %s -f - -o gpx -F %s", input_cmd, input_type, name_dst);
-    printf("%s\n", shell_command);
+    g_debug("%s: %s", __FUNCTION__, shell_command);
     close(fd_dst);
 
     args = g_malloc(sizeof(gchar *)*4);
@@ -157,3 +157,78 @@ gboolean a_babel_convert_from_shellcommand ( VikTrwLayer *vt, const char *input_
   return ret;
 }
 
+gboolean babel_general_convert_to( VikTrwLayer *vt, BabelStatusFunc cb, gchar **args, const gchar *name_src, gpointer user_data )
+{
+  gboolean ret;
+  GPid pid;
+  gint babel_stdin, babel_stdout, babel_stderr;
+
+  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)) {
+    ret = FALSE;
+  } else {
+    gchar line[512];
+    FILE *diag;
+    diag = fdopen(babel_stdout, "r");
+    setvbuf(diag, NULL, _IONBF, 0);
+
+    while (fgets(line, sizeof(line), diag)) {
+      if ( cb )
+        cb(BABEL_DIAG_OUTPUT, line, user_data);
+    }
+    if ( cb )
+      cb(BABEL_DONE, NULL, user_data);
+    fclose(diag);
+    waitpid(pid, NULL, 0);
+    g_spawn_close_pid(pid);
+
+    ret = TRUE;
+  }
+    
+  return ret;
+}
+
+gboolean a_babel_convert_to( VikTrwLayer *vt, const char *babelargs, BabelStatusFunc cb, const char *to, gpointer user_data )
+{
+  int fd_src;
+  gchar *name_src;
+  gchar *cmd;
+  gboolean ret = FALSE;
+  gchar **args;  
+
+  if ((fd_src = g_file_open_tmp("tmp-viking.XXXXXX", &name_src, NULL)) < 0) {
+    ret = FALSE;
+  } else {
+    gchar *gpsbabel_loc;
+    close(fd_src);
+
+    gpsbabel_loc = g_find_program_in_path("gpsbabel");
+
+    if (gpsbabel_loc ) {
+      gchar *unbuffer_loc = g_find_program_in_path("unbuffer");
+      cmd = g_strdup_printf ( "%s%s%s %s -i gpx %s %s",
+                             unbuffer_loc ? unbuffer_loc : "",
+                             unbuffer_loc ? " " : "",
+                             gpsbabel_loc,
+                             babelargs,
+                             name_src,
+                             to);
+
+      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);
+      g_free ( cmd );
+    }
+  }
+
+  remove(name_src);
+  g_free(name_src);
+  return ret;
+}