27c27
< # $FreeBSD: stable/9/usr.sbin/bsdconfig/share/media/cdrom.subr 252995 2013-07-07 19:13:34Z dteske $
---
> # $FreeBSD: stable/9/usr.sbin/bsdconfig/share/media/cdrom.subr 263791 2014-03-27 03:20:47Z dteske $
61c61
< ndevs=$( set -- $devs; echo $# )
---
> f_count ndevs $devs
97a98
> local funcname=f_media_init_cdrom
109,113c110,112
< if [ ! -e "$MOUNTPOINT" ] &&
< ! err=$( mkdir -p "$MOUNTPOINT" 2>&1 )
< then
< f_dialog_msgbox "$err"
< return $FAILURE
---
> if [ ! -e "$MOUNTPOINT" ]; then
> f_eval_catch $funcname mkdir 'mkdir -p "%s"' "$MOUNTPOINT" ||
> return $FAILURE
116c115,116
< if ! err=$( mount_cd9660 "$devname" "$MOUNTPOINT" 2>&1 )
---
> if ! f_eval_catch -dk err $funcname mount_cd9660 \
> 'mount_cd9660 "%s" "%s"' "$devname" "$MOUNTPOINT"
147c147
< # f_media_get_cdrom $device $file [$probe_only]
---
> # f_media_get_cdrom $device $file [$probe_type]
150c150,152
< # $probe_only is present and non-NULL, returns success if $file exists.
---
> # $probe_type is present and non-NULL, returns success if $file exists. If
> # $probe_type is equal to $PROBE_SIZE, prints the size of $file in bytes to
> # standard-out.
154c156
< local dev="$1" file="$2" probe_only="$3"
---
> local dev="$1" file="$2" probe_type="$3"
156,157c158,159
< f_dprintf "f_media_get_cdrom: dev=[%s] file=[%s] probe_only=%s" \
< "$dev" "$file" "$probe_only"
---
> f_dprintf "f_media_get_cdrom: dev=[%s] file=[%s] probe_type=%s" \
> "$dev" "$file" "$probe_type"
159c161
< f_media_generic_get "$MOUNTPOINT" "$file" "$probe_only"
---
> f_media_generic_get "$MOUNTPOINT" "$file" "$probe_type"
164,165c166
< # Shuts down the CDROM device and ejects the media using f_media_eject_cdrom(),
< # below. Return status should be ignored.
---
> # Shuts down the CDROM device. Return status should be ignored.
168a170
> local funcname=f_media_shutdown_cdrom
171c173
< [ "$CDROM_MOUNTED" ] || return
---
> [ "$CDROM_MOUNTED" ] || return $FAILURE
178c180,182
< if ! err=$( umount -f "$MOUNTPOINT" 2>&1 ); then
---
> if ! f_eval_catch -dk err $funcname umount \
> 'umount -f "%s"' "$MOUNPOINT"
> then
185,186d188
<
< f_media_eject_cdrom "$dev"
194a197
> local funcname=f_media_eject_cdrom
199c202,204
< if ! err=$( cdcontrol -f "$devname" eject 2>&1 ); then
---
> if ! f_eval_catch -dk err $funcname cdcontrol \
> 'cdcontrol -f "%s" eject' "$devname"
> then