working before add permission

Author: Lucccyo

src/sys/stm_tests.ml

@@ -14,6 +14,12 @@ struct
 
   module Map_names = Map.Make (String)
 
+  type permission = {
+    owner: int;
+    group: int;
+    other: int;
+  }
+
   type filesys =
     | Directory of {perm: int; fs_map: filesys Map_names.t}
     | File of {perm: int}
@@ -147,24 +153,24 @@ struct
       then fs
       else touch fs path new_file_name perm
 
-  (* let init_sut () = try Sys.mkdir (static_path / "sandbox_root") 0o777 with Sys_error _ -> () *)
-    let init_sut () = ignore(Sys.command ("rm -rf " ^ (static_path / "sandbox_root") ^ " && mkdir " ^ (static_path / "sandbox_root")))
+  let init_sut () = ignore(Sys.command ("rm -rf " ^ (static_path / "sandbox_root") ^ " && mkdir " ^ (static_path / "sandbox_root")))
 
-  (* let cleanup _ = ignore (Sys.command ("tree " ^ static_path ^ "/sandbox_root && rm -r -d -f " ^ static_path ^ "/sandbox_root")) *)
   let cleanup _   = ignore (Sys.command ("rm -r -d -f " ^ static_path ^ "/sandbox_root"))
 
   let precond _c _s = true
 
-  let run c _file_name = match c with
-    | File_exists (path) -> Res (bool, Sys.file_exists (static_path / "sandbox_root" / (List.fold_left (/) "" path)))
+  let run c _file_name =
+    let p path = static_path / "sandbox_root" / (List.fold_left (/) "" path) in
+    match c with
+    | File_exists (path) -> Res (bool, Sys.file_exists (p path))
     | Mkdir (path, new_dir_name, perm) ->
-      Res (result unit exn, protect (Sys.mkdir (static_path / "sandbox_root" / (List.fold_left (/) "" path) / new_dir_name))perm)
+      Res (result unit exn, protect (Sys.mkdir ((p path) / new_dir_name))perm)
     | Rmdir (path, delete_dir_name) ->
-      Res (result unit exn, protect (Sys.rmdir) (static_path / "sandbox_root" / (List.fold_left (/) "" path) / delete_dir_name))
+      Res (result unit exn, protect (Sys.rmdir) ((p path) / delete_dir_name))
     | Readdir (path) ->
-      Res (result (array string) exn, protect (Sys.readdir) (static_path / "sandbox_root" / (List.fold_left (/) "" path)))
+      Res (result (array string) exn, protect (Sys.readdir) (p path))
     | Touch (path, new_file_name, _perm) ->
-      Res (unit, ignore(Sys.command ("touch " ^ static_path / "sandbox_root" / (List.fold_left (/) "" path) / new_file_name ^ " 2>/dev/null")))
+      Res (unit, ignore(Sys.command ("touch " ^ (p path) / new_file_name ^ " 2>/dev/null")))
 
   let is_a_dir fs = match fs with | Directory _ -> true | File _ -> false