SOLIB = libpnd.so.1 # canonicle name
SOLIB1 = libpnd.so.1.0.1 # versioned name
XMLOBJ = lib/tinyxml/tinystr.o lib/tinyxml/tinyxml.o lib/tinyxml/tinyxmlerror.o lib/tinyxml/tinyxmlparser.o
-ALLOBJ = pnd_conf.o pnd_container.o pnd_discovery.o pnd_pxml.o pnd_notify.o pnd_locate.o pnd_tinyxml.o pnd_pndfiles.o
+ALLOBJ = pnd_conf.o pnd_container.o pnd_discovery.o pnd_pxml.o pnd_notify.o pnd_locate.o pnd_tinyxml.o pnd_pndfiles.o pnd_apps.o
all: ${SOLIB} ${LIB} conftest discotest notifytest locatetest pndnotifyd
clean:
${RM} -f ${ALLOBJ} ${XMLOBJ} ${LIB} ${SOLIB1} locatetest.o bin/locatetest conftest.o bin/conftest discotest.o bin/discotest bin/notifytest notifytest.o bin/pndnotifyd pndnotifyd.o ${SOLIB} testdata/dotdesktop/*.desktop
+ find . -name "*~*" -exec rm {} \; -print
libpnd.a: ${ALLOBJ} ${XMLOBJ}
${AR} r ${LIB} ${ALLOBJ} ${XMLOBJ}
Some things to be done..
+- put in code to fetch clock speed, and add clock speed handler to pnd_apps_exec
+
+- remove -u's from pnd_apps_exec and pnd_emit_dotdesktop
+
- replace brute force memcmp() in pnd pnd with a fancy pants CS alg
- review pnd_tinyxml to ensure the PXML_FILENAME is csae insensitive as needed
#include "pnd_notify.h"
#include "../lib/pnd_pathiter.h"
#include "pnd_discovery.h"
+#include "pnd_locate.h"
static unsigned char g_daemon_mode = 0;
// behaviour
unsigned char scanonlaunch = 1;
unsigned int interval_secs = 20;
+ // pnd runscript
+ char *run_searchpath;
+ char *run_script;
+ char *pndrun;
// misc
int i;
dotdesktoppath = PND_DOTDESKTOP_DEFAULT;
}
+ // try to locate a runscript
+
+ if ( apph ) {
+ run_searchpath = pnd_conf_get_as_char ( apph, PND_PNDRUN_SEARCHPATH_KEY );
+ run_script = pnd_conf_get_as_char ( apph, PND_PNDRUN_KEY );
+ pndrun = NULL;
+
+ if ( ! run_searchpath ) {
+ run_searchpath = PND_APPS_SEARCHPATH;
+ run_script = PND_PNDRUN_FILENAME;
+ }
+
+ } else {
+ run_searchpath = NULL;
+ run_script = NULL;
+ pndrun = PND_PNDRUN_DEFAULT;
+ }
+
+ if ( ! pndrun ) {
+ pndrun = pnd_locate_filename ( run_searchpath, run_script );
+
+ if ( ! pndrun ) {
+ pndrun = PND_PNDRUN_DEFAULT;
+ }
+
+ }
+
+ if ( ! g_daemon_mode ) {
+ if ( run_searchpath ) printf ( "Locating pnd run in %s\n", run_searchpath );
+ if ( run_script ) printf ( "Locating pnd runscript as %s\n", run_script );
+ if ( pndrun ) printf ( "Default pndrun is %s\n", pndrun );
+ }
+
/* startup
*/
}
// create the .desktop file
- if ( pnd_emit_dotdesktop ( dotdesktoppath, d ) ) {
+ if ( pnd_emit_dotdesktop ( dotdesktoppath, pndrun, d ) ) {
// add a watch onto the newly created .desktop?
#if 0
char buffer [ FILENAME_MAX ];
#define PND_APPS_SEARCHPATH "/mnt/sd1/pandora/apps:/mnt/sd2/pandora/apps:./testdata/apps"
#define PND_APPS_KEY "autodiscovery.searchpath"
-#define PND_PNDRUN_SEARCHPATH "pnd.searchpath"
-#define PND_PNDRUN_KEY "pnd.default"
+#define PND_PNDRUN_SEARCHPATH_KEY "pnd.searchpath"
+#define PND_PNDRUN_KEY "pnd.runscript"
#define PND_PNDRUN_FILENAME "pnd_run.sh"
#define PND_PNDRUN_DEFAULT "./testdata/scripts/pnd_run.sh"
/* pnd_apps_exec() is used to blindly launch an app, be it a .pnd file bundle or a plain executable
* (shell, bin, whatever.) pndrun specifies the full path to the pnd_run sh script, which should be
* found using searchpaths and locates.. see locatetest.c for a sample
- * if fullpath ends in PXML_FILENAME (PXML.xml) then pnd_run will be invoked (after extracting goodies
- * from PXML file as appropriate)
- * if fullpath ends in .pnd then pnd_run will be invoked (after inspecting embedded PXML or best-guess)
- * otherwise the fullpath will be executed as-is
+ * NOTE: Use pnd_locate function to locate the pnd_run, for example
+ * NOTE: clock speed will be set prior to invoking the script, and set back on exit
+ * NOTE: No values can be except clockspeed; a 0 clockspeed means 'leave alone'. Set startdoir to "." instead of NULL.
+ * fork() is implied; calling this function does not kill this process :)
*/
-signed char pnd_apps_exec ( char *fullpath, char *pndrun );
+unsigned char pnd_apps_exec ( char *pndrun, char *fullpath, char *unique_id, char *rel_exec, char *rel_startdir, unsigned int clockspeed );
#ifdef __cplusplus
} /* "C" */
// emit_dotdesktop() will determine a filename and create a FILENAME.desktop file in the targetpath
// TODO: Copy the icon into this directory as well, if its source is a .pnd or info is in the dico struct
-unsigned char pnd_emit_dotdesktop ( char *targetpath, pnd_disco_t *p );
+unsigned char pnd_emit_dotdesktop ( char *targetpath, char *pndrun, pnd_disco_t *p );
// TODO: A way to release the disco-lists and reclaim RAM :)
--- /dev/null
+
+#include <stdio.h> /* for FILE etc */
+#include <stdlib.h> /* for malloc */
+#include <string.h> /* for memset */
+#include <unistd.h> /* for fork/exec */
+
+#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 ) {
+ char *argv [ 20 ];
+ int f, i;
+
+ printf ( "Entering pnd_apps_exec\n" );
+#if 0
+ printf ( " runscript: %s\n", pndrun );
+ printf ( " path: %s\n", fullpath );
+ printf ( " id: %s\n", unique_id );
+ printf ( " exec: %s\n", rel_exec );
+ printf ( " cwd: %s\n", rel_startdir );
+ printf ( " clock: %u\n", clockspeed );
+#endif
+
+ memset ( argv, '\0', sizeof(char*) * 20 );
+
+ f = 0;
+ argv [ f++ ] = pndrun;
+ argv [ f++ ] = "-p";
+ argv [ f++ ] = fullpath;
+ argv [ f++ ] = "-e";
+ argv [ f++ ] = rel_exec;
+ // skip -a (arguments) for now
+
+ //argv [ f++ ] = "-b";
+ //argv [ f++ ] = baename;
+
+ argv [ f++ ] = "-u"; // no union for now
+ argv [ f++ ] = NULL; // for execv
+
+ // debug
+#if 0
+ for ( i = 0; i < f; i++ ) {
+ printf ( "exec's argv %u [ %s ]\n", i, argv [ i ] );
+ }
+#endif
+
+ // invoke it!
+
+ if ( ( f = fork() ) < 0 ) {
+ // error forking
+ } else if ( f > 0 ) {
+ // parent
+ } else {
+ // child, do it
+ execv ( pndrun, argv );
+ }
+
+ printf ( "Exiting pnd_apps_exec\n" );
+
+ return ( 1 );
+}
// check for validity and add to resultset if it looks executable
if ( pnd_is_pxml_valid_app ( pxmlh ) ) {
pnd_disco_t *p;
+ char *fixpxml;
p = pnd_box_allocinsert ( disco_box, (char*) fpath, sizeof(pnd_disco_t) );
// base path
p -> path_to_object = strdup ( fpath );
+ if ( ( fixpxml = strcasestr ( p -> path_to_object, PXML_FILENAME ) ) ) {
+ *fixpxml = '\0'; // if this is not a .pnd, lop off the PXML.xml at the end
+ }
+
// PXML fields
if ( pnd_pxml_get_app_name_en ( pxmlh ) ) {
p -> title_en = strdup ( pnd_pxml_get_app_name_en ( pxmlh ) );
return ( disco_box );
}
-unsigned char pnd_emit_dotdesktop ( char *targetpath, pnd_disco_t *p ) {
+unsigned char pnd_emit_dotdesktop ( char *targetpath, char *pndrun, pnd_disco_t *p ) {
char filename [ FILENAME_MAX ];
char buffer [ 1024 ];
FILE *f;
#endif
if ( p -> exec ) {
- snprintf ( buffer, 1020, "Exec=%s\n", p -> exec );
+ snprintf ( buffer, 1020, "Exec=%s -p %s -e %s -u\n", pndrun, p -> path_to_object, p -> exec );
fprintf ( f, "%s", buffer );
}
while ( 1 ) {
- printf ( "find pxml; pos %u readable %u\n", pos, readable );
+ //printf ( "find pxml; pos %u readable %u\n", pos, readable );
// seek into this blocks position
fseek ( f, pos, SEEK_SET );
// performing brute force strategy here.
if ( ( match = pnd_match_binbuf ( b, readable, PXML_TAGHEAD ) ) ) {
fseek ( f, pos + ( match - b ), SEEK_SET );
- printf ( " match found at %u\n", pos + ( match - b ) );
+ //printf ( " match found at %u\n", pos + ( match - b ) );
free ( b );
return ( 1 );
}
#include "pnd_apps.h"
#include "pnd_pxml.h"
#include "pnd_discovery.h"
+#include "pnd_locate.h"
int main ( void) {
char *configpath;
printf ( "No applications found in search path\n" );
}
+ // lets toy with executing an application
+ char *run_searchpath;
+ char *run_script;
+ char *pndrun;
+
+ if ( apph ) {
+ run_searchpath = pnd_conf_get_as_char ( apph, PND_PNDRUN_SEARCHPATH_KEY );
+ run_script = pnd_conf_get_as_char ( apph, PND_PNDRUN_KEY );
+ pndrun = NULL;
+
+ if ( ! run_searchpath ) {
+ run_searchpath = PND_APPS_SEARCHPATH;
+ run_script = PND_PNDRUN_FILENAME;
+ }
+
+ } else {
+ run_searchpath = NULL;
+ run_script = NULL;
+ pndrun = PND_PNDRUN_DEFAULT;
+ }
+
+ if ( ! pndrun ) {
+ pndrun = pnd_locate_filename ( run_searchpath, run_script );
+ }
+
+ if ( run_searchpath ) printf ( "Locating pnd run in %s\n", run_searchpath );
+ if ( run_script ) printf ( "Locating pnd runscript as %s\n", run_script );
+ if ( pndrun ) printf ( "Default pndrun is %s\n", pndrun );
+
+ if ( ! pndrun ) {
+ printf ( "*** Couldn't locate a pnd runscript.\n" );
+ } else {
+ printf ( "Found a pnd runscript of %s\n", pndrun );
+
+ pnd_disco_t *d = pnd_box_get_head ( applist );
+ if ( d ) {
+ d = pnd_box_get_next ( d );
+
+ if ( d ) {
+ pnd_apps_exec ( pndrun, d -> path_to_object, d -> unique_id, d -> exec, d -> startdir, atoi ( d -> clockspeed ) );
+ }
+ }
+
+ }
+
// exeunt with alarums
free ( configpath );
if ( apph ) {
apph = pnd_conf_fetch_by_id ( pnd_conf_apps, configpath );
if ( apph ) {
- pndpath = pnd_conf_get_as_char ( apph, PND_PNDRUN_SEARCHPATH );
+ pndpath = pnd_conf_get_as_char ( apph, PND_PNDRUN_SEARCHPATH_KEY );
printf ( "Found a path in apps config: '%s'\n", pndpath );
if ( ! pndpath ) {
- pndpath = PND_PNDRUN_SEARCHPATH;
+ pndpath = PND_PNDRUN_SEARCHPATH_KEY;
}
} else {
// couldn't find a useful app search path so use the default
- pndpath = PND_PNDRUN_SEARCHPATH;
+ pndpath = PND_PNDRUN_SEARCHPATH_KEY;
}
// given a searchpath (Default or configured), try to find pnd_run.sh; if not
# [pnd] defines where to locate the pnd support scripts, so the user may override pnd_run.sh without clobbering built in
[pnd]
searchpath /mnt/sd1/pandora/scripts:/mnt/sd2/pandora/scripts:./testdata/scripts
-default pndrun.sh
+runscript pnd_run.sh
<build>2</build>
</version>
-<exec>program.exe</exec>
+<exec>./my_ls</exec>
<category>
<main>Main category</main>
#detect fs
if [ $DFS = ISO ]; then
- mntline="mount -o loop $PND /mnt/pnd/$BASENAME"
+ mntline="mount -o loop,exec,umask=777 $PND /mnt/pnd/$BASENAME"
echo "Filetype is $DFS"
elif [ $DFS = Zip ]; then
mntline="fuse-zip $PND /mnt/pnd/$BASENAME -oro" #should be reight now
$mntline #mount the pnd/folder
#mount -t unionfs -o exec,dirs\=$MOUNTPOINT/appdata/$BASENAME=rw:/mnt/pnd/$BASENAME=ro unionfs /mnt/utmp/$BASENAME #union mount
#aufs, one of those should work, bit unsure.
- mount -t aufs -o exec,dirs\=$MOUNTPOINT/appdata/$BASENAME=rw:/mnt/pnd/$BASENAME=ro none /mnt/utmp/$BASENAME #aufs?
+ mount -t aufs -o exec,umask=777,dirs\=$MOUNTPOINT/appdata/$BASENAME=rw:/mnt/pnd/$BASENAME=ro none /mnt/utmp/$BASENAME #aufs?
#mount -t aufs -o exec,dirs\=$MOUNTPOINT/appdata/$BASENAME=rw:/mnt/pnd/$BASENAME=ro aufs /mnt/utmp/$BASENAME #aufs?
"
else
git.openpandora.org / pandora-libraries.git / commitdiff