don't assume it returns char

(cherry picked from commit 5f051a666b525abb2b3497a7966aa9ece8884aab)

diff --git a/src/butc/read_tape.c b/src/butc/read_tape.c
index 75c27e4413f9e2168fd656fbac89f7d18f4cf5ac..fc3d86aa041d541639355aab319d9e1a3bed9563 100644 (file)
--- 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 bf99054fd893f4ff00371d0f2ae10e185750a913..059f6484b0defcdb765245943678971f4c8d4a20 100644 (file)
--- 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 0e768d4c3931e3abe9f4387fde0679b05432e34f..cd44de0e416811c9c30d19c1050db41ef8e42547 100644 (file)
--- 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 e033802282701a7f8d89a4d64bec4315a2c3f314..29297b575fcf04665bc1597ae267a0d87cd0130c 100644 (file)
--- 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 235f19fba17825ecf939bb1e17e7e6e5a2640e2c..d27cedb258960e653d91606ca957ddd2afc0d963 100644 (file)
--- 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 1ffd712e216feec3a095a6886dd4ddff3ee61224..2edb546f0ba67c127ba72aaeb6b502d1ef7065c7 100644 (file)
--- 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 2d4d2d8ea4150fc2359a541f9a70d217c6520b72..e50b19849e36a3fe560d060ab3a0e6691da2507f 100644 (file)
--- 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);