ab9f5d2067
The former was deprecated with C++14. According to the C++11 and C++17 standards, both files are identical. Signed-off-by: Rosen Penev <rosenp@gmail.com>
61 lines
1.5 KiB
C++
61 lines
1.5 KiB
C++
/*
|
|
* Copyright 2003-2020 The Music Player Daemon Project
|
|
* http://www.musicpd.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#include "LocalOpen.hxx"
|
|
#include "InputStream.hxx"
|
|
#include "plugins/FileInputPlugin.hxx"
|
|
#include "config.h"
|
|
|
|
#ifdef ENABLE_ARCHIVE
|
|
#include "plugins/ArchiveInputPlugin.hxx"
|
|
#endif
|
|
|
|
#include "fs/Path.hxx"
|
|
#include "system/Error.hxx"
|
|
|
|
#include <cassert>
|
|
|
|
InputStreamPtr
|
|
OpenLocalInputStream(Path path, Mutex &mutex)
|
|
{
|
|
InputStreamPtr is;
|
|
|
|
#ifdef ENABLE_ARCHIVE
|
|
try {
|
|
#endif
|
|
is = OpenFileInputStream(path, mutex);
|
|
#ifdef ENABLE_ARCHIVE
|
|
} catch (const std::system_error &e) {
|
|
if (IsPathNotFound(e)) {
|
|
/* ENOTDIR means this may be a path inside an archive
|
|
file */
|
|
is = OpenArchiveInputStream(path, mutex);
|
|
if (!is)
|
|
throw;
|
|
} else
|
|
throw;
|
|
}
|
|
#endif
|
|
|
|
assert(is);
|
|
assert(is->IsReady());
|
|
|
|
return is;
|
|
}
|