move getchar() into libsa where applicable

ok miod@

2 files changed, 3 insertions, 19 deletions

diff --git a/sys/arch/hppa/stand/libsa/Makefile b/sys/arch/hppa/stand/libsa/Makefile
index ec004b01eac..7747c256ca8 100644
--- a/sys/arch/hppa/stand/libsa/Makefile
+++ b/sys/arch/hppa/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.16 2012/08/31 16:13:20 pascal Exp $
+#	$OpenBSD: Makefile,v 1.17 2014/07/12 21:54:58 jasper Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -20,7 +20,7 @@ SRCS=	machdep.c pdc.c itecons.c dev_hppa.c time.c \
 	ct.c dk.c lf.c lif.c cmd_hppa.c loadfile.c elf32.c elf64.c
 
 # stand routines
-SRCS+=	alloc.c exit.c getfile.c gets.c globals.c \
+SRCS+=	alloc.c exit.c getfile.c gets.c getchar.c globals.c \
 	printf.c strerror.c strtol.c strchr.c ctime.c snprintf.c
 
 # io routines
diff --git a/sys/arch/hppa/stand/libsa/dev_hppa.c b/sys/arch/hppa/stand/libsa/dev_hppa.c
index c885f24ec2c..b716fe8ff0a 100644
--- a/sys/arch/hppa/stand/libsa/dev_hppa.c
+++ b/sys/arch/hppa/stand/libsa/dev_hppa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dev_hppa.c,v 1.15 2012/02/25 20:12:00 miod Exp $	*/
+/*	$OpenBSD: dev_hppa.c,v 1.16 2014/07/12 21:54:58 jasper Exp $	*/
 
 /*
  * Copyright (c) 1998-2004 Michael Shalayeff
@@ -199,22 +199,6 @@ putchar(c)
 	}
 }
 
-int
-getchar()
-{
-	int c = cngetc();
-
-	if (c == '\r')
-		c = '\n';
-
-	if ((c < ' ' && c != '\n') || c == '\177')
-		return(c);
-
-	putchar(c);
-
-	return(c);
-}
-
 char ttyname_buf[8];
 char *
 ttyname(fd)