===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cdio/rip.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/cdio/rip.c	2017/12/23 20:04:23	1.17
--- src/usr.bin/cdio/rip.c	2019/06/28 13:35:00	1.18
***************
*** 1,4 ****
! /*	$OpenBSD: rip.c,v 1.17 2017/12/23 20:04:23 cheloha Exp $	*/
  
  /*
   * Copyright (c) 2007 Alexey Vatchenko <av@bsdua.org>
--- 1,4 ----
! /*	$OpenBSD: rip.c,v 1.18 2019/06/28 13:35:00 deraadt Exp $	*/
  
  /*
   * Copyright (c) 2007 Alexey Vatchenko <av@bsdua.org>
***************
*** 306,312 ****
  
  	while (secsize > 0) {
  		res = write(fd, sec, secsize);
! 		if (res < 0)
  			return (-1);
  
  		sec += res;
--- 306,312 ----
  
  	while (secsize > 0) {
  		res = write(fd, sec, secsize);
! 		if (res == -1)
  			return (-1);
  
  		sec += res;
***************
*** 595,601 ****
  	int rc;
  
  	rc = ioctl(fd, CDIOREADTOCHEADER, &h);
! 	if (rc < 0)
  		return (rc);
  
  	if (h.starting_track > h.ending_track) {
--- 595,601 ----
  	int rc;
  
  	rc = ioctl(fd, CDIOREADTOCHEADER, &h);
! 	if (rc == -1)
  		return (rc);
  
  	if (h.starting_track > h.ending_track) {