seal 0.1.0

data/mpg123/src/playlist.h

@@ -0,0 +1,52 @@
+/*
+	playlist: playlist logic
+
+	copyright 1995-2007 by the mpg123 project - free software under the terms of the LGPL 2.1
+	see COPYING and AUTHORS files in distribution or http://mpg123.org
+	initially written by Michael Hipp, outsourced/reorganized by Thomas Orgis
+*/
+#ifndef MPG123_PLAYLIST_H
+#define MPG123_PLAYLIST_H
+
+#include "mpg123app.h"
+
+enum playlist_type { UNKNOWN = 0, M3U, PLS, NO_LIST };
+
+typedef struct listitem
+{
+	char* url; /* the filename */
+	char freeit; /* if it was allocated and should be free()d here */
+	size_t playcount; /* has been played as ...th track in overall counting */
+} listitem;
+
+typedef struct playlist_struct
+{
+	FILE* file; /* the current playlist stream */
+	size_t entry; /* entry in the playlist file */
+	size_t playcount; /* overall track counter for playback */
+	long loop;    /* repeat a track n times */
+	size_t size;
+	size_t fill;
+	size_t pos;
+	size_t alloc_step;
+	struct listitem* list;
+	mpg123_string linebuf;
+	mpg123_string dir;
+	enum playlist_type type;
+#if defined (WANT_WIN32_SOCKETS)
+	int sockd; /* Is Win32 socket descriptor working? */
+#endif
+} playlist_struct;
+
+extern struct playlist_struct pl;
+
+/* create playlist form argv including reading of playlist file */
+void prepare_playlist(int argc, char** argv);
+/* returns the next url to play or NULL when there is none left */
+char *get_next_file();
+/* frees memory that got allocated in prepare_playlist */
+void free_playlist();
+/* Print out the playlist, with optional position indicator. */
+void print_playlist(FILE* out, int showpos);
+
+#endif

data/mpg123/src/resolver.c

@@ -0,0 +1,319 @@
+/*
+	resolver.c: TCP network stuff, for IPv4 and IPv6
+	Oh, and also some URL parsing... extracting host name and such.
+
+	copyright 2008-2010 by the mpg123 project - free software under the terms of the LGPL 2.1
+	see COPYING and AUTHORS files in distribution or http://mpg123.org
+	initially written Thomas Orgis (based on httpget.c)
+
+	The idea is to have everything involving the game between URLs and IPs/connections separated here.
+	I begin with the outsourcing of IPv4 stuff, then make the stuff generic.
+*/
+
+#include "mpg123app.h"
+
+#ifdef NETWORK
+#include "true.h"
+#include "resolver.h"
+#if !defined (WANT_WIN32_SOCKETS)
+#include <netdb.h>
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <errno.h>
+#include <fcntl.h>
+#endif
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include <unistd.h>
+#include "debug.h"
+
+int split_url(mpg123_string *url, mpg123_string *auth, mpg123_string *host, mpg123_string *port, mpg123_string *path)
+{
+	size_t pos  = 0; /* current position in input URL */
+	size_t pos2 = 0; /* another position in input URL */
+	char *part  = NULL; /* a part of url we work on */
+	int ret = TRUE; /* return code */
+	/* Zeroing the output strings; not freeing to avoid unnecessary mallocs. */
+	if(auth) auth->fill = 0;
+	if(host) host->fill = 0;
+	if(port) port->fill = 0;
+	if(path) path->fill = 0;
+
+	if(!url || !url->fill || url->p[url->fill-1] != 0)
+	{
+		error("URL string is not good! (Programmer's fault!?)");
+		return FALSE;
+	}
+	if (!(strncmp(url->p+pos, "http://", 7)))
+	pos += 7; /* Drop protocol. */
+
+	/* Extract user[:passwd]@... */
+	if( (part = strchr(url->p+pos,'@')) )
+	{
+		size_t i;
+		size_t partlen = part - url->p - pos;
+		int have_auth = TRUE;
+		/* User names or passwords don't have "/" in them (?), the "@" wasn't for real if we find such. */
+		for(i=0;i<partlen;i++)
+		{
+			if(url->p[pos+i] == '/' )
+			{
+				have_auth = FALSE;
+				break;
+			}
+		}
+		if(have_auth)
+		{
+			if(auth != NULL && !mpg123_set_substring(auth, url->p, pos, partlen))
+			{
+				error("Cannot set auth string (out of mem?).");
+				return FALSE;
+			}
+			pos += partlen+1; /* Continuing after the "@". */
+		}
+	}
+	
+	/* Extract host name or IP. */
+#ifdef IPV6
+	if(url->p[pos] == '[')
+	{ /* It's possibly an IPv6 url in [ ] */
+		++pos;
+		if( (part = strchr(url->p+pos,']')) != NULL)
+		{
+			pos2 = part-url->p;
+		}
+		else { error("Malformed IPv6 URL!"); return FALSE; }
+	}
+	else
+#endif
+	for(pos2=pos; pos2 < url->fill-1; ++pos2)
+	{
+		char a = url->p[pos2];
+		if( a == ':' || a == '/') break;
+	}
+	/* At pos2 there is now either a delimiter or the end. */
+debug4("hostname between %lu and %lu, %lu chars of %s", (unsigned long)pos, (unsigned long)pos2, (unsigned long)(pos2-pos), url->p + pos);
+	if(host != NULL && !mpg123_set_substring(host, url->p, pos, pos2-pos))
+	{
+		error("Cannot set host string (out of mem?).");
+		return FALSE;
+	}
+	pos = pos2;
+
+	/* Now for the port... */
+	if(url->p[pos] == ':')
+	{
+		pos += 1; /* We begin _after_ the ":". */
+		for(pos2=pos; pos2 < url->fill-1; ++pos2)
+		if( url->p[pos2] == '/' ) break;
+
+		/* Check for port being numbers? Not sure if that's needed. */
+		if(port) ret = mpg123_set_substring(port, url->p, pos, pos2-pos);
+		pos = pos2;
+	}
+	else if(port) ret = mpg123_set_string(port, "80");
+
+	if(!ret)
+	{
+		error("Cannot set port string (out of mem?).");
+		return FALSE;
+	}
+
+	/* Now only the path is left. */
+	if(path) ret = mpg123_set_substring(path, url->p, pos, url->fill-1-pos);
+
+	if(!ret) error("Cannot set path string (out of mem?)");
+
+	return ret;
+}
+
+/* Switch between blocking and non-blocking mode. */
+#if !defined (WANT_WIN32_SOCKETS)
+static void nonblock(int sock)
+{
+	int flags = fcntl(sock, F_GETFL);
+	flags |= O_NONBLOCK;
+	fcntl(sock, F_SETFL, flags);
+}
+
+static void block(int sock)
+{
+	int flags = fcntl(sock, F_GETFL);
+	flags &= ~O_NONBLOCK;
+	fcntl(sock, F_SETFL, flags);
+}
+
+/* If we want a timeout, connect non-blocking and wait for that long... */
+static int timeout_connect(int sockfd, const struct sockaddr *serv_addr, socklen_t addrlen)
+{
+	if(param.timeout > 0)
+	{
+		int err;
+		nonblock(sockfd);
+		err = connect(sockfd, serv_addr, addrlen);
+		if(err == 0)
+		{
+			debug("immediately successful");
+			block(sockfd);
+			return 0;
+		}
+		else if(errno == EINPROGRESS)
+		{
+			struct timeval tv;
+			fd_set fds;
+			tv.tv_sec = param.timeout;
+			tv.tv_usec = 0;
+
+			debug("in progress, waiting...");
+
+			FD_ZERO(&fds);
+			FD_SET(sockfd, &fds);
+			err = select(sockfd+1, NULL, &fds, NULL, &tv);
+			if(err > 0)
+			{
+				socklen_t len = sizeof(err);
+				if(   (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &err, &len) == 0)
+				   && (err == 0) )
+				{
+					debug("non-blocking connect has been successful");
+					block(sockfd);
+					return 0;
+				}
+				else
+				{
+					error1("connection error: %s", strerror(err));
+					return -1;
+				}
+			}
+			else if(err == 0)
+			{
+				error("connection timed out");
+				return -1;
+			}
+			else
+			{
+				error1("error from select(): %s", strerror(errno));
+				return -1;
+			}
+		}
+		else
+		{
+			error1("connection failed: %s", strerror(errno));
+			return err;
+		}
+	}
+	else
+	{
+		if(connect(sockfd, serv_addr, addrlen))
+		{
+			error1("connecton failed: %s", strerror(errno));
+			return -1;
+		}
+		else return 0; /* _good_ */
+	}
+}
+
+
+/* So, this then is the only routine that should know about IPv4 or v6 in future. */
+int open_connection(mpg123_string *host, mpg123_string *port)
+{
+#ifndef IPV6 /* The legacy code for IPv4. No real change to keep all compatibility. */
+#ifndef INADDR_NONE
+#define INADDR_NONE 0xffffffff
+#endif
+	struct sockaddr_in server;
+	struct hostent *myhostent;
+	struct in_addr myaddr;
+	int isip = 1;
+	char *cptr = host->p;
+	int sock = -1;
+	if(param.verbose>1) fprintf(stderr, "Note: Attempting old-style connection to %s\n", host->p);
+	/* Resolve to IP; parse port number. */
+	while(*cptr) /* Iterate over characters of hostname, check if it's an IP or name. */
+	{
+		if ((*cptr < '0' || *cptr > '9') && *cptr != '.')
+		{
+			isip = 0;
+			break;
+		}
+		cptr++;
+	}
+	if(!isip)
+	{ /* Name lookup. */
+		if (!(myhostent = gethostbyname(host->p))) return -1;
+
+		memcpy (&myaddr, myhostent->h_addr, sizeof(myaddr));
+		server.sin_addr.s_addr = myaddr.s_addr;
+	}
+	else  /* Just use the IP. */
+	if((server.sin_addr.s_addr = inet_addr(host->p)) == INADDR_NONE)
+	return -1;
+
+	server.sin_port = htons(atoi(port->p));
+	server.sin_family = AF_INET;
+
+	if((sock = socket(PF_INET, SOCK_STREAM, 6)) < 0)
+	{
+		error1("Cannot create socket: %s", strerror(errno));
+		return -1;
+	}
+	if(timeout_connect(sock, (struct sockaddr *)&server, sizeof(server)))
+	return -1;
+#else /* Host lookup and connection in a protocol independent manner. */
+	struct addrinfo hints;
+	struct addrinfo *addr, *addrlist;
+	int ret, sock = -1;
+
+	if(param.verbose>1) fprintf(stderr, "Note: Attempting new-style connection to %s\n", host->p);
+	memset(&hints, 0, sizeof(struct addrinfo));
+	hints.ai_family   = AF_UNSPEC; /* We accept both IPv4 and IPv6 ... and perhaps IPv8;-) */
+	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_flags = 0;
+#ifdef HAVE_GAI_ADDRCONFIG
+	hints.ai_flags |= AI_ADDRCONFIG; /* Only ask for addresses that we have configured interfaces for. */
+#endif
+	ret = getaddrinfo(host->p, port->p, &hints, &addrlist);
+	if(ret != 0)
+	{
+		error3("Resolving %s:%s: %s", host->p, port->p, gai_strerror(ret));
+		return -1;
+	}
+
+	addr = addrlist;
+	while(addr != NULL)
+	{
+		sock = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
+		if(sock >= 0)
+		{
+			if(timeout_connect(sock, addr->ai_addr, addr->ai_addrlen) == 0)
+			break;
+
+			close(sock);
+			sock=-1;
+		}
+		addr=addr->ai_next;
+	}
+	if(sock < 0) error2("Cannot resolve/connect to %s:%s!", host->p, port->p);
+
+	freeaddrinfo(addrlist);
+#endif
+	return sock; /* Hopefully, that's an open socket to talk with. */
+}
+#endif /* !defined (WANT_WIN32_SOCKETS) */
+#else /* NETWORK */
+
+void resolver_dummy_without_sense()
+{
+	/* Some compilers don't like empty source files. */
+}
+
+#endif

data/mpg123/src/resolver.h

@@ -0,0 +1,25 @@
+/*
+	resolver.c: TCP network stuff, for IPv4 and IPv6
+
+	copyright 2008 by the mpg123 project - free software under the terms of the LGPL 2.1
+	see COPYING and AUTHORS files in distribution or http://mpg123.org
+	initially written Thomas Orgis (based on httpget.c)
+*/
+
+#ifndef MPG123_RESOLVER_H
+#define MPG123_RESOLVER_H
+
+#include "mpg123app.h"
+/*
+	Split an URL into parts of user:password, hostname, port, path on host.
+	There is no name resolution going on here, also no numeric conversion.
+	Return code 1 (TRUE) is fine, 0 (FALSE) is bad.
+*/
+int split_url(mpg123_string *url, mpg123_string *auth, mpg123_string *host, mpg123_string *port, mpg123_string *path);
+/*
+	Open a connection to specified server and port.
+	The arguments are plain strings (hostname or IP, port number as string); any network specific data types are hidden.
+*/
+int open_connection(mpg123_string *host, mpg123_string *port);
+
+#endif

data/mpg123/src/sfifo.c

@@ -0,0 +1,146 @@
+/*
+	SFIFO 1.3 Simple portable lock-free FIFO
+
+	(c) 2000-2002, David Olofson - free software under the terms of the LGPL 2.1
+*/
+
+
+/*
+-----------------------------------------------------------
+TODO:
+	* Is there a way to avoid losing one byte of buffer
+	  space to avoid extra variables or locking?
+
+	* Test more compilers and environments.
+-----------------------------------------------------------
+ */
+
+#include	<string.h>
+#include	<stdlib.h>
+
+#include "sfifo.h"
+#include "debug.h"
+
+/*
+ * Alloc buffer, init FIFO etc...
+ */
+SFIFO_SCOPE int sfifo_init(sfifo_t *f, int size)
+{
+	memset(f, 0, sizeof(sfifo_t));
+
+	if(size > SFIFO_MAX_BUFFER_SIZE)
+		return -EINVAL;
+
+	/*
+	 * Set sufficient power-of-2 size.
+	 *
+	 * No, there's no bug. If you need
+	 * room for N bytes, the buffer must
+	 * be at least N+1 bytes. (The fifo
+	 * can't tell 'empty' from 'full'
+	 * without unsafe index manipulations
+	 * otherwise.)
+	 */
+	f->size = 1;
+	for(; f->size <= size; f->size <<= 1)
+		;
+
+	/* Get buffer */
+	if( 0 == (f->buffer = (void *)malloc(f->size)) )
+		return -ENOMEM;
+
+	return 0;
+}
+
+/*
+ * Dealloc buffer etc...
+ */
+SFIFO_SCOPE void sfifo_close(sfifo_t *f)
+{
+	if(f->buffer) {
+		free(f->buffer);
+		f->buffer = NULL;	/* Prevent double free */
+	}
+}
+
+/*
+ * Empty FIFO buffer
+ */
+SFIFO_SCOPE void sfifo_flush(sfifo_t *f)
+{
+	/* Reset positions */
+	f->readpos = 0;
+	f->writepos = 0;
+}
+
+/*
+ * Write bytes to a FIFO
+ * Return number of bytes written, or an error code
+ */
+SFIFO_SCOPE int sfifo_write(sfifo_t *f, const void *_buf, int len)
+{
+	int total;
+	int i;
+	const char *buf = (const char *)_buf;
+
+	if(!f->buffer)
+		return -ENODEV;	/* No buffer! */
+
+	/* total = len = min(space, len) */
+	total = sfifo_space(f);
+	debug1("sfifo_space() = %d",total);
+	if(len > total)
+		len = total;
+	else
+		total = len;
+
+	i = f->writepos;
+	if(i + len > f->size)
+	{
+		memcpy(f->buffer + i, buf, f->size - i);
+		buf += f->size - i;
+		len -= f->size - i;
+		i = 0;
+	}
+	memcpy(f->buffer + i, buf, len);
+	f->writepos = i + len;
+
+	return total;
+}
+
+
+/*
+ * Read bytes from a FIFO
+ * Return number of bytes read, or an error code
+ */
+SFIFO_SCOPE int sfifo_read(sfifo_t *f, void *_buf, int len)
+{
+	int total;
+	int i;
+	char *buf = (char *)_buf;
+
+	if(!f->buffer)
+		return -ENODEV;	/* No buffer! */
+
+	/* total = len = min(used, len) */
+	total = sfifo_used(f);
+	debug1("sfifo_used() = %d",total);
+	if(len > total)
+		len = total;
+	else
+		total = len;
+
+	i = f->readpos;
+	if(i + len > f->size)
+	{
+		memcpy(buf, f->buffer + i, f->size - i);
+		buf += f->size - i;
+		len -= f->size - i;
+		i = 0;
+	}
+	memcpy(buf, f->buffer + i, len);
+	f->readpos = i + len;
+
+	return total;
+}
+