b79f6b882a
thread-safety work in preparation for rewrite to use pthreads Expect no regressions against trunk (r7078), possibly minor performance improvements in update (due to fewer heap allocations), but increased stack usage. Applied the following patches: * maxpath_str for reentrancy (temporary fix, reverted) * path: start working on thread-safe variants of these methods * Re-entrancy work on path/character-set conversions * directory.c: exploreDirectory() use reentrant functions here * directory/update: more use of reentrant functions + cleanups * string_toupper: a strdup-less version of strDupToUpper * get_song_url: a static-variable-free version of getSongUrl() * Use reentrant/thread-safe get_song_url everywhere * replace rmp2amp with the reentrant version, rmp2amp_r * Get rid of the non-reentrant/non-thread-safe rpp2app, too. * buffer2array: assert strdup() returns a usable value in unit tests * replace utf8ToFsCharset and fsCharsetToUtf8 with thread-safe variants * fix storing playlists w/o absolute paths * parent_path(), a reentrant version of parentPath() * parentPath => parent_path for reentrancy and thread-safety * allow "make test" to automatically run embedded unit tests * remove convStrDup() and maxpath_str() * use MPD_PATH_MAX everywhere instead of MAXPATHLEN * path: get rid of appendSlash, pfx_path and just use pfx_dir * get_song_url: fix the ability to play songs in the top-level music_directory git-svn-id: https://svn.musicpd.org/mpd/trunk@7106 09075e82-0dd4-0310-85a5-a0d7c8717e4f
73 lines
1.9 KiB
C
73 lines
1.9 KiB
C
/* the Music Player Daemon (MPD)
|
|
* Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
|
|
* This project's homepage is: 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#include "myfprintf.h"
|
|
#include "interface.h"
|
|
#include "path.h"
|
|
#include "log.h"
|
|
#include "conf.h"
|
|
#include "utils.h"
|
|
|
|
#include <stdarg.h>
|
|
#include <sys/param.h>
|
|
#include <unistd.h>
|
|
#include <sys/select.h>
|
|
#include <fcntl.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
|
|
#define BUFFER_LENGTH MPD_PATH_MAX+1024
|
|
|
|
static void blockingWrite(const int fd, const char *string, size_t len)
|
|
{
|
|
while (len) {
|
|
ssize_t ret = xwrite(fd, string, len);
|
|
if (ret == len)
|
|
return;
|
|
if (ret >= 0) {
|
|
len -= ret;
|
|
string += ret;
|
|
continue;
|
|
}
|
|
return; /* error */
|
|
}
|
|
}
|
|
|
|
void vfdprintf(const int fd, const char *fmt, va_list args)
|
|
{
|
|
static char buffer[BUFFER_LENGTH];
|
|
char *buf = buffer;
|
|
size_t len;
|
|
|
|
vsnprintf(buf, BUFFER_LENGTH, fmt, args);
|
|
len = strlen(buf);
|
|
if (fd == STDERR_FILENO ||
|
|
fd == STDOUT_FILENO ||
|
|
interfacePrintWithFD(fd, buf, len) < 0)
|
|
blockingWrite(fd, buf, len);
|
|
}
|
|
|
|
mpd_fprintf void fdprintf(const int fd, const char *fmt, ...)
|
|
{
|
|
va_list args;
|
|
va_start(args, fmt);
|
|
vfdprintf(fd, fmt, args);
|
|
va_end(args);
|
|
}
|
|
|