Merge branch 'master' of git://git.openpandora.org/pandora-libraries

[pandora-libraries.git] / lib / pnd_apps.c

diff --git a/lib/pnd_apps.c b/lib/pnd_apps.c
index 35b1565..72a251d 100644 (file)
--- a/lib/pnd_apps.c
+++ b/lib/pnd_apps.c
@@ -4,15 +4,38 @@
 #include <string.h> /* for memset */
 #include <unistd.h> /* for fork/exec */
 
+#include <sys/types.h> /* for wait */
+#include <sys/wait.h> /* for wait */
+
 #include "pnd_container.h"
 #include "pnd_pxml.h"
 #include "pnd_apps.h"
 
-unsigned char pnd_apps_exec ( char *pndrun, char *fullpath, char *unique_id, char *rel_exec, char *rel_startdir, unsigned int clockspeed ) {
+unsigned char pnd_apps_exec ( char *pndrun, char *fullpath, char *unique_id,
+                             char *rel_exec, char *rel_startdir,
+                             unsigned int clockspeed, unsigned int options )
+{
   char *argv [ 20 ];
   int f;
 
-  printf ( "Entering pnd_apps_exec\n" );
+  //printf ( "Entering pnd_apps_exec\n" );
+
+  if ( ! pndrun ) {
+    return ( 0 );
+  }
+
+  if ( ! fullpath ) {
+    return ( 0 );
+  }
+
+  if ( ! unique_id ) {
+    return ( 0 );
+  }
+
+  if ( ! rel_exec ) {
+    return ( 0 );
+  }
+
 #if 0
   printf ( "  runscript: %s\n", pndrun );
   printf ( "  path: %s\n", fullpath );
@@ -30,12 +53,24 @@ unsigned char pnd_apps_exec ( char *pndrun, char *fullpath, char *unique_id, cha
   argv [ f++ ] = fullpath;
   argv [ f++ ] = "-e";
   argv [ f++ ] = rel_exec;
+  if ( rel_startdir ) {
+    argv [ f++ ] = "-s";
+    argv [ f++ ] = rel_startdir;
+  }
+  argv [ f++ ] = "-b";
+  argv [ f++ ] = unique_id;
+
   // skip -a (arguments) for now
 
-  //argv [ f++ ] = "-b";
-  //argv [ f++ ] = baename;
+  if ( options & PND_EXEC_OPTION_NOUNION ) {
+    argv [ f++ ] = "-n"; // no union for now
+  }
+
+  if ( options & PND_EXEC_OPTION_NOX11 ) {
+    argv [ f++ ] = "-x"; // no union for now
+  }
 
-  argv [ f++ ] = "-u"; // no union for now
+  // finish
   argv [ f++ ] = NULL; // for execv
 
   // debug
@@ -57,7 +92,74 @@ unsigned char pnd_apps_exec ( char *pndrun, char *fullpath, char *unique_id, cha
     execv ( pndrun, argv );
   } 
 
-  printf ( "Exiting pnd_apps_exec\n" );
+  // by definition, either error occurred or we are the original application.
+
+  // do we wish to wait until the child process completes? (we don't
+  // care if it crashed, was killed, was suspended, whatever.)
+  if ( options & PND_EXEC_OPTION_BLOCK ) {
+    int status = 0;
+    //waitpid ( f, &status. 0 /* no options */ );
+    wait ( &status );
+  }
+
+  // printf ( "Exiting pnd_apps_exec\n" );
+
+  return ( 1 );
+}
+
+void pnd_get_ro_mountpoint ( char *fullpath, char *unique_id, char *r_mountpoint, unsigned int mountpoint_len ) {
+
+  if ( ! r_mountpoint ) {
+    return; // sillyness
+  }
+
+  snprintf ( r_mountpoint, mountpoint_len, "%s/%s/", PND_MOUNT_PATH, unique_id );
+
+  return;
+}
+
+unsigned char pnd_get_appdata_path ( char *fullpath, char *unique_id, char *r_path, unsigned int path_len ) {
+  // you know, determining the 'mount point' used is sort of a pain in the rear
+  // use df <file>, skip header line, grab first token. Cheap and should work.
+  // (Rather than just assume first two path chunks in path, say, which would be pretty darned
+  // accurate, but whose to say they're not using NFS or crazy mountpoints?)
+  FILE *df;
+  char cmdbuf [ 1024 ];
+
+  snprintf ( cmdbuf, 1023, "/bin/df %s", fullpath );
+
+  df = popen ( cmdbuf, "r" );
+
+  if ( ! df ) {
+    return ( 0 ); // tunefs: you can tune a filesystem but you can't tune a fish
+  }
+
+  // fetch and discard header
+  if ( ! fgets ( cmdbuf, 1023, df ) ) {
+    pclose ( df );
+    return ( 0 );
+  }
+
+  // grab df result line
+  if ( ! fgets ( cmdbuf, 1023, df ) ) {
+    pclose ( df );
+    return ( 0 );
+  }
+
+  pclose ( df );
+
+  // parse
+  char *ws = strchr ( cmdbuf, ' ' );
+
+  if ( ! ws ) {
+    return ( 0 );
+  }
+
+  *ws = '\0';
+
+  if ( r_path && path_len ) {
+    snprintf ( r_path, path_len, "%s/appdata/%s/", cmdbuf, unique_id );
+  }
 
   return ( 1 );
 }