diff options
| author | Björn Gustavsson <[email protected]> | 2010-11-22 12:12:56 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-11-22 12:12:56 +0100 |
| commit | 2e46e9dc0dbbba67780e08863b8605ffe567ced0 (patch) | |
| tree | 29fbda805950584624c5e1051ebe5e9ea32cae80 /lib/kernel/src | |
| parent | 0f2f7ddea021441d79abbfda1cb915fe755cb766 (diff) | |
| parent | 67513294cd100042ba04e45a181253c29fead288 (diff) | |
| download | otp-2e46e9dc0dbbba67780e08863b8605ffe567ced0.tar.gz otp-2e46e9dc0dbbba67780e08863b8605ffe567ced0.tar.bz2 otp-2e46e9dc0dbbba67780e08863b8605ffe567ced0.zip | |
Merge branch 'ks/file_open-mode' into dev
* ks/file_open-mode:
Add the {encoding, _} options to file:open/2's modes
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/file.erl | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/lib/kernel/src/file.erl b/lib/kernel/src/file.erl index cffe4e3db5..97d914b043 100644 --- a/lib/kernel/src/file.erl +++ b/lib/kernel/src/file.erl @@ -81,19 +81,28 @@ -type io_device() :: pid() | fd(). -type location() :: integer() | {'bof', integer()} | {'cur', integer()} | {'eof', integer()} | 'bof' | 'cur' | 'eof'. --type mode() :: 'read' | 'write' | 'append' | 'raw' | 'binary' | - {'delayed_write', non_neg_integer(), non_neg_integer()} | - 'delayed_write' | {'read_ahead', pos_integer()} | - 'read_ahead' | 'compressed' | 'exclusive'. +-type mode() :: 'read' | 'write' | 'append' + | 'exclusive' | 'raw' | 'binary' + | {'delayed_write', non_neg_integer(), non_neg_integer()} + | 'delayed_write' | {'read_ahead', pos_integer()} + | 'read_ahead' | 'compressed' + | {'encoding', unicode:encoding()}. -type name() :: string() | atom() | [name()]. --type posix() :: atom(). +-type posix() :: 'eacces' | 'eagain' | 'ebadf' | 'ebusy' | 'edquot' + | 'eexist' | 'efault' | 'efbig' | 'eintr' | 'einval' + | 'eio' | 'eisdir' | 'eloop' | 'emfile' | 'emlink' + | 'enametoolong' + | 'enfile' | 'enodev' | 'enoent' | 'enomem' | 'enospc' + | 'enotblk' | 'enotdir' | 'enotsup' | 'enxio' | 'eperm' + | 'epipe' | 'erofs' | 'espipe' | 'esrch' | 'estale' + | 'exdev'. -type bindings() :: any(). -type date() :: {pos_integer(), pos_integer(), pos_integer()}. -type time() :: {non_neg_integer(), non_neg_integer(), non_neg_integer()}. -type date_time() :: {date(), time()}. --type posix_file_advise() :: 'normal' | 'sequential' | 'random' | 'no_reuse' | - 'will_need' | 'dont_need'. +-type posix_file_advise() :: 'normal' | 'sequential' | 'random' + | 'no_reuse' | 'will_need' | 'dont_need'. %%%----------------------------------------------------------------- %%% General functions @@ -286,7 +295,7 @@ raw_write_file_info(Name, #file_info{} = Info) -> %% Contemporary mode specification - list of options -spec open(Name :: name(), Modes :: [mode()]) -> - {'ok', io_device()} | {'error', posix()}. + {'ok', io_device()} | {'error', posix() | 'system_limit'}. open(Item, ModeList) when is_list(ModeList) -> case lists:member(raw, ModeList) of |