--- lbbs/src/screen.c	2005/05/06 15:48:44	1.16
+++ lbbs/src/screen.c	2006/01/03 12:34:54	1.20
@@ -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;
 }
@@ -216,12 +231,13 @@ int
 display_file_ex (const char *filename, int begin_line, int wait)
 {
   char buffer[260], temp[256];
-  int i, ch, input_ok;
+  int i, ch, input_ok, max_lines;
   long int line, c_line_begin = 0, c_line_total = 0;
   long int f_line, f_size, f_offset;
   FILE *fin;
   struct stat f_stat;
 
+  max_lines = screen_lines - 1;
   clrline (begin_line, screen_lines);
   line = begin_line;
   moveto (line, 0);
@@ -241,7 +257,7 @@ display_file_ex (const char *filename, i
 
       while (fgets (buffer, 255, fin))
 	{
-	  if (line >= screen_lines)
+	  if (line >= max_lines)
 	    {
 	      f_offset = ftell (fin);
 
@@ -287,7 +303,7 @@ display_file_ex (const char *filename, i
 		    case KEY_PGUP:
 		    case Ctrl ('B'):
 		      if (c_line_begin > 0)
-			c_line_begin -= (screen_lines - begin_line - 1);
+			c_line_begin -= (max_lines - begin_line - 1);
 		      else
 			goto exit;
 		      if (c_line_begin < 0)
@@ -303,11 +319,11 @@ display_file_ex (const char *filename, i
 		    case KEY_PGDN:
 		    case Ctrl ('F'):
 		    case KEY_SPACE:
-		      c_line_begin += (screen_lines - begin_line - 1);
-		      if (c_line_begin + (screen_lines - begin_line) >
+		      c_line_begin += (max_lines - begin_line - 1);
+		      if (c_line_begin + (max_lines - begin_line) >
 			  c_line_total)
 			c_line_begin =
-			  c_line_total - (screen_lines - begin_line);
+			  c_line_total - (max_lines - begin_line);
 		      rewind (fin);
 		      for (f_line = 0; f_line < c_line_begin; f_line++)
 			{