head 1.4; access; symbols pkgsrc-2020Q3:1.3.0.118 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.114 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.94 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.116 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.112 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.110 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.108 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.106 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.104 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.102 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.100 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.98 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.96 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.92 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.90 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.88 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.86 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.84 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.82 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.80 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.78 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.76 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.74 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.72 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.70 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.68 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.66 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.64 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.62 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.60 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.58 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.56 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.54 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.52 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.50 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.48 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.46 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.44 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.42 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.40 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.38 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.36 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.34 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.32 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.30 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.28 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.26 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.24 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.22 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.20 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.18 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.16 pkgsrc-2008Q1:1.3.0.14 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.12 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.10 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.8 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.6 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.4 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.2 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.2.0.12 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.10 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.8 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.6 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.4 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.2 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.1.1.1.0.6 pkgsrc-2004Q4-base:1.1.1.1 pkgsrc-2004Q3:1.1.1.1.0.4 pkgsrc-2004Q3-base:1.1.1.1 pkgsrc-2004Q2:1.1.1.1.0.2 pkgsrc-2004Q2-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2020.11.02.14.04.42; author nia; state dead; branches; next 1.3; commitid yW3iTgKGVQMyPjuC; 1.3 date 2006.07.03.02.18.15; author tron; state Exp; branches; next 1.2; 1.2 date 2005.01.08.06.44.41; author schmonz; state dead; branches; next 1.1; 1.1 date 2004.06.05.19.07.51; author nathanw; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2004.06.05.19.07.51; author nathanw; state Exp; branches; next ; desc @@ 1.4 log @audio: Remove daapd, successor forked-daapd @ text @$NetBSD: patch-ac,v 1.3 2006/07/03 02:18:15 tron Exp $ --- libhttpd/src/select.h.orig 2006-03-05 14:00:38.000000000 +0000 +++ libhttpd/src/select.h 2006-07-03 03:10:45.000000000 +0100 @@@@ -81,7 +81,7 @@@@ c++; } - return 0; + return c; } @@@@ -154,7 +154,7 @@@@ void erase( const int fDesc ) { ClientIterator c; - if ((c = locateFDesc(fDesc)) != 0) { + if ((c = locateFDesc(fDesc)) != clientList.end()) { clientList.erase(c); close(fDesc); } @@@@ -162,14 +162,14 @@@@ void finish( const int fDesc ) { ClientIterator c; - if ((c = locateFDesc(fDesc)) != 0) { + if ((c = locateFDesc(fDesc)) != clientList.end()) { c->finished = true; } } void address( const int fDesc, char address[HTTP_IP_ADDR_LEN] ) { ClientIterator c; - if ((c = locateFDesc(fDesc)) != 0) { + if ((c = locateFDesc(fDesc)) != clientList.end()) { strncpy(address, c->address, HTTP_IP_ADDR_LEN); } } @@@@ -180,7 +180,7 @@@@ int readBuf(const int fDesc, char *destBuf, const uint len) { ClientIterator c; - if ((c = locateFDesc(fDesc)) == 0) { + if ((c = locateFDesc(fDesc)) == clientList.end()) { // printf("unknown client id %d\n", fDesc); return 0; } @@@@ -192,7 +192,7 @@@@ int readLine(const int fDesc, char *destBuf, const uint len) { ClientIterator c; - if ((c = locateFDesc(fDesc)) == 0) { + if ((c = locateFDesc(fDesc)) == clientList.end()) { // printf("unknown client id %d\n", fDesc); return 0; } @@@@ -217,7 +217,7 @@@@ int handleWrite(int socket) { int bytesWritten; ClientIterator c; - if ((c = locateFDesc(socket)) == 0) { + if ((c = locateFDesc(socket)) == clientList.end()) { // printf("unknown client id %d\n", socket); return 2; } @@@@ -260,7 +260,7 @@@@ return 1; } else { ClientIterator c; - if ((c = locateFDesc(fDesc)) == 0) { + if ((c = locateFDesc(fDesc)) == clientList.end()) { // printf("unknown client id %d\n", fDesc); return 2; } @@@@ -304,7 +304,7 @@@@ void doWrite(const int fDesc, const char* string, const uint len) { ClientIterator c; - if ((c = locateFDesc(fDesc)) == 0) { + if ((c = locateFDesc(fDesc)) == clientList.end()) { //printf("unknown client id %d\n", fDesc); return; } @@@@ -318,7 +318,7 @@@@ void doWrite(const int fDesc, const char* string) { ClientIterator c; - if ((c = locateFDesc(fDesc)) == 0) { + if ((c = locateFDesc(fDesc)) == clientList.end()) { //printf("unknown client id %d\n", fDesc); return; } @@@@ -351,7 +351,7 @@@@ void queueFile(const int socket, const int pendingFile ) { ClientIterator c; - if ((c = locateFDesc(socket)) == 0) { + if ((c = locateFDesc(socket)) == clientList.end()) { // printf("unknown client id %d\n", socket); return; } @@@@ -360,7 +360,7 @@@@ void subscribe(const int fDesc) { ClientIterator c; - if ((c = locateFDesc(fDesc)) == 0) { + if ((c = locateFDesc(fDesc)) == clientList.end()) { //printf("unknown client id %d\n", fDesc); return; } @ 1.3 log @Fix build with GCC 4.x: - Use "-ffriend-injection" to get "daaplib" to build again. - Use proper return values in iterators in "libhttpd-persistent". @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @pkgsrc changes: * Remove unnecessary patches to strip /usr/local from -L and -I paths. * Makefile style nits. * Specify dependency on howl's mDNSResponder in the rc.d script. Ride the version and PKGREVISION from mjl's commit an hour ago. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1 2004/06/05 19:07:51 nathanw Exp $ d3 109 a111 10 --- libhttpd/Site.mm.in.orig 2004-06-04 14:51:42.000000000 -0400 +++ libhttpd/Site.mm.in 2004-06-04 14:52:05.000000000 -0400 @@@@ -37,5 +37,5 @@@@ # Any other CFlags required EXTRA_CFLAGS= -CFLAGS= -g -I$(TOP)/ -I/usr/local/include $(EXTRA_CFLAGS) -D$(OS_TYPE) -LDLIBS= -L/usr/local/lib -L$(TOP)/lib @@LIBS@@ $(EXTRA_LIBS) +CFLAGS= -g -I$(TOP)/ $(EXTRA_CFLAGS) -D$(OS_TYPE) +LDLIBS= -L$(TOP)/lib @@LIBS@@ $(EXTRA_LIBS) @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Initial import of daapd-0.2.2b. Server for DAAP, the digital audio access protocol daapd scans a directory for mp3 files and makes them available via the Apple proprietary protocol DAAP. DAAP clients can browse the directory and retrieve individual files, either by streaming or by downloading them. [read: iTunes server] @ text @@