Fix wrong handling command line arguments.

Submitted by:	Kouhei Sutou <kou@cozmixng.org>

7 files changed, 76 insertions, 4 deletions

diff --git a/net/DarwinStreamingServer/Makefile b/net/DarwinStreamingServer/Makefile
index 1e41b2d8c484..f81cc1072b32 100644
--- a/net/DarwinStreamingServer/Makefile
+++ b/net/DarwinStreamingServer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	DarwinStreamingServer
 PORTVERSION=	5.5.4
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	#http://developer.apple.com/darwin/projects/streaming/source/
 #		You must accept APSL (Apple Public Source License),  and get
diff --git a/net/DarwinStreamingServer/files/patch-MP3Broadcaster::BroadcasterMain.cpp b/net/DarwinStreamingServer/files/patch-MP3Broadcaster::BroadcasterMain.cpp
index fbb8ed529b1b..7130eb19e325 100644
--- a/net/DarwinStreamingServer/files/patch-MP3Broadcaster::BroadcasterMain.cpp
+++ b/net/DarwinStreamingServer/files/patch-MP3Broadcaster::BroadcasterMain.cpp
@@ -1,5 +1,23 @@
 --- MP3Broadcaster/BroadcasterMain.cpp.orig	Sat Mar 12 08:24:54 2005
-+++ MP3Broadcaster/BroadcasterMain.cpp	Sun Aug 13 00:37:12 2006
++++ MP3Broadcaster/BroadcasterMain.cpp	Sat Feb 10 03:54:31 2007
+@@ -85,7 +85,7 @@
+     char* config = NULL;
+     char* playList = NULL;
+     char* workingDir = NULL;
+-    char ch;
++    int ch;
+     bool preflight = false;
+     bool checkMP3s = false;
+     char*   errorlog = NULL;
+@@ -112,7 +112,7 @@
+         ::exit(0);
+     }
+ 
+-    while ( (ch = getopt(argc,argv, "vdixXa:p:c:l:e:w:")) != EOF ) // opt: means requires option
++    while ( (ch = getopt(argc,argv, "vdixXa:p:c:l:e:w:")) != -1 ) // opt: means requires option
+     {
+         switch(ch)
+         {
 @@ -216,7 +216,7 @@
  
  struct sigaction act;
diff --git a/net/DarwinStreamingServer/files/patch-PlaylistBroadcaster.tproj::PlaylistBroadcaster.cpp b/net/DarwinStreamingServer/files/patch-PlaylistBroadcaster.tproj::PlaylistBroadcaster.cpp
index 951baabe6361..82e5d4962f35 100644
--- a/net/DarwinStreamingServer/files/patch-PlaylistBroadcaster.tproj::PlaylistBroadcaster.cpp
+++ b/net/DarwinStreamingServer/files/patch-PlaylistBroadcaster.tproj::PlaylistBroadcaster.cpp
@@ -1,5 +1,17 @@
 --- PlaylistBroadcaster.tproj/PlaylistBroadcaster.cpp.orig	Sat Mar 12 08:24:54 2005
-+++ PlaylistBroadcaster.tproj/PlaylistBroadcaster.cpp	Sun Aug 13 00:38:20 2006
++++ PlaylistBroadcaster.tproj/PlaylistBroadcaster.cpp	Sat Feb 10 04:04:32 2007
+@@ -229,9 +229,9 @@
+ 
+     sgProgramName = argv[0];
+ #ifdef __Win32__
+-    while ((anOption = getopt(argc, argv, "vhdcpbDtai:fe:" )) != EOF)
++    while ((anOption = getopt(argc, argv, "vhdcpbDtai:fe:" )) != -1)
+ #else
+-    while ((anOption = getopt(argc, argv, "vhdcpbDls:tai:fe:" )) != EOF)
++    while ((anOption = getopt(argc, argv, "vhdcpbDls:tai:fe:" )) != -1)
+ #endif
+     {
+         
 @@ -2077,7 +2077,7 @@
  
  struct sigaction act;
diff --git a/net/DarwinStreamingServer/files/patch-Server.tproj::main.cpp b/net/DarwinStreamingServer/files/patch-Server.tproj::main.cpp
index 37958f7ab378..902f1124e1ba 100644
--- a/net/DarwinStreamingServer/files/patch-Server.tproj::main.cpp
+++ b/net/DarwinStreamingServer/files/patch-Server.tproj::main.cpp
@@ -1,5 +1,5 @@
 --- Server.tproj/main.cpp.orig	Wed Apr 27 21:21:14 2005
-+++ Server.tproj/main.cpp	Sun Aug 13 00:39:07 2006
++++ Server.tproj/main.cpp	Sat Feb 10 04:06:49 2007
 @@ -212,7 +212,7 @@
      //(void) ::signal(SIGPIPE, SIG_IGN);
      struct sigaction act;
@@ -9,3 +9,12 @@
      sigemptyset(&act.sa_mask);
      act.sa_flags = 0;
      act.sa_handler = (void(*)(int))&sigcatcher;
+@@ -291,7 +291,7 @@
+ 
+     char* theConfigFilePath = sDefaultConfigFilePath;
+     char* theXMLFilePath = sDefaultXMLFilePath;
+-    while ((ch = getopt(argc,argv, "vdfxp:DZ:c:o:S:Ih")) != EOF) // opt: means requires option arg
++    while ((ch = getopt(argc,argv, "vdfxp:DZ:c:o:S:Ih")) != -1) // opt: means requires option arg
+     {
+         switch(ch)
+         {
diff --git a/net/DarwinStreamingServer/files/patch-StreamingLoadTool-StreamingLoadTool.cpp b/net/DarwinStreamingServer/files/patch-StreamingLoadTool-StreamingLoadTool.cpp
new file mode 100644
index 000000000000..adf025f249e5
--- /dev/null
+++ b/net/DarwinStreamingServer/files/patch-StreamingLoadTool-StreamingLoadTool.cpp
@@ -0,0 +1,11 @@
+--- StreamingLoadTool/StreamingLoadTool.cpp.orig	Thu May 26 12:36:32 2005
++++ StreamingLoadTool/StreamingLoadTool.cpp	Sat Feb 10 04:01:06 2007
+@@ -191,7 +191,7 @@
+ 	UInt32* theURLIndexArray = NEW UInt32[theURLIndexArraySize];
+ 	UInt32 theNumURLs = 0;
+     char* controlID = NULL;
+-	char			ch = 0;
++	int			ch = 0;
+ 	//
+ 	// Read our command line options
+ 	while( (ch = getopt(argc, argv, "vf:c:i:d")) != -1 )
diff --git a/net/DarwinStreamingServer/files/patch-StreamingProxy.tproj-proxy.c b/net/DarwinStreamingServer/files/patch-StreamingProxy.tproj-proxy.c
new file mode 100644
index 000000000000..210618c63f39
--- /dev/null
+++ b/net/DarwinStreamingServer/files/patch-StreamingProxy.tproj-proxy.c
@@ -0,0 +1,11 @@
+--- StreamingProxy.tproj/proxy.c.orig	Sat Feb 10 04:02:08 2007
++++ StreamingProxy.tproj/proxy.c	Sat Feb 10 04:02:33 2007
+@@ -203,7 +203,7 @@
+ {
+     int i, j;
+     int     numOptions = 0; // num command line options spec'd
+-    signed char ch;
++    int ch;
+     int listening_port = 554, user_listener = false;
+     time_t time_zero, now, last;
+     time_t  usnow, uslast;
diff --git a/net/DarwinStreamingServer/files/patch-qtpasswd.tproj-QTSSPasswd.cpp b/net/DarwinStreamingServer/files/patch-qtpasswd.tproj-QTSSPasswd.cpp
new file mode 100644
index 000000000000..6094928a28e4
--- /dev/null
+++ b/net/DarwinStreamingServer/files/patch-qtpasswd.tproj-QTSSPasswd.cpp
@@ -0,0 +1,11 @@
+--- qtpasswd.tproj/QTSSPasswd.cpp.orig	Fri May 20 04:03:22 2005
++++ qtpasswd.tproj/QTSSPasswd.cpp	Sat Feb 10 04:05:38 2007
+@@ -720,7 +720,7 @@
+     extern int optind;
+ 
+ 	/* Read command line arguments */
+-    while ((ch = getopt(argc, argv, "O:f:cg:r:p:P:A:D:C:R:dFhv?")) != EOF)
++    while ((ch = getopt(argc, argv, "O:f:cg:r:p:P:A:D:C:R:dFhv?")) != -1)
+     {
+         switch(ch) 
+         {