Deleted Added
full compact
usb.subr (252987) usb.subr (253333)
1if [ ! "$_MEDIA_USB_SUBR" ]; then _MEDIA_USB_SUBR=1
2#
3# Copyright (c) 2012-2013 Devin Teske
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:

--- 10 unchanged lines hidden (view full) ---

19# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25# SUCH DAMAGE.
26#
1if [ ! "$_MEDIA_USB_SUBR" ]; then _MEDIA_USB_SUBR=1
2#
3# Copyright (c) 2012-2013 Devin Teske
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:

--- 10 unchanged lines hidden (view full) ---

19# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25# SUCH DAMAGE.
26#
27# $FreeBSD: head/usr.sbin/bsdconfig/share/media/usb.subr 252987 2013-07-07 18:51:44Z dteske $
27# $FreeBSD: head/usr.sbin/bsdconfig/share/media/usb.subr 253333 2013-07-14 03:08:52Z dteske $
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_dprintf "%s: loading includes..." media/usb.subr
34f_include $BSDCFG_SHARE/device.subr
35f_include $BSDCFG_SHARE/dialog.subr

--- 91 unchanged lines hidden (view full) ---

127 fi
128
129 err="${err#mount: }"; err="${err#$devname: }"
130 f_show_msg "$msg_error_mounting_usb_drive" \
131 "$devname" "$MOUNTPOINT" "$err"
132 return $FAILURE
133}
134
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_dprintf "%s: loading includes..." media/usb.subr
34f_include $BSDCFG_SHARE/device.subr
35f_include $BSDCFG_SHARE/dialog.subr

--- 91 unchanged lines hidden (view full) ---

127 fi
128
129 err="${err#mount: }"; err="${err#$devname: }"
130 f_show_msg "$msg_error_mounting_usb_drive" \
131 "$devname" "$MOUNTPOINT" "$err"
132 return $FAILURE
133}
134
135# f_media_get_usb $device $file [$probe_only]
135# f_media_get_usb $device $file [$probe_type]
136#
136#
137# Returns data from $file on a mounted USB disk device. Similar to cat(1).
138# If $probe_only is present and non-NULL, returns success if $file exists.
137# Returns data from $file on a mounted USB disk device. Similar to cat(1). If
138# $probe_type is present and non-NULL, returns success if $file exists. If
139# $probe_type is equal to $PROBE_SIZE, prints the size of $file in bytes to
140# standard-out.
139#
140f_media_get_usb()
141{
141#
142f_media_get_usb()
143{
142 local dev="$1" file="$2" probe_only="$3"
144 local dev="$1" file="$2" probe_type="$3"
143
145
144 f_dprintf "f_media_get_usb: dev=[%s] file=[%s] probe_only=%s" \
145 "$dev" "$file" "$probe_only"
146 f_dprintf "f_media_get_usb: dev=[%s] file=[%s] probe_type=%s" \
147 "$dev" "$file" "$probe_type"
146
148
147 f_media_generic_get "$MOUNTPOINT" "$file" "$probe_only"
149 f_media_generic_get "$MOUNTPOINT" "$file" "$probe_type"
148}
149
150# f_media_shutdown_usb $device
151#
152# Shuts down the USB disk device using umount(8). Return status should be
153# ignored.
154#
155f_media_shutdown_usb()

--- 19 unchanged lines hidden ---
150}
151
152# f_media_shutdown_usb $device
153#
154# Shuts down the USB disk device using umount(8). Return status should be
155# ignored.
156#
157f_media_shutdown_usb()

--- 19 unchanged lines hidden ---