aboutsummaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-07-14 22:07:14 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-07-14 22:07:14 +0000
commitfb79a2e2cfe33002398f1898c26d8e4f341db006 (patch)
treef5b3ee27db5bc8c9b181fbec171f8fa430a75ba5 /miscutils
parentfcfaf2e18aba06dd90b16958ecfbfcfbf59ceb02 (diff)
downloadbusybox-fb79a2e2cfe33002398f1898c26d8e4f341db006.tar.gz
busybox-fb79a2e2cfe33002398f1898c26d8e4f341db006.tar.bz2
xioctl and friends by Tito <farmatito@tiscali.it>
function old new delta do_iptunnel 203 977 +774 process_dev 5328 5494 +166 ioctl_or_perror - 54 +54 ioctl_or_perror_and_die - 51 +51 ioctl_alt_func - 49 +49 bb_ioctl_or_warn - 47 +47 do_add_ioctl 102 145 +43 bb_xioctl - 39 +39 print_value_on_off - 31 +31 get_lcm 105 123 +18 arp_main 2155 2167 +12 .................. zcip_main 1576 1566 -10 setlogcons_main 92 82 -10 dumpkmap_main 263 253 -10 do_get_ioctl 85 75 -10 setkeycodes_main 165 154 -11 write_table 244 232 -12 vconfig_main 318 306 -12 do_del_ioctl 93 81 -12 set_address 75 62 -13 maybe_set_utc 30 16 -14 loadfont_main 495 479 -16 slattach_main 712 695 -17 do_loadfont 191 174 -17 do_iplink 1155 1136 -19 getty_main 2583 2562 -21 fbset_main 2058 2035 -23 do_time 588 565 -23 xioctl 25 - -25 read_rtc 186 160 -26 parse_conf 1299 1270 -29 udhcp_read_interface 269 239 -30 bb_ioctl 45 - -45 bb_ioctl_alt 70 - -70 bb_ioctl_on_off 78 - -78 .rodata 129370 129018 -352 do_show 799 - -799 ------------------------------------------------------------------------------ (add/remove: 6/5 grow/shrink: 13/49 up/down: 1316/-1864) Total: -548 bytes text data bss dec hex filename 675352 2740 13968 692060 a8f5c busybox_old 674804 2740 13968 691512 a8d38 busybox_unstripped
Diffstat (limited to 'miscutils')
-rw-r--r--miscutils/devfsd.c16
-rw-r--r--miscutils/eject.c5
-rw-r--r--miscutils/hdparm.c158
-rw-r--r--miscutils/mt.c6
-rw-r--r--miscutils/raidautorun.c4
5 files changed, 90 insertions, 99 deletions
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index 814fbd686..1dfbadf83 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -234,7 +234,6 @@ static char get_old_ide_name(unsigned , unsigned);
static char *write_old_sd_name(char *, unsigned, unsigned, const char *);
/* busybox functions */
-static void do_ioctl_or_die(int fd, int request, unsigned long event_mask_flag);
static int get_uid_gid(int flag, const char *string);
static void safe_memcpy(char * dest, const char * src, int len);
static unsigned int scan_dev_name_common(const char *d, unsigned int n, int addendum, const char *ptr);
@@ -298,12 +297,6 @@ static const char * const bb_msg_variable_not_found = "variable: %s not found";
#define error_logger_and_die(p, fmt, args...) exit(1)
#endif
-static void do_ioctl_or_die(int fd, int request, unsigned long event_mask_flag)
-{
- if (ioctl(fd, request, event_mask_flag) == -1)
- msg_logger_and_die(LOG_ERR, "ioctl");
-}
-
static void safe_memcpy(char *dest, const char *src, int len)
{
memcpy(dest , src, len);
@@ -386,8 +379,7 @@ int devfsd_main(int argc, char **argv)
if (fcntl(fd, F_SETFD, FD_CLOEXEC) != 0)
bb_perror_msg_and_die("FD_CLOEXEC");
- if (ioctl(fd, DEVFSDIOC_GET_PROTO_REV, &proto_rev) == -1)
- bb_perror_msg_and_die("ioctl");
+ xioctl(fd, DEVFSDIOC_GET_PROTO_REV, &proto_rev);
/*setup initial entries */
for (curr = initial_symlinks; curr->dest != NULL; ++curr)
@@ -404,7 +396,7 @@ int devfsd_main(int argc, char **argv)
exit(EXIT_SUCCESS); /* -v */
}
/* Tell kernel we are special(i.e. we get to see hidden entries) */
- do_ioctl_or_die(fd, DEVFSDIOC_SET_EVENT_MASK, 0);
+ xioctl(fd, DEVFSDIOC_SET_EVENT_MASK, 0);
sigemptyset(&new_action.sa_mask);
new_action.sa_flags = 0;
@@ -435,7 +427,7 @@ int devfsd_main(int argc, char **argv)
if (do_daemon) {
/* Release so that the child can grab it */
- do_ioctl_or_die(fd, DEVFSDIOC_RELEASE_EVENT_QUEUE, 0);
+ xioctl(fd, DEVFSDIOC_RELEASE_EVENT_QUEUE, 0);
bb_daemonize_or_rexec(0, argv);
} else if (ENABLE_DEVFSD_FG_NP) {
setpgid(0, 0); /* Become process group leader */
@@ -661,7 +653,7 @@ static int do_servicing(int fd, unsigned long event_mask)
/* Tell devfs what events we care about */
tmp_event_mask = event_mask;
- do_ioctl_or_die(fd, DEVFSDIOC_SET_EVENT_MASK, tmp_event_mask);
+ xioctl(fd, DEVFSDIOC_SET_EVENT_MASK, tmp_event_mask);
while (!caught_signal) {
errno = 0;
bytes = read(fd,(char *) &info, sizeof info);
diff --git a/miscutils/eject.c b/miscutils/eject.c
index 631a344a1..ba7da5c65 100644
--- a/miscutils/eject.c
+++ b/miscutils/eject.c
@@ -50,9 +50,8 @@ int eject_main(int argc, char **argv)
if (flags & FLAG_CLOSE
|| (flags & FLAG_SMART && ioctl(dev, CDROM_DRIVE_STATUS) == CDS_TRAY_OPEN))
cmd = CDROMCLOSETRAY;
- if (ioctl(dev, cmd)) {
- bb_perror_msg_and_die("%s", device);
- }
+
+ ioctl_or_perror_and_die(dev, cmd, NULL, "%s", device);
if (ENABLE_FEATURE_CLEAN_UP)
close(dev);
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index fe4c67a9a..5c7d1f60c 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -200,8 +200,7 @@ static const char * const ata1_cfg_str[] = { /* word 0 in ATA-1 mode */
#define MULTIPLE_SETTING_VALID 0x0100 /* 1=multiple sector setting is valid */
/* word 49: capabilities 0 */
-#define STD_STBY 0x2000 /* 1=standard values supported (ATA);
- 0=vendor specific values */
+#define STD_STBY 0x2000 /* 1=standard values supported (ATA); 0=vendor specific values */
#define IORDY_SUP 0x0800 /* 1=support; 0=may be supported */
#define IORDY_OFF 0x0400 /* 1=may be disabled */
#define LBA_SUP 0x0200 /* 1=Logical Block Address support */
@@ -442,25 +441,29 @@ static const char * const secu_str[] = {
#undef DO_FLUSHCACHE /* under construction: force cache flush on -W0 */
/* Busybox messages and functions */
-static int bb_ioctl(int fd, int request, void *argp, const char *string)
+#if ENABLE_IOCTL_HEX2STR_ERROR
+static int ioctl_alt_func(int fd, int cmd, unsigned char *args, int alt, const char *string)
{
- int e = ioctl(fd, request, argp);
- if (e && string)
- bb_perror_msg(" %s", string);
- return e;
+ if (!ioctl(fd, cmd, args))
+ return 0;
+ args[0] = alt;
+ return bb_ioctl_or_warn(fd, cmd, args, string);
}
-
-static int bb_ioctl_alt(int fd, int cmd, unsigned char *args, int alt, const char *string)
+#define ioctl_alt_or_warn(fd,cmd,args,alt) ioctl_alt_func(fd,cmd,args,alt,#cmd)
+#else
+static int ioctl_alt_func(int fd, int cmd, unsigned char *args, int alt)
{
if (!ioctl(fd, cmd, args))
return 0;
args[0] = alt;
- return bb_ioctl(fd, cmd, args, string);
+ return bb_ioctl_or_warn(fd, cmd, args);
}
+#define ioctl_alt_or_warn(fd,cmd,args,alt) ioctl_alt_func(fd,cmd,args,alt)
+#endif
static void on_off(int value)
{
- printf(value ? " (on)\n" : " (off)\n");
+ puts(value ? " (on)" : " (off)");
}
static void print_flag_on_off(int get_arg, const char *s, unsigned long arg)
@@ -471,15 +474,10 @@ static void print_flag_on_off(int get_arg, const char *s, unsigned long arg)
}
}
-static void bb_ioctl_on_off(int fd, int request, void *argp, const char *string,
- const char * str)
+static void print_value_on_off(const char *str, unsigned long argp)
{
- if (ioctl(fd, request, &argp) != 0)
- bb_perror_msg(" %s", string);
- else {
- printf(" %s\t= %2ld", str, (unsigned long) argp);
- on_off(((unsigned long) argp) != 0);
- }
+ printf(" %s\t= %2ld", str, argp);
+ on_off(argp != 0);
}
#if ENABLE_FEATURE_HDPARM_GET_IDENTITY
@@ -1245,11 +1243,15 @@ static void dump_identity(const struct hd_driveid *id)
static void flush_buffer_cache(int fd)
{
fsync(fd); /* flush buffers */
- bb_ioctl(fd, BLKFLSBUF, NULL, "BLKFLSBUF"); /* do it again, big time */
+ ioctl_or_warn(fd, BLKFLSBUF, NULL); /* do it again, big time */
#ifdef HDIO_DRIVE_CMD
sleep(1);
- if (ioctl(fd, HDIO_DRIVE_CMD, NULL) && errno != EINVAL) /* await completion */
- bb_perror_msg("HDIO_DRIVE_CMD");
+ if (ioctl(fd, HDIO_DRIVE_CMD, NULL) && errno != EINVAL) { /* await completion */
+ if (ENABLE_IOCTL_HEX2STR_ERROR) /* To be coherent with ioctl_or_warn */
+ bb_perror_msg("HDIO_DRIVE_CMD");
+ else
+ bb_perror_msg("ioctl %#x failed", HDIO_DRIVE_CMD);
+ }
#endif
}
@@ -1284,9 +1286,7 @@ static int do_blkgetsize(int fd, unsigned long long *blksize64)
*blksize64 /= 512;
return 0;
}
- rc = ioctl(fd, BLKGETSIZE, &blksize32); // returns sectors
- if (rc)
- bb_perror_msg("BLKGETSIZE");
+ rc = ioctl_or_warn(fd, BLKGETSIZE, &blksize32); // returns sectors
*blksize64 = blksize32;
return rc;
}
@@ -1516,12 +1516,12 @@ static void process_dev(char *devname)
if (set_readahead) {
print_flag(get_readahead, "fs readahead", Xreadahead);
- bb_ioctl(fd, BLKRASET, (int *)Xreadahead, "BLKRASET");
+ ioctl_or_warn(fd, BLKRASET, (int *)Xreadahead);
}
#if ENABLE_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
if (unregister_hwif) {
printf(" attempting to unregister hwif#%lu\n", hwif);
- bb_ioctl(fd, HDIO_UNREGISTER_HWIF, (int *)(unsigned long)hwif, "HDIO_UNREGISTER_HWIF");
+ ioctl_or_warn(fd, HDIO_UNREGISTER_HWIF, (int *)(unsigned long)hwif);
}
#endif
#if ENABLE_FEATURE_HDPARM_HDIO_SCAN_HWIF
@@ -1530,7 +1530,7 @@ static void process_dev(char *devname)
args[0] = hwif_data;
args[1] = hwif_ctrl;
args[2] = hwif_irq;
- bb_ioctl(fd, HDIO_SCAN_HWIF, args, "HDIO_SCAN_HWIF");
+ ioctl_or_warn(fd, HDIO_SCAN_HWIF, args);
args[0] = WIN_SETFEATURES;
args[1] = 0;
}
@@ -1547,70 +1547,70 @@ static void process_dev(char *devname)
else
printf("set UDMA mode to %d\n", (piomode-200));
}
- bb_ioctl(fd, HDIO_SET_PIO_MODE, (int *)(unsigned long)piomode, "HDIO_SET_PIO_MODE");
+ ioctl_or_warn(fd, HDIO_SET_PIO_MODE, (int *)(unsigned long)piomode);
}
if (set_io32bit) {
print_flag(get_io32bit, "32-bit IO_support flag", io32bit);
- bb_ioctl(fd, HDIO_SET_32BIT, (int *)io32bit, "HDIO_SET_32BIT");
+ ioctl_or_warn(fd, HDIO_SET_32BIT, (int *)io32bit);
}
if (set_mult) {
print_flag(get_mult, "multcount", mult);
#ifdef HDIO_DRIVE_CMD
- bb_ioctl(fd, HDIO_SET_MULTCOUNT, (void *)mult, "HDIO_SET_MULTCOUNT");
+ ioctl_or_warn(fd, HDIO_SET_MULTCOUNT, (void *)mult);
#else
- force_operation |= (!bb_ioctl(fd, HDIO_SET_MULTCOUNT, (void *)mult, "HDIO_SET_MULTCOUNT"));
+ force_operation |= (!ioctl_or_warn(fd, HDIO_SET_MULTCOUNT, (void *)mult));
#endif
}
if (set_readonly) {
print_flag_on_off(get_readonly, "readonly", readonly);
- bb_ioctl(fd, BLKROSET, &readonly, "BLKROSET");
+ ioctl_or_warn(fd, BLKROSET, &readonly);
}
if (set_unmask) {
print_flag_on_off(get_unmask, "unmaskirq", unmask);
- bb_ioctl(fd, HDIO_SET_UNMASKINTR, (int *)unmask, "HDIO_SET_UNMASKINTR");
+ ioctl_or_warn(fd, HDIO_SET_UNMASKINTR, (int *)unmask);
}
#if ENABLE_FEATURE_HDPARM_HDIO_GETSET_DMA
if (set_dma) {
print_flag_on_off(get_dma, "using_dma", dma);
- bb_ioctl(fd, HDIO_SET_DMA, (int *)dma, "HDIO_SET_DMA");
+ ioctl_or_warn(fd, HDIO_SET_DMA, (int *)dma);
}
#endif /* FEATURE_HDPARM_HDIO_GETSET_DMA */
if (set_dma_q) {
print_flag_on_off(get_dma_q, "DMA queue_depth", dma_q);
- bb_ioctl(fd, HDIO_SET_QDMA, (int *)dma_q, "HDIO_SET_QDMA");
+ ioctl_or_warn(fd, HDIO_SET_QDMA, (int *)dma_q);
}
if (set_nowerr) {
print_flag_on_off(get_nowerr, "nowerr", nowerr);
- bb_ioctl(fd, HDIO_SET_NOWERR, (int *)nowerr, "HDIO_SET_NOWERR");
+ ioctl_or_warn(fd, HDIO_SET_NOWERR, (int *)nowerr);
}
if (set_keep) {
print_flag_on_off(get_keep, "keep_settings", keep);
- bb_ioctl(fd, HDIO_SET_KEEPSETTINGS, (int *)keep, "HDIO_SET_KEEPSETTINGS");
+ ioctl_or_warn(fd, HDIO_SET_KEEPSETTINGS, (int *)keep);
}
#ifdef HDIO_DRIVE_CMD
if (set_doorlock) {
args[0] = doorlock ? WIN_DOORLOCK : WIN_DOORUNLOCK;
args[2] = 0;
print_flag_on_off(get_doorlock, "drive doorlock", doorlock);
- bb_ioctl(fd, HDIO_DRIVE_CMD, &args, "HDIO_DRIVE_CMD(doorlock)");
+ ioctl_or_warn(fd, HDIO_DRIVE_CMD, &args);
args[0] = WIN_SETFEATURES;
}
if (set_dkeep) {
/* lock/unlock the drive's "feature" settings */
print_flag_on_off(get_dkeep, "drive keep features", dkeep);
args[2] = dkeep ? 0x66 : 0xcc;
- bb_ioctl(fd, HDIO_DRIVE_CMD, &args, "HDIO_DRIVE_CMD(keepsettings)");
+ ioctl_or_warn(fd, HDIO_DRIVE_CMD, &args);
}
if (set_defects) {
args[2] = defects ? 0x04 : 0x84;
print_flag(get_defects, "drive defect-mgmt", defects);
- bb_ioctl(fd, HDIO_DRIVE_CMD, &args, "HDIO_DRIVE_CMD(defectmgmt)");
+ ioctl_or_warn(fd, HDIO_DRIVE_CMD, &args);
}
if (set_prefetch) {
args[1] = prefetch;
args[2] = 0xab;
print_flag(get_prefetch, "drive prefetch", prefetch);
- bb_ioctl(fd, HDIO_DRIVE_CMD, &args, "HDIO_DRIVE_CMD(setprefetch)");
+ ioctl_or_warn(fd, HDIO_DRIVE_CMD, &args);
args[1] = 0;
}
if (set_xfermode) {
@@ -1620,20 +1620,20 @@ static void process_dev(char *devname)
print_flag(1, "xfermode", xfermode_requested);
interpret_xfermode(xfermode_requested);
}
- bb_ioctl(fd, HDIO_DRIVE_CMD, &args, "HDIO_DRIVE_CMD(setxfermode)");
+ ioctl_or_warn(fd, HDIO_DRIVE_CMD, &args);
args[1] = 0;
}
if (set_lookahead) {
args[2] = lookahead ? 0xaa : 0x55;
print_flag_on_off(get_lookahead, "drive read-lookahead", lookahead);
- bb_ioctl(fd, HDIO_DRIVE_CMD, &args, "HDIO_DRIVE_CMD(setreadahead)");
+ ioctl_or_warn(fd, HDIO_DRIVE_CMD, &args);
}
if (set_apmmode) {
args[2] = (apmmode == 255) ? 0x85 /* disable */ : 0x05 /* set */; /* feature register */
args[1] = apmmode; /* sector count register 1-255 */
if (get_apmmode)
printf(" setting APM level to %s 0x%02lX (%ld)\n", (apmmode == 255) ? "disabled" : "", apmmode, apmmode);
- bb_ioctl(fd, HDIO_DRIVE_CMD, &args, "HDIO_DRIVE_CMD");
+ ioctl_or_warn(fd, HDIO_DRIVE_CMD, &args);
args[1] = 0;
}
if (set_wcache) {
@@ -1647,12 +1647,12 @@ static void process_dev(char *devname)
print_flag_on_off(get_wcache, "drive write-caching", wcache);
#ifdef DO_FLUSHCACHE
if (!wcache)
- bb_ioctl(fd, HDIO_DRIVE_CMD, &flushcache, "HDIO_DRIVE_CMD(flushcache)");
+ ioctl_or_warn(fd, HDIO_DRIVE_CMD, &flushcache);
#endif /* DO_FLUSHCACHE */
- bb_ioctl(fd, HDIO_DRIVE_CMD, &args, "HDIO_DRIVE_CMD(setcache)");
+ ioctl_or_warn(fd, HDIO_DRIVE_CMD, &args);
#ifdef DO_FLUSHCACHE
if (!wcache)
- bb_ioctl(fd, HDIO_DRIVE_CMD, &flushcache, "HDIO_DRIVE_CMD(flushcache)");
+ ioctl_or_warn(fd, HDIO_DRIVE_CMD, &flushcache);
#endif /* DO_FLUSHCACHE */
}
@@ -1669,7 +1669,7 @@ static void process_dev(char *devname)
#endif
if (get_standbynow) printf(" issuing standby command\n");
args[0] = WIN_STANDBYNOW1;
- bb_ioctl_alt(fd, HDIO_DRIVE_CMD, args, WIN_STANDBYNOW2, "HDIO_DRIVE_CMD(standby)");
+ ioctl_alt_or_warn(fd, HDIO_DRIVE_CMD, args, WIN_STANDBYNOW2);
}
if (set_sleepnow) {
#ifndef WIN_SLEEPNOW1
@@ -1680,12 +1680,12 @@ static void process_dev(char *devname)
#endif
if (get_sleepnow) printf(" issuing sleep command\n");
args[0] = WIN_SLEEPNOW1;
- bb_ioctl_alt(fd, HDIO_DRIVE_CMD, args, WIN_SLEEPNOW2, "HDIO_DRIVE_CMD(sleep)");
+ ioctl_alt_or_warn(fd, HDIO_DRIVE_CMD, args, WIN_SLEEPNOW2);
}
if (set_seagate) {
args[0] = 0xfb;
if (get_seagate) printf(" disabling Seagate auto powersaving mode\n");
- bb_ioctl(fd, HDIO_DRIVE_CMD, &args, "HDIO_DRIVE_CMD(seagatepwrsave)");
+ ioctl_or_warn(fd, HDIO_DRIVE_CMD, &args);
}
if (set_standby) {
args[0] = WIN_SETIDLE1;
@@ -1694,7 +1694,7 @@ static void process_dev(char *devname)
print_flag(1, "standby", standby_requested);
interpret_standby(standby_requested);
}
- bb_ioctl(fd, HDIO_DRIVE_CMD, &args, "HDIO_DRIVE_CMD(setidle1)");
+ ioctl_or_warn(fd, HDIO_DRIVE_CMD, &args);
args[1] = 0;
}
#else /* HDIO_DRIVE_CMD */
@@ -1709,15 +1709,17 @@ static void process_dev(char *devname)
if (get_mult || get_identity) {
multcount = -1;
if (ioctl(fd, HDIO_GET_MULTCOUNT, &multcount)) {
- if (get_mult)
+ if (get_mult && ENABLE_IOCTL_HEX2STR_ERROR) /* To be coherent with ioctl_or_warn. */
bb_perror_msg("HDIO_GET_MULTCOUNT");
+ else
+ bb_perror_msg("ioctl %#x failed", HDIO_GET_MULTCOUNT);
} else if (get_mult) {
printf(fmt, "multcount", multcount);
on_off(multcount != 0);
}
}
if (get_io32bit) {
- if (!bb_ioctl(fd, HDIO_GET_32BIT, &parm, "HDIO_GET_32BIT")) {
+ if (!ioctl_or_warn(fd, HDIO_GET_32BIT, &parm)) {
printf(" IO_support\t=%3ld (", parm);
if (parm == 0)
printf("default 16-bit)\n");
@@ -1734,14 +1736,14 @@ static void process_dev(char *devname)
}
}
if (get_unmask) {
- bb_ioctl_on_off(fd, HDIO_GET_UNMASKINTR, (unsigned long *)parm,
- "HDIO_GET_UNMASKINTR", "unmaskirq");
+ if(!ioctl_or_warn(fd, HDIO_GET_UNMASKINTR, (unsigned long *)parm))
+ print_value_on_off("unmaskirq", parm);
}
#if ENABLE_FEATURE_HDPARM_HDIO_GETSET_DMA
if (get_dma) {
- if (!bb_ioctl(fd, HDIO_GET_DMA, &parm, "HDIO_GET_DMA")) {
+ if (!ioctl_or_warn(fd, HDIO_GET_DMA, &parm)) {
printf(fmt, "using_dma", parm);
if (parm == 8)
printf(" (DMA-Assisted-PIO)\n");
@@ -1751,31 +1753,31 @@ static void process_dev(char *devname)
}
#endif
if (get_dma_q) {
- bb_ioctl_on_off(fd, HDIO_GET_QDMA, (unsigned long *)parm,
- "HDIO_GET_QDMA", "queue_depth");
+ if(!ioctl_or_warn(fd, HDIO_GET_QDMA, (unsigned long *)parm))
+ print_value_on_off("queue_depth", parm);
}
if (get_keep) {
- bb_ioctl_on_off(fd, HDIO_GET_KEEPSETTINGS, (unsigned long *)parm,
- "HDIO_GET_KEEPSETTINGS", "keepsettings");
+ if(!ioctl_or_warn(fd, HDIO_GET_KEEPSETTINGS, (unsigned long *)parm))
+ print_value_on_off("keepsettings", parm);
}
if (get_nowerr) {
- bb_ioctl_on_off(fd, HDIO_GET_NOWERR, (unsigned long *)&parm,
- "HDIO_GET_NOWERR", "nowerr");
+ if(!ioctl_or_warn(fd, HDIO_GET_NOWERR, (unsigned long *)parm))
+ print_value_on_off("nowerr", parm);
}
if (get_readonly) {
- bb_ioctl_on_off(fd, BLKROGET, (unsigned long *)parm,
- "BLKROGET", "readonly");
+ if(!ioctl_or_warn(fd, BLKROGET, (unsigned long *)parm))
+ print_value_on_off("readonly", parm);
}
if (get_readahead) {
- bb_ioctl_on_off(fd, BLKRAGET, (unsigned long *) parm,
- "BLKRAGET", "readahead");
+ if(!ioctl_or_warn(fd, BLKRAGET, (unsigned long *)parm))
+ print_value_on_off("readahead", parm);
}
if (get_geom) {
- if (!bb_ioctl(fd, BLKGETSIZE, &parm, "BLKGETSIZE")) {
+ if (!ioctl_or_warn(fd, BLKGETSIZE, &parm)) {
struct hd_geometry g;
- if (!bb_ioctl(fd, HDIO_GETGEO, &g, "HDIO_GETGEO"))
+ if (!ioctl_or_warn(fd, HDIO_GETGEO, &g))
printf(" geometry\t= %u/%u/%u, sectors = %ld, start = %ld\n",
g.cylinders, g.heads, g.sectors, parm, g.start);
}
@@ -1791,7 +1793,7 @@ static void process_dev(char *devname)
const char *state;
args[0] = WIN_CHECKPOWERMODE1;
- if (bb_ioctl_alt(fd, HDIO_DRIVE_CMD, args, WIN_CHECKPOWERMODE2, 0)) {
+ if (ioctl_alt_or_warn(fd, HDIO_DRIVE_CMD, args, WIN_CHECKPOWERMODE2)) {
if (errno != EIO || args[0] != 0 || args[1] != 0)
state = "unknown";
else
@@ -1805,14 +1807,14 @@ static void process_dev(char *devname)
#endif
#if ENABLE_FEATURE_HDPARM_HDIO_DRIVE_RESET
if (perform_reset) {
- bb_ioctl(fd, HDIO_DRIVE_RESET, NULL, "HDIO_DRIVE_RESET");
+ ioctl_or_warn(fd, HDIO_DRIVE_RESET, NULL);
}
#endif /* FEATURE_HDPARM_HDIO_DRIVE_RESET */
#if ENABLE_FEATURE_HDPARM_HDIO_TRISTATE_HWIF
if (perform_tristate) {
args[0] = 0;
args[1] = tristate;
- bb_ioctl(fd, HDIO_TRISTATE_HWIF, &args, "HDIO_TRISTATE_HWIF");
+ ioctl_or_warn(fd, HDIO_TRISTATE_HWIF, &args);
}
#endif /* FEATURE_HDPARM_HDIO_TRISTATE_HWIF */
#if ENABLE_FEATURE_HDPARM_GET_IDENTITY
@@ -1828,8 +1830,10 @@ static void process_dev(char *devname)
dump_identity(&id);
} else if (errno == -ENOMSG)
printf(" no identification info available\n");
+ else if (ENABLE_IOCTL_HEX2STR_ERROR) /* To be coherent with ioctl_or_warn */
+ bb_perror_msg("HDIO_GET_IDENTITY");
else
- bb_perror_msg("HDIO_GET_IDENTITY");
+ bb_perror_msg("ioctl %#x failed", HDIO_GET_IDENTITY);
}
if (get_IDentity) {
@@ -1838,7 +1842,7 @@ static void process_dev(char *devname)
memset(args1, 0, sizeof(args1));
args1[0] = WIN_IDENTIFY;
args1[3] = 1;
- if (!bb_ioctl_alt(fd, HDIO_DRIVE_CMD, args1, WIN_PIDENTIFY, "HDIO_DRIVE_CMD(identify)"))
+ if (!ioctl_alt_or_warn(fd, HDIO_DRIVE_CMD, args1, WIN_PIDENTIFY))
identify((void *)(args1 + 4));
}
#endif
@@ -1848,17 +1852,17 @@ static void process_dev(char *devname)
print_flag(1, "bus state", busstate);
bus_state_value(busstate);
}
- bb_ioctl(fd, HDIO_SET_BUSSTATE, (int *)(unsigned long)busstate, "HDIO_SET_BUSSTATE");
+ ioctl_or_warn(fd, HDIO_SET_BUSSTATE, (int *)(unsigned long)busstate);
}
if (get_busstate) {
- if (!bb_ioctl(fd, HDIO_GET_BUSSTATE, &parm, "HDIO_GET_BUSSTATE")) {
+ if (!ioctl_or_warn(fd, HDIO_GET_BUSSTATE, &parm)) {
printf(fmt, "bus state", parm);
bus_state_value(parm);
}
}
#endif
if (reread_partn)
- bb_ioctl(fd, BLKRRPART, NULL, "BLKRRPART");
+ ioctl_or_warn(fd, BLKRRPART, NULL);
if (do_ctimings)
do_time(0, fd); /* time cache */
diff --git a/miscutils/mt.c b/miscutils/mt.c
index 2971421ef..b9bc2a11b 100644
--- a/miscutils/mt.c
+++ b/miscutils/mt.c
@@ -106,14 +106,12 @@ int mt_main(int argc, char **argv)
switch (code->value) {
case MTTELL:
- if (ioctl(fd, MTIOCPOS, &position) < 0)
- bb_perror_msg_and_die("%s", file);
+ ioctl_or_perror_and_die(fd, MTIOCPOS, &position, "%s", file);
printf("At block %d.\n", (int) position.mt_blkno);
break;
default:
- if (ioctl(fd, MTIOCTOP, &op) != 0)
- bb_perror_msg_and_die("%s", file);
+ ioctl_or_perror_and_die(fd, MTIOCTOP, &op, "%s", file);
break;
}
diff --git a/miscutils/raidautorun.c b/miscutils/raidautorun.c
index 2b65d39bc..edcb6d66d 100644
--- a/miscutils/raidautorun.c
+++ b/miscutils/raidautorun.c
@@ -19,9 +19,7 @@ int raidautorun_main(int argc, char **argv)
if (argc != 2)
bb_show_usage();
- if (ioctl(xopen(argv[1], O_RDONLY), RAID_AUTORUN, NULL) != 0) {
- bb_perror_msg_and_die("ioctl");
- }
+ xioctl(xopen(argv[1], O_RDONLY), RAID_AUTORUN, NULL);
return EXIT_SUCCESS;
}