Skip to content

Handle block devices in main_file_stat, fixes "non-seekable" source bug for block devices #282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adbjo wants to merge 1 commit into
base: release3_1_apl
Choose a base branch
from
+18 −2
Open

Handle block devices in main_file_stat, fixes "non-seekable" source bug for block devices #282

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions xdelta3/xdelta3-main.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,10 @@ xsnprintf_func (char *str, size_t n, const char *fmt, ...)
#include <unistd.h> /* lots */
#include <sys/time.h> /* gettimeofday() */
#include <sys/stat.h> /* stat() and fstat() */
#include <sys/ioctl.h> /* ioctl() */
#ifndef BLKGETSIZE64
# define BLKGETSIZE64 _IOR(0x12,114,size_t)
#endif
#else
#if defined(_MSC_VER)
#define strtoll _strtoi64
Expand Down Expand Up @@ -944,11 +948,23 @@ main_file_stat (main_file *xfile, xoff_t *size)
return ret;
}

if (! S_ISREG (sbuf.st_mode))
if (S_ISBLK (sbuf.st_mode))
{
uint64_t blk_size;
if (ioctl (XFNO (xfile), BLKGETSIZE64, &blk_size) < 0)
{
return get_errno ();
}
(*size) = (xoff_t)blk_size;
}
else if (S_ISREG (sbuf.st_mode))
{
(*size) = sbuf.st_size;
}
else
{
return ESPIPE;
}
(*size) = sbuf.st_size;
#endif
return ret;
}
Expand Down