- New configure option --disable-wrapping-as-root. Added because the 1.0 series...

git-svn-id: svn://svn.savannah.gnu.org/nano/branches/nano_1_0_branch/nano@1000 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 818a4c9b625343348c887daa67ba7b90819ab2b4..0b89f398f84afa570ee61e29cb0d6698521aa91b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ CVS Code -
          and nano.c:do_int_spell_fix() (Rocco Corsi).
        - Add Meta-A as alternate keyystroke for ^^ for people with
          non-US keyboards.
+       - New configure option --disable-wrapping-as-root.  Added
+         because the 1.0 series doesn't really allow wrapping disabled
+         without a flag and debian's installer can't handle that.
 - global.c:
   shorcut_init()
        - Replace hard coded ALT_G and ALT_H values in the replace

diff --git a/acconfig.h b/acconfig.h
index 6cd9782b57a19654eb63b4f27b16fdb5f1d726a8..2848b5206c82e1791aa0ac0151d65fb0ca0f8c6e 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -51,3 +51,6 @@
 /* Define this to disable any and all text wrapping */
 #undef DISABLE_WRAPPING
 
+/* Define this to disable wrapping as root by default */
+#undef DISABLE_ROOTWRAP
+

diff --git a/configure.in b/configure.in
index a56135dc4dd04ad1159a2b73a85707e2be75df75..909791ae4227d83524a9181a139871973e508c32 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -68,6 +68,12 @@ AC_ARG_ENABLE(wrapping,
     AC_DEFINE(DISABLE_WRAPPING)
  fi])
 
+AC_ARG_ENABLE(wrapping-as-root,
+[  --disable-wrapping-as-root  Disables wrapping of text as root by default],
+ [if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_ROOTWRAP)
+ fi])
+
 AC_MSG_CHECKING([whether to use slang])
 CURSES_LIB_NAME=""
 AC_ARG_WITH(slang,

diff --git a/nano.c b/nano.c
index bb2e0f11692ca7091a3e5d48806f9ebccdc4c04b..46954b6f2916ffa1a4e9212644b3f97a483e693c 100644 (file)
--- a/nano.c
+++ b/nano.c
@@ -479,6 +479,9 @@ void version(void)
 #ifdef DISABLE_WRAPPING
     printf(" --disable-wrapping");
 #endif
+#ifdef DISABLE_ROOTWRAP
+    printf(" --disable-wrapping-as-root");
+#endif
 #ifdef USE_SLANG
     printf(" --with-slang");
 #endif
@@ -2463,6 +2466,10 @@ int main(int argc, char *argv[])
            filename = mallocstrcpy(filename, argv[optind]);
     }
 
+#ifdef DISABLE_ROOTWRAP
+    if (geteuid() == 0)
+       SET(NO_WRAP);
+#endif
 
     /* First back up the old settings so they can be restored, duh */
     tcgetattr(0, &oldterm);