* commands.c, control.c, cux2ascii.c, file_ops.c, import.c,

          ipc_c_tcp.c: eliminate sprintf() calls

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index dfa6882219c24ffcdb72882eb8b231e20b14f5c9..a6849442d9e4a62321465f0f1a4f1dbbc6e9a62f 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,6 +1,8 @@
 1998-11-09 Nathan Bryant <bryant@cs.usm.maine.edu>
        * 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 <ajc@uncnsrd.mt-kisco.ny.us>
        * serv_upgrade.c: added all missing fields to export/import

diff --git a/citadel/commands.c b/citadel/commands.c
index ec036fdf2055783edaac49a48dd1c8f6c06bd46d..6262901d48d432423d3d38b403461634580a7a21 100644 (file)
--- 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 (i<imin) printf("*** Must be no less than %d.\n",imin);
@@ -353,14 +353,14 @@ void load_command_set(void) {
 
        ccfile = NULL;
        if (getenv("HOME") != NULL) {
-               sprintf(buf,"%s/.citadelrc",getenv("HOME"));
+               snprintf(buf,sizeof buf,"%s/.citadelrc",getenv("HOME"));
                ccfile = fopen(buf,"r");
                }
        if (ccfile==NULL) {
                ccfile = fopen("/usr/local/lib/citadel.rc","r");
                }
        if (ccfile==NULL) {
-               sprintf(buf,"%s/citadel.rc",BBSDIR);
+               snprintf(buf,sizeof buf,"%s/citadel.rc",BBSDIR);
                ccfile = fopen(buf,"r");
                }
        if (ccfile==NULL) {

diff --git a/citadel/control.c b/citadel/control.c
index c8f6a5c3ee5917e833193e6c3b67eb1dae7a758c..d6623b99980503d627e678b46c563bedcc80200e 100644 (file)
--- a/citadel/control.c
+++ b/citadel/control.c
@@ -184,8 +184,9 @@ void cmd_conf(char *argbuf) {
                    ++a;
                    }
                put_config();
-               sprintf(buf,"Global system configuration edited by %s",
-                       CC->curr_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 8c78e8ec964ecc8225a9dcb76aa9e2eb161fa462..c69d96f264aa9b9eaf239add92c55f6bdf5702aa 100644 (file)
--- 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 866ed0978ea6187a3c1209bf32c56da27fa6d7ee..965c45b103966a261fa6c41c14dcb3b1373d7efd 100644 (file)
--- a/citadel/file_ops.c
+++ b/citadel/file_ops.c
@@ -49,7 +49,8 @@ void cmd_delf(char *filename)
                }
        for (a=0; a<strlen(filename); ++a)
                if (filename[a]=='/') filename[a] = '_';
-       sprintf(pathname,"./files/%s/%s",CC->quickroom.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; a<strlen(filename); ++a)
                if (filename[a]=='/') filename[a] = '_';
-       sprintf(pathname,"./files/%s/%s",CC->quickroom.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; a<strlen(filename); ++a)
                if (filename[a]=='/') filename[a] = '_';
-       sprintf(pathname,"./files/%s/%s",CC->quickroom.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; a<strlen(CC->upl_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 9a72f4cb29349daa281091ec5d4d830fde761c78..9722af0f18145b3ef5b3a5b33b52366d70b6da32 100644 (file)
--- 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 3c56c26ba03e9a587db4c967cfc30f969dc26f1f..9e5b4805721e80b49da4cc105d601697fb79765d 100644 (file)
--- 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);