From: Ken Raeburn Date: Sat, 19 Feb 2000 02:34:19 +0000 (+0000) Subject: Volatile decls as needed. X-Git-Tag: krb5-1.2-beta1~65 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ea0b89cfbd5202972456b7e68f7c84467b40aea0;p=krb5.git Volatile decls as needed. Format attribute declarations for gcc. Deleting some unused variables. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12058 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog index 91a5e1512..411aff711 100644 --- a/src/appl/gssftp/ftp/ChangeLog +++ b/src/appl/gssftp/ftp/ChangeLog @@ -1,3 +1,11 @@ +2000-02-18 Ken Raeburn + + * cmds.c (mls): Declare some variables volatile to protect against + getting clobbered by setjmp/longjmp. + * ftp.c (sendrequest, recvrequest, proxtrans): Ditto. + * main.c (main): Ditto. + * pclose.c (mypopen): Ditto. + 1999-10-26 Tom Yu * Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES, diff --git a/src/appl/gssftp/ftp/cmds.c b/src/appl/gssftp/ftp/cmds.c index 4d1a8206a..2a8e77550 100644 --- a/src/appl/gssftp/ftp/cmds.c +++ b/src/appl/gssftp/ftp/cmds.c @@ -1439,7 +1439,7 @@ mls(argc, argv) extern jmp_buf jabort; sig_t oldintr; int ointer, i; - char *cmd, mode[1], *dest; + char *volatile cmd, mode[1], *dest; sigtype mabort(); if (argc < 2 && !another(&argc, &argv, "remote-files")) diff --git a/src/appl/gssftp/ftp/ftp.c b/src/appl/gssftp/ftp/ftp.c index 24049eabe..11f583a6c 100644 --- a/src/appl/gssftp/ftp/ftp.c +++ b/src/appl/gssftp/ftp/ftp.c @@ -797,11 +797,11 @@ sendrequest(cmd, local, remote, printnames) struct stat st; struct timeval start, stop; register int c, d; - FILE *fin, *dout = 0, *popen(); - int (*closefunc)(), pclose(), fclose(); - sig_t oldintr, oldintp; - long bytes = 0, hashbytes = HASHBYTES; - char *lmode, buf[FTP_BUFSIZ], *bufp; + FILE *volatile fin, *volatile dout = 0, *popen(); + int (*volatile closefunc)(), pclose(), fclose(); + volatile sig_t oldintr, oldintp; + volatile long bytes = 0, hashbytes = HASHBYTES; + char *volatile lmode, buf[FTP_BUFSIZ], *bufp; sigtype abortsend(); if (verbose && printnames) { @@ -1046,17 +1046,17 @@ abortrecv(sig) } recvrequest(cmd, local, remote, lmode, printnames) - char *cmd, *local, *remote, *lmode; + char *cmd, *volatile local, *remote, *lmode; { - FILE *fout, *din = 0, *popen(); - int (*closefunc)(), pclose(), fclose(); - sig_t oldintr, oldintp; - int is_retr, tcrflag, bare_lfs = 0; + FILE *volatile fout, *volatile din = 0, *popen(); + int (*volatile closefunc)(), pclose(), fclose(); + volatile sig_t oldintr, oldintp; + volatile int is_retr, tcrflag, bare_lfs = 0; char *gunique(); static int bufsize; static char *buf; int blksize; - long bytes = 0, hashbytes = HASHBYTES; + volatile long bytes = 0, hashbytes = HASHBYTES; register int c, d; struct timeval start, stop; struct stat st; @@ -1691,10 +1691,11 @@ abortpt(sig) proxtrans(cmd, local, remote) char *cmd, *local, *remote; { - sig_t oldintr; - int secndflag = 0, prox_type, nfnd; + volatile sig_t oldintr; + volatile int secndflag = 0; + int prox_type, nfnd; extern jmp_buf ptabort; - char *cmd2; + char *volatile cmd2; fd_set mask; sigtype abortpt(); diff --git a/src/appl/gssftp/ftp/main.c b/src/appl/gssftp/ftp/main.c index aa6e5a4df..9c1e43a86 100644 --- a/src/appl/gssftp/ftp/main.c +++ b/src/appl/gssftp/ftp/main.c @@ -80,7 +80,8 @@ extern char realm[]; #endif /* KRB5_KRB4_COMPAT */ main(argc, argv) - char *argv[]; + volatile int argc; + char **volatile argv; { register char *cp; int top; diff --git a/src/appl/gssftp/ftp/pclose.c b/src/appl/gssftp/ftp/pclose.c index 02f08f6f9..04e481b19 100644 --- a/src/appl/gssftp/ftp/pclose.c +++ b/src/appl/gssftp/ftp/pclose.c @@ -44,7 +44,8 @@ mypopen(cmd,mode) char *mode; { int p[2]; - int myside, hisside, pid; + volatile int myside, hisside; + int pid; if (nfiles <= 0) nfiles = getdtablesize(); diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog index ccce75813..a459d308b 100644 --- a/src/appl/gssftp/ftpd/ChangeLog +++ b/src/appl/gssftp/ftpd/ChangeLog @@ -1,3 +1,11 @@ +2000-02-18 Ken Raeburn + + * ftpd.c (reply, lreply): Declare with format attribute under + gcc. + (send_data, receive_data, send_file_list): Declare some variables + volatile to protect against getting clobbered by setjmp/longjmp. + * popen.c (ftpd_popen): Declare IOP volatile. + 1999-10-26 Tom Yu * Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES, diff --git a/src/appl/gssftp/ftpd/ftpd.c b/src/appl/gssftp/ftpd/ftpd.c index 52be05fb6..c7dfc8ad2 100644 --- a/src/appl/gssftp/ftpd/ftpd.c +++ b/src/appl/gssftp/ftpd/ftpd.c @@ -119,8 +119,16 @@ extern char *mktemp (); #include #ifdef STDARG -extern reply(int, char *, ...); -extern lreply(int, char *, ...); +extern reply(int, char *, ...) +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) + __attribute__ ((__format__ (__printf__, 2, 3))) +#endif + ; +extern lreply(int, char *, ...) +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) + __attribute__ ((__format__ (__printf__, 2, 3))) +#endif + ; #endif #ifdef KRB5_KRB4_COMPAT @@ -1446,7 +1454,7 @@ void send_data(instr, outstr, blksize) register int c, cnt; register char *buf; int netfd, filefd; - int ret = 0; + volatile int ret = 0; transflag++; if (sigsetjmp(urgcatch, 1)) { @@ -1527,7 +1535,7 @@ receive_data(instr, outstr) FILE *instr, *outstr; { register int c; - int cnt, bare_lfs = 0; + volatile int cnt, bare_lfs = 0; char buf[FTP_BUFSIZ]; int ret = 0; @@ -2485,13 +2493,13 @@ send_file_list(whichfiles) struct stat st; DIR *dirp = NULL; struct dirent *dir; - FILE *dout = NULL; - register char **dirlist, *dirname; - int simple = 0; + FILE *volatile dout = NULL; + register char **volatile dirlist, *dirname; + volatile int simple = 0; #ifndef strpbrk char *strpbrk(); #endif - int ret = 0; + volatile int ret = 0; if (strpbrk(whichfiles, "~{[*?") != NULL) { extern char **ftpglob(), *globerr; @@ -2728,8 +2736,6 @@ ftpd_gss_convert_creds(name, creds) char ccname[MAXPATHLEN]; #ifdef KRB5_KRB4_COMPAT krb5_principal kpcserver; - krb5_error_code kpccode; - int kpcval; krb5_creds increds, *v5creds; CREDENTIALS v4creds; #endif diff --git a/src/appl/gssftp/ftpd/popen.c b/src/appl/gssftp/ftpd/popen.c index ffafe0529..d26746107 100644 --- a/src/appl/gssftp/ftpd/popen.c +++ b/src/appl/gssftp/ftpd/popen.c @@ -66,7 +66,7 @@ ftpd_popen(program, type) char *program, *type; { register char *cp; - FILE *iop; + FILE *volatile iop; int argc, gargc, pdes[2], pid; char **pop, *argv[MAX_ARGV], *gargv[MAX_GARGV], *vv[2]; extern char **ftpglob(), **copyblk();