From 6f8bcdf41ec5d54f32b854c85d76044cca5d90f3 Mon Sep 17 00:00:00 2001 From: Nathan Bryant Date: Tue, 10 Nov 1998 05:44:35 +0000 Subject: [PATCH] * commands.c, control.c, cux2ascii.c, file_ops.c, import.c, ipc_c_tcp.c: eliminate sprintf() calls --- citadel/ChangeLog | 2 ++ citadel/commands.c | 6 ++--- citadel/control.c | 5 +++-- citadel/cux2ascii.c | 2 +- citadel/file_ops.c | 55 ++++++++++++++++++++++++++++----------------- citadel/import.c | 17 +++++--------- citadel/ipc_c_tcp.c | 2 +- 7 files changed, 51 insertions(+), 38 deletions(-) diff --git a/citadel/ChangeLog b/citadel/ChangeLog index dfa688221..a6849442d 100644 --- a/citadel/ChangeLog +++ b/citadel/ChangeLog @@ -1,6 +1,8 @@ 1998-11-09 Nathan Bryant * client_chat.c: eliminate calls to sprintf() * commands.h, routines.c, routines2.c: warning fix + * commands.c, control.c, cux2ascii.c, file_ops.c, import.c, + ipc_c_tcp.c: eliminate sprintf() calls Mon Nov 9 19:15:31 EST 1998 Art Cancro * serv_upgrade.c: added all missing fields to export/import diff --git a/citadel/commands.c b/citadel/commands.c index ec036fdf2..6262901d4 100644 --- a/citadel/commands.c +++ b/citadel/commands.c @@ -293,7 +293,7 @@ int intprompt(char *prompt, int ival, int imin, int imax) int i; i = ival; do { - sprintf(buf,"%d",i); + snprintf(buf,sizeof buf,"%d",i); strprompt(prompt,buf,15); i=atoi(buf); if (icurr_user); + snprintf(buf,sizeof buf, + "Global system configuration edited by %s", + CC->curr_user); aide_message(buf); } diff --git a/citadel/cux2ascii.c b/citadel/cux2ascii.c index 8c78e8ec9..c69d96f26 100644 --- a/citadel/cux2ascii.c +++ b/citadel/cux2ascii.c @@ -43,7 +43,7 @@ char *argv[]; { get_config(); - sprintf(tflnm,"/tmp/c2a%d",getpid()); + snprintf(tflnm,sizeof tflnm,"/tmp/c2a%d",getpid()); fp=stdin; while (1) { diff --git a/citadel/file_ops.c b/citadel/file_ops.c index 866ed0978..965c45b10 100644 --- a/citadel/file_ops.c +++ b/citadel/file_ops.c @@ -49,7 +49,8 @@ void cmd_delf(char *filename) } for (a=0; aquickroom.QRdirname,filename); + snprintf(pathname,sizeof pathname,"./files/%s/%s", + CC->quickroom.QRdirname,filename); a=unlink(pathname); if (a==0) cprintf("%d File '%s' deleted.\n",OK,pathname); else cprintf("%d File '%s' not found.\n",ERROR+FILE_NOT_FOUND,pathname); @@ -98,7 +99,8 @@ void cmd_movf(char *cmdbuf) for (a=0; aquickroom.QRdirname,filename); + snprintf(pathname,sizeof pathname,"./files/%s/%s", + CC->quickroom.QRdirname,filename); if (access(pathname,0)!=0) { cprintf("%d File '%s' not found.\n", ERROR+FILE_NOT_FOUND,pathname); @@ -115,7 +117,8 @@ void cmd_movf(char *cmdbuf) ERROR+NOT_HERE,qrbuf.QRname); return; } - sprintf(newpath,"./files/%s/%s",qrbuf.QRdirname,filename); + snprintf(newpath,sizeof newpath,"./files/%s/%s",qrbuf.QRdirname, + filename); if (link(pathname,newpath)!=0) { cprintf("%d Couldn't move file: %s\n",ERROR,strerror(errno)); return; @@ -123,7 +126,8 @@ void cmd_movf(char *cmdbuf) unlink(pathname); /* this is a crude method of copying the file description */ - sprintf(buf,"cat ./files/%s/filedir |grep %s >>./files/%s/filedir", + snprintf(buf, sizeof buf, + "cat ./files/%s/filedir |grep %s >>./files/%s/filedir", CC->quickroom.QRdirname, filename, qrbuf.QRdirname); @@ -169,20 +173,22 @@ void cmd_netf(char *cmdbuf) for (a=0; aquickroom.QRdirname,filename); + snprintf(pathname,sizeof pathname,"./files/%s/%s", + CC->quickroom.QRdirname,filename); if (access(pathname,0)!=0) { cprintf("%d File '%s' not found.\n", ERROR+FILE_NOT_FOUND,pathname); return; } - sprintf(buf,"sysop@%s",destsys); + snprintf(buf,sizeof buf,"sysop@%s",destsys); e=alias(buf); if (e!=M_BINARY) { cprintf("%d No such system: '%s'\n", ERROR+NO_SUCH_SYSTEM,destsys); return; } - sprintf(outfile,"%s/network/spoolin/nsf.%d",BBSDIR,getpid()); + snprintf(outfile,sizeof outfile,"%s/network/spoolin/nsf.%d",BBSDIR, + getpid()); ofp=fopen(outfile,"a"); if (ofp==NULL) { cprintf("%d internal error\n",ERROR); @@ -203,7 +209,8 @@ void cmd_netf(char *cmdbuf) putc('M',ofp); fclose(ofp); - sprintf(buf,"cd ./files/%s; uuencode %s <%s 2>/dev/null >>%s", + snprintf(buf,sizeof buf, + "cd ./files/%s; uuencode %s <%s 2>/dev/null >>%s", CC->quickroom.QRdirname,filename,filename,outfile); system(buf); @@ -308,11 +315,13 @@ void cmd_oimg(char *cmdbuf) cprintf("%d No such user.\n", ERROR+NO_SUCH_USER); return; } - sprintf(pathname, "./userpics/%ld.gif", usbuf.usernum); + snprintf(pathname, sizeof pathname, "./userpics/%ld.gif", + usbuf.usernum); } else if (!strcasecmp(filename, "_floorpic_")) { which_floor = extract_int(cmdbuf, 1); - sprintf(pathname, "./images/floor.%d.gif", which_floor); + snprintf(pathname, sizeof pathname, "./images/floor.%d.gif", + which_floor); } else if (!strcasecmp(filename, "_roompic_")) { assoc_file_name(pathname, &CC->quickroom, "images"); @@ -322,7 +331,7 @@ void cmd_oimg(char *cmdbuf) filename[a] = tolower(filename[a]); if (filename[a]=='/') filename[a] = '_'; } - sprintf(pathname,"./images/%s.gif",filename); + snprintf(pathname,sizeof pathname,"./images/%s.gif",filename); } CC->download_fp = fopen(pathname,"r"); @@ -368,8 +377,10 @@ void cmd_uopn(char *cmdbuf) for (a=0; aupl_file); ++a) if (CC->upl_file[a]=='/') CC->upl_file[a] = '_'; - sprintf(CC->upl_path,"./files/%s/%s",CC->quickroom.QRdirname,CC->upl_file); - sprintf(CC->upl_filedir,"./files/%s/filedir",CC->quickroom.QRdirname); + snprintf(CC->upl_path,sizeof CC->upl_path,"./files/%s/%s", + CC->quickroom.QRdirname,CC->upl_file); + snprintf(CC->upl_filedir,sizeof CC->upl_filedir,"./files/%s/filedir", + CC->quickroom.QRdirname); CC->upload_fp = fopen(CC->upl_path,"r"); if (CC->upload_fp != NULL) { @@ -421,17 +432,19 @@ void cmd_uimg(char *cmdbuf) } if (CC->usersupp.axlevel >= 6) { - sprintf(CC->upl_path, "./images/%s", basenm); + snprintf(CC->upl_path, sizeof CC->upl_path, "./images/%s", + basenm); } if (!strcasecmp(basenm, "_userpic_")) { - sprintf(CC->upl_path, "./userpics/%ld.gif", - CC->usersupp.usernum); + snprintf(CC->upl_path, sizeof CC->upl_path, + "./userpics/%ld.gif", CC->usersupp.usernum); } if ( (!strcasecmp(basenm, "_floorpic_")) && (CC->usersupp.axlevel >= 6) ) { which_floor = extract_int(cmdbuf, 2); - sprintf(CC->upl_path, "./images/floor.%d.gif", which_floor); + snprintf(CC->upl_path, sizeof CC->upl_path, + "./images/floor.%d.gif", which_floor); } if ( (!strcasecmp(basenm, "_roompic_")) && (is_room_aide()) ) { @@ -476,7 +489,8 @@ void cmd_clos(void) { if (CC->dl_is_net == 1) { CC->dl_is_net = 0; - sprintf(buf,"%s/network/spoolout/%s",BBSDIR,CC->net_node); + snprintf(buf,sizeof buf,"%s/network/spoolout/%s",BBSDIR, + CC->net_node); unlink(buf); } @@ -644,7 +658,8 @@ void cmd_ndop(char *cmdbuf) return; } - sprintf(pathname,"%s/network/spoolout/%s",BBSDIR,CC->net_node); + snprintf(pathname,sizeof pathname,"%s/network/spoolout/%s",BBSDIR, + CC->net_node); /* first open the file in append mode in order to create a * zero-length file if it doesn't already exist @@ -686,7 +701,7 @@ void cmd_nuop(char *cmdbuf) return; } - sprintf(CC->upl_path,"%s/network/spoolin/%s.%d", + snprintf(CC->upl_path,sizeof CC->upl_path,"%s/network/spoolin/%s.%d", BBSDIR,CC->net_node,getpid()); CC->upload_fp = fopen(CC->upl_path,"r"); diff --git a/citadel/import.c b/citadel/import.c index 9a72f4cb2..9722af0f1 100644 --- a/citadel/import.c +++ b/citadel/import.c @@ -30,17 +30,12 @@ struct CitContext *MyContext() { void begin_critical_section(int c) { } void end_critical_section(int c) { } -void lprintf(int loglevel, const char *format, ...) { - va_list arg_ptr; - char buf[256]; - int rc; - - va_start(arg_ptr, format); - rc = vsprintf(buf, format, arg_ptr); - va_end(arg_ptr); - - fprintf(stderr, "%s", buf); - fflush(stderr); +void lprintf(int loglevel, const char *format, ...) { + va_list arg_ptr; + + va_start(arg_ptr, format); + vfprintf(stderr, format, arg_ptr); + va_end(arg_ptr); } diff --git a/citadel/ipc_c_tcp.c b/citadel/ipc_c_tcp.c index 3c56c26ba..9e5b48057 100644 --- a/citadel/ipc_c_tcp.c +++ b/citadel/ipc_c_tcp.c @@ -295,7 +295,7 @@ void attach_to_server(int argc, char **argv) printf("Attaching to server...\r"); fflush(stdout); - sprintf(buf,"%c%c", + snprintf(buf,sizeof buf,"%c%c", 4, /* version 4 */ 1); /* method = connect */ serv_write(buf,2); -- 2.30.2