Changeset 20358

Timestamp:

Oct 24, 2008, 1:38:30 PM (18 years ago)

Author:

eugene

Message:

allow for an empty or missing .ptolemyrc file

File:

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

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

@@ -138 +138 @@
   /* open file */
   f = fopen (filename, "r");
-  if (f == NULL) {
-    return ((char *) NULL);
-  }
+  // if (f == NULL) {
+  // return ((char *) NULL);
+  // }
  
   /* allocate tmp space, 2 extra bytes for a final return and EOL */
@@ -148 +148 @@
     
   /* load data from file */
-  done = FALSE;
-  while ((nbytes = fread (&ibuffer[Nbytes], sizeof(char), D_NBYTES, f)) == D_NBYTES) {
+  if (f) {
+    done = FALSE;
+    while ((nbytes = fread (&ibuffer[Nbytes], sizeof(char), D_NBYTES, f)) == D_NBYTES) {
+      Nbytes += nbytes;
+      NBYTES += D_NBYTES;
+      REALLOCATE (ibuffer, char, NBYTES + 2);
+    }
     Nbytes += nbytes;
-    NBYTES += D_NBYTES;
-    REALLOCATE (ibuffer, char, NBYTES + 2);
-  }
-  Nbytes += nbytes;
-  fclose (f);
+    fclose (f);
+  }
 
   /* add final return & EOL if non-existent */