Misc sprintf/snprintf cleanup

diff --git a/libraries/liblber/debug.c b/libraries/liblber/debug.c
index 4921bd2b30f12d1bd5edf0f8a786e2218c718907..92b52d67b75c3c950079ff850cc476f2a0f80641 100644 (file)
--- a/libraries/liblber/debug.c
+++ b/libraries/liblber/debug.c
@@ -106,7 +106,7 @@ int lutil_mnem2level( const char *level )
 
 static int addSubsys( const char *subsys, int level )
 {
-       int i, j, subsys_num;
+       int subsys_num;
 
        if ( !strcasecmp( subsys, "backend" ) )
        {
@@ -152,8 +152,7 @@ void lutil_log_int(
        time_t now;
        struct tm *today;
 #endif
-       int i;
-       char data[4096];
+       size_t i;
        char * t_subsys;
        char * tmp;
 

diff --git a/libraries/liblber/liblber.dsp b/libraries/liblber/liblber.dsp
index e02e1f3f762617076a1cf250fb1c4fe153aa114c..02c82831f9b532ef77b5df85d27acff675c27131 100644 (file)
--- a/libraries/liblber/liblber.dsp
+++ b/libraries/liblber/liblber.dsp
@@ -179,6 +179,10 @@ SOURCE=.\bprint.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\debug.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\decode.c
 # End Source File
 # Begin Source File

diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index e7d0648a1f7448cf181791ca519a056d7a8d87f8..96e7b8f3dc9f67be7a18bb108a3c23902bb831e0 100644 (file)
--- a/libraries/libldap/init.c
+++ b/libraries/libldap/init.c
@@ -267,7 +267,7 @@ static void openldap_ldap_init_w_userconf(const char *file)
                Debug(LDAP_DEBUG_TRACE, "ldap_init: HOME env is %s\n",
                      home, 0, 0);
 #endif
-               path = LDAP_MALLOC(strlen(home) + strlen(file) + 3);
+               path = LDAP_MALLOC(strlen(home) + strlen(file) + sizeof( LDAP_DIRSEP "."));
        } else {
 #ifdef NEW_LOGGING
        LDAP_LOG ( CONFIG, ARGS, "openldap_init_w_userconf: HOME env is NULL\n",
@@ -282,11 +282,11 @@ static void openldap_ldap_init_w_userconf(const char *file)
                /* we assume UNIX path syntax is used... */
 
                /* try ~/file */
-               sprintf(path, "%s%s%s", home, LDAP_DIRSEP, file);
+               sprintf(path, "%s" LDAP_DIRSEP "%s", home, file);
                openldap_ldap_init_w_conf(path, 1);
 
                /* try ~/.file */
-               sprintf(path, "%s%s.%s", home, LDAP_DIRSEP, file);
+               sprintf(path, "%s" LDAP_DIRSEP ".%s", home, file);
                openldap_ldap_init_w_conf(path, 1);
        }
 

diff --git a/libraries/libldap/schema.c b/libraries/libldap/schema.c
index 4fd83bc4bd182bbd95ba5eb69c4014bca89fd0c4..93a1daf381a10ab12a2b8bf451abccc5e17a1507 100644 (file)
--- a/libraries/libldap/schema.c
+++ b/libraries/libldap/schema.c
@@ -281,7 +281,7 @@ print_noidlen(safe_string *ss, char *s, int l)
 
        ret = print_numericoid(ss,s);
        if ( l ) {
-               sprintf(buf,"{%d}",l);
+               snprintf(buf, sizeof buf, "{%d}",l);
                ret = print_literal(ss,buf);
        }
        return(ret);

diff --git a/libraries/liblunicode/ucdata/ucgendat.c b/libraries/liblunicode/ucdata/ucgendat.c
index 2daee8a4c339656ccbde77a93be410a5e3f55262..7629707a449a160aceb223954c8771277041a3b4 100644 (file)
--- a/libraries/liblunicode/ucdata/ucgendat.c
+++ b/libraries/liblunicode/ucdata/ucgendat.c
@@ -1229,7 +1229,7 @@ write_cdata(char *opath)
     /*
      * Open the ctype.dat file.
      */
-    sprintf(path, "%s%sctype.dat", opath, LDAP_DIRSEP);
+    snprintf(path, sizeof path, "%s%sctype.dat", opath, LDAP_DIRSEP);
     if ((out = fopen(path, "wb")) == 0)
       return;
 
@@ -1300,7 +1300,7 @@ write_cdata(char *opath)
     /*
      * Open the case.dat file.
      */
-    sprintf(path, "%s%scase.dat", opath, LDAP_DIRSEP);
+    snprintf(path, sizeof path, "%s%scase.dat", opath, LDAP_DIRSEP);
     if ((out = fopen(path, "wb")) == 0)
       return;
 
@@ -1355,7 +1355,7 @@ write_cdata(char *opath)
     /*
      * Open the comp.dat file.
      */
-    sprintf(path, "%s%scomp.dat", opath, LDAP_DIRSEP);
+    sprintf(path, sizeof path, "%s%scomp.dat", opath, LDAP_DIRSEP);
     if ((out = fopen(path, "wb")) == 0)
        return;
     
@@ -1393,7 +1393,7 @@ write_cdata(char *opath)
     /*
      * Open the decomp.dat file.
      */
-    sprintf(path, "%s%sdecomp.dat", opath, LDAP_DIRSEP);
+    snprintf(path, sizeof path, "%s%sdecomp.dat", opath, LDAP_DIRSEP);
     if ((out = fopen(path, "wb")) == 0)
       return;
 
@@ -1447,7 +1447,7 @@ write_cdata(char *opath)
     /*
      * Open the kdecomp.dat file.
      */
-    sprintf(path, "%s%skdecomp.dat", opath, LDAP_DIRSEP);
+    snprintf(path, sizeof path, "%s%skdecomp.dat", opath, LDAP_DIRSEP);
     if ((out = fopen(path, "wb")) == 0)
       return;
 
@@ -1507,7 +1507,7 @@ write_cdata(char *opath)
     /*
      * Open the cmbcl.dat file.
      */
-    sprintf(path, "%s%scmbcl.dat", opath, LDAP_DIRSEP);
+    snprintf(path, sizeof path, "%s%scmbcl.dat", opath, LDAP_DIRSEP);
     if ((out = fopen(path, "wb")) == 0)
       return;
 
@@ -1545,7 +1545,7 @@ write_cdata(char *opath)
     /*
      * Open the num.dat file.
      */
-    sprintf(path, "%s%snum.dat", opath, LDAP_DIRSEP);
+    snprintf(path, sizeof path, "%s%snum.dat", opath, LDAP_DIRSEP);
     if ((out = fopen(path, "wb")) == 0)
       return;
 

diff --git a/libraries/liblutil/liblutil.dsp b/libraries/liblutil/liblutil.dsp
index a17939d6f35d2bceab481c2be4265f121aa5035a..436a6981bf7aeef502b0301375bfec07d163a915 100644 (file)
--- a/libraries/liblutil/liblutil.dsp
+++ b/libraries/liblutil/liblutil.dsp
@@ -144,10 +144,6 @@ SOURCE=.\csn.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\debug.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\entropy.c
 # End Source File
 # Begin Source File

diff --git a/libraries/liblutil/ntservice.c b/libraries/liblutil/ntservice.c
index 4d6504211c4177aa9db279ad5692964818f3bcbe..9bd27b7065837dfaab261b7564f97324eb8cdaf2 100644 (file)
--- a/libraries/liblutil/ntservice.c
+++ b/libraries/liblutil/ntservice.c
@@ -83,7 +83,8 @@ int srv_install(LPCTSTR lpszServiceName, LPCTSTR lpszDisplayName,
                        CloseServiceHandle(schService);
                        CloseServiceHandle(schSCManager);
 
-                       sprintf( regpath, "SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\%s",
+                       snprintf( regpath, sizeof regpath,
+                               "SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\%s",
                                lpszServiceName );
                        /* Create the registry key for event logging to the Windows NT event log. */
                        if ( RegCreateKeyEx(HKEY_LOCAL_MACHINE, 
@@ -357,9 +358,9 @@ void *getRegParam( char *svc, char *value )
        DWORD valLen = sizeof( vValue );
 
        if ( svc != NULL )
-               sprintf ( path, "SOFTWARE\\%s", svc );
+               snprintf ( path, sizeof path, "SOFTWARE\\%s", svc );
        else
-               strcpy (path, "SOFTWARE\\OpenLDAP\\Parameters" );
+               snprintf ( path, sizeof path, "SOFTWARE\\OpenLDAP\\Parameters" );
        
        if ( RegOpenKeyEx( HKEY_LOCAL_MACHINE, path, 0, KEY_READ, &hkey ) != ERROR_SUCCESS )
        {

diff --git a/libraries/liblutil/sasl.c b/libraries/liblutil/sasl.c
index 3f330ab1ddb5afdebaa15a818a1f0fca643c99d8..a1308a8018deb8cd52e6a1a89ad02a14b7f6e8fa 100644 (file)
--- a/libraries/liblutil/sasl.c
+++ b/libraries/liblutil/sasl.c
@@ -126,7 +126,7 @@ static int interaction(
                fprintf( stderr, "Default: %s\n", dflt );
        }
 
-       sprintf( input, "%s: ",
+       snprintf( input, sizeof input, "%s: ",
                interact->prompt ? interact->prompt : "Interact" );
 
        if( noecho ) {