Merge branch 'uncool/dvbsi++' commit '9d968280bac'

This is the last commit before the "menu hints" started.
Needs buildfixing...

Conflicts:
	configure.ac
	src/daemonc/remotecontrol.cpp
	src/daemonc/remotecontrol.h
	src/driver/audiodec/basedec.cpp
	src/driver/fb_window.cpp
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/global.h
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/neutrino.cpp
	src/sectionsd/dmx.cpp
	src/sectionsd/dmxapi.cpp
	src/sectionsd/sectionsd.cpp
	src/system/setting_helpers.cpp
	src/zapit/include/zapit/client/zapittypes.h
	src/zapit/include/zapit/frontend_c.h
	src/zapit/include/zapit/satconfig.h
	src/zapit/include/zapit/scan.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/pmt.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/sdt.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: ae1b98aa38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-22 (Sun, 22 Jul 2012)



------------------
This commit was generated by Migit

src/system/configure_network.cpp

@@ -22,6 +22,7 @@
 #include <sys/wait.h>
 #include <sys/types.h>          /* u_char */
 #include <string.h>
+#include <unistd.h>
 #include "configure_network.h"
 #include "libnet.h"             /* netGetNameserver, netSetNameserver   */
 #include "network_interfaces.h" /* getInetAttributes, setInetAttributes */
@@ -39,6 +40,11 @@ CNetworkConfig::CNetworkConfig()
 	netGetNameserver(our_nameserver);
 	nameserver = our_nameserver;
 	ifname = "eth0";
+	orig_automatic_start = false;
+	orig_inet_static = false;
+	automatic_start = false;
+	inet_static = false;
+	wireless = false;
 }
 
 CNetworkConfig* CNetworkConfig::getInstance()
@@ -212,24 +218,26 @@ void CNetworkConfig::commitConfig(void)
 
 int mysystem(char * cmd, char * arg1, char * arg2)
 {
-        int pid, i;
-        switch (pid = fork())
-        {
-                case -1: /* can't fork */
-                        perror("fork");
-                        return -1;
+        int i;
+	pid_t pid;
+	int maxfd = getdtablesize();// sysconf(_SC_OPEN_MAX);
+	switch (pid = vfork())
+	{
+		case -1: /* can't fork */
+			perror("vfork");
+			return -1;
 
-                case 0: /* child process */
-                        for(i = 3; i < 256; i++)
+		case 0: /* child process */
+			for(i = 3; i < maxfd; i++)
                                 close(i);
-                        if(execlp(cmd, cmd, arg1, arg2, NULL))
-                        {
-                                perror("exec");
-                        }
-                        exit(0);
-                default: /* parent returns to calling process */
-                        break;
-        }
+			if(execlp(cmd, cmd, arg1, arg2, NULL))
+			{
+				perror("exec");
+			}
+			exit(0);
+		default: /* parent returns to calling process */
+			break;
+	}
 	waitpid(pid, 0, 0);
 	return 0;
 }