upstream/1.1.0_cvsrelease/1.1.0_cvs

1 files changed, 23 insertions, 11 deletions

diff --git a/lib/libcurses/addch.c b/lib/libcurses/addch.c
index 027c4bf94476..d1408c21fe92 100644
--- a/lib/libcurses/addch.c
+++ b/lib/libcurses/addch.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 1981 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1981, 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
@@ -32,19 +32,31 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)addch.c	5.5 (Berkeley) 6/1/90";
-#endif /* not lint */
+static char sccsid[] = "@(#)addch.c	8.1 (Berkeley) 6/4/93";
+#endif	/* not lint */
 
-# include	"curses.ext"
+#include <curses.h>
 
 /*
- *	This routine adds the character to the current position
+ * waddch --
+ *	Add the character to the current position in the given window.
  *
  */
-waddch(win, c)
-WINDOW	*win;
-char c;
+int
+waddch(WINDOW *win, char ch)
 {
-    chtype ch = (unsigned char) c;
-    return _waddbytes(win, &ch, 1);
+	__LDATA buf;
+
+	buf.ch = ch;
+	buf.attr = 0;
+	return (__waddch(win, &buf));
+}
+
+int
+__waddch(WINDOW *win, __LDATA *dp)
+{
+	char buf[2];
+
+	buf[0] = dp->ch;
+	return (__waddbytes(win, buf, 1, dp->attr & __STANDOUT));
 }