x_option:1,
a_arg:1,
i_arg:1;
+
+ unsigned int force_exclusive; /* use O_EXCL */
+
long int c_arg; /* changer slot number */
long int x_arg; /* cd speed */
};
case 'F':
ctl->F_option = 1;
break;
- case 'h':
- usage();
- break;
case 'i':
ctl->i_option = 1;
ctl->i_arg = parse_switch(optarg, _("argument error"),
case 'v':
ctl->v_option = 1;
break;
+
+ case 'h':
+ usage();
case 'V':
- printf(UTIL_LINUX_VERSION);
- exit(EXIT_SUCCESS);
- break;
+ print_version(EXIT_SUCCESS);
default:
errtryhelp(EXIT_FAILURE);
break;
if ((*name == '.' || *name == '/') && access(name, F_OK) == 0)
return xstrdup(name);
- else {
- char buf[PATH_MAX];
- snprintf(buf, sizeof(buf), "/dev/%s", name);
- if (access(buf, F_OK) == 0)
- return xstrdup(buf);
- }
+ char buf[PATH_MAX];
+
+ snprintf(buf, sizeof(buf), "/dev/%s", name);
+ if (access(buf, F_OK) == 0)
+ return xstrdup(buf);
return NULL;
}
* Stops CDROM from opening on manual eject button press.
* This can be useful when you carry your laptop
* in your bag while it's on and no CD inserted in it's drive.
- * Implemented as found in Documentation/ioctl/cdrom.txt
+ * Implemented as found in Documentation/userspace-api/ioctl/cdrom.rst
*/
static void manual_eject(const struct eject_control *ctl)
{
struct timeval time_start, time_stop;
int time_elapsed;
- /* Try to open the CDROM tray and measure the time therefor
+ /* Try to open the CDROM tray and measure the time therefore
* 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. */
/* Open a device file. */
static void open_device(struct eject_control *ctl)
{
- ctl->fd = open(ctl->device, O_RDWR | O_NONBLOCK);
+ int extra = ctl->F_option == 0 && /* never use O_EXCL on --force */
+ ctl->force_exclusive ? O_EXCL : 0;
+
+ ctl->fd = open(ctl->device, O_RDWR | O_NONBLOCK | extra);
if (ctl->fd < 0)
- ctl->fd = open(ctl->device, O_RDONLY | O_NONBLOCK);
+ ctl->fd = open(ctl->device, O_RDONLY | O_NONBLOCK | extra);
if (ctl->fd == -1)
err(EXIT_FAILURE, _("cannot open %s"), ctl->device);
}
return st.st_rdev == diskno ? NULL : find_device(diskname);
}
+/* umount all partitions if -M not specified, otherwise returns
+ * number of the mounted partitions only.
+ */
static int umount_partitions(struct eject_control *ctl)
{
struct path_cxt *pc = NULL;
setlocale(LC_ALL,"");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
- atexit(close_stdout);
+ close_stdout_atexit();
/* parse the command line arguments */
parse_args(&ctl, argc, argv);
}
if (!ctl.device)
- errx(EXIT_FAILURE, _("%s: unable to find device"), ctl.device);
+ errx(EXIT_FAILURE, _("unable to find device"));
verbose(&ctl, _("device name is `%s'"), ctl.device);
* partition is mounted.
*/
if (!ctl.m_option) {
- int ct = umount_partitions(&ctl);
+ int ct = umount_partitions(&ctl); /* umount all, or count mounted on -M */
if (ct == 0 && mountpoint)
umount_one(&ctl, mountpoint); /* probably whole-device */
else if (ct)
errx(EXIT_FAILURE, _("error: %s: device in use"), ctl.device);
}
+ /* Now, we assume the device is no more used, use O_EXCL to be
+ * resistant against our bugs and possible races (someone else
+ * remounted the device).
+ */
+ ctl.force_exclusive = 1;
}
/* handle -c option */