Changeset 28003 for branches/pap/Ohana/src/opihi/lib.shell/startup.c

Timestamp:

May 18, 2010, 12:49:05 PM (16 years ago)

Author:

eugene

Message:

merging changes from trunk into branches/pap

Location:

branches/pap

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi/lib.shell/startup.c (modified) (1 diff)

branches/pap/Ohana/src/opihi/lib.shell/startup.c

@@ -124 +124 @@
     if (LOAD_RC && !is_script) {
       rcfile = get_variable ("RCFILE");
-      sprintf (line, "input %s/%s", home, rcfile);
-      status = command (line, &outline, TRUE);
-      if (outline != (char *) NULL) free (outline);
+      if (rcfile && check_file_access (rcfile, FALSE, FALSE, FALSE)) {
+        sprintf (line, "input %s/%s", home, rcfile);
+        status = command (line, &outline, TRUE);
+        if (outline != (char *) NULL) free (outline);
+        if (status) {
+          gprint (GP_LOG, "loaded file %s\n", rcfile); 
+        }         
+      }
       if (rcfile) free (rcfile);
     }