oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

input/cdio_paranoia: use CopyString() instead of g_strlcpy()

Browse Source
This commit is contained in:
Max Kellermann 2014-12-01 22:22:29 +01:00
parent bc00c38f9d
commit fbf76c6d21
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -780,9 +780,8 @@ AM_CONDITIONAL(ENABLE_SOUNDCLOUD, test x$enable_soundcloud = xyes)
AC_SUBST(YAJL_LIBS) AC_SUBST(YAJL_LIBS)
dnl ---------------------------------- cdio --------------------------------- dnl ---------------------------------- cdio ---------------------------------
MPD_ENABLE_AUTO_PKG_DEPENDS(cdio_paranoia, CDIO_PARANOIA, [libcdio_paranoia], MPD_ENABLE_AUTO_PKG(cdio_paranoia, CDIO_PARANOIA, [libcdio_paranoia],
[libcdio_paranoia input plugin], [libcdio_paranoia not found], [], [libcdio_paranoia input plugin], [libcdio_paranoia not found])
[enable_glib], [Cannot use --enable-cdio-paranoia with --disable-glib])
if test x$enable_cdio_paranoia = xyes; then if test x$enable_cdio_paranoia = xyes; then
AC_CHECK_HEADERS(cdio/paranoia/paranoia.h) AC_CHECK_HEADERS(cdio/paranoia/paranoia.h)
fi fi

3
src/input/plugins/CdioParanoiaInputPlugin.cxx
View File

@ -39,7 +39,6 @@
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <glib.h>
#include <assert.h> #include <assert.h>
#ifdef HAVE_CDIO_PARANOIA_PARANOIA_H #ifdef HAVE_CDIO_PARANOIA_PARANOIA_H
@ -149,7 +148,7 @@ parse_cdio_uri(struct cdio_uri *dest, const char *src, Error &error)
const char *slash = strrchr(src, '/'); const char *slash = strrchr(src, '/');
if (slash == nullptr) { if (slash == nullptr) {
/* play the whole CD in the specified drive */ /* play the whole CD in the specified drive */
g_strlcpy(dest->device, src, sizeof(dest->device)); CopyString(dest->device, src, sizeof(dest->device));
dest->track = -1; dest->track = -1;
return true; return true;
} }