Zoolooc

diff -Naur yacoto-0.2.1_orig/Makefile yacoto-0.2.1/Makefile--- yacoto-0.2.1_orig/Makefile	2008-10-06 20:14:20.000000000 +0200+++ yacoto-0.2.1/Makefile	2010-03-11 14:47:16.000000000 +0100@@ -22,7 +22,10 @@ TMPDIR = /tmp  ### The directory containing the conf files-YAC_CONF_DIR = /etc/vdr/plugins/yacoto+YAC_CONF_DIR ?= /etc/vdr/plugins/yacoto++### The directory containing the script files+YAC_DIR ?= $(YAC_CONF_DIR)  ### Allow user defined options to overwrite defaults: -include $(VDRDIR)/Make.config@@ -39,7 +42,7 @@  ### Includes and Defines (add further entries here): INCLUDES += -I$(VDRDIR)/include-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'+DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DYAC_DIR='"$(YAC_DIR)"'  ### The object files (add further files here): OBJS = $(PLUGIN).o yac-menurecordings.o yac-menurecinfo.o yac-menuconvert.o yac-recordings.o yac-tools.o yac-setup.odiff -Naur yacoto-0.2.1_orig/yac-recordings.c yacoto-0.2.1/yac-recordings.c--- yacoto-0.2.1_orig/yac-recordings.c	2008-12-18 19:03:12.000000000 +0100+++ yacoto-0.2.1/yac-recordings.c	2010-03-11 14:56:53.000000000 +0100@@ -11,7 +11,7 @@ #include "yac-recordings.h"  #define INDEXFILESUFFIX   "/index.vdr"-#define SCRIPT_FILE "yac_start.sh"+#define SCRIPT_FILE "/yac_start.sh"  char yacProjName[MAX_NAME_LEN]; bool yacMergeRecs;@@ -22,7 +22,7 @@    cString text;    const cComponents *Components;    cRec = (cRecording *)Recording;-   if( (name = strrchr(cRec->Name(), '~')) != NULL )+   if( (name = (char *)strrchr(cRec->Name(), '~')) != NULL )       name++;    else       name = (char *)cRec->Name();@@ -225,7 +225,7 @@    char execCmd[8192];    int baseLen = 0; -   strcpy(execCmd,AddDirectory( cPlugin::ConfigDirectory(), "yacoto/" ));+   strcpy(execCmd,YAC_DIR);    strcat(execCmd,SCRIPT_FILE);    baseLen = strlen(execCmd);    if( yacMergeRecs == true || numItems == 1 ) {diff -Naur yacoto-0.2.1_orig/yac-setup.c yacoto-0.2.1/yac-setup.c--- yacoto-0.2.1_orig/yac-setup.c	2008-10-06 19:00:00.000000000 +0200+++ yacoto-0.2.1/yac-setup.c	2010-03-11 14:42:51.000000000 +0100@@ -24,7 +24,7 @@ #define NUM_CHARS   "0123456789" #define FNAME_CHARS " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-.#~,/_@" -#define CFG_FILE "yacadmin.conf"+#define CFG_FILE "/yacadmin.conf" #define START_SCRIPT "/yac_admin.sh -start" #define INIT_SCRIPT "/yac_admin.sh -init" #define SAVE_SCRIPT "/yac_admin.sh -save"@@ -47,7 +47,7 @@    bStored = false;    strcpy(configFile,AddDirectory( cPlugin::ConfigDirectory(), "yacoto/" ));    strcat(configFile,CFG_FILE);-   strcpy(buffer,AddDirectory( cPlugin::ConfigDirectory(), "yacoto" ));+   strcpy(buffer,YAC_DIR);     strcat(buffer, START_SCRIPT);    dsyslog( "Executing <%s>", buffer );@@ -262,7 +262,7 @@    }    if( bStored ) {       char buffer[ 512 ];-      strcpy(buffer,AddDirectory( cPlugin::ConfigDirectory(), "yacoto" ));+      strcpy(buffer,YAC_DIR);       strcat(buffer, SAVE_SCRIPT);       dsyslog( "Executing <%s>", buffer );       system( buffer );diff -Naur yacoto-0.2.1_orig/yac-tools.c yacoto-0.2.1/yac-tools.c--- yacoto-0.2.1_orig/yac-tools.c	2008-10-06 19:00:00.000000000 +0200+++ yacoto-0.2.1/yac-tools.c	2010-03-11 14:42:51.000000000 +0100@@ -17,8 +17,8 @@       free(commandResult);       commandResult = NULL;    }-   strcpy(cmd,AddDirectory( cPlugin::ConfigDirectory(), "yacoto/" ));-   strcat(cmd,"yac_show_status.sh");+   strcpy(cmd,YAC_DIR);+   strcat(cmd,"/yac_show_status.sh");     dsyslog("executing command '%s'", cmd);    FILE *p = popen(cmd, "r");