diff options
| author | Rickard Green <[email protected]> | 2017-10-12 16:30:38 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-10-12 16:30:38 +0200 |
| commit | 55693961fbb6371d2c3ec0a426f30b8acace6ed1 (patch) | |
| tree | 7debd0d509349e26508c211763f1865652c623ef /lib/kernel/doc/src/file.xml | |
| parent | 4900f9886cc80ecf34f9590829878da937e75422 (diff) | |
| parent | f28539265d753bbaa473cb488e951bfe47304a01 (diff) | |
| download | otp-55693961fbb6371d2c3ec0a426f30b8acace6ed1.tar.gz otp-55693961fbb6371d2c3ec0a426f30b8acace6ed1.tar.bz2 otp-55693961fbb6371d2c3ec0a426f30b8acace6ed1.zip | |
Merge branch 'maint'
* maint:
Revert "Merge branch 'rickard/null-char-filenames/ERL-370/OTP-14543' into maint"
Diffstat (limited to 'lib/kernel/doc/src/file.xml')
| -rw-r--r-- | lib/kernel/doc/src/file.xml | 38 |
1 files changed, 4 insertions, 34 deletions
diff --git a/lib/kernel/doc/src/file.xml b/lib/kernel/doc/src/file.xml index 593bee74fe..b674b3ca93 100644 --- a/lib/kernel/doc/src/file.xml +++ b/lib/kernel/doc/src/file.xml @@ -59,7 +59,7 @@ terminal supports UTF-8, otherwise <c>latin1</c>. The default can be overridden using <c>+fnl</c> (to force <c>latin1</c> mode) or <c>+fnu</c> (to force <c>utf8</c> mode) when starting - <seealso marker="erts:erl"><c>erl</c></seealso>.</p> + <seealso marker="erts:erl"><c>erts:erl</c></seealso>.</p> <p>On operating systems with transparent naming, files can be inconsistently named, for example, some files are encoded in UTF-8 while @@ -81,22 +81,6 @@ <p>See also section <seealso marker="stdlib:unicode_usage#notes-about-raw-filenames">Notes About Raw Filenames</seealso> in the STDLIB User's Guide.</p> - <note><p> - File operations used to accept filenames containing - null characters (integer value zero). This caused - the name to be truncated at the first null character. - Filenames containing null characters inside the filename - are now <em>rejected</em> and will cause primitive - file operations fail. - </p></note> - <warning><p> - Currently null characters at the end of the filename - will be accepted by primitive file operations. Such - filenames are however still documented as invalid. The - implementation will also change in the future and - reject such filenames. - </p></warning> - </description> <datatypes> @@ -112,21 +96,9 @@ </datatype> <datatype> <name name="filename"/> - <desc> - <p> - See also the documentation of the - <seealso marker="#type-name_all"><c>name_all()</c></seealso> type. - </p> - </desc> </datatype> <datatype> <name name="filename_all"/> - <desc> - <p> - See also the documentation of the - <seealso marker="#type-name_all"><c>name_all()</c></seealso> type. - </p> - </desc> </datatype> <datatype> <name name="io_device"/> @@ -140,23 +112,21 @@ <name name="name"/> <desc> <p>If VM is in Unicode filename mode, <c>string()</c> and <c>char()</c> - are allowed to be > 255. See also the documentation of the - <seealso marker="#type-name_all"><c>name_all()</c></seealso> type. + are allowed to be > 255. </p> </desc> </datatype> <datatype> <name name="name_all"/> <desc> - <p>If VM is in Unicode filename mode, characters + <p>If VM is in Unicode filename mode, <c>string()</c> and <c>char()</c> are allowed to be > 255. <c><anno>RawFilename</anno></c> is a filename not subject to Unicode translation, meaning that it can contain characters not conforming to the Unicode encoding expected from the file system (that is, non-UTF-8 characters although the VM is started - in Unicode filename mode). Null characters (integer value zero) - are <em>not</em> allowed in filenames (not even at the end). + in Unicode filename mode). </p> </desc> </datatype> |