diff options
| author | Jasper Lievisse Adriaanse <jasper@cvs.openbsd.org> | 2014-07-12 21:54:59 +0000 |
|---|---|---|
| committer | Jasper Lievisse Adriaanse <jasper@cvs.openbsd.org> | 2014-07-12 21:54:59 +0000 |
| commit | 55a05995977ff661af3b9e512515abc461867ca5 (patch) | |
| tree | d4bb8dcc9cdf6a4c586530a373c0849e4080678a /sys/arch/zaurus | |
| parent | 131b9116e2e83a04a7aab4b8596774aa49ed6935 (diff) | |
move getchar() into libsa where applicable
ok miod@
Diffstat (limited to 'sys/arch/zaurus')
| -rw-r--r-- | sys/arch/zaurus/stand/zboot/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/zaurus/stand/zboot/devopen.c | 18 |
2 files changed, 3 insertions, 19 deletions
diff --git a/sys/arch/zaurus/stand/zboot/Makefile b/sys/arch/zaurus/stand/zboot/Makefile index c89143ebc3c..8e45e107256 100644 --- a/sys/arch/zaurus/stand/zboot/Makefile +++ b/sys/arch/zaurus/stand/zboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2013/09/10 21:00:26 deraadt Exp $ +# $OpenBSD: Makefile,v 1.14 2014/07/12 21:54:58 jasper Exp $ MAN= boot.8 MANSUBDIR=zaurus @@ -29,7 +29,7 @@ SRCS+= close.c closeall.c cons.c ctime.c disklabel.c dkcksum.c fstat.c \ readdir.c snprintf.c stat.c strerror.c strtol.c ufs.c .PATH: ${S}/lib/libkern/arch/arm ${S}/lib/libkern -SRCS+= strcmp.c strlcpy.c strlen.c strncmp.c strncpy.c write.c \ +SRCS+= getchar.c strcmp.c strlcpy.c strlen.c strncmp.c strncpy.c write.c \ ashrdi3.c divsi3.S divdi3.c moddi3.c qdivrem.c # local overrides and additions diff --git a/sys/arch/zaurus/stand/zboot/devopen.c b/sys/arch/zaurus/stand/zboot/devopen.c index 442f30af831..e9e424182d2 100644 --- a/sys/arch/zaurus/stand/zboot/devopen.c +++ b/sys/arch/zaurus/stand/zboot/devopen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: devopen.c,v 1.10 2011/06/26 23:19:11 tedu Exp $ */ +/* $OpenBSD: devopen.c,v 1.11 2014/07/12 21:54:58 jasper Exp $ */ /* * Copyright (c) 1996-1999 Michael Shalayeff @@ -129,22 +129,6 @@ putchar(int c) } } -int -getchar(void) -{ - register 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 * |