aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-09-25Fix handling of single dot in filename:join/2Siri Hansen
The reference manual says that filename:join(A,B) is equivalent to filename:join([A,B]). In some rare cases this turns out not to be true: 1> filename:join("/a/.","b"). "/a/./b" 2> filename:join(["/a/.","b"]). "/a/b" In general, filename:join/1,2 removes single dots from the resulting path, except dots that occur at the beginning or end of the path. The problem above occurs when the first argument to join/2 ends with a dot, then it is not removed even if the second argument differs from an empty string and thus the dot ends up in "the middle" of the path. This commit corrects this problem. A single dot is now only kept if it occurs at the very beginning or the very end of the resulting path. Test of filename:join/1,2 are added in filename_SUITE. In addition, filelib_SUITE is updated with more tests of filelib:wildcard/2 since this failed when the given current directory (second argument) ended with a dot.
2014-09-15Merge branch 'cdituri/epmd-pedantic-spellfix'Marcus Arendt
* cdituri/epmd-pedantic-spellfix: epmd: pedantic spelling fix in comments
2014-09-15epmd: pedantic spelling fix in commentsChris Dituri
Correct spelling errors in the run_daemon() comments which describe the redirection of stdin, stdout, and stderr to /dev/null for safety reasons.
2014-09-15Merge branch 'maint'Siri Hansen
2014-09-15Merge branch 'siri/megaco/fix-appup' into maintSiri Hansen
* siri/megaco/fix-appup: [megaco] Fix appup for OTP-17.3
2014-09-15Merge branch 'maint'Hans Nilsson
2014-09-15Merge branch 'hans/common_test/add_xml_p_tag' into maintHans Nilsson
2014-09-15common_test: Add p-tag to warning-tagHans Nilsson
2014-09-14Merge branch 'maint'Anders Svensson
2014-09-14Merge branch 'anders/diameter/17.3_release/OTP-12093' into maintAnders Svensson
* anders/diameter/17.3_release/OTP-12093: Add recompilation admonition to 17.2 release notes
2014-09-14Merge branch 'anders/diameter/Failed-AVP/OTP-12094' into maintAnders Svensson
* anders/diameter/Failed-AVP/OTP-12094: Fix ?MODULE in preprocessed dictionary forms
2014-09-14Add recompilation admonition to 17.2 release notesAnders Svensson
That dictionaries need to be recompiled, which is the case whenever diameter_gen.hrl is modified.
2014-09-12Fix ?MODULE in preprocessed dictionary formsAnders Svensson
By replacing literal diameter_gen_relay atoms in forms extracted from that module by the name of the module in question. This has been wrong for some time, but only became noticable when the parent commit started using ?MODULE as more than a process dictionary key or tag to match on. In particular, the function dict/1 in diameter_gen.hrl (included by every dictionary module) can now return ?MODULE, which is (not surprisingly) expected to be the name of the dictionary module in question. It wasn't in the case of a module compiled from forms: it was diameter_gen_relay, since that's the module the forms were extracted from. The fix only affects dictionaries compiled from forms, as returned by diameter_make:codec/2. In particular, dictionaries compiled from Erlang source returned by this function, or by diameterc(1), are unaffected.
2014-09-12Merge branch 'maint'Henrik Nord
2014-09-12Update preloaded modulesHenrik Nord
2014-09-12[megaco] Fix appup for OTP-17.3Siri Hansen
2014-09-12Merge branch 'maint'Sverker Eriksson
2014-09-12Merge branch 'sverk/dirty-sched-api-cleanup' into maintSverker Eriksson
* sverk/dirty-sched-api-cleanup: erts: Remove enif_have_dirty_schedulers() erts: Correct dirty scheduler NIF API for Windows
2014-09-12erts: Remove enif_have_dirty_schedulers()Sverker Eriksson
and add 'dirty_scheduler_support' to ErlNifSysInfo
2014-09-11Merge branch 'maint'Ingela Anderton Andin
2014-09-11Merge branch 'ia/public_key/links' into maintIngela Anderton Andin
* ia/public_key/links: public_key: Fix link errors in documentation
2014-09-11public_key: Fix link errors in documentationIngela Anderton Andin
2014-09-11Update preloadedMarcus Arendt
2014-09-11Merge branch 'maint'Marcus Arendt
Conflicts: erts/preloaded/ebin/erl_prim_loader.beam
2014-09-11Update preloadedMarcus Arendt
2014-09-11Merge branch 'lrascao/fix_bug_windows_directory_symlinks' into maintMarcus Arendt
* lrascao/fix_bug_windows_directory_symlinks: fix indentation, add comment describing windows symlink creation assumption fix escript archive symlinked across drives OTP-12155 OTP-12154 OTP-12153
2014-09-10Merge branch 'maint'Dan Gudmundsson
2014-09-10Merge branch 'dgud/tools/emacs-fix' into maintDan Gudmundsson
* dgud/tools/emacs-fix: Add new bif to emacs mode
2014-09-10Merge branch 'maint'Raimo Niskanen
2014-09-10Merge branch 'raimo/snmp/manager-ipv4+ipv6/OTP-12108' into maintRaimo Niskanen
* raimo/snmp/manager-ipv4+ipv6/OTP-12108: Remove debug printouts Fix manager backwards compat for agent addr Update .appup Update documentation Clean up some config warts Raise timeout and see if testcases stabilize Merge manager net_if_mt into net_if Clean up config error handling and negative results Remove decommented code and clean up diff Implement IPv4+IPv6 in MT manager Avoid test case known to fail Improve testcase test for IPv6 capable host Write manager IPv4+IPv6 test Rewrite manager net_if for IPv4+IPv6
2014-09-10erts: Correct dirty scheduler NIF API for WindowsSverker Eriksson
enif_schedule_nif() put LAST of the unconditional functions to keep the order which is vital for ABI compatibility on Windows. The conditional dirty scheduler stuff moved down at the end of the list to keep them out of the way. We don't want them mess things up then they become unconditional some day.
2014-09-10Merge branch 'maint'Ingela Anderton Andin
2014-09-10Merge branch 'ia/ssl/partial_chain/OTP-12149' into maintIngela Anderton Andin
* ia/ssl/partial_chain/OTP-12149: ssl: One more workaround as tcp has no delivery gurantee on application level ssl: Prepare for release - soft upgrade ssl, public_key: Add new option partial_chain
2014-09-10Merge branch 'maint'Lukas Larsson
* maint: Fix some spelling misstakes
2014-09-10Merge branch 'lukas/docfixes-17.3/OTP-12152' into maintLukas Larsson
* lukas/docfixes-17.3/OTP-12152: Fix some spelling misstakes
2014-09-10Merge branch 'maint'Ingela Anderton Andin
2014-09-10Merge branch 'ia/inets/appup' into maintIngela Anderton Andin
2014-09-10ssl: One more workaround as tcp has no delivery gurantee on application levelIngela Anderton Andin
2014-09-10ssl: Prepare for release - soft upgradeIngela Anderton Andin
2014-09-09Merge branch 'maint'Anders Svensson
2014-09-09Merge branch 'anders/diameter/17.3_release/OTP-12093' into maintAnders Svensson
* anders/diameter/17.3_release/OTP-12093: vsn -> 1.7.1 Update appup for OTP-12094 Update appup for OTP-12080 Update appup for OTP-12069
2014-09-09Merge branch 'anders/diameter/5014/OTP-12074' into maintAnders Svensson
* anders/diameter/5014/OTP-12074: Don't leave extra bit in decoded AVP data
2014-09-09Merge branch 'anders/diameter/Failed-AVP/OTP-12094' into maintAnders Svensson
* anders/diameter/Failed-AVP/OTP-12094: Fix best effort decode of Failed-AVP Fix decode of Failed-AVP in RFC 3588 answer-message
2014-09-09Merge branch 'anders/diameter/counters/OTP-12080' into maintAnders Svensson
* anders/diameter/counters/OTP-12080: Fix counters for answer-message Count relayed messages on {relay, Rbit} Count request retransmissions Fix counting of outgoing requests
2014-09-09Merge branch 'anders/diameter/info/OTP-12069' into maintAnders Svensson
* anders/diameter/info/OTP-12069: Map binary process info to a reference/byte count Add info item for diameter:service_info/2 Add (process) info tuple to diameter:service_info/2 Add diameter_dbg:sizes/0 Tweak comments
2014-09-09Merge branch 'maint'Sverker Eriksson
2014-09-09Merge branch 'sverk/crypto-check-version/OTP-12146' into maintSverker Eriksson
* sverk/crypto-check-version/OTP-12146: crypto: Verify OpenSSL library major version at load
2014-09-09Remove debug printoutsRaimo Niskanen
2014-09-09Fix manager backwards compat for agent addrRaimo Niskanen
2014-09-09Merge branch 'egil/erlang-get_keys/OTP-12151'Björn-Egil Dahlberg
* egil/erlang-get_keys/OTP-12151: Update preloaded erlang.beam erts: Document erlang:get_keys/0 stdlib: Auto-import erlang:get_keys/0 erts: Add spec for erlang:get_keys/0 kernel: Test BIF erlang:get_keys/0 erts: Add BIF erlang:get_keys/0