From e57d627cb7322af663039434905cfa04f1da5eb5 Mon Sep 17 00:00:00 2001 From: skeezix Date: Wed, 1 Apr 2009 09:55:10 -0400 Subject: [PATCH] Added -b UNIQUEID to both .desktop and to pnd_app_exec() -- why don't these two things share common code? Added /usr/bin/nohup to .desktop Need to figure out when to use -x to pnd_run to kill X11 --- lib/pnd_apps.c | 6 +++--- lib/pnd_desktop.c | 6 ++++-- testdata/pndsample/x86_echo.pnd | Bin 387644 -> 387644 bytes testdata/pndsample/x86_ls.pnd | Bin 488547 -> 488547 bytes 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/pnd_apps.c b/lib/pnd_apps.c index 4a2cf94..d2d2ce6 100644 --- a/lib/pnd_apps.c +++ b/lib/pnd_apps.c @@ -57,10 +57,10 @@ unsigned char pnd_apps_exec ( char *pndrun, char *fullpath, char *unique_id, argv [ f++ ] = "-s"; argv [ f++ ] = rel_startdir; } - // skip -a (arguments) for now + argv [ f++ ] = "-b"; + argv [ f++ ] = unique_id; - //argv [ f++ ] = "-b"; - //argv [ f++ ] = baename; + // skip -a (arguments) for now if ( options & PND_EXEC_OPTION_NOUNION ) { argv [ f++ ] = "-n"; // no union for now diff --git a/lib/pnd_desktop.c b/lib/pnd_desktop.c index 0868629..0c91c74 100644 --- a/lib/pnd_desktop.c +++ b/lib/pnd_desktop.c @@ -84,9 +84,11 @@ unsigned char pnd_emit_dotdesktop ( char *targetpath, char *pndrun, pnd_disco_t // basics if ( p -> object_type == pnd_object_type_directory ) { - snprintf ( buffer, 1020, "Exec=%s -p %s -e %s -n", pndrun, p -> object_path, p -> exec ); + snprintf ( buffer, 1020, "Exec=/usr/bin/nohup %s -p %s -e %s -b %s -n", + pndrun, p -> object_path, p -> exec, p -> unique_id ); } else if ( p -> object_type == pnd_object_type_pnd ) { - snprintf ( buffer, 1020, "Exec=%s -p %s/%s -e %s -n", pndrun, p -> object_path, p -> object_filename, p -> exec ); + snprintf ( buffer, 1020, "Exec=/usr/bin/nohup %s -p %s/%s -e %s -b %s -n", + pndrun, p -> object_path, p -> object_filename, p -> exec, p -> unique_id ); } // start dir diff --git a/testdata/pndsample/x86_echo.pnd b/testdata/pndsample/x86_echo.pnd index d3891db1497566be4d85424230ce2c80932d45c3..1bddde2ccaad9b0643d9a8b52c6854621f7fa9f3 100644 GIT binary patch delta 110 zcmdmUMSRZ{@eM}JQYHq529`z^h9(9EAB+qPEDhiSlYN>cIpMs`dCj_}tSpS2GJKO4 j?64FDvp(b^Q_XL7w7=QG2*gZ4%nZaV+u!V94KM@%3=boo delta 110 zcmdmUMSRZ{@eM}JQpQFmMusLP#^weFAB+qPEDhiSlYN>cIpMs`dCj_}tjrRkI;xWw j?64FDvp(b^Q_XL7w7=QG2*gZ4%nZaV+u!V94KM@%IT|Fz diff --git a/testdata/pndsample/x86_ls.pnd b/testdata/pndsample/x86_ls.pnd index 1cc6c85866065dffc420aa5b29174111f9501aef..db323e14d4a1ad8d9b1345a4016a2bba5a9aa05d 100644 GIT binary patch delta 114 zcmaF-LiX_s*$qa`QYHq529`z^h9(9EAB+qPEDhiSlYN>cIpMs`dCj_}tSpS2GJKO4 l?64FDvp(b^Q_XL7w7=QG2*gZ4%nZaVK+L-R%?`Hm-2mJ)CjtNf delta 114 zcmaF-LiX_s*$qa`QpQFmMusLP#^weFAB+qPEDhiSlYN>cIpMs`dCj_}tjrRkI;xWw l?64FDvp(b^Q_XL7w7=QG2*gZ4%nZaVK+L-R%?`Hm-2e^hC@BB{ -- 2.39.5