aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2012-12-20 14:54:53 +0100
committerPatrik Nyblom <[email protected]>2012-12-20 14:54:53 +0100
commit52a6a63e0448cd5b969cf345aff59fc9c00d0050 (patch)
tree765c47828ec03de53df67528e03f63b3c7a8f2ae /erts
parent4693e0cca3ce468c999e1c8bd5d100b68dc8136f (diff)
parent5333635c03a6c0c5f57dc184bae8bdf285bb6b2c (diff)
downloadotp-52a6a63e0448cd5b969cf345aff59fc9c00d0050.tar.gz
otp-52a6a63e0448cd5b969cf345aff59fc9c00d0050.tar.bz2
otp-52a6a63e0448cd5b969cf345aff59fc9c00d0050.zip
Merge branch 'pan/fna_not_working'
* pan/fna_not_working: Fix emulator +fna option OTP-10650
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/beam/erl_init.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 175f04b15b..8cdf954dd2 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -989,6 +989,7 @@ erl_start(int argc, char **argv)
break;
case 'a':
erts_set_user_requested_filename_encoding(ERL_FILENAME_UNKNOWN);
+ break;
default:
erts_fprintf(stderr, "bad filename encoding %s, can be (l,u or a)\n", arg);
erts_usage();