Commit Graph

53 Commits

Author SHA1 Message Date
ed
cafdfab148 Make all functions and global variables static for cdcontrol(8).
While there, replace __const by const, which seems to be our preference
nowadays. Also fix some style(9) bugs by adding newlines and removing
unneeded spaces from function declarations.
2011-11-06 16:52:26 +00:00
dwmalone
a0dce5cf22 New style function definitions.
Fix constness problem - don't know that pstatus won't change a string with no
whitespace.
2010-01-05 20:40:40 +00:00
jh
e6e0b17268 When run() returns an error, print the error message also in
non-interactive mode. Previously error messages were printed only in
interactive mode.

PR:		bin/124517
Approved by:	trasz (mentor)
MFC after:	1 month
2009-10-07 13:25:22 +00:00
gahr
75a36a87b2 - Enhance volume handling
PR:		125054
Submitted by:	gahr
Approved by:	cperciva
2008-07-14 13:22:09 +00:00
ru
2aa5a61fd3 getopt(3) returns -1, not EOF. 2008-02-19 07:09:19 +00:00
stefanf
267cbf8d22 Use the new name H_SETSIZE instead of the old H_EVENT to set the history
size.

PR:	86355
2005-10-19 15:37:43 +00:00
dwmalone
dcbc9095f3 If the user doesn't specify a device and we can't open any of the defaults,
don't print an error using a uninitialised devbuf.
2004-04-01 16:37:46 +00:00
eivind
1043231f84 * Auto-detect what device to use if none is specified
* Replace references to mcd0 with acd0 (doc only)
* Remove references to the "c" partition (doc only - code was already fixed)
2003-11-17 14:02:04 +00:00
maxim
fd3bfcf5e3 Retire 'c' partition for a CD device.
Submitted by:		Craig Rodrigues <rodrigc@crodrigues.org>
Not objected by:	-current
2003-09-01 12:50:02 +00:00
obrien
7293a24a2b Use __FBSDID over rcsid[]. Protect copyright[] where needed. 2003-05-03 21:06:42 +00:00
eivind
ffd0ffb69b Fix bug that made cdcontrol play <track> play <track> - 1 2003-03-24 20:54:30 +00:00
des
372cfdca8c The default CD drive is /dev/cd0, not /dev/cd0c.
Reviewed by:	jhb
Approved by:	re (rwatson)
2002-12-03 15:41:30 +00:00
njl
1813115081 * Add CDRIOC{READ,WRITE}SPEED ioctls to cd(4). Units are in KB/sec.
* Change atapi-cd ioctls to use the same units.
* Change burncd, cdcontrol to convert CDROM speed to KB/sec before
calling the ioctl.  Add a "max" speed option for their command lines.

This change does not break ABI but does change the units passed through
the ioctl so 3rd party software that uses cdrio.h will have to convert
(most likely by multiplying CDROM speed by 177 to get KB/s).

PR:		kern/36845
Submitted by:	Philipp Mergenthaler <p@i609a.hadiko.de> (CAM ioctls)
Reviewed by:	sos, ken
MFC after:	1 month
2002-10-18 22:03:39 +00:00
maxim
236b22fa5b Do not add a start offset time to the track duration time.
Submitted by:	Dmitry Afanasiev, <KOT@MATPOCKuH.SPb.Ru>
MFC after:	2 weeks
2002-09-23 15:00:23 +00:00
alfred
c40ae61c8c de-__P() 2002-07-11 18:31:16 +00:00
maxim
80acd97fab style(9): remove an EOF space. 2002-05-08 07:40:22 +00:00
maxim
04f7d4f048 Implement 'speed' command: set a maximum read speed. At the moment it
works on ATAPI drives only.

PR:		kern/35512 (a part of)
Submitted by:	Philipp Mergenthaler <philipp.mergenthaler@stud.uni-karlsruhe.de>
Reviewed by:	-hackers
MFC after:	1 month
2002-05-08 07:32:40 +00:00
mike
bcee06d42c o Move NTOHL() and associated macros into <sys/param.h>. These are
deprecated in favor of the POSIX-defined lowercase variants.
o Change all occurrences of NTOHL() and associated marcros in the
  source tree to use the lowercase function variants.
o Add missing license bits to sparc64's <machine/endian.h>.
  Approved by: jake
o Clean up <machine/endian.h> files.
o Remove unused __uint16_swap_uint32() from i386's <machine/endian.h>.
o Remove prototypes for non-existent bswapXX() functions.
o Include <machine/endian.h> in <arpa/inet.h> to define the
  POSIX-required ntohl() family of functions.
o Do similar things to expose the ntohl() family in libstand, <netinet/in.h>,
  and <sys/param.h>.
o Prepend underscores to the ntohl() family to help deal with
  complexities associated with having MD (asm and inline) versions, and
  having to prevent exposure of these functions in other headers that
  happen to make use of endian-specific defines.
o Create weak aliases to the canonical function name to help deal with
  third-party software forgetting to include an appropriate header.
o Remove some now unneeded pollution from <sys/types.h>.
o Add missing <arpa/inet.h> includes in userland.

Tested on:	alpha, i386
Reviewed by:	bde, jake, tmm
2002-02-18 20:35:27 +00:00
mikeh
9b498cae46 style(9) cleanup: spaces -> tabs.
MFC after:	2 weeks
2001-12-09 19:34:11 +00:00
mikeh
bb541f1f22 WARNS=2 cleanup.
PR:		bin/32646
MFC after:	2 weeks
2001-12-09 18:40:56 +00:00
obrien
d9494059c0 *** empty log message *** 2001-10-01 08:43:58 +00:00
kris
2c67993389 Add the 'next' and 'prev' commands (aliased to '+' and '-') which skip
forward or backward by a specified number of tracks (defaulting to 1).
Use strvisx() to display the media catalog in case it contains unprintable
characters.  Sort includes.  Based on two patches submitted by PR, plus
style fixes and other changes of my own.

Submitted by:   Seth Kingsley <sethk@osd.bsdi.com>, Maxime Henrion <mux@qualys.com>
PR:             bin/22672, bin/26962
MFC After:      1 week
2001-05-25 09:24:50 +00:00
joe
5a516440e4 Don't complain about deprecated environment variables, like MUSIC_CD,
being present in the environment if the user has CDROM defined, or
has specified a device on the command line.

This avoids users of ports like 'workman' that use these variables
getting gratuitous warnings from cdcontrol.

Suggested by:	John Sellens <jsellens@generalconcepts.com>
2001-04-08 21:35:17 +00:00
joe
912ac1b805 Deprecate the use of the CD_DRIVE, CDPLAY, DISC and MUSIC_CD environment
variables in favour of CDROM.

Discussed on:	stable@FreeBSD.org
2001-01-16 20:31:53 +00:00
des
9f7f4f99d4 If no device is specified, check the CDROM environment variable before
picking the default device.
2000-12-18 14:35:54 +00:00
obrien
c2ee1dcc02 Add `_PATH_DEVZERO'.
Use _PATH_* where where possible.
2000-12-09 09:35:55 +00:00
joe
4fa3dd4b5e Add a new command, 'cdid', to calculate and display a serial number
for a cd, using the algorithm that the cddb database uses.

Submitted by:	Sergey Shkonda <serg@bcs.zp.ua>
2000-07-13 22:56:43 +00:00
mckay
7b3c74238f Fix the ^D -> core dump problem properly. ^D == "quit" again. 2000-07-13 12:55:50 +00:00
msmith
e976c906e5 Don't do anything with /dev/rXXX 2000-05-31 01:03:26 +00:00
joe
3955613d85 Fixed a potential buffer overflow problem, in the device name handling.
PR:		bin/15101
1999-12-05 20:05:45 +00:00
roberto
e5e1ccbdfe Stop run() from dereferencing a NULL pointer when you enter a valid command
then a ^D at the prompt.

cdcontrol> play 1 14
cdcontrol>
zsh: 40874 segmentation fault (core dumped)  /usr/sbin/cdcontrol -f /dev/cd1c
1999-11-18 23:04:38 +00:00
peter
efabb9ccb1 $Id$ -> $FreeBSD$ 1999-08-28 01:35:59 +00:00
mdodd
add3f6325f What the heck was I thinking? Nobody else saw this? Sheesh.
(num > MAX) ? MAX : num

rather than

(MAX > num) ? MAX : num

Also, make things a little easier to read while I'm here.
1999-08-20 01:24:35 +00:00
mdodd
1e31ba6301 Use el_source() so we pick up .editrc 1999-08-19 04:10:33 +00:00
mdodd
fb1440bad5 Add support for command line editing and history.
Remove src/contrib/bind/bin/nslookup/commands.c as it is generated by lex
from commands.l.

Submitted by: lpc/cdcontrol patches originally by msmith.
Reviewed by: msmith (in theory)
1999-08-19 03:29:15 +00:00
billf
29aa2dd17b (1) Make usage() and SYNOPSIS agree with each other.
(2) Use 'device' instead of 'device name', there seems to be a precedent in
    /usr/share/man/man1

Prompted By:	bde
1999-01-31 15:30:21 +00:00
jmz
96686a66db The status command prints the audio position, the media catalog and the
volume value for the disc. It is now possible to specify additional arguments
(audio, volume, media) to print only a subset of the full status.
This is particularly useful with drives which stop playing when asked to
return the catalog number.
1998-01-26 00:57:54 +00:00
charnier
8f89c97f8a Use err(3). Style in usage(). 1997-09-04 11:52:28 +00:00
peter
b782f4df30 Revert $FreeBSD$ to $Id$ 1997-02-22 16:15:28 +00:00
jkh
808a36ef65 Make the long-awaited change from $Id$ to $FreeBSD$
This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
1997-01-14 07:20:47 +00:00
ache
40797deb0e Don't print number (garbadge) if media catalog is inactive 1996-06-25 21:01:27 +00:00
ache
eca0ed1879 LBA addition to new commands 1996-02-09 01:16:23 +00:00
ache
346633f6e2 Integrate vak fixes, mostly command parsing & cosmetic
Submitted by: vak@cronyx.ru
1996-02-09 00:22:17 +00:00
ache
7bf1219d00 Print out media catalog number, if exists 1996-02-03 15:21:30 +00:00
ache
b2a974e602 Request/print out media catalog validation info in status command 1996-02-03 15:07:32 +00:00
ache
a768aedccd Implement several new commands 1996-02-03 14:13:36 +00:00
ache
d54012cef4 Don't mask last track number with end word, better be shure that it is 170 1996-02-02 22:14:39 +00:00
ache
8b50fd992a Implement 'inject' command 1996-02-02 22:03:37 +00:00
ache
62a0fe7554 Back out my control->addr_type change, need to be fixed in another place 1996-02-02 20:46:46 +00:00
ache
4861dbe70d Fix user input parser, play command even not work in old variant 1996-02-01 19:09:50 +00:00