Changeset 38553 for trunk/Ohana/src/libohana/src/config.c

Timestamp:

Jun 25, 2015, 10:41:05 PM (11 years ago)

Author:

eugene

Message:

merge changes from branches/eam_branches/ipp-20150616

File:

• trunk/Ohana/src/libohana/src/config.c (modified) (4 diffs)

trunk/Ohana/src/libohana/src/config.c

@@ -7 +7 @@
 static char **DefineVariable;
 static char **DefineValue;
+
+void FreeConfigFile (void) {
+  int i;
+  for (i = 0; i < NDefineVariable; i++) {
+    free (DefineVariable[i]);
+    free (DefineValue[i]);
+  }
+  free (DefineVariable);
+  free (DefineValue);
+  free (ConfigVariable);
+}
 
 char *SelectConfigFile (int *argc, char **argv, char *progname) {
@@ -80 +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) { 
@@ -114 +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) { 
@@ -264 +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,