Changeset 5919 for trunk/Ohana/src/opihi/lib.shell/startup.c

Timestamp:

Jan 5, 2006, 6:55:37 PM (21 years ago)

Author:

eugene

Message:

split init into general and program init, cleaned up open_image, open_graph, and related

File:

• trunk/Ohana/src/opihi/lib.shell/startup.c (modified) (11 diffs)

trunk/Ohana/src/opihi/lib.shell/startup.c

@@ -6 +6 @@
  */
 
-void general_init (int argc, char **argv) {
+void general_init (int *argc, char **argv) {
 
   /* init srand for rnd numbers elsewhere */
@@ -18 +18 @@
 
   /* load config data (.ptolemyrc) */
-  if (!ConfigInit (&argc, argv)) {
+  if (!ConfigInit (argc, argv)) {
     fprintf (stderr, "can't find config file. some functions will be unavailable\n");
   }
@@ -25 +25 @@
 }
 
-void startup (int argc, char **argv) {
+void startup (int *argc, char **argv) {
     
     int i, N, status, ONLY_INPUT, LOAD_RC;
@@ -31 +31 @@
     char *rcfile, **list;
     int Nlist, NLIST;
-    static char dot[] = ".";
    
     /* load in interesting environment variables */
@@ -37 +36 @@
     
     home = getenv ("HOME");
-    if (home == NULL) home = dot;
-    set_str_variable ("HOME", home);
+    if (home == NULL) 
+      set_str_variable ("HOME", ".");
+    else 
+      set_str_variable ("HOME", home);
     set_str_variable ("KII", "kii");
     set_str_variable ("KAPA", "kapa");
@@ -54 +55 @@
     char *opihi_history;
 
-    opihi_history = get_variable ("RCFILE");
+    opihi_history = get_variable ("HISTORY");
     f = fopen (opihi_history, "a");
     if (f == NULL) /* no current history file here */
@@ -84 +85 @@
       }
     }
+  }
 
     LOAD_RC = TRUE;
-    if ((N = get_argument (argc, argv, "--norc"))) {
-      remove_argument (N, &argc, argv);
+    if ((N = get_argument (*argc, argv, "--norc"))) {
+      remove_argument (N, argc, argv);
       LOAD_RC = FALSE;
     }
     
     ONLY_INPUT = FALSE;
-    if ((N = get_argument (argc, argv, "--only"))) {
-      remove_argument (N, &argc, argv);
+    if ((N = get_argument (*argc, argv, "--only"))) {
+      remove_argument (N, argc, argv);
       ONLY_INPUT = TRUE;
     }
@@ -101 +103 @@
     NLIST = 10;
     ALLOCATE (list, char *, NLIST);
-    while ((N = get_argument (argc, argv, "--load"))) {
-      remove_argument (N, &argc, argv);
+    while ((N = get_argument (*argc, argv, "--load"))) {
+      remove_argument (N, argc, argv);
       list[Nlist] = strcreate (argv[N]);
-      remove_argument (N, &argc, argv);
+      remove_argument (N, argc, argv);
       Nlist++;
       if (Nlist == NLIST) {
@@ -113 +115 @@
 
     is_script = TRUE;
-    if (argc == 1) is_script = FALSE;
+    if (*argc == 1) is_script = FALSE;
     set_int_variable ("SCRIPT", is_script);
 
@@ -130 +132 @@
       /* generate list argv:0 - argv:n from arguments */
       ALLOCATE (varname, char, 256);
-      for (i = 2; i < argc; i++) {
+      for (i = 2; i < *argc; i++) {
         sprintf (varname, "argv:%d", i - 2);
         set_str_variable (varname, argv[i]);
@@ -150 +152 @@
     if (ONLY_INPUT) exit (2);
     if (is_script) exit (2);
-  }
+    return;
 }