diff options
Diffstat (limited to 'sys/lib/libsa')
| -rw-r--r-- | sys/lib/libsa/Makefile | 6 | ||||
| -rw-r--r-- | sys/lib/libsa/putchar.c | 68 | ||||
| -rw-r--r-- | sys/lib/libsa/stand.h | 3 |
3 files changed, 72 insertions, 5 deletions
diff --git a/sys/lib/libsa/Makefile b/sys/lib/libsa/Makefile index 88113b81ff1..3a02abb715c 100644 --- a/sys/lib/libsa/Makefile +++ b/sys/lib/libsa/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2013/01/01 18:49:33 miod Exp $ +# $OpenBSD: Makefile,v 1.25 2014/07/13 09:26:08 jasper Exp $ # $NetBSD: Makefile,v 1.13 1996/10/02 16:19:51 ws Exp $ LIB= sa @@ -24,8 +24,8 @@ CPPFLAGS+= -D__INTERNAL_LIBSA_CREAD .endif # stand routines -SRCS+= alloc.c memcpy.c exit.c getfile.c gets.c globals.c \ - printf.c snprintf.c strerror.c strcmp.c memset.c memcmp.c \ +SRCS+= alloc.c memcpy.c exit.c getfile.c getchar.c gets.c globals.c \ + printf.c putchar.c snprintf.c strerror.c strcmp.c memset.c memcmp.c \ strncpy.c strncmp.c strchr.c # math from libkern diff --git a/sys/lib/libsa/putchar.c b/sys/lib/libsa/putchar.c new file mode 100644 index 00000000000..f1eeb23f4a7 --- /dev/null +++ b/sys/lib/libsa/putchar.c @@ -0,0 +1,68 @@ +/* $OpenBSD: putchar.c,v 1.1 2014/07/13 09:26:08 jasper Exp $ */ + +/* + * Copyright (c) 1982, 1986, 1990, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +#include "stand.h" + +int pch_pos = 0; + +void +putchar(int c) +{ + switch (c) { + case '\177': /* DEL erases */ + cnputc('\b'); + cnputc(' '); + case '\b': + cnputc('\b'); + if (pch_pos) + pch_pos--; + break; + case '\t': + do + cnputc(' '); + while (++pch_pos % 8); + break; + case '\n': + case '\r': + cnputc(c); + pch_pos=0; + break; + default: + cnputc(c); + pch_pos++; + break; + } +} diff --git a/sys/lib/libsa/stand.h b/sys/lib/libsa/stand.h index 63f9b738e6b..40273a5ed3f 100644 --- a/sys/lib/libsa/stand.h +++ b/sys/lib/libsa/stand.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stand.h,v 1.57 2014/07/12 21:54:58 jasper Exp $ */ +/* $OpenBSD: stand.h,v 1.58 2014/07/13 09:26:08 jasper Exp $ */ /* $NetBSD: stand.h,v 1.18 1996/11/30 04:35:51 gwr Exp $ */ /*- @@ -185,7 +185,6 @@ void cnputc(int); int cngetc(void); int cnischar(void); int cnspeed(dev_t, int); -int getchar(void); u_int sleep(u_int); void usleep(u_int); char *ctime(const time_t *); |