===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cdio/mmc.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** src/usr.bin/cdio/mmc.c	2006/08/28 02:36:43	1.16
--- src/usr.bin/cdio/mmc.c	2007/07/31 21:21:11	1.17
***************
*** 1,4 ****
! /* $OpenBSD: mmc.c,v 1.16 2006/08/28 02:36:43 mjc Exp $ */
  
  /*
   * Copyright (c) 2006 Michael Coulter <mjc@openbsd.org>
--- 1,4 ----
! /* $OpenBSD: mmc.c,v 1.17 2007/07/31 21:21:11 deraadt Exp $ */
  
  /*
   * Copyright (c) 2006 Michael Coulter <mjc@openbsd.org>
***************
*** 223,229 ****
  again:
  			r = ioctl(fd, SCIOCCOMMAND, &scr);
  			if (r != 0) {
! 				printf("%60s\r", "");
  				warn("ioctl failed while attempting to write");
  				return (-1);
  			}
--- 223,229 ----
  again:
  			r = ioctl(fd, SCIOCCOMMAND, &scr);
  			if (r != 0) {
! 				printf("\r%60s", "");
  				warn("ioctl failed while attempting to write");
  				return (-1);
  			}
***************
*** 232,238 ****
  				goto again;
  			}
  			if (scr.retsts != SCCMD_OK) {
! 				printf("%60s\r", "");
  				warnx("ioctl returned bad status while "
  				    "attempting to write: %d",
  				    scr.retsts);
--- 232,238 ----
  				goto again;
  			}
  			if (scr.retsts != SCCMD_OK) {
! 				printf("\r%60s", "");
  				warnx("ioctl returned bad status while "
  				    "attempting to write: %d",
  				    scr.retsts);
***************
*** 243,249 ****
  			gettimeofday(&tv, NULL);
  			if (lba == end_lba || timercmp(&tv, &otv, >)) {
  				fprintf(stderr,
! 				    "track %02d '%c' %08u/%08u %3d%%\r",
  				    track, tr->type,
  				    lba, end_lba, 100 * lba / end_lba);
  				timeradd(&tv, &atv, &otv);
--- 243,249 ----
  			gettimeofday(&tv, NULL);
  			if (lba == end_lba || timercmp(&tv, &otv, >)) {
  				fprintf(stderr,
! 				    "\rtrack %02d '%c' %08u/%08u %3d%%",
  				    track, tr->type,
  				    lba, end_lba, 100 * lba / end_lba);
  				timeradd(&tv, &atv, &otv);