mirror of
https://github.com/sheumann/hush.git
synced 2024-12-22 14:30:31 +00:00
Eliminate use of a kernel scsi header file.
Prevent potentially misaligned accesses while indexing a pointer to the partition table, which would be a bad thing on i.e. arm.
This commit is contained in:
parent
68474f3b36
commit
7495b0d4b1
@ -26,12 +26,7 @@
|
||||
#include <setjmp.h>
|
||||
#include <assert.h> /* assert */
|
||||
#include <getopt.h>
|
||||
|
||||
#include <endian.h>
|
||||
#define u_char unsigned char
|
||||
#include <scsi/scsi.h> /* SCSI_IOCTL_GET_IDLUN */
|
||||
#undef u_char
|
||||
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/sysmacros.h> /* major */
|
||||
@ -93,6 +88,10 @@
|
||||
#define cround(n) (display_in_cyl_units ? ((n)/units_per_sector)+1 : (n))
|
||||
#define scround(x) (((x)+units_per_sector-1)/units_per_sector)
|
||||
|
||||
#ifdef CONFIG_FEATURE_SUN_LABEL
|
||||
#define SCSI_IOCTL_GET_IDLUN 0x5382
|
||||
#endif
|
||||
|
||||
|
||||
#if defined(CONFIG_LFS) || defined(FDISK_SUPPORT_LARGE_DISKS) || defined(__alpha__) || defined(__ia64__) || defined(__s390x__)
|
||||
typedef long long fdisk_loff_t;
|
||||
@ -203,7 +202,7 @@ struct partition {
|
||||
unsigned char end_cyl; /* end cylinder */
|
||||
unsigned char start4[4]; /* starting sector counting from 0 */
|
||||
unsigned char size4[4]; /* nr of sectors in partition */
|
||||
};
|
||||
} __attribute__((__packed__));
|
||||
|
||||
enum failure {
|
||||
ioctl_error, unable_to_open, unable_to_read, unable_to_seek,
|
||||
|
Loading…
Reference in New Issue
Block a user