[foo-cvs] foo/elkfoo/src main.c,1.2,1.3

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/elkfoo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25460

Modified Files:
	main.c 
Log Message:
readline support now via env variable, not different toplevel file

Index: main.c
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main.c	6 Aug 2004 02:52:59 -0000	1.2
--- main.c	7 Aug 2004 21:20:42 -0000	1.3
***************
*** 35,40 ****
--- 35,42 ----
  #endif
  
+ #include <stdlib.h>
  #include <limits.h>
  #include <string.h>
+ #include <strings.h>
  
  #ifdef HAVE_FOOELK_SCHEME_H
***************
*** 59,71 ****
        char **argv)
  {
!   int i, nr = 0;
    char toplevel[PATH_MAX] = ELKFOO_SCM_PATH;
  
!   /* determine toplevel-file */
    for (i = 0; i < argc; ++i)
      {
        if (! strcmp(argv[i], ELKFOO_NO_READLINE_OPTION))
  	{
! 	  nr = 1;
  	  /* tweak argv so that elk sees nothing */
  	  for (; i < argc; ++i)
--- 61,77 ----
        char **argv)
  {
!   int i, rl = 1;
    char toplevel[PATH_MAX] = ELKFOO_SCM_PATH;
+   char *elk_rl;
  
!   /* toplevel filename */
!   strcat(toplevel, "/toplevel.foo");
! 
!   /* readline extension? */
    for (i = 0; i < argc; ++i)
      {
        if (! strcmp(argv[i], ELKFOO_NO_READLINE_OPTION))
  	{
! 	  rl = 0;
  	  /* tweak argv so that elk sees nothing */
  	  for (; i < argc; ++i)
***************
*** 79,89 ****
      }
  
!   if (nr)
      {
!       strcat(toplevel, "/toplevel-no-rl.foo");
      }
    else
!     {
!       strcat(toplevel, "/toplevel.foo");
      }
  
--- 85,98 ----
      }
  
!   if (rl
!       && ((elk_rl = getenv("ELK_READLINE"))
! 	  && (strlen(elk_rl) && strcasecmp(elk_rl, "NO"))
! 	  || (! elk_rl)))
      {
!       setenv("ELK_READLINE", "YES", 1);
      }
    else
!     { /* --no-rl */
!       unsetenv("ELK_READLINE");
      }