From 98a607a2188044452e088b4bf098a14385e078a3 Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Sun, 20 Oct 2002 19:01:31 +0000 Subject: [PATCH] getchar returns int --- src/butc/read_tape.c | 4 ++-- src/butc/recoverDb.c | 6 +++--- src/kauth/klogin.c | 8 ++++---- src/login/login.c | 4 ++-- src/lwp/waitkey.c | 4 ++-- src/volser/vos.c | 4 ++-- src/volser/vsprocs.c | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/butc/read_tape.c b/src/butc/read_tape.c index 6af2c8617..8061aa885 100644 --- a/src/butc/read_tape.c +++ b/src/butc/read_tape.c @@ -10,7 +10,7 @@ #include #include -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 #include @@ -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 5cb247fde..0eceb7d9a 100644 --- a/src/butc/recoverDb.c +++ b/src/butc/recoverDb.c @@ -10,7 +10,7 @@ #include #include -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 #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 47282bd07..ca977df5d 100644 --- a/src/kauth/klogin.c +++ b/src/kauth/klogin.c @@ -21,7 +21,7 @@ #include #include -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 @@ -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 348ee358e..f7f326d41 100644 --- a/src/login/login.c +++ b/src/login/login.c @@ -39,7 +39,7 @@ #include #include -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 #include @@ -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 2a529c2e4..00a26eb4f 100644 --- a/src/lwp/waitkey.c +++ b/src/lwp/waitkey.c @@ -22,7 +22,7 @@ #include #include -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 #include @@ -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 2b0e8da18..e25567c64 100644 --- a/src/volser/vos.c +++ b/src/volser/vos.c @@ -10,7 +10,7 @@ #include #include -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 #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 5f1c99eca..df38a4dd1 100644 --- a/src/volser/vsprocs.c +++ b/src/volser/vsprocs.c @@ -10,7 +10,7 @@ #include #include -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 #include @@ -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