fixed the bug about stat() in lexer.l

Alain Prouté
1 parent 918956f3
Showing 8 changed files with 180 additions and 40 deletions Show diff stats
anubis_dev/compiler/src/compil.h
anubis_dev/compiler/src/index.c
anubis_dev/compiler/src/lexer.l
anubis_dev/compiler/src/main.cpp
anubis_dev/library/network/remote_files_manager_common.anubis
anubis_dev/library/syntactic_analysis/anubis_output.anubis
anubis_dev/library/syntactic_analysis/make_automaton.anubis
anubis_dev/library/tools/basis.anubis
@@ -128,7 +128,7 @@ extern char *            strdupz(const char *);
 extern char *            strduppz(const char *, const char *); 
 extern char *            strdupppz(const char *, const char *, const char *); 
 extern FILE *            fopenz(const char *name, const char *mode);
-extern FILE *            fopensrc(const char *name);  
+extern FILE *            fopensrc(const char *name, int n);  
 void                     mkdirz(const char *dirname);
 extern int               lineno; 
 extern int               colno; 
@@ -481,7 +481,7 @@ void make_index_for_file(char *fname)
   lineno = 1; 
   colno = 1; 
   current_file_abs_path = fname;  
-  yyin = fopensrc(fname);     
+  yyin = fopensrc(fname,4);     
   add_to_already_included(fname); 
   yyrestart(yyin); 
   begin_INITIAL(); 
@@ -247,7 +247,7 @@ extern   void NormalizeFileName(char *pathName);
  
  
 /* open an Anubis source file. */ 
-FILE *fopensrc(const char *name)    
+FILE *fopensrc(const char *name, int n)    
                               /* The  given name may  be either  absolute or  relative. It
                                  must  be  immediately converted  into  an absolute  path,
                                  because  the  compiler  uses  ONLY  absolute  file  paths
@@ -264,7 +264,7 @@ FILE *fopensrc(const char *name)
   FILE *result;
   struct stat st; 
  
-  //printf("\nExecuting fopensrc(%s)\n",name); 
+  //printf("\nExecuting fopensrc(%s,%d)\n",name,n); 
  
   /* compute absolute path of file */ 
   if (is_absolute_path(name))
@@ -286,10 +286,6 @@ FILE *fopensrc(const char *name)
    normalize_filepath(linecol(),fopensrc_abs_path); /* eliminates /xxx/../ (see expr.cpp) */
    //printf("fopensrc: after filepath normalization: %s\n",fopensrc_abs_path); 
  
-  /* check that the file is a regular file */ 
-  //if (stat(fopensrc_abs_path,&st) != 0) { printf("Cannot stat\n"); goto not_found; }   /* file not found */ 
-  //if (!(S_ISREG(st.st_mode)))    { printf("Not a regular file\n");  goto not_found; }   /* file is not a regular file */ 
-
   /* open the file */ 
   result = fopen(fopensrc_abs_path,"rt"); 
  
@@ -297,6 +293,13 @@ FILE *fopensrc(const char *name)
  
   if (result != NULL) 
    {
+     /* check that the file is a regular file */ 
+     if (fstat(fileno(result),&st) != 0) { // printf("Cannot stat %s\n",fopensrc_abs_path); 
+                                           fclose(result); 
+                                           goto not_found; }   /* file not found */ 
+     if (!(S_ISREG(st.st_mode)))         { // printf("Not a regular file\n");
+                                           fclose(result);   
+                                           goto not_found; }   /* file is not a regular file */ 
      /* the file has been successfully opened */
      fopensrc_cur_dir = strdupz(path_prefix(fopensrc_abs_path)); 
      assert(is_absolute_path(fopensrc_cur_dir));
@@ -315,7 +318,7 @@ FILE *fopensrc(const char *name)
  
   includePathsCheckFile(name);  /* makes a side effect on fopensrc_abs_path */
  
-  //printf("fopensrc: definitive file path: %s\n",fopensrc_abs_path); 
+  // printf("fopensrc: definitive file path: %s\n",fopensrc_abs_path); 
  
   /* (2) try to open the file whose path has been found by includePathsCheckFile  */ 
  
@@ -327,8 +330,15 @@ FILE *fopensrc(const char *name)
     result = fopen(fopensrc_abs_path,"rt");
     if (result != NULL) 
     {
-        fopensrc_cur_dir  = strdupz(path_prefix(fopensrc_abs_path)); 
-        return result;
+      /* check that the file is a regular file */ 
+      if (fstat(fileno(result),&st) != 0) { // printf("Cannot stat %s\n",fopensrc_abs_path); 
+                                            fclose(result); 
+                                            goto not_found; }   /* file not found */ 
+      if (!(S_ISREG(st.st_mode)))         { // printf("Not a regular file\n");
+                                            fclose(result);   
+                                            goto not_found; }   /* file is not a regular file */ 
+      fopensrc_cur_dir  = strdupz(path_prefix(fopensrc_abs_path)); 
+      return result;
     }
   }
  
@@ -446,7 +456,7 @@ int is_already_included(char *name)
   U32 i; 
   FILE *fp; 
   //NormalizeFileName(name);   
-  fp = fopensrc(name); 
+  fp = fopensrc(name,2); 
  
   for (i = 0; i < next_already_included; i++)
     {
@@ -1114,7 +1124,7 @@ W   [\ \t\r\n]
                                   max_include));  
           anb_exit(1); 
        }
-       yyin = fopensrc(fname); 
+       yyin = fopensrc(fname,3); 
        add_to_already_included(fopensrc_abs_path);  
  
        //printf("lexer line %d: current_file_id = %d, next_already_included = %d\n",__LINE__,current_file_id,next_already_included); fflush(stdout); 
@@ -855,7 +855,7 @@ int main(int argc, const char **argv)
       unput_token = 0; 
       snprintf(buf,buf_size,"predef_npd.aux"); 
       predef_npd_aux = fopenz(buf,"wt"); 
-        yyin = fopensrc(strdup("predef.anubis"));   // must be executed from compiler/src
+        yyin = fopensrc(strdup("predef.anubis"),6);   // must be executed from compiler/src
           current_file_abs_path = (char *)"/predefined.anubis"; 
           current_file_id = 0; 
           abs_file_paths_stack[0] = already_included[0] = (char *)"/predefined.anubis"; 
@@ -915,7 +915,7 @@ int main(int argc, const char **argv)
                                  current_file_abs_path);
        }
   //initialize_visibility(); 
-  yyin = fopensrc(main_file_original_path); 
+  yyin = fopensrc(main_file_original_path,5); 
   unput_token = 0;
   initializing = 0; 
   yyrestart(yyin); 
@@ -182,17 +182,24 @@ public define RFMshutdownAnswer
    be used (even if not very useful) to transfer (hence copy) a file from the local machine to itself.  
  
    Possible answers to a transfer command:   
+   
+public type RFMfileAnswer:
+  cannot_read_file        (String filename), 
+  cannot_create_file      (String filename), 
+  cannot_write_file       (String filename),
+  cannot_set_file_mode    (String filename),     
+  cannot_set_file_times   (String filename), 
+  ok                      (String filename). 
  
 public type RFMtransferAnswer:
   source_server_not_responding, 
   target_server_not_responding, 
   invalid_source_password,       
   invalid_target_password,       
-  invalid_source_directory,                 // the directory is not in the list of allowed directories
-  invalid_target_directory,                 // the directory is not in the list of allowed directories
-  cannot_create_file, 
-  cannot_write_file,
-  ok.                                       // everything ok
+  invalid_source_directory,                    // the directory is not in the list of allowed directories
+  invalid_target_directory,                    // the directory is not in the list of allowed directories
+  files   (List(RFMfileAnswer)   result).      // result of transfering files
+  
  
    A function for translating such an answer into English:
  
@@ -214,7 +221,7 @@ public define RFMtransferAnswer
    For example:
  
       print(to_English(transfer(source(local, ".", "my_file.pdf"),
-                                target(my_server1, "archives"))))
+                                target(my_server1, "archives", my_mode))))
  
    Recall: directories on a remote machine have names which are setup when configuring
    the server and mapped to the actual directory path. 
@@ -289,6 +296,7 @@ public define RFMdeleteAnswer
 read tools/basis.anubis   
 read tools/safe_save_retrieve.anubis
 read system/string.anubis
+read system/files.anubis
 read tools/exceptions.anubis
  
  
@@ -314,23 +322,37 @@ public type RFMPlace:
 type RFMCommand: 
   shutdown, 
  
+  // check if a remote directory is valid
+  check_dir  (String     directory), 
+  
+  // initiate a file transfer
   check_put  (String     directory,         // where to put the file
-              String     filename), 
+              String     filename, 
+              Int        size, 
+              FileMode   mode), 
  
-  put        (String     directory,         // where to put the file
-              String     filename,          // name of the file
-              ByteArray  content,           // of the file
+  // send a chunk of a file
+  put_chunk  (String     directory,         // directory and 
+              String     filename,          // file this chunk belongs to
+              Int        rank,              // chunk rank
+              ByteArray  content,           // content of chunk
               ByteArray  hash),             // hash of content
  
+  // signal that tranfer is finished
+  put_end    (String     directory,
+              String     filename,
+              Int        number_of_chunks),               
+               
+  // get a file
   get        (String     directory, 
               String     filename),
  
+  // delete a file
   delete     (String     directory,
               String     filename). 
  
  
  
-  
    *** [2] Answers.
  
 type RFMAnswer:
@@ -438,6 +460,25 @@ public define RFMshutdownAnswer
  
       *** [4.2] transfer. 
  
+
+type 
+
+define List(String)
+  files_in   // get only names of regular files and links
+  (
+    String     directory,
+    String     mask
+  ) = 
+  map_select((FileDescription d) |-> if d is 
+                {
+                  no_info(_)        then failure, 
+                  file(n,_,_,_)     then success(n),
+                  link(n,_,_,_)     then todo("Extend transfer to files seen through a link"); failure, 
+                  directory(_,_,_)  then failure
+                },
+              directory_full_list(directory,mask,mask,"")). 
+      
+      
 define RFMtransferAnswer
   local_to_local
   (
@@ -446,11 +487,34 @@ define RFMtransferAnswer
     String         filemask,
     // destination
     String         target_dir
-  ) =      
-  todo("local_to_local"). 
+  ) =  
+  files(map((String name) |-> if copy_file(source_dir/name,target_dir) is 
+               {
+                 cant_read_file         then cannot_read_file(name), 
+                 cant_create_file       then cannot_create_file(name),
+                 copy_error             then cannot_write_file(name),
+                 copy_file_mode_error   then cannot_set_file_mode(name), 
+                 copy_file_times_error  then cannot_set_file_times(name),
+                 copy_ok(written)       then ok(name)
+               },
+             files_in(source_dir,filemask))). 
+    
  
  
 define RFMtransferAnswer
+  local_to_remote_1
+  (
+    // source
+    String          source_dir, 
+    String          filename,
+    Int             size, 
+    FileMode        mode,
+    // destination
+    SSL_Connection  target_conn, 
+    String          target_dir
+  ). 
+
+define RFMtransferAnswer
   local_to_remote
   (
     // source
@@ -460,7 +524,15 @@ define RFMtransferAnswer
     SSL_Connection  target_conn, 
     String          target_dir
   ) =
-  todo("local_to_remote"). 
+  if send_datum(target_conn,check_dir(target_dir)) is
+  {
+    failure     then invalid_target_directory, 
+    success(_)  then 
+      map((String name) |-> local_to_remote
+          files_in(source_dir,filemask))
+  }. 
+  
+  
  
 define RFMtransferAnswer
   remote_to_local
@@ -511,7 +583,7 @@ define RFMtransferAnswer
   todo("remote_to_remote_get"). 
  
  
-public define RFMtransferAnswer      
+ public define RFMtransferAnswer      
   transfer 
   (
     RFMSource     src, 
@@ -591,6 +663,66 @@ public define RFMtransferAnswer
   }. 
  
  
-         
+   *** [5] to_English.
+   
+public define String
+  to_English
+  (
+    RFMshutdownAnswer   a
+  ) = 
+  if a is 
+  {
+    no_local_server        then "There is no local server.",  
+    server_not_responding  then "The server is not responding.",
+    cannot_send            then "Cannot send datd to the server.",
+    cannot_receive         then "Cannot receive data from the server.", 
+    invalid_server_answer  then "Invalid server answer.",
+    exiting                then "The server is shutting down."
+  }. 
+  
+public define String
+  to_English
+  (
+    RFMtransferAnswer   a
+  ) = 
+  if a is 
+  {
+    source_server_not_responding  then "The source server is not responding.", 
+    target_server_not_responding  then "The target server is not responding.",
+    invalid_source_password       then "Invalid password for source server.",
+    invalid_target_password       then "Invalid password for target server.",
+    invalid_source_directory      then "Invalid directory on source server.", 
+    invalid_target_directory      then "Invalid directory on target server.",
+    files(l)                      then 
+      concat(map((RFMfileAnswer fa) |-> if fa is 
+                      {
+                        cannot_read_file(filename)       then "cannot read '"+filename+"'",  
+                        cannot_create_file(filename)     then "cannot create '"+filename+"'",  
+                        cannot_write_file(filename)      then "cannot write'"+filename+"'",  
+                        cannot_set_file_mode(filename)   then "cannot set mode for '"+filename+"'",  
+                        cannot_set_file_times(filename)  then "cannot set times for '"+filename+"'",  
+                        ok(filename)                     then "file '"+filename+"' copied",  
+           },l),
+             "\n")
+  }.   
+  
+public define String
+  to_English
+  (
+    RFMdeleteAnswer   a
+  ) =
+  if a is
+  {
+    server_not_responding  then "The server is not responding.", 
+    invalid_password       then "Invalid password.",
+    invalid_directory      then "Invalid directory.", 
+    file_not_found         then "File not found.",
+    cannot_delete_file     then "Cannot delete file.",
+    ok                     then "File deleted."
+  }.
+  
+  
+    
+  
  
  
@@ -1283,7 +1283,7 @@ define One
    print_acceptable_tokens
      (
        Stream                s,
-       Word32                 state_id,
+       Word32                state_id,
        String                parser_name,
        List(BehaviorEntry)   behaviors,
        List(String)          non_terminals
@@ -1510,7 +1510,7 @@ define One
    print_state_function_beginning
      (
        Stream            s, 
-       Word32             state_id,
+       Word32            state_id,
        String            parser_name,
        List(String)      stack,
        List(TypeEntry)   type_table,
@@ -1260,7 +1260,7 @@ define One
      ) =
    with id1 = state_id(source), id2 = state_id(target), 
    /*
-   (if (verbose /*& id1 /= id2*/)
+   (if (verbose)
     then print(stderr,id1+"->"+id2+" ")
     else unique);
    */
@@ -13,8 +13,7 @@
    This file was originally containing a very long list of basic things. Finding
    what we needed in it became problematic. Thanks to the new initial keyword
    'transmit', it was possible since version 1.13.5 of Anubis to split it into
-   several parts without the need to change even a comma in the files using 
-   it (at least I hope it works like this; AP).  
+   several parts without the need to change even a comma in the files using it.  
  
    Below is a brief description of each 'chapter' of basis.anubis. The details
    for a given chapter are to be found in the corresponding (transmited) Anubis 
@@ -22,16 +21,15 @@
  
    *** (1) Booleans. 
  
+transmit bool.anubis 
+
    Basic utilities for booleans (type Bool), such as conjunction, disjunction, negation,...
    The same for boolean predicates (type $T -> Bool). 
    Also contains multiple 'and' (mapand) and 'or' (mapor), 
    and non equality (/=  and  !=). 
  
-transmit bool.anubis 
  
-   *** (2) Integers. 
-  
-   
+   *** (2) Integers and rational numbers. 
  
 transmit int.anubis
 transmit rationals.anubis