--- lbbs/src/screen.c	2005/05/06 15:48:44	1.16
+++ lbbs/src/screen.c	2005/05/06 17:03:02	1.19
@@ -107,12 +107,15 @@ set_input_echo (int echo)
 }
 
 int
-str_input (char *buffer, int buffer_length, int echo_mode)
+_str_input (char *buffer, int buffer_length, int echo_mode)
 {
   char buf[256], ch;
   int c, offset = 0, len, loop = 1, i, hz = 0;
 
-  memset (buffer, '\0', buffer_length);
+  for (i=0; i<buffer_length && buffer[i] != '\0'; i++)
+    {
+  	  offset++;
+    }
 
   while (c = igetch_t (60))
     {
@@ -148,10 +151,10 @@ str_input (char *buffer, int buffer_leng
       buffer[offset] = '\0';
       switch (echo_mode)
 	{
-	case 0:
+	case DOECHO:
 	  outc ((char) c);
 	  break;
-	case 1:
+	case NOECHO:
 	  outc ('*');
 	  break;
 	}
@@ -168,6 +171,18 @@ str_input (char *buffer, int buffer_leng
 }
 
 int
+str_input (char *buffer, int buffer_length, int echo_mode)
+{
+  int offset;
+  
+  memset (buffer, '\0', buffer_length);
+  
+  offset = _str_input (buffer, buffer_length, echo_mode);
+  
+  return offset;
+};
+
+int
 get_data (int row, int col, char *prompt, char *buffer, int buffer_length, int echo_mode)
 {
   int len;
@@ -178,7 +193,7 @@ get_data (int row, int col, char *prompt
   prints (buffer);
   iflush ();
 
-  len = str_input (buffer, buffer_length, echo_mode);
+  len = _str_input (buffer, buffer_length, echo_mode);
   
   return len;
 }