@@@ more wip

[runlisp] / old-runlisp.c

diff --git a/old-runlisp.c b/old-runlisp.c
index 2557dc3..eea8c42 100644 (file)
--- a/old-runlisp.c
+++ b/old-runlisp.c
@@ -298,8 +298,8 @@ static void try_exec(const struct argstate *arg, struct argv *av)
   dstr_release(&d);
 }
 
-static const char *getenv_or_default(const char *var, const char *dflt)
-  { const char *p = getenv(var); return (p ? p : dflt); }
+static char *getenv_or_default(const char *var, char *dflt)
+  { char *p = getenv(var); return (p ? p : dflt); }
 
 /*----- Invoking Lisp systems ---------------------------------------------*/
 
@@ -760,7 +760,7 @@ static void scan_options_from_string(char *p, struct argstate *arg,
     if (st) lose("unfinished `%c' string in %s `%s'", st, what, file);
   }
 
-  i = 0; parse_arguments(arg, av.v, av.n, &i);
+  i = 0; parse_arguments(arg, (const char **)av.v, av.n, &i);
   if (i < av.n)
     lose("positional argument `%s' in %s `%s'", av.v[i], what, file);
   argv_release(&av);
@@ -871,7 +871,7 @@ int main(int argc, char *argv[])
     if (!script) script = DATADIR "/eval.lisp";
     argv_append(&arg.av, "--");
   }
-  argv_appendn(&arg.av, (const char *const *)argv + i, argc - i);
+  argv_appendn(&arg.av, argv + i, argc - i);
   n = arg.av.n;
 
   /* Find the user's home directory.  (Believe them if they set something