ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

startup: activate restricted mode earlier, so --help will reflect it 

Kind-of-discovered-by: Markus Bergholz <markuman@gmail.com>
master
Benno Schulenberg 2016-11-17 18:05:09 +01:00
parent f2c72bf759
commit eb5968f845
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/nano.c
View File

@ -2081,6 +2081,10 @@ int main(int argc, char **argv)
SET(NO_WRAP); SET(NO_WRAP);
#endif #endif
/* If the executable's name starts with 'r', activate restricted mode. */
if (*(tail(argv[0])) == 'r')
SET(RESTRICTED);
while ((optchr = while ((optchr =
#ifdef HAVE_GETOPT_LONG #ifdef HAVE_GETOPT_LONG
getopt_long(argc, argv, 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, /* If we're using restricted mode, disable suspending, backups,
* rcfiles, and history files, since they all would allow reading * rcfiles, and history files, since they all would allow reading
* from or writing to files not specified on the command line. */ * from or writing to files not specified on the command line. */