diff options
| author | landley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-08-03 17:58:17 +0000 |
|---|---|---|
| committer | landley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-08-03 17:58:17 +0000 |
| commit | 2265911dfe0141d98022f3054f4af2c7976e0921 (patch) | |
| tree | b3002e01131f99581c1be3462b96b2f2c40408f4 /miscutils | |
| parent | 87ac4ebdd5bf5a359df75b6e63ce1be4fd0cd47b (diff) | |
| download | busybox-w32-2265911dfe0141d98022f3054f4af2c7976e0921.tar.gz busybox-w32-2265911dfe0141d98022f3054f4af2c7976e0921.tar.bz2 busybox-w32-2265911dfe0141d98022f3054f4af2c7976e0921.zip | |
These should have been part of 15767 too.
git-svn-id: svn://busybox.net/trunk/busybox@15770 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'miscutils')
| -rw-r--r-- | miscutils/eject.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/miscutils/eject.c b/miscutils/eject.c index 8ac66779a..282090d38 100644 --- a/miscutils/eject.c +++ b/miscutils/eject.c | |||
| @@ -14,9 +14,6 @@ | |||
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include "busybox.h" | 16 | #include "busybox.h" |
| 17 | #include <fcntl.h> | ||
| 18 | #include <sys/ioctl.h> | ||
| 19 | #include <unistd.h> | ||
| 20 | #include <mntent.h> | 17 | #include <mntent.h> |
| 21 | 18 | ||
| 22 | /* various defines swiped from linux/cdrom.h */ | 19 | /* various defines swiped from linux/cdrom.h */ |
| @@ -40,7 +37,7 @@ int eject_main(int argc, char **argv) | |||
| 40 | erase_mtab(m->mnt_fsname); | 37 | erase_mtab(m->mnt_fsname); |
| 41 | } | 38 | } |
| 42 | } | 39 | } |
| 43 | if (ioctl(bb_xopen(device, (O_RDONLY | O_NONBLOCK)), | 40 | if (ioctl(xopen(device, (O_RDONLY | O_NONBLOCK)), |
| 44 | (flags ? CDROMCLOSETRAY : CDROMEJECT))) { | 41 | (flags ? CDROMCLOSETRAY : CDROMEJECT))) { |
| 45 | bb_perror_msg_and_die("%s", device); | 42 | bb_perror_msg_and_die("%s", device); |
| 46 | } | 43 | } |
