Merge branch 'siri/string-new-api'

* siri/string-new-api: (28 commits)
  hipe (test): Do not use deprecated functions in string(3)
  dialyzer (test): Do not use deprecated functions in string(3)
  eunit (test): Do not use deprecated functions in string(3)
  system (test): Do not use deprecated functions in string(3)
  system (test): Do not use deprecated functions in string(3)
  mnesia (test): Do not use deprecated functions in string(3)
  Deprecate old string functions
  observer: Do not use deprecated functions in string(3)
  common_test: Do not use deprecated functions in string(3)
  eldap: Do not use deprecated functions in string(3)
  et: Do not use deprecated functions in string(3)
  os_mon: Do not use deprecated functions in string(3)
  debugger: Do not use deprecated functions in string(3)
  runtime_tools: Do not use deprecated functions in string(3)
  asn1: Do not use deprecated functions in string(3)
  compiler: Do not use deprecated functions in string(3)
  sasl: Do not use deprecated functions in string(3)
  reltool: Do not use deprecated functions in string(3)
  kernel: Do not use deprecated functions in string(3)
  hipe: Do not use deprecated functions in string(3)
  ...

Conflicts:
	lib/eunit/src/eunit_lib.erl
	lib/observer/src/crashdump_viewer.erl
	lib/reltool/src/reltool_target.erl

4 files changed, 10 insertions, 15 deletions

diff --git a/lib/reltool/src/reltool_mod_win.erl b/lib/reltool/src/reltool_mod_win.erl
index 894d6e2ecb..dcd802a5de 100644
--- a/lib/reltool/src/reltool_mod_win.erl
+++ b/lib/reltool/src/reltool_mod_win.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/reltool/src/reltool_target.erl b/lib/reltool/src/reltool_target.erl
index 1b1461178e..676ce70aea 100644
--- a/lib/reltool/src/reltool_target.erl
+++ b/lib/reltool/src/reltool_target.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/reltool/src/reltool_utils.erl b/lib/reltool/src/reltool_utils.erl
index 3891b5ae4d..1a00671f13 100644
--- a/lib/reltool/src/reltool_utils.erl
+++ b/lib/reltool/src/reltool_utils.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/reltool/test/reltool_server_SUITE.erl b/lib/reltool/test/reltool_server_SUITE.erl
index e8dfea94da..e97b23efe2 100644
--- a/lib/reltool/test/reltool_server_SUITE.erl
+++ b/lib/reltool/test/reltool_server_SUITE.erl
@@ -2549,7 +2549,7 @@ undefined_regexp(_Config) ->
 %% Library functions
 
 erl_libs() ->
-    string:tokens(os:getenv("ERL_LIBS", ""), ":;").
+    string:lexemes(os:getenv("ERL_LIBS", ""), ":;").
 
 datadir(Config) ->
     %% Removes the trailing slash...
@@ -2559,7 +2559,7 @@ latest(App) ->
     AppStr = atom_to_list(App),
     AppDirs = filelib:wildcard(filename:join(code:lib_dir(),AppStr++"-*")),
     [LatestAppDir|_] = lists:reverse(AppDirs),
-    [_,Vsn] = string:tokens(filename:basename(LatestAppDir),"-"),
+    [_,Vsn] = string:lexemes(filename:basename(LatestAppDir),"-"),
     Vsn.
 
 rm_missing_app(Apps) ->
@@ -2635,16 +2635,11 @@ os_cmd(Cmd) when is_list(Cmd) ->
         Return->
             %% Find the position of the status code wich is last in the string
             %% prepended with #
-            case string:rchr(Return, $#) of
-                
-                %% This happens only if the sh command pipe is somehow interrupted
-                0->
-                {98, Return};
-                
-                Position->
-                Result = string:left(Return,Position - 1),
-                Status = string:substr(Return,Position + 1, length(Return) - Position - 1),
-                {list_to_integer(Status), Result}
+            case string:split(Return, "$#", trailing) of
+                [_] -> %% This happens only if the sh command pipe is somehow interrupted
+                    {98, Return};
+                [Result, Status0] ->
+                    {list_to_integer(string:trim(Status0)), Result}
             end
     end.