===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/kdump/kdump.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -c -r1.126 -r1.127
*** src/usr.bin/kdump/kdump.c	2016/03/24 05:05:42	1.126
--- src/usr.bin/kdump/kdump.c	2016/03/30 08:00:01	1.127
***************
*** 1,4 ****
! /*	$OpenBSD: kdump.c,v 1.126 2016/03/24 05:05:42 guenther Exp $	*/
  
  /*-
   * Copyright (c) 1988, 1993
--- 1,4 ----
! /*	$OpenBSD: kdump.c,v 1.127 2016/03/30 08:00:01 guenther Exp $	*/
  
  /*-
   * Copyright (c) 1988, 1993
***************
*** 694,700 ****
      [SYS_ktrace]	= { Ppath, Ktraceopname, Ktracefacname, Ppgid },
      [SYS_sigaction]	= { Signame, Pptr, Pptr },
      [SYS_sigprocmask]	= { Sigprocmaskhowname, Sigset },
!     [SYS_getlogin]	= { Pptr, Pucount },
      [SYS_setlogin]	= { Pptr },
      [SYS_acct]		= { Ppath },
      [SYS_fstat]		= { Pfd, Pptr },
--- 694,700 ----
      [SYS_ktrace]	= { Ppath, Ktraceopname, Ktracefacname, Ppgid },
      [SYS_sigaction]	= { Signame, Pptr, Pptr },
      [SYS_sigprocmask]	= { Sigprocmaskhowname, Sigset },
!     [SYS_getlogin_r]	= { Pptr, Psize },
      [SYS_setlogin]	= { Pptr },
      [SYS_acct]		= { Ppath },
      [SYS_fstat]		= { Pfd, Pptr },
***************
*** 1076,1081 ****
--- 1076,1082 ----
  	else
  		(void)printf("%s ", syscallnames[code]);
  
+ doerr:
  	if (error == 0) {
  		if (fancy) {
  			switch (code) {
***************
*** 1099,1104 ****
--- 1100,1111 ----
  			case SYS_getegid:
  				gidname(ret);
  				break;
+ 			/* syscalls that return errno values */
+ 			case SYS_getlogin_r:
+ 			case SYS___thrsleep:
+ 				if ((error = ret) != 0)
+ 					goto doerr;
+ 				/* FALLTHROUGH */
  			default:
  				(void)printf("%ld", (long)ret);
  				if (ret < 0 || ret > 9)
***************
*** 1115,1123 ****
  	else if (error == EJUSTRETURN)
  		(void)printf("JUSTRETURN");
  	else {
! 		(void)printf("-1 errno %d", ktr->ktr_error);
  		if (fancy)
! 			(void)printf(" %s", strerror(ktr->ktr_error));
  	}
  	(void)putchar('\n');
  }
--- 1122,1130 ----
  	else if (error == EJUSTRETURN)
  		(void)printf("JUSTRETURN");
  	else {
! 		(void)printf("-1 errno %d", error);
  		if (fancy)
! 			(void)printf(" %s", strerror(error));
  	}
  	(void)putchar('\n');
  }