ncurses 5.7 - patch 20090419

[ncurses.git] / ncurses / base / lib_echo.c

diff --git a/ncurses/base/lib_echo.c b/ncurses/base/lib_echo.c
index 4ccf97ff64c08a3cc070c24663c87dec6111d67f..c2cdfc9b2a1c13576b059019a850cbf1daf83ba0 100644 (file)
--- a/ncurses/base/lib_echo.c
+++ b/ncurses/base/lib_echo.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -29,9 +29,10 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Thomas E. Dickey                        1996-on                 *
+ *     and: Juergen Pfeifer                         2009                    *
  ****************************************************************************/
 
-
 /*
  *     echo.c
  *
@@ -43,18 +44,40 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_echo.c,v 1.3 1998/10/12 13:15:33 Alexander.V.Lukyanov Exp $")
+MODULE_ID("$Id: lib_echo.c,v 1.7 2009/02/21 20:20:40 tom Exp $")
+
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(echo) (NCURSES_SP_DCL0)
+{
+    T((T_CALLED("echo(%p)"), SP_PARM));
+    if (0 == SP_PARM)
+       returnCode(ERR);
+    SP_PARM->_echo = TRUE;
+    returnCode(OK);
+}
+
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+echo(void)
+{
+    return NCURSES_SP_NAME(echo) (CURRENT_SCREEN);
+}
+#endif
 
-int echo(void)
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(noecho) (NCURSES_SP_DCL0)
 {
-       T((T_CALLED("echo()")));
-       SP->_echo = TRUE;
-       returnCode(OK);
+    T((T_CALLED("noecho(%p)"), SP_PARM));
+    if (0 == SP_PARM)
+       returnCode(ERR);
+    SP_PARM->_echo = FALSE;
+    returnCode(OK);
 }
 
-int noecho(void)
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+noecho(void)
 {
-       T((T_CALLED("noecho()")));
-       SP->_echo = FALSE;
-       returnCode(OK);
+    return NCURSES_SP_NAME(noecho) (CURRENT_SCREEN);
 }
+#endif