diff options
author | Sverker Eriksson <[email protected]> | 2013-10-16 18:15:47 +0200 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2013-10-16 18:16:26 +0200 |
commit | 717cf073d2c4ccbb508a272486ec83369ed1f043 (patch) | |
tree | 86d6321d6ab6e906297b602e151630277b78997c /erts/emulator/beam/utils.c | |
parent | b95da0ad6236be268d63fd960934c787971e1fd0 (diff) | |
parent | b6b0b73ecec7facefb3b9c5a7ef663599cfee4aa (diff) | |
download | otp-717cf073d2c4ccbb508a272486ec83369ed1f043.tar.gz otp-717cf073d2c4ccbb508a272486ec83369ed1f043.tar.bz2 otp-717cf073d2c4ccbb508a272486ec83369ed1f043.zip |
Merge branch 'sverk/load-nif-unicode'
OTP-11408
* sverk/load-nif-unicode:
erts: Fix bug in atom to filename conversions
Fix open_ddll for win
erts, crypto: Support NIF library with unicode filename on windows
erts: Factor out erts_convert_filename_to_wchar()
erts: Fix compiler warning
erts: Fix loading of NIF library with unicode in path
erts: Remove unused constant DRIVER_TAB_SIZE
Diffstat (limited to 'erts/emulator/beam/utils.c')
-rw-r--r-- | erts/emulator/beam/utils.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c index efacee3ea5..605a625282 100644 --- a/erts/emulator/beam/utils.c +++ b/erts/emulator/beam/utils.c @@ -4019,28 +4019,6 @@ erts_smp_ensure_later_interval_acqb(erts_interval_t *icp, Uint64 ic) #endif } -const char *erts_basename(const char* path, char* buff) { - /* This function is not compliant with bash basename. Edge cases like "//" - and "/path//" do not work properly. - */ - int i; - int len = strlen(path); - const char *basename = path; - for (i = 0; path[i] != '\0'; i++) { - if (path[i] == '/') { - if (path[i+1] == '\0') { - memcpy(buff,basename,len - (basename-path)); - buff[len - (basename-path)-1] = '\0'; - basename = buff; - break; - } else { basename = path+i;} - } - } - if (basename == path) - return path; - return basename+1; -} - /* * A millisecond timestamp without time correction where there's no hrtime * - for tracing on "long" things... |