mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00
Code Issues Releases Activity

* Fix libmad and libid3tag dependencies.

Browse Source 
Submitted by:	sheldonh

* Don't leak file descriptors on error.

Obtained from:	Debian
This commit is contained in:
Christian Weisgerber 2004-01-07 20:24:23 +00:00
parent b9b77268ed
commit 70080bf1f6
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=97597
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
audio/mpg321/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= mpg321
PORTVERSION= 0.2.10
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= mpg321
@ -16,7 +16,8 @@ MAINTAINER= naddy@FreeBSD.org
COMMENT= A free command-line mp3 player, compatible with mpg123
LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao \
mad.2:${PORTSDIR}/audio/mad
id3tag.2:${PORTSDIR}/audio/libid3tag \
mad.2:${PORTSDIR}/audio/libmad
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-mpg123-symlink

31
audio/mpg321/files/patch-mpg321.c
View File

@ -2,7 +2,7 @@
$FreeBSD$
--- mpg321.c.orig Sun Mar 24 06:49:20 2002
+++ mpg321.c Tue Sep 3 01:29:40 2002
+++ mpg321.c Wed Jan 7 21:12:40 2004
@@ -188,7 +188,7 @@
else
@ -21,7 +21,30 @@ $FreeBSD$
free (names[i]);
}
if (i%2) fprintf (stderr, "\n");
@@ -509,9 +509,6 @@
@@ -410,12 +410,14 @@
if(fstat(fd, &stat) == -1)
{
+ close(fd);
mpg321_error(currentfile);
continue;
}
if (!S_ISREG(stat.st_mode))
{
+ close(fd);
continue;
}
@@ -432,6 +434,7 @@
if((playbuf.buf = mmap(0, playbuf.length, PROT_READ, MAP_SHARED, fd, 0))
== MAP_FAILED)
{
+ close(fd);
mpg321_error(currentfile);
continue;
}
@@ -509,9 +512,6 @@
mad_decoder_finish(&decoder);
@ -31,7 +54,7 @@ $FreeBSD$
if (playbuf.frames)
free(playbuf.frames);
@@ -521,6 +518,7 @@
@@ -521,6 +521,7 @@
if (playbuf.fd == -1)
{
munmap(playbuf.buf, playbuf.length);
@ -39,7 +62,7 @@ $FreeBSD$
}
else
@@ -535,10 +533,6 @@
@@ -535,10 +536,6 @@
ao_close(playdevice);
ao_shutdown();