summaryrefslogtreecommitdiffstats
path: root/source/a/eject/eject.CDROM_DRIVE_STATUS.diff
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-05-28 19:12:29 +0000
committer Eric Hameleers <alien@slackware.com>2018-05-31 23:39:35 +0200
commit646a5c1cbfd95873950a87b5f75d52073a967023 (patch)
treeb8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/a/eject/eject.CDROM_DRIVE_STATUS.diff
parentd31c50870d0bee042ce660e445c9294a59a3a65b (diff)
downloadcurrent-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz
current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.xz
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a/eject/eject.CDROM_DRIVE_STATUS.diff')
-rw-r--r--source/a/eject/eject.CDROM_DRIVE_STATUS.diff76
1 files changed, 0 insertions, 76 deletions
diff --git a/source/a/eject/eject.CDROM_DRIVE_STATUS.diff b/source/a/eject/eject.CDROM_DRIVE_STATUS.diff
deleted file mode 100644
index 0a80739fa..000000000
--- a/source/a/eject/eject.CDROM_DRIVE_STATUS.diff
+++ /dev/null
@@ -1,76 +0,0 @@
-# Make CDROM tray toggle more robust by using CDS_TRAY_OPEN
-# when avaiable.
-# Also includes Slackware's eject_for_mac.patch
-#
-diff -Nurp eject.old/eject.c eject.new/eject.c
---- eject.old/eject.c 2013-02-19 10:18:36.041669514 +0000
-+++ eject.new/eject.c 2013-02-19 10:33:04.289392780 +0000
-@@ -564,34 +564,45 @@ static void ToggleTray(int fd)
- {
- struct timeval time_start, time_stop;
- int time_elapsed;
-+ int status;
-
- #ifdef CDROMCLOSETRAY
-+
-+ status = ioctl(fd, CDROM_DRIVE_STATUS, 0);
-+ if (status == CDS_TRAY_OPEN) {
-+ CloseTray(fd);
-+ } else {
-
-- /* Try to open the CDROM tray and measure the time therefor
-- * needed. In my experience the function needs less than 0.05
-- * seconds if the tray was already open, and at least 1.5 seconds
-- * if it was closed. */
-- gettimeofday(&time_start, NULL);
-+ /* Try to open the CDROM tray and measure the time therefor
-+ * needed. In my experience the function needs less than 0.05
-+ * seconds if the tray was already open, and at least 1.5 seconds
-+ * if it was closed. */
-+ gettimeofday(&time_start, NULL);
-
-- /* Send the CDROMEJECT command to the device. */
-- if (ioctl(fd, CDROMEJECT, 0) < 0) {
-- perror("ioctl");
-- exit(1);
-+ /* Send the CDROMEJECT command to the device. */
-+ if (ioctl(fd, CDROMEJECT, 0) < 0 && errno != EIO) {
-+ perror("ioctl CDROMEJECT");
-+ exit(1);
-+ }
-+
-+ /* Get the second timestamp, to measure the time needed to open
-+ * the tray. */
-+ gettimeofday(&time_stop, NULL);
-+
-+ /* If the ioctl returns CDS_TRAY_OPEN now then we can ignore
-+ * the guess based on elapsed-time */
-+ status = ioctl(fd, CDROM_DRIVE_STATUS, 0);
-+ if (status != CDS_TRAY_OPEN) {
-+ time_elapsed = (time_stop.tv_sec * 1000000 + time_stop.tv_usec) -
-+ (time_start.tv_sec * 1000000 + time_start.tv_usec);
-+
-+ /* If the tray "opened" too fast, we can be nearly sure, that it
-+ * was already open. In this case, close it now. Else the tray was
-+ * closed before. This would mean that we are done. */
-+ if (time_elapsed < TRAY_WAS_ALREADY_OPEN_USECS)
-+ CloseTray(fd);
-+ }
- }
--
-- /* Get the second timestamp, to measure the time needed to open
-- * the tray. */
-- gettimeofday(&time_stop, NULL);
--
-- time_elapsed = (time_stop.tv_sec * 1000000 + time_stop.tv_usec) -
-- (time_start.tv_sec * 1000000 + time_start.tv_usec);
--
-- /* If the tray "opened" too fast, we can be nearly sure, that it
-- * was already open. In this case, close it now. Else the tray was
-- * closed before. This would mean that we are done. */
-- if (time_elapsed < TRAY_WAS_ALREADY_OPEN_USECS)
-- CloseTray(fd);
--
- #else
- fprintf(stderr, _("%s: CD-ROM tray toggle command not supported by this kernel\n"), programName);
- #endif