diff --git a/ChangeLog b/ChangeLog
index 118fc42c7..2753bead1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-06  Robert Larice
+ * src/frontend/parser/input.c :
+    tiny rewrite, type fixes
+
 2010-11-06  Robert Larice
  * src/frontend/inpcom.c :
     drop a redundant check
diff --git a/src/frontend/parser/input.c b/src/frontend/parser/input.c
index 1706e9728..cccf51ba7 100644
--- a/src/frontend/parser/input.c
+++ b/src/frontend/parser/input.c
@@ -25,14 +25,14 @@ int
 inchar(FILE *fp)
 {
 
-    char c;
 #ifndef HAS_WINDOWS    
-    int i;
+    char c;
+    ssize_t i;
 
     if (cp_interactive && !cp_nocc) {
       do {
-	i = read((int) fileno(fp), &c, 1);
-	} while (i == -1 && errno == EINTR);
+        i = read(fileno(fp), &c, 1);
+      } while (i == -1 && errno == EINTR);
       if (i == 0 || c == '\004')
         return (EOF);
       else if (i == -1) {
@@ -42,8 +42,7 @@ inchar(FILE *fp)
         return ((int) c);
     } else
 #endif    
-    c = getc(fp);
-    return ((int) c);
+    return (getc(fp));
 }