diff options
Diffstat (limited to 'release/src/router/busybox/archival/libunarchive/seek_by_jump.c')
| -rw-r--r-- | release/src/router/busybox/archival/libunarchive/seek_by_jump.c | 36 |
1 files changed, 10 insertions, 26 deletions
diff --git a/release/src/router/busybox/archival/libunarchive/seek_by_jump.c b/release/src/router/busybox/archival/libunarchive/seek_by_jump.c index 578870d9..0a259c96 100644 --- a/release/src/router/busybox/archival/libunarchive/seek_by_jump.c +++ b/release/src/router/busybox/archival/libunarchive/seek_by_jump.c @@ -1,35 +1,19 @@ +/* vi: set sw=4 ts=4: */ /* - * 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 Library 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. + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include <sys/types.h> -#include <errno.h> -#include <unistd.h> -#include <stdlib.h> - #include "libbb.h" #include "unarchive.h" -extern void seek_by_jump(const archive_handle_t *archive_handle, const unsigned int amount) +void FAST_FUNC seek_by_jump(const archive_handle_t *archive_handle, unsigned amount) { - if (lseek(archive_handle->src_fd, (off_t) amount, SEEK_CUR) == (off_t) -1) { -#ifdef CONFIG_FEATURE_UNARCHIVE_TAPE - if (errno == ESPIPE) { - seek_by_char(archive_handle, amount); - } else -#endif - bb_perror_msg_and_die("Seek failure"); + if (amount + && lseek(archive_handle->src_fd, (off_t) amount, SEEK_CUR) == (off_t) -1 + ) { + if (errno == ESPIPE) + seek_by_read(archive_handle, amount); + else + bb_perror_msg_and_die("seek failure"); } } |