getchar returns int

diff --git a/src/butc/read_tape.c b/src/butc/read_tape.c
index 6af2c861728c21fa5afb977c2abc59146bf97372..8061aa885945848f9e021ff58e8ef70b3ad2b9ec 100644 (file)
--- a/src/butc/read_tape.c
+++ b/src/butc/read_tape.c
@@ -10,7 +10,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/butc/read_tape.c,v 1.1.1.4 2001/07/14 22:21:06 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/butc/read_tape.c,v 1.2 2002/10/20 19:01:30 hartmans Exp $");
 
 #include <afs/cmd.h>
 #include <lock.h>
@@ -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 5cb247fde399b6138b3aa96da209e40187096a1d..0eceb7d9a69384f32a84a4e21cb68d5605f92654 100644 (file)
--- a/src/butc/recoverDb.c
+++ b/src/butc/recoverDb.c
@@ -10,7 +10,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/butc/recoverDb.c,v 1.1.1.5 2001/09/11 14:31:51 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/butc/recoverDb.c,v 1.2 2002/10/20 19:01:30 hartmans Exp $");
 
 #include <stdio.h>
 #ifdef AFS_NT40_ENV
@@ -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 47282bd076bd56af0acd01c30a4c2d78079e3cf2..ca977df5de72156146cdb75b362c69757bb2b997 100644 (file)
--- a/src/kauth/klogin.c
+++ b/src/kauth/klogin.c
@@ -21,7 +21,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/kauth/klogin.c,v 1.1.1.8 2001/10/14 18:05:08 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/kauth/klogin.c,v 1.2 2002/10/20 19:01:30 hartmans Exp $");
 
 #if !defined(AFS_SUN_ENV) && !defined(AFS_AIX_ENV) && !defined(AFS_HPUX_ENV) && !defined(AFS_SGI_ENV) && !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV)
 #include <sys/param.h>
@@ -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 348ee358e58d3e5eb15b7527355cb0b5b31cbb9b..f7f326d41422223ac2ccec0d299a37afed39dc37 100644 (file)
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -39,7 +39,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/login/login.c,v 1.1.1.5 2001/09/11 14:33:33 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/login/login.c,v 1.2 2002/10/20 19:01:30 hartmans Exp $");
 
 #include <unistd.h>
 #include <stdlib.h>
@@ -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 2a529c2e40c0071272d67db7228680198577c75a..00a26eb4f462c766a0ba1cec7b7c3cc55801a62c 100644 (file)
--- a/src/lwp/waitkey.c
+++ b/src/lwp/waitkey.c
@@ -22,7 +22,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/lwp/waitkey.c,v 1.1.1.10 2001/10/14 18:05:48 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/lwp/waitkey.c,v 1.2 2002/10/20 19:01:31 hartmans Exp $");
 
 #include <stdio.h>
 #include <sys/types.h>
@@ -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 2b0e8da1881e726fc56fc6c7a5ea4d9a835027c4..e25567c642907894e623d25c6c065ab6ed0fcd73 100644 (file)
--- a/src/volser/vos.c
+++ b/src/volser/vos.c
@@ -10,7 +10,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/volser/vos.c,v 1.1.1.11 2002/09/26 19:09:35 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/volser/vos.c,v 1.2 2002/10/20 19:01:31 hartmans Exp $");
 
 #include <sys/types.h>
 #ifdef AFS_NT40_ENV
@@ -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 5f1c99eca3f823c19402e535c939edf342894887..df38a4dd13a4b5ad5316ed78e9837698a20d470c 100644 (file)
--- a/src/volser/vsprocs.c
+++ b/src/volser/vsprocs.c
@@ -10,7 +10,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/volser/vsprocs.c,v 1.1.1.9 2002/09/26 19:09:36 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/volser/vsprocs.c,v 1.2 2002/10/20 19:01:31 hartmans Exp $");
 
 #include <stdio.h>
 #include <sys/types.h>
@@ -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);