diff options
| author | Gabriel Scherer <gabriel.scherer@gmail.com> | 2014-12-21 11:46:02 +0000 |
|---|---|---|
| committer | Gabriel Scherer <gabriel.scherer@gmail.com> | 2014-12-21 11:46:02 +0000 |
| commit | fae0140b378ba3fa9ca652d918d7f1180b5d0dda (patch) | |
| tree | 24dba3408492923c1fc3f742dddf034dbce652fd /stdlib | |
| parent | fe758fb89795b52721d1273e278fe241ed9d2b9b (diff) | |
Add optional perms argument to Filename.open_temp_file.
From: Daniel Bünzli <daniel.buenzli@erratique.ch>
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15722 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/filename.ml | 6 | ||||
| -rw-r--r-- | stdlib/filename.mli | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/stdlib/filename.ml b/stdlib/filename.ml index db15169a0..ec20ba41f 100644 --- a/stdlib/filename.ml +++ b/stdlib/filename.ml @@ -230,13 +230,13 @@ let temp_file ?(temp_dir = !current_temp_dir_name) prefix suffix = if counter >= 1000 then raise e else try_name (counter + 1) in try_name 0 -let open_temp_file ?(mode = [Open_text]) ?(temp_dir = !current_temp_dir_name) - prefix suffix = +let open_temp_file ?(mode = [Open_text]) ?(perms = 0o600) + ?(temp_dir = !current_temp_dir_name) prefix suffix = let rec try_name counter = let name = temp_file_name temp_dir prefix suffix in try (name, - open_out_gen (Open_wronly::Open_creat::Open_excl::mode) 0o600 name) + open_out_gen (Open_wronly::Open_creat::Open_excl::mode) perms name) with Sys_error _ as e -> if counter >= 1000 then raise e else try_name (counter + 1) in try_name 0 diff --git a/stdlib/filename.mli b/stdlib/filename.mli index c2cc6a486..9e8a527da 100644 --- a/stdlib/filename.mli +++ b/stdlib/filename.mli @@ -87,8 +87,8 @@ val temp_file : ?temp_dir: string -> string -> string -> string *) val open_temp_file : - ?mode: open_flag list -> ?temp_dir: string -> string -> string -> - string * out_channel + ?mode: open_flag list -> ?perms: int -> ?temp_dir: string -> string -> + string -> string * out_channel (** Same as {!Filename.temp_file}, but returns both the name of a fresh temporary file, and an output channel opened (atomically) on this file. This function is more secure than [temp_file]: there @@ -96,8 +96,12 @@ val open_temp_file : by a symbolic link) before the program opens it. The optional argument [mode] is a list of additional flags to control the opening of the file. It can contain one or several of [Open_append], [Open_binary], - and [Open_text]. The default is [[Open_text]] (open in text mode). - Raise [Sys_error] if the file could not be opened. + and [Open_text]. The default is [[Open_text]] (open in text mode). The + file is created with permissions [perms] (defaults to readable and + writable only by the file owner). + + @raise Sys_error if the file could not be opened. + @before 4.03.0 no ?perms optional argument @before 3.11.2 no ?temp_dir optional argument *) |