From eb5968f845c88d8e801618045b1bcc092a655604 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Thu, 17 Nov 2016 18:05:09 +0100 Subject: [PATCH] startup: activate restricted mode earlier, so --help will reflect it Kind-of-discovered-by: Markus Bergholz --- src/nano.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/nano.c b/src/nano.c index 8a0d4c05..7204b45d 100644 --- a/src/nano.c +++ b/src/nano.c @@ -2081,6 +2081,10 @@ int main(int argc, char **argv) SET(NO_WRAP); #endif + /* If the executable's name starts with 'r', activate restricted mode. */ + if (*(tail(argv[0])) == 'r') + SET(RESTRICTED); + while ((optchr = #ifdef HAVE_GETOPT_LONG getopt_long(argc, argv, @@ -2298,11 +2302,6 @@ int main(int argc, char **argv) } } - /* If the executable filename starts with 'r', enable restricted - * mode. */ - if (*(tail(argv[0])) == 'r') - SET(RESTRICTED); - /* If we're using restricted mode, disable suspending, backups, * rcfiles, and history files, since they all would allow reading * from or writing to files not specified on the command line. */