Fixes #2\nFixes #3

ipk/control/control

@@ -1,5 +1,5 @@
 Package: wtfos-modloader
-Version: 0.1.1
+Version: 0.1.2
 Maintainer: Joonas Trussmann <[email protected]>
 Description: Configurable LD_PRELOAD injector for DJI services
 Architecture: armv7-3.2

modloader

@@ -1,16 +1,23 @@
 #!/system/bin/sh
 
 me=$(basename "$0")
+MODS=""
 
 if [ -d "/opt/etc/preload.d/${me}" ]
 then
-  MODS="$(find /opt/etc/preload.d/${me}/ -name "*.so" -maxdepth 1 -type l)" 
+  while read lname; do
+    #check that the link resolves to an actual file
+    if [ -f $(readlink -f ${lname}) ]; then 
+      MODS="${MODS} ${lname}"
+    fi
+  done <<< "$(find /opt/etc/preload.d/${me}/ -name \"*.so\" -maxdepth 1 -type l)"
 fi
 
 if [ ! -z "${MODS}" ]
 then
   #clear LD_PRELOAD in application env so spawns don't get spammed
-  MODS="${MODS} /opt/lib/libmodloader_final.so"
+  MODS="${MODS##*( )} /opt/lib/libmodloader_final.so"
+  echo "modloader starting with: ${MODS}"
   LD_PRELOAD="${MODS}" ${me}_original "$@"
 else 
   ${me}_original "$@"

modmanager

@@ -2,6 +2,11 @@
 
 PRELOAD_D=/opt/etc/preload.d/
 
+if [ $# -eq 0 ]; then
+    sh $0 help
+    exit 1
+fi
+
 if [ $1 = "enable" ]; then
   if [ $# -ne 3 ]; then 
     echo "illegal number of parameters"
@@ -26,7 +31,8 @@ if [ $1 = "enable" ]; then
   ln -sf "${PRELOAD_D}${modlib}" "${PRELOAD_D}${target}/${modlib}" 
 
   #this will force init to reload the service, which should auto enable it
-  killall ${target}_original || killall ${target} || true
+  killall ${target} > /dev/null 2>&1 || true
+  killall ${target}_original > /dev/null 2>&1 || true
 
 elif  [ $1 = "disable" ]; then
   if [ $# -ne 3 ]; then 
@@ -46,7 +52,8 @@ elif  [ $1 = "disable" ]; then
 
   if [[ -L "${PRELOAD_D}${target}/${modlib}" ]]; then
     rm -f "${PRELOAD_D}${target}/${modlib}"
-    killall ${target}_original || true
+    killall ${target} > /dev/null 2>&1 || true
+    killall ${target}_original > /dev/null 2>&1 || true
   else
     echo "no such mod enabled"
   fi