aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
Diffstat (limited to 'lib/stdlib')
-rw-r--r--lib/stdlib/doc/src/c.xml9
-rw-r--r--lib/stdlib/doc/src/filelib.xml10
-rw-r--r--lib/stdlib/doc/src/filename.xml58
-rw-r--r--lib/stdlib/doc/src/gen_statem.xml10
-rw-r--r--lib/stdlib/doc/src/unicode_usage.xml4
-rw-r--r--lib/stdlib/src/c.erl18
-rw-r--r--lib/stdlib/src/ets.erl2
-rw-r--r--lib/stdlib/src/filename.erl32
-rw-r--r--lib/stdlib/src/gen_statem.erl4
-rw-r--r--lib/stdlib/src/stdlib.app.src2
-rw-r--r--lib/stdlib/test/filename_SUITE.erl57
11 files changed, 78 insertions, 128 deletions
diff --git a/lib/stdlib/doc/src/c.xml b/lib/stdlib/doc/src/c.xml
index 7666699183..697e1715e7 100644
--- a/lib/stdlib/doc/src/c.xml
+++ b/lib/stdlib/doc/src/c.xml
@@ -94,6 +94,15 @@
</func>
<func>
+ <name name="erlangrc" arity="1"/>
+ <fsummary>Load an erlang resource file.</fsummary>
+ <desc>
+ <p>Search <c>PathList</c> and load <c>.erlang</c> resource file if
+ found.</p>
+ </desc>
+ </func>
+
+ <func>
<name name="flush" arity="0"/>
<fsummary>Flush any messages sent to the shell.</fsummary>
<desc>
diff --git a/lib/stdlib/doc/src/filelib.xml b/lib/stdlib/doc/src/filelib.xml
index 1b69e84d31..5e631aac21 100644
--- a/lib/stdlib/doc/src/filelib.xml
+++ b/lib/stdlib/doc/src/filelib.xml
@@ -50,16 +50,16 @@
<p>
Functionality in this module generally assumes valid input and
does not necessarily fail on input that does not use a valid
- encoding. You can validate the encoding of a filename using
- <seealso marker="stdlib:filename#validate/1">filename:validate/1</seealso>.
+ encoding, but may instead very likely produce invalid output.
</p>
<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
+ the name to be truncated and in some cases arguments
+ to primitive operations to be mixed up. Filenames
+ containing null characters inside the filename
are now <em>rejected</em> and will cause primitive
- file operations fail.
+ file operations to fail.
</p>
</note>
<warning><p>
diff --git a/lib/stdlib/doc/src/filename.xml b/lib/stdlib/doc/src/filename.xml
index b6028fc066..d2608ad542 100644
--- a/lib/stdlib/doc/src/filename.xml
+++ b/lib/stdlib/doc/src/filename.xml
@@ -64,16 +64,16 @@
<p>
Functionality in this module generally assumes valid input and
does not necessarily fail on input that does not use a valid
- encoding. You can validate the encoding of a filename using
- <seealso marker="#validate/1">filename:validate/1</seealso>.
+ encoding, but may instead very likely produce invalid output.
</p>
<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
+ the name to be truncated and in some cases arguments
+ to primitive operations to be mixed up. Filenames
+ containing null characters inside the filename
are now <em>rejected</em> and will cause primitive
- file operations fail.
+ file operations to fail.
</p>
</note>
<warning><p>
@@ -583,54 +583,6 @@ unsafe</pre>
</desc>
</func>
- <func>
- <name name="validate" arity="1"/>
- <fsummary>Validate encoding of filename</fsummary>
- <desc>
- <p>
- Validates filename encoding. Returns <c>true</c> if
- <c><anno>FileName</anno></c> has a valid encoding;
- otherwise, returns <c>false</c>.
- </p>
- <taglist>
- <tag>Ordinary Filename</tag>
- <item>
- <p>
- Type: <c><anno>FileName</anno> = </c><seealso marker="kernel:file#type-name"><c>file:name()</c></seealso>
- </p>
- <p>
- Validates encoding against the
- <seealso marker="kernel:file#native_name_encoding/0">native file
- name encoding</seealso>, and the
- capabilities of the operating system used.
- Regardless of configuration and OS, null
- characters (integer value zero) will be
- rejected by the validation (even when only
- present at the end of the filename).
- </p>
- </item>
- <tag><seealso marker="unicode_usage#notes-about-raw-filenames">Raw
- Filename</seealso></tag>
- <item>
- <p>
- Type: <c><anno>FileName</anno> = binary()</c>
- </p>
- <p>
- The encoding will not be interpreted, but
- null bytes (integer value zero) will be
- rejected by the validation (even when only
- present at the end of the filename).
- </p>
- </item>
- </taglist>
- <p>
- For information on filename encoding see the documentation
- of unicode filenames in
- <seealso marker="stdlib:unicode_usage#unicode_file_names">STDLIB
- Users Guide ➜ Using Unicode in Erlang ➜ Unicode Filenames</seealso>.
- </p>
- </desc>
- </func>
</funcs>
</erlref>
diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml
index 8de6ed754f..4a824f073e 100644
--- a/lib/stdlib/doc/src/gen_statem.xml
+++ b/lib/stdlib/doc/src/gen_statem.xml
@@ -1329,7 +1329,7 @@ handle_event(_, _, State, Data) ->
<c><anno>T</anno></c> is the time-out time.
<c>{clean_timeout,<anno>T</anno>}</c> works like
just <c>T</c> described in the note above
- and uses a proxy process for <c>T &lt; infinity</c>,
+ and uses a proxy process
while <c>{dirty_timeout,<anno>T</anno>}</c>
bypasses the proxy process which is more lightweight.
</p>
@@ -1339,8 +1339,12 @@ handle_event(_, _, State, Data) ->
with <c>{dirty_timeout,<anno>T</anno>}</c>
to avoid that the calling process dies when the call
times out, you will have to be prepared to handle
- a late reply.
- So why not just let the calling process die?
+ a late reply. Note that there is an odd chance
+ to get a late reply even with
+ <c>{dirty_timeout,infinity}</c> or <c>infinity</c>
+ for example in the event of network problems.
+ So why not just let the calling process die
+ by not catching the exception?
</p>
</note>
<p>
diff --git a/lib/stdlib/doc/src/unicode_usage.xml b/lib/stdlib/doc/src/unicode_usage.xml
index ff1f864e22..789e063c12 100644
--- a/lib/stdlib/doc/src/unicode_usage.xml
+++ b/lib/stdlib/doc/src/unicode_usage.xml
@@ -857,6 +857,10 @@ Eshell V5.10.1 (abort with ^G)
<section>
<marker id="notes-about-raw-filenames"/>
<title>Notes About Raw Filenames</title>
+ <note><p>
+ Note that raw filenames <em>not</em> necessarily are encoded the
+ same way as on the OS level.
+ </p></note>
<p>Raw filenames were introduced together with Unicode filename support
in ERTS 5.8.2 (Erlang/OTP R14B01). The reason &quot;raw
filenames&quot; were introduced in the system was
diff --git a/lib/stdlib/src/c.erl b/lib/stdlib/src/c.erl
index c04a201ce1..9a447af5b7 100644
--- a/lib/stdlib/src/c.erl
+++ b/lib/stdlib/src/c.erl
@@ -668,19 +668,23 @@ lm() ->
[l(M) || M <- mm()].
%% erlangrc(Home)
-%% Try to run a ".erlang" file, first in the current directory
-%% else in home directory.
+%% Try to run a ".erlang" file in home directory.
+
+-spec erlangrc() -> {ok, file:filename()} | {error, term()}.
erlangrc() ->
case init:get_argument(home) of
{ok,[[Home]]} ->
erlangrc([Home]);
_ ->
- f_p_e(["."], ".erlang")
+ {error, enoent}
end.
-erlangrc([Home]) ->
- f_p_e([".",Home], ".erlang").
+-spec erlangrc(PathList) -> {ok, file:filename()} | {error, term()}
+ when PathList :: [Dir :: file:name()].
+
+erlangrc([Home|_]=Paths) when is_list(Home) ->
+ f_p_e(Paths, ".erlang").
error(Fmt, Args) ->
error_logger:error_msg(Fmt, Args).
@@ -692,11 +696,11 @@ f_p_e(P, F) ->
{error, E={Line, _Mod, _Term}} ->
error("file:path_eval(~tp,~tp): error on line ~p: ~ts~n",
[P, F, Line, file:format_error(E)]),
- ok;
+ {error, E};
{error, E} ->
error("file:path_eval(~tp,~tp): ~ts~n",
[P, F, file:format_error(E)]),
- ok;
+ {error, E};
Other ->
Other
end.
diff --git a/lib/stdlib/src/ets.erl b/lib/stdlib/src/ets.erl
index 4858c8d13c..b6548626f3 100644
--- a/lib/stdlib/src/ets.erl
+++ b/lib/stdlib/src/ets.erl
@@ -1700,6 +1700,8 @@ choice(Height, Width, P, Mode, Tab, Key, Turn, Opos) ->
io:format("~ts\n", [ErrorString]),
choice(Height, Width, P, Mode, Tab, Key, Turn, Opos)
end;
+ eof ->
+ ok;
_ ->
choice(Height, Width, P, Mode, Tab, Key, Turn, Opos)
end.
diff --git a/lib/stdlib/src/filename.erl b/lib/stdlib/src/filename.erl
index 73eccb226e..919f8f20e6 100644
--- a/lib/stdlib/src/filename.erl
+++ b/lib/stdlib/src/filename.erl
@@ -34,6 +34,38 @@
%% we flatten the arguments immediately on function entry as that makes
%% it easier to ensure that the code works.
+%%
+%% *** Requirements on Raw Filename Format ***
+%%
+%% These requirements are due to the 'filename' module
+%% in stdlib. This since it is documented that it
+%% should be able to operate on raw filenames as well
+%% as ordinary filenames.
+%%
+%% A raw filename *must* be a byte sequence where:
+%% 1. Codepoints 0-127 (7-bit ascii) *must* be encoded
+%% as a byte with the corresponding value. That is,
+%% the most significant bit in the byte encoding the
+%% codepoint is never set.
+%% 2. Codepoints greater than 127 *must* be encoded
+%% with the most significant bit set in *every* byte
+%% encoding it.
+%%
+%% Latin1 and UTF-8 meet these requirements while
+%% UTF-16 and UTF-32 don't.
+%%
+%% On Windows filenames are natively stored as malformed
+%% UTF-16LE (lonely surrogates may appear). A more correct
+%% description than UTF-16 would be an array of 16-bit
+%% words... In order to meet the requirements of the
+%% raw file format we convert the malformed UTF-16LE to
+%% malformed UTF-8 which meet the requirements.
+%%
+%% Note that these requirements are today only OTP
+%% internal (erts-stdlib internal) requirements that
+%% could be changed.
+%%
+
-export([absname/1, absname/2, absname_join/2,
basename/1, basename/2, dirname/1,
extension/1, join/1, join/2, pathtype/1,
diff --git a/lib/stdlib/src/gen_statem.erl b/lib/stdlib/src/gen_statem.erl
index 1110d18af6..cd6312855d 100644
--- a/lib/stdlib/src/gen_statem.erl
+++ b/lib/stdlib/src/gen_statem.erl
@@ -296,7 +296,7 @@
(Reason :: term()).
%% Format the callback module state in some sensible that is
-%% often condensed way. For StatusOption =:= 'normal' the perferred
+%% often condensed way. For StatusOption =:= 'normal' the preferred
%% return term is [{data,[{"State",FormattedState}]}], and for
%% StatusOption =:= 'terminate' it is just FormattedState.
-callback format_status(
@@ -510,8 +510,6 @@ call(ServerRef, Request, Timeout) ->
parse_timeout(Timeout) ->
case Timeout of
- {clean_timeout,infinity} ->
- {dirty_timeout,infinity};
{clean_timeout,_} ->
Timeout;
{dirty_timeout,_} ->
diff --git a/lib/stdlib/src/stdlib.app.src b/lib/stdlib/src/stdlib.app.src
index 41c89270aa..ab0824ca17 100644
--- a/lib/stdlib/src/stdlib.app.src
+++ b/lib/stdlib/src/stdlib.app.src
@@ -107,7 +107,7 @@
dets]},
{applications, [kernel]},
{env, []},
- {runtime_dependencies, ["sasl-3.0","kernel-5.4.1","erts-9.1.1","crypto-3.3",
+ {runtime_dependencies, ["sasl-3.0","kernel-6.0","erts-10.0","crypto-3.3",
"compiler-5.0"]}
]}.
diff --git a/lib/stdlib/test/filename_SUITE.erl b/lib/stdlib/test/filename_SUITE.erl
index 4c82ec1c22..fc77593bb8 100644
--- a/lib/stdlib/test/filename_SUITE.erl
+++ b/lib/stdlib/test/filename_SUITE.erl
@@ -30,7 +30,6 @@
-export([pathtype_bin/1,rootname_bin/1,split_bin/1]).
-export([t_basedir_api/1, t_basedir_xdg/1, t_basedir_windows/1]).
-export([safe_relative_path/1]).
--export([validate/1]).
-include_lib("common_test/include/ct.hrl").
@@ -44,8 +43,7 @@ all() ->
absname_bin, absname_bin_2,
{group,p},
t_basedir_xdg, t_basedir_windows,
- safe_relative_path,
- validate].
+ safe_relative_path].
groups() ->
[{p, [parallel],
@@ -1013,56 +1011,3 @@ basedir_xdg_def(Type,Home,Name) ->
Dir <- ["/usr/local/share/","/usr/share/"]];
site_config -> [filename:join(["/etc/xdg",Name])]
end.
-
-validate(Config) when is_list(Config) ->
- true = filename:validate(blipp),
- false = filename:validate('bli\0pp'),
- false = filename:validate('blipp\0'),
- true = filename:validate("blipp"),
- false = filename:validate("bli"++[0]++"pp"),
- false = filename:validate("blipp"++[0]),
- true = filename:validate(["one ", blipp, "blopp"]),
- false = filename:validate(["one ", 'bli\0pp', "blopp"]),
- false = filename:validate(["one ", 'blipp\0', "blopp"]),
- false = filename:validate(["one ", 'blipp', "blopp\0"]),
- false = filename:validate([0]),
- false = filename:validate([]),
- false = filename:validate([[[]],[[[[],[[[[[[[[]]], '', [[[[[]]]]]]]]]]]]]]),
- false = filename:validate([16#110000]),
- false = filename:validate([16#110001]),
- false = filename:validate([16#110000*2]),
- case file:native_name_encoding() of
- latin1 ->
- true = filename:validate(lists:seq(1, 255)),
- false = filename:validate([256]);
- utf8 ->
- true = filename:validate(lists:seq(1, 16#D7FF)),
- true = filename:validate(lists:seq(16#E000, 16#FFFF)),
- true = filename:validate([16#FFFF]),
- case os:type() of
- {win32, _} ->
- false = filename:validate([16#10000]),
- true = filename:validate(lists:seq(16#D800,16#DFFF));
- _ ->
- true = filename:validate([16#10000]),
- true = filename:validate([16#10FFFF]),
- lists:foreach(fun (C) ->
- false = filename:validate([C])
- end,
- lists:seq(16#D800,16#DFFF))
- end
-
- end,
- true = filename:validate(<<1,17,255>>),
- false = filename:validate(<<1,0,17,255>>),
- false = filename:validate(<<1,17,255,0>>),
- false = filename:validate(<<>>),
- lists:foreach(fun (N) ->
- true = filename:validate(N)
- end,
- code:get_path()),
- ok.
-
-
-
-
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-19 08:33:48 +0000