CVS code -
+- General:
+ - Forward-ported Chris' --disable-wrapping-as-root option from
+ 1.0.9. Per Jordi's suggestions, have it override /etc/nanorc
+ but not ~/.nanorc. (DLR)
GNU nano 1.1.12 - 10/24/2002
- General:
AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable any and all text wrapping.])
fi])
+AC_ARG_ENABLE(wrapping-as-root,
+[ --disable-wrapping-as-root Disable wrapping of text as root by default],
+ [if test x$enableval != xyes; then
+ AC_DEFINE(DISABLE_ROOTWRAP, 1, [Define this to disable wrapping as root by default.])
+ fi])
+
AC_ARG_ENABLE(color,
[ --enable-color Enable color and syntax highlighting],
[if test x$enableval = xyes; then
#ifdef DISABLE_WRAPPING
printf(" --disable-wrapping");
#endif
+#ifdef DISABLE_ROOTWRAP
+ printf(" --disable-wrapping-as-root");
+#endif
#ifdef ENABLE_COLOR
printf(" --enable-color");
#endif
}
if (!ISSET(NO_RCFILE))
do_rcfile();
+#else
+#if defined(DISABLE_ROOTWRAP) && !defined(DISABLE_WRAPPING)
+ /* if we don't have rcfile support, we're root, and
+ --disable-wrapping-as-root is used, turn wrapping off */
+ if (geteuid() == 0)
+ SET(NO_WRAP);
+#endif
#endif /* ENABLE_NANORC */
#ifdef HAVE_GETOPT_LONG
nanorc = nrealloc(nanorc, strlen(userage->pw_dir) + 9);
sprintf(nanorc, "%s/.nanorc", userage->pw_dir);
+#if defined(DISABLE_ROOTWRAP) && !defined(DISABLE_WRAPPING)
+ /* If we've already read $SYSCONFDIR/nanorc (if it's there), we're
+ root, and --disable-wrapping-as-root is used, turn wrapping off */
+ if (euid == 0)
+ SET(NO_WRAP);
+#endif
if ((rcstream = fopen(nanorc, "r")) == NULL) {
/* Don't complain about the file not existing */
if (errno != ENOENT)