From 0e7005fcc7483c01aa102fbea358c5ac65a48d62 Mon Sep 17 00:00:00 2001
From: root <root@elwms02.(none)>
Date: Tue, 6 Apr 2010 16:13:08 +0200
Subject: hello world

---
 plugins/submenu/MainMenu.conf              | 57 +++++++++++++++++++++
 plugins/submenu/patches/submenu-0.0.2.diff | 82 ++++++++++++++++++++++++++++++
 plugins/submenu/plugin.sh                  | 54 ++++++++++++++++++++
 plugins/submenu/submenu-0.0.2.diff         | 82 ++++++++++++++++++++++++++++++
 4 files changed, 275 insertions(+)
 create mode 100644 plugins/submenu/MainMenu.conf
 create mode 100644 plugins/submenu/patches/submenu-0.0.2.diff
 create mode 100644 plugins/submenu/plugin.sh
 create mode 100644 plugins/submenu/submenu-0.0.2.diff

(limited to 'plugins/submenu')

diff --git a/plugins/submenu/MainMenu.conf b/plugins/submenu/MainMenu.conf
new file mode 100644
index 0000000..5fbbb7d
--- /dev/null
+++ b/plugins/submenu/MainMenu.conf
@@ -0,0 +1,57 @@
+0:0:Schedule
+0:0:Channels
+0:1:Info&EPG
+0:2:Recorder
+0:3:Media
+0:4:Extras
+1:0:tvonscreen
+1:0:nordlichtsepg
+1:0:Schedule
+1:0:epgsearch
+1:0:yaepg
+1:0:noepgmenu
+1:0:director
+1:0:pilot
+1:0:pilotskin
+1:0:osdteletext
+1:0:fussball
+1:0:newsticker
+1:0:weatherng
+2:0:Timers
+2:0:Recordings
+2:0:extrecmenu
+2:0:burn
+2:0:vdrrip
+2:0:recstatus
+2:0:audiorecorder
+3:0:cdda
+3:0:dvd
+3:0:dvdselect
+3:0:dvdswitch
+3:0:mplayer
+3:0:muggle
+3:0:image
+3:0:digicam
+3:0:radio
+3:0:freecell
+3:0:games
+3:0:solitaire
+3:0:sudoku
+4:0:pin
+4:0:filebrowser
+4:0:femon
+4:0:chanorg
+4:0:reelchannelscan
+4:0:rotor
+4:0:sleeptimer
+4:0:screenshot
+0:0:osdpip
+0:0:mp3
+0:0:mp3ng
+0:0:music
+0:0:vdrcd
+0:0:dxr3
+0:0:softdevice
+0:0:xineliboutput
+0:0:Setup
+0:0:Commands
diff --git a/plugins/submenu/patches/submenu-0.0.2.diff b/plugins/submenu/patches/submenu-0.0.2.diff
new file mode 100644
index 0000000..d5ab305
--- /dev/null
+++ b/plugins/submenu/patches/submenu-0.0.2.diff
@@ -0,0 +1,82 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_asprintf.dpatch by Tobias Grimm <tg@e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes wrong usage of asprintf and correctly free's memory allocated by it.
+
+@DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./submenu-setup.c /tmp/dpep-work.ho7VxE/vdr-plugin-submenu-0.0.2/submenu-setup.c
+--- ./submenu-setup.c	2005-02-03 15:35:49.000000000 +0100
++++ /tmp/dpep-work.ho7VxE/vdr-plugin-submenu-0.0.2/submenu-setup.c	2005-08-24 00:37:43.000000000 +0200
+@@ -245,19 +245,25 @@
+ void cSubMenuSetup::DrawSubMenu(int level)
+ {
+ 	curLevel++;
+-	char *line;
++	char *line, *tmp;
+ 	for(int i=0;i<SMSetup.Arbo.MaxItem[level];i++)
+ 	{
+ 		asprintf(&line,"%s","");
+ 		for (int z=0;z<curLevel*5;z++)
+ 		{
+-			asprintf(&line,"%s ",line);
++			tmp = line;
++			asprintf(&line,"%s ",tmp);
++			free(tmp);
+ 		}
+ 		if (SMSetup.subMenuItem[SMSetup.Arbo.Index[level][i]].kindOfItem!=0)
+ 		{
+-			asprintf(&line,"%s+",line);
++			tmp = line;
++			asprintf(&line,"%s+",tmp);
++			free(tmp);
+ 		}
+-		asprintf(&line,"%s%s",line,tr(SMSetup.subMenuItem[SMSetup.Arbo.Index[level][i]].name));
++		tmp = line;
++		asprintf(&line,"%s%s",tmp,tr(SMSetup.subMenuItem[SMSetup.Arbo.Index[level][i]].name));
++		free(tmp);
+ 		Add (new cOsdItem(line),true);
+ 		SMSetup.Arbo.CurrentIndex[Current()]=SMSetup.Arbo.Index[level][i];
+ 		if (SMSetup.subMenuItem[SMSetup.Arbo.Index[level][i]].kindOfItem!=0)
+@@ -265,23 +271,26 @@
+ 		   DrawSubMenu(SMSetup.subMenuItem[SMSetup.Arbo.Index[level][i]].kindOfItem);
+ 		   curLevel--;
+ 		}
++		free(line);
+ 	}
+-	delete line;
+ }
+ 
+ void cSubMenuSetup::DrawMenu(void)
+ {
+ 	int cur=Current();
+ 	Clear();
+-	char *line;
++	char *line, *tmp;
+ 	for (int j=0;j<SMSetup.Arbo.MaxItem[0];j++)
+ 	{
+ 		asprintf(&line,"%s"," ");
+ 		if (SMSetup.subMenuItem[SMSetup.Arbo.Index[0][j]].kindOfItem!=0)
+ 		{
++			free(line);
+ 			asprintf(&line,"+");
+ 		}
+-		asprintf(&line,"%s%s",line,tr(SMSetup.subMenuItem[SMSetup.Arbo.Index[0][j]].name));
++		tmp = line; 
++		asprintf(&line,"%s%s",tmp,tr(SMSetup.subMenuItem[SMSetup.Arbo.Index[0][j]].name));
++		free(tmp);
+ 		Add (new cOsdItem(line),true);
+ 		SMSetup.Arbo.CurrentIndex[Current()]=SMSetup.Arbo.Index[0][j];
+ 		if (SMSetup.subMenuItem[SMSetup.Arbo.Index[0][j]].kindOfItem!=0)
+@@ -289,10 +298,10 @@
+ 			DrawSubMenu(SMSetup.subMenuItem[SMSetup.Arbo.Index[0][j]].kindOfItem);
+ 			curLevel--;
+ 		}
++		free(line);
+ 	}
+ 	SetCurrent(Get(cur));
+ 	Display();
+-	delete line;
+ }
+ 
+ 
diff --git a/plugins/submenu/plugin.sh b/plugins/submenu/plugin.sh
new file mode 100644
index 0000000..ce44f1a
--- /dev/null
+++ b/plugins/submenu/plugin.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# x-vdr (Installations-Skript fuer einen VDR mit Debian als Basis)
+# von Marc Wernecke - www.zulu-entertainment.de
+# 30.03.2006
+#
+# vdr-submenu
+
+# defaults
+source ./../../x-vdr.conf
+source ./../../setup.conf
+source ./../../functions
+WEB="http://www.freewebs.com/sadhome/Plugin/SubMenu/vdr-submenu-0.0.2.tar.gz"
+VERSION="submenu-0.0.2"
+LINK="submenu"
+
+VAR=`basename $WEB`
+DIR=`pwd`
+
+# plugin entfernen
+function clean_plugin() {
+  cd $SOURCEDIR/VDR/PLUGINS/src
+  rm -rf $LINK*
+  rm -f $VDRLIBDIR/libvdr-$LINK*
+  log "cleaning $LINK"
+}
+
+# plugin installieren
+function install_plugin() {
+  download_plugin
+  extract_plugin
+  cd $SOURCEDIR/VDR/PLUGINS/src
+  rm -f $LINK
+  ln -vfs $VERSION $LINK
+  patch_plugin
+
+  ## plugin specials - start ##
+  if [ -f $DIR/MainMenu.conf ]; then 
+    cp -f $DIR/MainMenu.conf $VDRCONFDIR/plugins
+    chown $VDRUSER.$VDRGROUP $VDRCONFDIR/plugins/MainMenu.conf
+  fi
+  ## plugin specials - ende ##
+}
+
+# plugin commands
+if [ $# \> 0 ]; then
+  cmd=$1
+  cmd_plugin
+else
+  install_plugin
+  log "install-plugin fuer $VERSION ist fertig"
+fi
+
+exit 0
diff --git a/plugins/submenu/submenu-0.0.2.diff b/plugins/submenu/submenu-0.0.2.diff
new file mode 100644
index 0000000..d5ab305
--- /dev/null
+++ b/plugins/submenu/submenu-0.0.2.diff
@@ -0,0 +1,82 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_asprintf.dpatch by Tobias Grimm <tg@e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes wrong usage of asprintf and correctly free's memory allocated by it.
+
+@DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./submenu-setup.c /tmp/dpep-work.ho7VxE/vdr-plugin-submenu-0.0.2/submenu-setup.c
+--- ./submenu-setup.c	2005-02-03 15:35:49.000000000 +0100
++++ /tmp/dpep-work.ho7VxE/vdr-plugin-submenu-0.0.2/submenu-setup.c	2005-08-24 00:37:43.000000000 +0200
+@@ -245,19 +245,25 @@
+ void cSubMenuSetup::DrawSubMenu(int level)
+ {
+ 	curLevel++;
+-	char *line;
++	char *line, *tmp;
+ 	for(int i=0;i<SMSetup.Arbo.MaxItem[level];i++)
+ 	{
+ 		asprintf(&line,"%s","");
+ 		for (int z=0;z<curLevel*5;z++)
+ 		{
+-			asprintf(&line,"%s ",line);
++			tmp = line;
++			asprintf(&line,"%s ",tmp);
++			free(tmp);
+ 		}
+ 		if (SMSetup.subMenuItem[SMSetup.Arbo.Index[level][i]].kindOfItem!=0)
+ 		{
+-			asprintf(&line,"%s+",line);
++			tmp = line;
++			asprintf(&line,"%s+",tmp);
++			free(tmp);
+ 		}
+-		asprintf(&line,"%s%s",line,tr(SMSetup.subMenuItem[SMSetup.Arbo.Index[level][i]].name));
++		tmp = line;
++		asprintf(&line,"%s%s",tmp,tr(SMSetup.subMenuItem[SMSetup.Arbo.Index[level][i]].name));
++		free(tmp);
+ 		Add (new cOsdItem(line),true);
+ 		SMSetup.Arbo.CurrentIndex[Current()]=SMSetup.Arbo.Index[level][i];
+ 		if (SMSetup.subMenuItem[SMSetup.Arbo.Index[level][i]].kindOfItem!=0)
+@@ -265,23 +271,26 @@
+ 		   DrawSubMenu(SMSetup.subMenuItem[SMSetup.Arbo.Index[level][i]].kindOfItem);
+ 		   curLevel--;
+ 		}
++		free(line);
+ 	}
+-	delete line;
+ }
+ 
+ void cSubMenuSetup::DrawMenu(void)
+ {
+ 	int cur=Current();
+ 	Clear();
+-	char *line;
++	char *line, *tmp;
+ 	for (int j=0;j<SMSetup.Arbo.MaxItem[0];j++)
+ 	{
+ 		asprintf(&line,"%s"," ");
+ 		if (SMSetup.subMenuItem[SMSetup.Arbo.Index[0][j]].kindOfItem!=0)
+ 		{
++			free(line);
+ 			asprintf(&line,"+");
+ 		}
+-		asprintf(&line,"%s%s",line,tr(SMSetup.subMenuItem[SMSetup.Arbo.Index[0][j]].name));
++		tmp = line; 
++		asprintf(&line,"%s%s",tmp,tr(SMSetup.subMenuItem[SMSetup.Arbo.Index[0][j]].name));
++		free(tmp);
+ 		Add (new cOsdItem(line),true);
+ 		SMSetup.Arbo.CurrentIndex[Current()]=SMSetup.Arbo.Index[0][j];
+ 		if (SMSetup.subMenuItem[SMSetup.Arbo.Index[0][j]].kindOfItem!=0)
+@@ -289,10 +298,10 @@
+ 			DrawSubMenu(SMSetup.subMenuItem[SMSetup.Arbo.Index[0][j]].kindOfItem);
+ 			curLevel--;
+ 		}
++		free(line);
+ 	}
+ 	SetCurrent(Get(cur));
+ 	Display();
+-	delete line;
+ }
+ 
+ 
-- 
cgit v1.2.3