* Most of the dirty work blatantly ripped off from cat.c =)
*/
+#include <sys/mount.h>
#include "libbb.h"
+/* Must be after libbb.h: they need size_t */
+#include "fix_u32.h"
+#include <scsi/sg.h>
+#include <scsi/scsi.h>
/* various defines swiped from linux/cdrom.h */
#define CDROMCLOSETRAY 0x5319 /* pendant of CDROMEJECT */
/* Code taken from the original eject (http://eject.sourceforge.net/),
* refactored it a bit for busybox (ne-bb@nicoerfurth.de) */
-#include <scsi/sg.h>
-#include <scsi/scsi.h>
-
static void eject_scsi(const char *dev)
{
static const char sg_commands[3][6] = {
{ START_STOP, 0, 0, 0, 2, 0 }
};
- int i;
+ unsigned i;
unsigned char sense_buffer[32];
unsigned char inqBuff[2];
sg_io_hdr_t io_hdr;
int cmd = CDROMEJECT;
if (flags & FLAG_CLOSE
- || (flags & FLAG_SMART && ioctl(dev_fd, CDROM_DRIVE_STATUS) == CDS_TRAY_OPEN)
+ || ((flags & FLAG_SMART) && ioctl(dev_fd, CDROM_DRIVE_STATUS) == CDS_TRAY_OPEN)
) {
cmd = CDROMCLOSETRAY;
}
}
int eject_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int eject_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int eject_main(int argc UNUSED_PARAM, char **argv)
{
unsigned flags;
const char *device;
opt_complementary = "?1:t--T:T--t";
- flags = getopt32(argv, "tT" USE_FEATURE_EJECT_SCSI("s"));
+ flags = getopt32(argv, "tT" IF_FEATURE_EJECT_SCSI("s"));
device = argv[optind] ? argv[optind] : "/dev/cdrom";
/* We used to do "umount <device>" here, but it was buggy
eject /dev/cdrom
*/
- xmove_fd(xopen(device, O_RDONLY|O_NONBLOCK), dev_fd);
+ xmove_fd(xopen_nonblocking(device), dev_fd);
if (ENABLE_FEATURE_EJECT_SCSI && (flags & FLAG_SCSI))
eject_scsi(device);