mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-03 11:12:13 +00:00
Code Issues Releases Activity

Fix wrong handling command line arguments.

Browse Source 
Submitted by:	Kouhei Sutou <kou@cozmixng.org>
This commit is contained in:
Norikatsu Shigemura 2007-02-09 19:10:52 +00:00
parent b55634d473
commit 660b062518
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=184732
7 changed files with 76 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/DarwinStreamingServer/Makefile
View File

@ -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

20
net/DarwinStreamingServer/files/patch-MP3Broadcaster::BroadcasterMain.cpp
View File

@ -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;

14
net/DarwinStreamingServer/files/patch-PlaylistBroadcaster.tproj::PlaylistBroadcaster.cpp
View File

@ -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;

11
net/DarwinStreamingServer/files/patch-Server.tproj::main.cpp
View File

@ -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)
{

11
net/DarwinStreamingServer/files/patch-StreamingLoadTool-StreamingLoadTool.cpp Normal file
View File

@ -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 )

11
net/DarwinStreamingServer/files/patch-StreamingProxy.tproj-proxy.c Normal file
View File

@ -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;

11
net/DarwinStreamingServer/files/patch-qtpasswd.tproj-QTSSPasswd.cpp Normal file
View File

@ -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)
{