From 01fae19aea7ccbc23b9710f23a0bde7b99d9d6f7 Mon Sep 17 00:00:00 2001
From: Sam Hartman <hartmans@mit.edu>
Date: Thu, 14 Nov 2002 21:40:34 +0000
Subject: [PATCH] don't assume it returns char

(cherry picked from commit 5f051a666b525abb2b3497a7966aa9ece8884aab)
---
 src/butc/read_tape.c | 2 +-
 src/butc/recoverDb.c | 4 ++--
 src/kauth/klogin.c   | 6 +++---
 src/login/login.c    | 2 +-
 src/lwp/waitkey.c    | 2 +-
 src/volser/vos.c     | 2 +-
 src/volser/vsprocs.c | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/butc/read_tape.c b/src/butc/read_tape.c
index 75c27e441..fc3d86aa0 100644
--- a/src/butc/read_tape.c
+++ b/src/butc/read_tape.c
@@ -163,7 +163,7 @@ int openOutFile(headerPtr)
   struct volumeHeader *headerPtr;
 {
   afs_int32 len;
-  char ch;
+  int ch;
   int rc;
   int oflag;
   int  skip, first;
diff --git a/src/butc/recoverDb.c b/src/butc/recoverDb.c
index bf99054fd..059f6484b 100644
--- a/src/butc/recoverDb.c
+++ b/src/butc/recoverDb.c
@@ -113,7 +113,7 @@ afs_int32
 Ask(st)
      char *st;
 {
-    char response;
+    int  response;
 
     while (1)
     {
@@ -123,7 +123,7 @@ Ask(st)
 	fflush(stdout);
 	response = getchar();
 	if      ( response == 'y' ) return(1);
-	else if ( response == 'n' ) return(0);
+	else if ( response == 'n' || response == EOF) return(0);
 	printf("please answer y/n\n");
     }
 }
diff --git a/src/kauth/klogin.c b/src/kauth/klogin.c
index 0e768d4c3..cd44de0e4 100644
--- a/src/kauth/klogin.c
+++ b/src/kauth/klogin.c
@@ -461,7 +461,7 @@ int main(
 static void getloginname(register struct utmp *up)
 {
 	register char *namep;
-	char c;
+	int c;
 
 	while (up->ut_name[0] == '\0') {
 		namep = up->ut_name;
@@ -469,10 +469,10 @@ static void getloginname(register struct utmp *up)
 		while ((c = getchar()) != '\n') {
 			if (c == ' ')
 				c = '_';
-			if (c == (char)EOF)
+			if (c == EOF)
 				exit(0);
 			if (namep < up->ut_name+NMAX)
-				*namep++ = c;
+				*namep++ = (char) c;
 		}
 	}
 	strncpy(lusername, up->ut_name, NMAX);
diff --git a/src/login/login.c b/src/login/login.c
index e03380228..29297b575 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -1439,7 +1439,7 @@ int prompt;
 				exit(0);
 			}
 			if (p < nbuf + UT_NAMESIZE)
-				*p++ = ch;
+				*p++ = (char) ch;
 		}
 		if (p > nbuf) {
 			if (nbuf[0] == '-')
diff --git a/src/lwp/waitkey.c b/src/lwp/waitkey.c
index 235f19fba..d27cedb25 100644
--- a/src/lwp/waitkey.c
+++ b/src/lwp/waitkey.c
@@ -253,7 +253,7 @@ int LWP_GetResponseKey(int seconds, char *key)
 #ifdef AFS_NT40_ENV
   *key = getche(); /* get char and echo it to screen */
 #else
-  *key = getchar();
+  *key = (char ) getchar();
 #endif
 
   return rc;
diff --git a/src/volser/vos.c b/src/volser/vos.c
index 1ffd712e2..2edb546f0 100644
--- a/src/volser/vos.c
+++ b/src/volser/vos.c
@@ -2076,7 +2076,7 @@ register struct cmd_syndesc *as;
 	else {                    /* volume exists - do we do a full incremental or abort */
 	    int Oserver, Opart, Otype, vol_elsewhere = 0;
 	    struct nvldbentry Oentry;
-	    char   c, dc;
+	    int   c, dc;
 
 	    if(avolid == 0) {
 		avolid = entry.volumeId[voltype];
diff --git a/src/volser/vsprocs.c b/src/volser/vsprocs.c
index 2d4d2d8ea..e50b19849 100644
--- a/src/volser/vsprocs.c
+++ b/src/volser/vsprocs.c
@@ -97,7 +97,7 @@ char *partName;
 yesprompt(str)
 char *str;
 {
-    char response, c;
+    int response, c;
     int code;
 
     fprintf(STDERR, "Do you want to %s? [yn](n): ", str);
-- 
2.39.5