chaos / scrub

disk overwrite utility

GNU General Public License v2.0

70 stars 21 forks source link

Portability fixes upstreamed from pkgsrc #4

Closed sevan closed 9 years ago

sevan commented 9 years ago

Taken from http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/sysutils/diskscrub Various changes which improve the portability of the codebase & resolve build issue on some platforms.

Use ioctl names (feature tests) rather than OS names. XXX for SIOC_CAPACITY consider using SIOC_STORAGE_CAPACITY.
Implement getsize() based on DIOCGDISKINFO ioctl.
Check for sys/mman.h & use it in src/util.h as off_t is defined there on FreeBSD.

garlick commented 9 years ago

Looks like a file system block size not anticipated when I wrote the test. I should have used a power of 2 for the file size. I'll merge your patch later today and make another change to fix the tests and then ask you to update and try again if that is OK with you.

sevan commented 9 years ago

Sure thing.

garlick commented 9 years ago

Hey, I've pushed some test suite changes to master that I hope will get the tests passing on freebsd. Could you give a try? Thanks.

sevan commented 9 years ago

PASS: t00 PASS: t01 PASS: t02 PASS: t03 PASS: t04 PASS: t05 PASS: t06 PASS: t07 PASS: t08 SKIP: t09 SKIP: t10 PASS: t11 PASS: t12 PASS: t13 PASS: t14 PASS: t15 PASS: t16 PASS: t17 SKIP: t18 SKIP: t19 SKIP: t20 SKIP: t21

PASS: t22

Testsuite summary for scrub 2.6.1

TOTAL: 23

PASS: 17

SKIP: 6

XFAIL: 0

FAIL: 0

XPASS: 0

ERROR: 0

sevan commented 9 years ago

btw, when is a new release due?