aboutsummaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
Diffstat (limited to 'miscutils')
-rw-r--r--miscutils/eject.c2
-rw-r--r--miscutils/hdparm.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/miscutils/eject.c b/miscutils/eject.c
index 75618bea6..adff9e0e2 100644
--- a/miscutils/eject.c
+++ b/miscutils/eject.c
@@ -103,7 +103,7 @@ int eject_main(int argc UNUSED_PARAM, char **argv)
103 eject /dev/cdrom 103 eject /dev/cdrom
104 */ 104 */
105 105
106 xmove_fd(xopen(device, O_RDONLY|O_NONBLOCK), dev_fd); 106 xmove_fd(xopen_nonblocking(device), dev_fd);
107 107
108 if (ENABLE_FEATURE_EJECT_SCSI && (flags & FLAG_SCSI)) 108 if (ENABLE_FEATURE_EJECT_SCSI && (flags & FLAG_SCSI))
109 eject_scsi(device); 109 eject_scsi(device);
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index 65c11ec79..c4d2f3b03 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -1552,8 +1552,8 @@ static void process_dev(char *devname)
1552 unsigned char args[4] = { WIN_SETFEATURES, 0, 0, 0 }; 1552 unsigned char args[4] = { WIN_SETFEATURES, 0, 0, 0 };
1553 const char *fmt = " %s\t= %2ld"; 1553 const char *fmt = " %s\t= %2ld";
1554 1554
1555 /*fd = xopen(devname, O_RDONLY | O_NONBLOCK);*/ 1555 /*fd = xopen_nonblocking(devname);*/
1556 xmove_fd(xopen(devname, O_RDONLY | O_NONBLOCK), fd); 1556 xmove_fd(xopen_nonblocking(devname), fd);
1557 printf("\n%s:\n", devname); 1557 printf("\n%s:\n", devname);
1558 1558
1559 if (getset_readahead == IS_SET) { 1559 if (getset_readahead == IS_SET) {