*** empty log message ***

Common/GetOptions.cpp

-// $Id: GetOptions.cpp,v 1.8 2001-02-05 07:56:57 geuzaine Exp $
+// $Id: GetOptions.cpp,v 1.9 2001-02-05 20:32:32 geuzaine Exp $
 
 #include "Gmsh.h"
 #include "GmshUI.h"
@@ -14,7 +14,6 @@ extern Context_T  CTX;
 
 char  *TheFileNameTab[MAX_OPEN_FILES];
 char  *TheBgmFileName=NULL;
-char   ThePathForIncludes[NAME_STR_L];
 
 char gmsh_progname[]  = "This is Gmsh" ;
 char gmsh_copyright[] = "Copyright (C) 1997-2001 J.-F. Remacle, C. Geuzaine";
@@ -72,7 +71,6 @@ char gmsh_options[]   =
 #ifdef _MOTIF
   "  -nothreads            disable threads\n"
 #endif
-  "  -path string          set path for included files\n"
   "  -version              show version number\n"
   "  -info                 show detailed version information\n"
   "  -help                 show this message\n"
@@ -113,16 +111,6 @@ void Get_Options (int argc, char *argv[], int *nbfiles) {
       else if(!strcmp(argv[i]+1, "3")){ 
         CTX.interactive = 3; i++;
       }
-      else if(!strcmp(argv[i]+1, "path")){ 
-        i++;
-        /* we need to make a copy because of bison */
-        if(argv[i] != NULL) 
-          strncpy(ThePathForIncludes, argv[i++], NAME_STR_L) ;
-        else {    
-          fprintf(stderr, ERROR_STR "Missing String\n");
-          exit(1);
-        }
-      }
       else if(!strcmp(argv[i]+1, "bgm")){ 
         i++;
         if(argv[i] != NULL) TheBgmFileName = argv[i++];

Parser/Gmsh.y

 %{ 
 
-// $Id: Gmsh.y,v 1.57 2001-01-29 08:43:45 geuzaine Exp $
+// $Id: Gmsh.y,v 1.58 2001-02-05 20:32:33 geuzaine Exp $
 
 #include <stdarg.h>
 
@@ -32,7 +32,6 @@ List_T *Symbol_L;
 
 extern Mesh      *THEM;
 extern Post_View *ActualView;
-extern char       ThePathForIncludes[NAME_STR_L];
 
 static FILE          *yyinTab[MAX_OPEN_FILES];
 static int            yylinenoTab[MAX_OPEN_FILES];
@@ -1608,12 +1607,18 @@ Command :
       if(!strcmp($1, "Include")){
 
 	yyinTab[RecursionLevel++] = yyin;
-	strcpy(tmpstring, ThePathForIncludes);
-	if((yyin = fopen(strcat(tmpstring,$2),"r"))){
+
+	strcpy(tmpstring, yyname);
+	i = strlen(yyname)-1 ;
+	while(i >= 0 && yyname[i] != '/' && yyname[i] != '\\') i-- ;
+	tmpstring[i+1] = '\0';
+	strcat(tmpstring,$2);
+
+	if((yyin = fopen(tmpstring,"r"))){
 	  strcpy(yynameTab[RecursionLevel-1],yyname);
 	  yylinenoTab[RecursionLevel-1]=yylineno;
 	  yylineno=1;
-	  strcpy(yyname,$2);
+	  strcpy(yyname,tmpstring);
 	  while(!feof(yyin)){
 	    yyparse();
 	  }
@@ -1623,7 +1628,7 @@ Command :
 	  yylineno = yylinenoTab[RecursionLevel];
 	}
 	else{
-	  vyyerror("Unknown File '%s'", $2) ;  
+	  vyyerror("Unknown File '%s'", tmpstring) ;  
 	  yyin = yyinTab[--RecursionLevel];
 	}
 

Parser/Gmsh.yy.cpp

@@ -2,7 +2,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.65 2001-01-29 08:43:45 geuzaine Exp $
+ * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.66 2001-02-05 20:32:33 geuzaine Exp $
  */
 
 #define FLEX_SCANNER
@@ -977,7 +977,7 @@ char *yytext;
 #define INITIAL 0
 #line 2 "Gmsh.l"
 
-// $Id: Gmsh.yy.cpp,v 1.65 2001-01-29 08:43:45 geuzaine Exp $
+// $Id: Gmsh.yy.cpp,v 1.66 2001-02-05 20:32:33 geuzaine Exp $
 
 #include <stdio.h>
 #include <stdlib.h>

TODO

 
+- Ecrire une vraie base de donnee des options, avec un fonction pour
+chaque option. Cette fonction devrait modifier la GUI s'il y a lieu
+