===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cdio/rip.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** src/usr.bin/cdio/rip.c	2007/05/27 14:50:24	1.3
--- src/usr.bin/cdio/rip.c	2007/05/28 22:04:24	1.4
***************
*** 80,86 ****
  
  static int	write_sector(int fd, u_char *sec, u_int32_t secsize);
  
! int	read_data_sector(int fd, u_int32_t lba, u_char *sec, u_int32_t secsize);
  
  struct track_info {
  	int fd;		/* descriptor of output file */
--- 80,86 ----
  
  static int	write_sector(int fd, u_char *sec, u_int32_t secsize);
  
! int	read_data_sector(u_int32_t lba, u_char *sec, u_int32_t secsize);
  
  struct track_info {
  	int fd;		/* descriptor of output file */
***************
*** 317,323 ****
   *	[EAGAIN]	The operation must be made again. XXX - not implemented
   */
  int
! read_data_sector(int fd, u_int32_t lba, u_char *sec, u_int32_t secsize)
  {
  	scsireq_t scr;
  	u_char *cmd;
--- 317,323 ----
   *	[EAGAIN]	The operation must be made again. XXX - not implemented
   */
  int
! read_data_sector(u_int32_t lba, u_char *sec, u_int32_t secsize)
  {
  	scsireq_t scr;
  	u_char *cmd;
***************
*** 370,376 ****
  		fprintf(stderr, "track %u '%c' %08u/%08u %3u%%\r", ti->track,
  		    (ti->isaudio) ? 'a' : 'd', i, n_sec, 100 * i / n_sec);
  
! 		error = read_data_sector(fd, i + ti->start_lba, sec, blksize);
  		if (error == 0) {
  			if (write_sector(ti->fd, sec, blksize) != 0) {
  				free(sec);
--- 370,376 ----
  		fprintf(stderr, "track %u '%c' %08u/%08u %3u%%\r", ti->track,
  		    (ti->isaudio) ? 'a' : 'd', i, n_sec, 100 * i / n_sec);
  
! 		error = read_data_sector(i + ti->start_lba, sec, blksize);
  		if (error == 0) {
  			if (write_sector(ti->fd, sec, blksize) != 0) {
  				free(sec);
***************
*** 580,592 ****
  int
  cdrip(char *arg)
  {
- 
  	return rip_tracks(arg, rip_next_track, 1);
  }
  
  int
  cdplay(char *arg)
  {
- 
  	return rip_tracks(arg, play_next_track, 0);
  }
--- 580,590 ----