libaacs | branch: master | npzacs <npz...@gmail.com> | Wed May 6 15:07:06 2015 +0300| [e5de82442622aeedb20704cde221887e7fb32cc7] | committer: npzacs
Merge file_posix changes from libbluray > http://git.videolan.org/gitweb.cgi/libaacs.git/?a=commit;h=e5de82442622aeedb20704cde221887e7fb32cc7 --- src/file/file_posix.c | 82 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 63 insertions(+), 19 deletions(-) diff --git a/src/file/file_posix.c b/src/file/file_posix.c index 49d5e72..20d6193 100644 --- a/src/file/file_posix.c +++ b/src/file/file_posix.c @@ -25,19 +25,22 @@ #include "util/macro.h" #include "util/logging.h" -#include <stdio.h> +#include <errno.h> #include <inttypes.h> #include <stdlib.h> +#include <string.h> +#include <fcntl.h> +#include <unistd.h> #include <sys/stat.h> #include <sys/types.h> static void _file_close(AACS_FILE_H *file) { if (file) { - fclose((FILE *)file->internal); + close((int)(intptr_t)file->internal); - BD_DEBUG(DBG_FILE, "Closed LINUX file (%p)\n", (void*)file); + BD_DEBUG(DBG_FILE, "Closed POSIX file (%p)\n", (void*)file); X_FREE(file); } @@ -45,46 +48,87 @@ static void _file_close(AACS_FILE_H *file) static int64_t _file_seek(AACS_FILE_H *file, int64_t offset, int32_t origin) { - return fseeko((FILE *)file->internal, offset, origin); + off_t result = lseek((int)(intptr_t)file->internal, offset, origin); + if (result == (off_t)-1) { + BD_DEBUG(DBG_FILE, "lseek() failed (%p)\n", (void*)file); + return -1; + } + return (int64_t)result; } static int64_t _file_tell(AACS_FILE_H *file) { - return ftello((FILE *)file->internal); + return _file_seek(file, 0, SEEK_CUR); } static int64_t _file_read(AACS_FILE_H *file, uint8_t *buf, int64_t size) { + ssize_t got, result; + if (size <= 0 || size >= BD_MAX_SSIZE) { BD_DEBUG(DBG_FILE | DBG_CRIT, "Ignoring invalid read of size %"PRId64" (%p)\n", size, (void*)file); return 0; } - return fread(buf, 1, size, (FILE *)file->internal); + for (got = 0; got < (ssize_t)size; got += result) { + result = read((int)(intptr_t)file->internal, buf + got, size - got); + if (result < 0) { + if (errno != EINTR) { + BD_DEBUG(DBG_FILE, "read() failed (%p)\n", (void*)file); + break; + } + result = 0; + } else if (result == 0) { + // hit EOF. + break; + } + } + return (int64_t)got; } -static AACS_FILE_H *_file_open(const char* filename, const char *mode) +static AACS_FILE_H *_file_open(const char* filename, const char *cmode) { - FILE *fp = NULL; - AACS_FILE_H *file = calloc(1, sizeof(AACS_FILE_H)); + AACS_FILE_H *file; + int fd = -1; + int flags = 0; + int mode = 0; + + if (strchr(cmode, 'w')) { + flags = O_WRONLY | O_CREAT | O_TRUNC; + mode = S_IRUSR | S_IWUSR; + } else { + flags = O_RDONLY; + } + +#ifdef O_CLOEXEC + flags |= O_CLOEXEC; +#endif +#ifdef O_BINARY + flags |= O_BINARY; +#endif + + if ((fd = open(filename, flags, mode)) < 0) { + BD_DEBUG(DBG_FILE, "Error opening file %s\n", filename); + return NULL; + } + + file = calloc(1, sizeof(AACS_FILE_H)); + if (!file) { + close(fd); + BD_DEBUG(DBG_FILE, "Error opening file %s (out of memory)\n", filename); + return NULL; + } - BD_DEBUG(DBG_FILE, "Opening LINUX file %s... (%p)\n", filename, (void*)file); file->close = _file_close; file->seek = _file_seek; file->read = _file_read; file->tell = _file_tell; - if ((fp = fopen(filename, mode))) { - file->internal = fp; - - return file; - } - - BD_DEBUG(DBG_FILE, "Error opening file %s ! (%p)\n", filename, (void*)file); + file->internal = (void*)(intptr_t)fd; - X_FREE(file); + BD_DEBUG(DBG_FILE, "Opened POSIX file %s (%p)\n", filename, (void*)file); - return NULL; + return file; } AACS_FILE_H* (*file_open)(const char* filename, const char *mode) = _file_open; _______________________________________________ libaacs-devel mailing list libaacs-devel@videolan.org https://mailman.videolan.org/listinfo/libaacs-devel
