hust testsuite: fix a false positive

[oweals/busybox.git] / miscutils / eject.c

diff --git a/miscutils/eject.c b/miscutils/eject.c
index 184ccc5d7fc449dc57b0595a1e2f1bc6c66c94cc..16ae250ff6168edebc36b17d499e3918b765f489 100644 (file)
--- a/miscutils/eject.c
+++ b/miscutils/eject.c
@@ -17,7 +17,6 @@
 //usage:       "[-t] [-T] [DEVICE]"
 //usage:#define eject_full_usage "\n\n"
 //usage:       "Eject DEVICE or default /dev/cdrom\n"
-//usage:     "\nOptions:"
 //usage:       IF_FEATURE_EJECT_SCSI(
 //usage:     "\n       -s      SCSI device"
 //usage:       )
@@ -26,26 +25,22 @@
 
 #include <sys/mount.h>
 #include "libbb.h"
+#if ENABLE_FEATURE_EJECT_SCSI
 /* 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  */
-#define CDROMEJECT                0x5309  /* Ejects the cdrom media */
-#define CDROM_DRIVE_STATUS        0x5326  /* Get tray position, etc. */
-/* drive status possibilities returned by CDROM_DRIVE_STATUS ioctl */
-#define CDS_TRAY_OPEN        2
+# include "fix_u32.h"
+# include <scsi/sg.h>
+# include <scsi/scsi.h>
+#endif
 
 #define dev_fd 3
 
 /* Code taken from the original eject (http://eject.sourceforge.net/),
  * refactored it a bit for busybox (ne-bb@nicoerfurth.de) */
 
+#if ENABLE_FEATURE_EJECT_SCSI
 static void eject_scsi(const char *dev)
 {
-       static const char sg_commands[3][6] = {
+       static const char sg_commands[3][6] ALIGN1 = {
                { ALLOW_MEDIUM_REMOVAL, 0, 0, 0, 0, 0 },
                { START_STOP, 0, 0, 0, 1, 0 },
                { START_STOP, 0, 0, 0, 2, 0 }
@@ -77,6 +72,16 @@ static void eject_scsi(const char *dev)
        /* force kernel to reread partition table when new disc is inserted */
        ioctl(dev_fd, BLKRRPART);
 }
+#else
+# define eject_scsi(dev) ((void)0)
+#endif
+
+/* various defines swiped from linux/cdrom.h */
+#define CDROMCLOSETRAY            0x5319  /* pendant of CDROMEJECT  */
+#define CDROMEJECT                0x5309  /* Ejects the cdrom media */
+#define CDROM_DRIVE_STATUS        0x5326  /* Get tray position, etc. */
+/* drive status possibilities returned by CDROM_DRIVE_STATUS ioctl */
+#define CDS_TRAY_OPEN        2
 
 #define FLAG_CLOSE  1
 #define FLAG_SMART  2