From b44c790e41e281965955a83408f35ea53ecdb3d2 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Mon, 17 Mar 2008 09:29:43 +0000 Subject: *: fix various kinds of damage to letter 'c' in Arkadiusz Mickiewicz' surname. chrt,taskset,dc,eject: shrink crontab: call "vi" with just name, no path watchdog: intercept all fatal signals function old new delta xstrtoull_range - 35 +35 static.sg_commands - 18 +18 packed_usage 23698 23712 +14 watchdog_main 148 151 +3 crontab_main 637 638 +1 base 1 - -1 static.ps 4 - -4 pointer 4 - -4 stack_machine 99 92 -7 run_command 273 260 -13 eject_main 360 343 -17 static.C 30 12 -18 ptok 61 38 -23 xstrtol_range 27 - -27 get_token 35 - -35 taskset_main 586 550 -36 chrt_main 411 372 -39 dc_main 158 117 -41 time_main 1127 1037 -90 ------------------------------------------------------------------------------ (add/remove: 2/5 grow/shrink: 3/9 up/down: 71/-355) Total: -284 bytes text data bss dec hex filename 793680 662 7420 801762 c3be2 busybox_old 793327 662 7412 801401 c3a79 busybox_unstripped --- miscutils/eject.c | 95 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 46 deletions(-) (limited to 'miscutils/eject.c') diff --git a/miscutils/eject.c b/miscutils/eject.c index 3d27ce545..42e071941 100644 --- a/miscutils/eject.c +++ b/miscutils/eject.c @@ -22,68 +22,71 @@ /* drive status possibilities returned by CDROM_DRIVE_STATUS ioctl */ #define CDS_TRAY_OPEN 2 -#define FLAG_CLOSE 1 -#define FLAG_SMART 2 - +#define dev_fd 3 /* Code taken from the original eject (http://eject.sourceforge.net/), * refactored it a bit for busybox (ne-bb@nicoerfurth.de) */ -#define FLAG_SCSI 4 #include #include -static void eject_scsi(const int fd, const char * const dev) + +static void eject_scsi(const char *dev) { - int i; - unsigned char sense_buffer[32]; - unsigned char inqBuff[2]; - sg_io_hdr_t io_hdr; - char sg_commands[3][6] = { - {ALLOW_MEDIUM_REMOVAL, 0, 0, 0, 0, 0}, - {START_STOP, 0, 0, 0, 1, 0}, - {START_STOP, 0, 0, 0, 2, 0} - }; - - if ((ioctl(fd, SG_GET_VERSION_NUM, &i) < 0) || (i < 30000)) - bb_error_msg_and_die("not an sg device or old sg driver"); - - memset(&io_hdr, 0, sizeof(sg_io_hdr_t)); - io_hdr.interface_id = 'S'; - io_hdr.cmd_len = 6; - io_hdr.mx_sb_len = sizeof(sense_buffer); - io_hdr.dxfer_direction = SG_DXFER_NONE; - /* io_hdr.dxfer_len = 0; */ - io_hdr.dxferp = inqBuff; - io_hdr.sbp = sense_buffer; - io_hdr.timeout = 2000; - - for (i=0; i < 3; i++) { - io_hdr.cmdp = sg_commands[i]; - ioctl_or_perror_and_die(fd, SG_IO, (void *)&io_hdr, "%s", dev); - } - - /* force kernel to reread partition table when new disc inserted */ - ioctl(fd, BLKRRPART); + static const char sg_commands[3][6] = { + { ALLOW_MEDIUM_REMOVAL, 0, 0, 0, 0, 0 }, + { START_STOP, 0, 0, 0, 1, 0 }, + { START_STOP, 0, 0, 0, 2, 0 } + }; + + int i; + unsigned char sense_buffer[32]; + unsigned char inqBuff[2]; + sg_io_hdr_t io_hdr; + + if ((ioctl(dev_fd, SG_GET_VERSION_NUM, &i) < 0) || (i < 30000)) + bb_error_msg_and_die("not a sg device or old sg driver"); + + memset(&io_hdr, 0, sizeof(sg_io_hdr_t)); + io_hdr.interface_id = 'S'; + io_hdr.cmd_len = 6; + io_hdr.mx_sb_len = sizeof(sense_buffer); + io_hdr.dxfer_direction = SG_DXFER_NONE; + /* io_hdr.dxfer_len = 0; */ + io_hdr.dxferp = inqBuff; + io_hdr.sbp = sense_buffer; + io_hdr.timeout = 2000; + + for (i = 0; i < 3; i++) { + io_hdr.cmdp = (char*)sg_commands[i]; + ioctl_or_perror_and_die(dev_fd, SG_IO, (void *)&io_hdr, "%s", dev); + } + + /* force kernel to reread partition table when new disc is inserted */ + ioctl(dev_fd, BLKRRPART); } -static void eject_cdrom(const int fd, const unsigned long flags, - const char * const dev) +#define FLAG_CLOSE 1 +#define FLAG_SMART 2 +#define FLAG_SCSI 4 + +static void eject_cdrom(unsigned flags, const char *dev) { int cmd = CDROMEJECT; if (flags & FLAG_CLOSE - || (flags & FLAG_SMART && ioctl(fd, CDROM_DRIVE_STATUS) == CDS_TRAY_OPEN)) + || (flags & FLAG_SMART && ioctl(dev_fd, CDROM_DRIVE_STATUS) == CDS_TRAY_OPEN) + ) { cmd = CDROMCLOSETRAY; + } - return ioctl_or_perror_and_die(fd, cmd, NULL, "%s", dev); + ioctl_or_perror_and_die(dev_fd, cmd, NULL, "%s", dev); } int eject_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int eject_main(int argc ATTRIBUTE_UNUSED, char **argv) { - unsigned long flags; + unsigned flags; const char *device; - int dev; opt_complementary = "?1:t--T:T--t"; flags = getopt32(argv, "tT" USE_FEATURE_EJECT_SCSI("s")); @@ -96,18 +99,18 @@ int eject_main(int argc ATTRIBUTE_UNUSED, char **argv) This works equally well (or better): #!/bin/sh umount /dev/cdrom - eject + eject /dev/cdrom */ - dev = xopen(device, O_RDONLY|O_NONBLOCK); + xmove_fd(xopen(device, O_RDONLY|O_NONBLOCK), dev_fd); if (ENABLE_FEATURE_EJECT_SCSI && (flags & FLAG_SCSI)) - eject_scsi(dev, device); + eject_scsi(device); else - eject_cdrom(dev, flags, device); + eject_cdrom(flags, device); if (ENABLE_FEATURE_CLEAN_UP) - close(dev); + close(dev_fd); return EXIT_SUCCESS; } -- cgit v1.2.3-55-g6feb