===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cdio/cdio.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -c -r1.76 -r1.77
*** src/usr.bin/cdio/cdio.c	2019/04/01 03:57:07	1.76
--- src/usr.bin/cdio/cdio.c	2019/06/28 13:35:00	1.77
***************
*** 1,4 ****
! /*	$OpenBSD: cdio.c,v 1.76 2019/04/01 03:57:07 naddy Exp $	*/
  
  /*  Copyright (c) 1995 Serge V. Vakulenko
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: cdio.c,v 1.77 2019/06/28 13:35:00 deraadt Exp $	*/
  
  /*  Copyright (c) 1995 Serge V. Vakulenko
   * All rights reserved.
***************
*** 378,384 ****
  			return (0);
  
  		rc = ioctl(fd, CDIOCRESET);
! 		if (rc < 0)
  			return rc;
  		close(fd);
  		fd = -1;
--- 378,384 ----
  			return (0);
  
  		rc = ioctl(fd, CDIOCRESET);
! 		if (rc == -1)
  			return rc;
  		close(fd);
  		fd = -1;
***************
*** 424,430 ****
  
  		(void) ioctl(fd, CDIOCALLOW);
  		rc = ioctl(fd, CDIOCEJECT);
! 		if (rc < 0)
  			return (rc);
  #if defined(__OpenBSD__)
  		close(fd);
--- 424,430 ----
  
  		(void) ioctl(fd, CDIOCALLOW);
  		rc = ioctl(fd, CDIOCEJECT);
! 		if (rc == -1)
  			return (rc);
  #if defined(__OpenBSD__)
  		close(fd);
***************
*** 442,448 ****
  
  		(void) ioctl(fd, CDIOCALLOW);
  		rc = ioctl(fd, CDIOCCLOSE);
! 		if (rc < 0)
  			return (rc);
  		close(fd);
  		fd = -1;
--- 442,448 ----
  
  		(void) ioctl(fd, CDIOCALLOW);
  		rc = ioctl(fd, CDIOCCLOSE);
! 		if (rc == -1)
  			return (rc);
  		close(fd);
  		fd = -1;
***************
*** 694,700 ****
  
  	rc = ioctl(fd, CDIOREADTOCHEADER, &h);
  
! 	if (rc < 0)
  		return (rc);
  
  	if (h.starting_track > h.ending_track) {
--- 694,700 ----
  
  	rc = ioctl(fd, CDIOREADTOCHEADER, &h);
  
! 	if (rc == -1)
  		return (rc);
  
  	if (h.starting_track > h.ending_track) {
***************
*** 1037,1043 ****
  		trk--;
  
  		rc = ioctl(fd, CDIOREADTOCHEADER, &h);
! 		if (rc < 0) {
  			warn("getting toc header");
  			return (rc);
  		}
--- 1037,1043 ----
  		trk--;
  
  		rc = ioctl(fd, CDIOREADTOCHEADER, &h);
! 		if (rc == -1) {
  			warn("getting toc header");
  			return (rc);
  		}
***************
*** 1060,1066 ****
  
  	if (status (&trk, &min, &sec, &frm) >= 0) {
  		rc = ioctl(fd, CDIOREADTOCHEADER, &h);
! 		if (rc < 0) {
  			warn("getting toc header");
  			return (rc);
  		}
--- 1060,1066 ----
  
  	if (status (&trk, &min, &sec, &frm) >= 0) {
  		rc = ioctl(fd, CDIOREADTOCHEADER, &h);
! 		if (rc == -1) {
  			warn("getting toc header");
  			return (rc);
  		}
***************
*** 1081,1087 ****
  	if (status(&trk, &min, &sec, &frm) >= 0) {
  		trk++;
  		rc = ioctl(fd, CDIOREADTOCHEADER, &h);
! 		if (rc < 0) {
  			warn("getting toc header");
  			return (rc);
  		}
--- 1081,1087 ----
  	if (status(&trk, &min, &sec, &frm) >= 0) {
  		trk++;
  		rc = ioctl(fd, CDIOREADTOCHEADER, &h);
! 		if (rc == -1) {
  			warn("getting toc header");
  			return (rc);
  		}
***************
*** 1474,1480 ****
  	s.address_format = msf ? CD_MSF_FORMAT : CD_LBA_FORMAT;
  	s.data_format = CD_CURRENT_POSITION;
  
! 	if (ioctl(fd, CDIOCREADSUBCHANNEL, (char *) &s) < 0)
  		return -1;
  
  	*trk = s.data->what.position.track_number;
--- 1474,1480 ----
  	s.address_format = msf ? CD_MSF_FORMAT : CD_LBA_FORMAT;
  	s.data_format = CD_CURRENT_POSITION;
  
! 	if (ioctl(fd, CDIOCREADSUBCHANNEL, (char *) &s) == -1)
  		return -1;
  
  	*trk = s.data->what.position.track_number;
***************
*** 1598,1604 ****
  			fd = opendev(dev, O_RDWR, OPENDEV_PART, &realdev);
  		else
  			fd = opendev(dev, O_RDONLY, OPENDEV_PART, &realdev);
! 		if (fd < 0) {
  			if (errno == ENXIO) {
  				/*  ENXIO has an overloaded meaning here.
  				 *  The original "Device not configured" should
--- 1598,1604 ----
  			fd = opendev(dev, O_RDWR, OPENDEV_PART, &realdev);
  		else
  			fd = opendev(dev, O_RDONLY, OPENDEV_PART, &realdev);
! 		if (fd == -1) {
  			if (errno == ENXIO) {
  				/*  ENXIO has an overloaded meaning here.
  				 *  The original "Device not configured" should
***************
*** 1614,1620 ****
  		}
  		sleep(1);
  	}
! 	if (fd < 0) {
  		warn("Can't open %s", realdev);
  		return (0);
  	}
--- 1614,1620 ----
  		}
  		sleep(1);
  	}
! 	if (fd == -1) {
  		warn("Can't open %s", realdev);
  		return (0);
  	}