summaryrefslogtreecommitdiff
path: root/data/raop-play/getline.diff
diff options
context:
space:
mode:
Diffstat (limited to 'data/raop-play/getline.diff')
-rw-r--r--data/raop-play/getline.diff55
1 files changed, 32 insertions, 23 deletions
diff --git a/data/raop-play/getline.diff b/data/raop-play/getline.diff
index 3205fd2ae..3130dceb2 100644
--- a/data/raop-play/getline.diff
+++ b/data/raop-play/getline.diff
@@ -1,37 +1,46 @@
+diff -ru raop_play-0.5.1/raop_play/Makefile.in raop_play-0.5.1+iPhone/raop_play/Makefile.in
+--- raop_play-0.5.1/raop_play/Makefile.in 2005-12-16 14:17:00.000000000 +0000
++++ raop_play-0.5.1+iPhone/raop_play/Makefile.in 2008-12-06 22:45:54.000000000 +0000
+@@ -15,7 +15,7 @@
+ CFLAGS=-Wall
+ OBJS := raop_play.o raop_client.o rtsp_client.o aexcl_lib.o base64.o aes.o m4a_stream.o \
+ audio_stream.o wav_stream.o mp3_stream.o flac_stream.o ogg_stream.o aac_stream.o pls_stream.o \
+-pcm_stream.o flac_stream.o
++pcm_stream.o flac_stream.o getline.o
+
+ all: $(TARGET)
+
+diff -ru raop_play-0.5.1/rendezvous/Makefile.in raop_play-0.5.1+iPhone/rendezvous/Makefile.in
+--- raop_play-0.5.1/rendezvous/Makefile.in 2005-12-16 14:17:02.000000000 +0000
++++ raop_play-0.5.1+iPhone/rendezvous/Makefile.in 2008-12-06 22:45:48.000000000 +0000
+@@ -17,7 +17,7 @@
+ all: $(TARGET)
+
+
+-mDNSClient: mDNSPosix.o mDNSUNP.o ExampleClientApp.o mDNS.o Client.o
++mDNSClient: mDNSPosix.o mDNSUNP.o ExampleClientApp.o mDNS.o Client.o getline.o
+ $(CC) $(LFLAGS) $^ -o $@
+
+ install:
diff -ru raop_play-0.5.1/raop_play/pls_stream.c raop_play-0.5.1+iPhone/raop_play/pls_stream.c
--- raop_play-0.5.1/raop_play/pls_stream.c 2005-12-16 14:17:01.000000000 +0000
-+++ raop_play-0.5.1+iPhone/raop_play/pls_stream.c 2008-12-06 04:06:57.000000000 +0000
-@@ -29,6 +29,9 @@
++++ raop_play-0.5.1+iPhone/raop_play/pls_stream.c 2008-12-06 22:46:54.000000000 +0000
+@@ -27,6 +27,7 @@
+ #include "audio_stream.h"
+ #include "pls_stream.h"
#include "aexcl_lib.h"
++#include "getline.h"
-+/* XXX: this is slightly wrong, but I don't think this code cares */
-+#define getline(a, b, c) (fgets(*a, *b, c) == NULL ? -1 : strlen(*a))
-+
- static int str_termlf(char *line)
- {
diff -ru raop_play-0.5.1/rendezvous/Client.c raop_play-0.5.1+iPhone/rendezvous/Client.c
--- raop_play-0.5.1/rendezvous/Client.c 2005-12-16 14:17:02.000000000 +0000
-+++ raop_play-0.5.1+iPhone/rendezvous/Client.c 2008-12-06 04:07:02.000000000 +0000
-@@ -83,8 +83,11 @@
- #include "mDNSClientAPI.h"// Defines the interface to the mDNS core code
++++ raop_play-0.5.1+iPhone/rendezvous/Client.c 2008-12-06 22:46:50.000000000 +0000
+@@ -89,6 +89,7 @@
#include "mDNSPosix.h" // Defines the specific types needed to run mDNS on this platform
#include "ExampleClientApp.h"
#include "mDNS.h"
++#include "getline.h"
-+/* XXX: this is slightly wrong, but I don't think this code cares */
-+#define getline(a, b, c) (fgets(*a, *b, c) == NULL ? -1 : strlen(*a))
-+
// Globals
- static mDNS mDNSStorage; // mDNS core uses this to store its globals
-@@ -106,7 +108,7 @@
- char fname[128],wfname[128];
- FILE *inf,*outf;
- char *sline;
-- size_t linelen=128;
-+ size_t linelen=128*128;
- int i,ln,ws,cp1=0,cp2=0,cp3=0;
-
- if(addr->type != mDNSAddrType_IPv4) return -1;