Changeset 38526

Timestamp:

Jun 24, 2015, 6:55:47 AM (11 years ago)

Author:

eugene

Message:

replace sprintf with snprintf

Location:

branches/eam_branches/ipp-20150616/Ohana/src/libohana/src

Files:

• config.c (modified) (3 diffs)
• findexec.c (modified) (4 diffs)
• glockfile.c (modified) (2 diffs)
• time.c (modified) (2 diffs)

branches/eam_branches/ipp-20150616/Ohana/src/libohana/src/config.c

@@ -91 +91 @@
   uid = getuid();
   gid = getgid();
-  ALLOCATE (find, char, strlen(progname) + 32);
+
+  int Nchar = strlen(progname) + 32;
+  ALLOCATE (find, char, Nchar);
 
   /* look for progname.rc */
-  sprintf (find, "%s.rc", progname);
+  snprintf (find, Nchar, "%s.rc", progname);
   status = stat (find, &filestat);
   if (status == 0) { 
@@ -125 +127 @@
   if (home == (char *) NULL) { return ((char *) NULL); }
   ALLOCATE (find, char, 1024);
-  sprintf (find, "%s/.%src", home, progname);
+  snprintf (find, 1024, "%s/.%src", home, progname);
   status = stat (find, &filestat);
   if (status == 0) { 
@@ -275 +277 @@
   va_start (argp, Nentry);
 
-  ALLOCATE (tfield, char, strlen (field) + 3);
-  sprintf (tfield, "\n%s", field);
+  int Nchar = strlen (field) + 16;
+  ALLOCATE (tfield, char, Nchar);
+  snprintf (tfield, Nchar, "\n%s", field);
 
   /* we search for Nentry matching fields,

branches/eam_branches/ipp-20150616/Ohana/src/libohana/src/findexec.c

@@ -113 +113 @@
   /* check permission to write to backup file */
   if (BACKUP) {
-    ALLOCATE (filename, char, strlen(basefile) + 2);
-    sprintf (filename, "%s~", basefile);
+    int Nchar = strlen(basefile) + 16;
+    ALLOCATE (filename, char, Nchar);
+    snprintf (filename, Nchar, "%s~", basefile);
     status = stat (filename, &filestat);
     if (status == 0) { /* file exists, are permissions OK? */
@@ -289 +290 @@
         e = strchr (c, ':');
       }
-      sprintf (name, "%s/%s", path, argv[0]);
+      snprintf (name, 1024, "%s/%s", path, argv[0]);
       status = check_file_exec (name);
 
@@ -374 +375 @@
   int status, cmode;
   struct stat filestat;
-  char line[256];
+  char line[1024];
 
   status = stat (filename, &filestat);
   if (status == 0) { /* file exists, make backup copy */
-    sprintf (line, "cp %s %s~", filename, filename);
+    snprintf (line, 1024, "cp %s %s~", filename, filename);
     status = system (line);
     if (status) {
@@ -385 +386 @@
     }
     cmode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
-    sprintf (line, "%s~", filename);
+    snprintf (line, 1024, "%s~", filename);
     chmod (line, cmode);
   }

branches/eam_branches/ipp-20150616/Ohana/src/libohana/src/glockfile.c

@@ -152 +152 @@
     path = pathname (filename);
     file = filebasename (filename);
-    ALLOCATE (lockname, char, strlen (path) + strlen (file) + 10);
-    sprintf (lockname, "%s/.%s.lck", path, file);
+    int Nchar = strlen (path) + strlen (file) + 16;
+    ALLOCATE (lockname, char, Nchar);
+    snprintf (lockname, Nchar, "%s/.%s.lck", path, file);
 
     status = stat (lockname, &filestat);
@@ -261 +262 @@
     path = pathname (filename);
     file = filebasename (filename);
-    ALLOCATE (lockname, char, strlen (path) + strlen (file) + 10);
-    sprintf (lockname, "%s/.%s.lck", path, file);
+    int Nchar = strlen (path) + strlen (file) + 16;
+    ALLOCATE (lockname, char, Nchar);
+    snprintf (lockname, Nchar, "%s/.%s.lck", path, file);
     
     /* check for lockfile existance */

branches/eam_branches/ipp-20150616/Ohana/src/libohana/src/time.c

@@ -141 +141 @@
       ALLOCATE (tmpline, char, 64);
       gmt   = gmtime (&tsec);
-      sprintf (tmpline, "%04d/%02d/%02d,%s", 1900 + gmt[0].tm_year, gmt[0].tm_mon+1, gmt[0].tm_mday, &line[6]);
+      snprintf (tmpline, 64, "%04d/%02d/%02d,%s", 1900 + gmt[0].tm_year, gmt[0].tm_mon+1, gmt[0].tm_mday, &line[6]);
       *second = ohana_date_to_sec (tmpline);
       free (tmpline);
@@ -251 +251 @@
   ALLOCATE (line, char, 64);
   gmt   = gmtime (&second);
-  sprintf (line, "%04d/%02d/%02d,%02d:%02d:%02d", 1900 + gmt[0].tm_year, gmt[0].tm_mon+1, gmt[0].tm_mday, gmt[0].tm_hour, gmt[0].tm_min, gmt[0].tm_sec); 
+  snprintf (line, 64, "%04d/%02d/%02d,%02d:%02d:%02d", 1900 + gmt[0].tm_year, gmt[0].tm_mon+1, gmt[0].tm_mday, gmt[0].tm_hour, gmt[0].tm_min, gmt[0].tm_sec); 
   return (line);