Separated out the _putchar & __cputchar() routines so that programs such

as tn3270 can replace _putchar(0 with their own routine and still keep
using the __cputchar() routine used by all of the other curses routines.

Reviewed by:	"Andrey A. Chernov, Black Mage" <ache@astral.msk.su>

3 files changed, 51 insertions, 11 deletions

diff --git a/lib/libcurses/Makefile b/lib/libcurses/Makefile
index 42d9de1..26e9a14 100644
--- a/lib/libcurses/Makefile
+++ b/lib/libcurses/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 1/2/94
-#	$Id: Makefile,v 1.3 1994/08/28 21:48:11 ache Exp $
+#	$Id: Makefile,v 1.4 1994/10/12 01:57:56 ache Exp $
 
 CFLAGS+=#-DTFILE=\"/dev/ttyp0\"
 CFLAGS+=-D_CURSES_PRIVATE -I${.CURDIR}
@@ -9,8 +9,9 @@ SRCS=	addbytes.c addch.c addnstr.c box.c clear.c clrtobot.c clrtoeol.c \
 	cr_put.c ctrace.c cur_hash.c curses.c delch.c deleteln.c delwin.c \
 	erase.c fullname.c getch.c getstr.c id_subwins.c idlok.c initscr.c \
 	insch.c insertln.c longname.c move.c mvwin.c newwin.c overlay.c \
-	overwrite.c printw.c putchar.c refresh.c scanw.c scroll.c setterm.c \
-	standout.c toucholap.c touchwin.c tscroll.c tstp.c tty.c unctrl.c
+	overwrite.c printw.c _putchar.c putchar.c refresh.c scanw.c scroll.c \
+	setterm.c standout.c toucholap.c touchwin.c tscroll.c tstp.c tty.c \
+	unctrl.c
 MAN3=	curses.3
 
 beforeinstall:
diff --git a/lib/libcurses/_putchar.c b/lib/libcurses/_putchar.c
new file mode 100644
index 0000000..ff90d2c
--- /dev/null
+++ b/lib/libcurses/_putchar.c
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 1981, 1993, 1994
+ *	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.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)_putchar.c	8.2 (Berkeley) 5/4/94";
+#endif	/* not lint */
+
+#include "curses.h"
+
+int
+_putchar(ch)
+	int ch;
+{
+	__cputchar(ch);
+	return 0;
+}
+
diff --git a/lib/libcurses/putchar.c b/lib/libcurses/putchar.c
index 0a629ce..2ed5bb4 100644
--- a/lib/libcurses/putchar.c
+++ b/lib/libcurses/putchar.c
@@ -47,11 +47,3 @@ __cputchar(ch)
 #endif
 	(void)putchar(ch);
 }
-
-int
-_putchar(ch)
-	int ch;
-{
-	__cputchar(ch);
-	return 0;
-}