From e37086c63c8755cd02632b5216b28f056d0780b5 Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Fri, 2 Sep 2005 20:10:30 +0000
Subject: [PATCH] Corrected wrong ANSI setting for new users

---
 ChangeLog         |   1 +
 configure         | 102 ++++++++++++++++++++++++++++++++++++++++++++++
 configure.in      |   1 +
 mbsebbs/newuser.c |   8 +---
 4 files changed, 106 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d870e7f6..b0cf749d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,7 @@ v0.71.5		18-Aug-2005
 		If we can detect the users screenlength then we don't bother
 		asking the user.
 		Added logging during execute of mbuseradd.
+		Corrected wrong ansi setting for new users.
 
 	mbtask:
 		Added check to some chat commands to check if the chat thread
diff --git a/configure b/configure
index 2befde4c..2f6499e0 100755
--- a/configure
+++ b/configure
@@ -7927,6 +7927,108 @@ fi
 done
 
 
+for ac_func in sysctl
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
 # Extract the first word of "compress", so it can be a program name with args.
 set dummy compress; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
diff --git a/configure.in b/configure.in
index 0d2b2d34..5d99f3e8 100644
--- a/configure.in
+++ b/configure.in
@@ -255,6 +255,7 @@ AC_TYPE_SIGNAL
 AC_FUNC_UTIME_NULL
 AC_CHECK_FUNCS(gettimeofday re_comp select)
 AC_CHECK_FUNCS(getspnam initgroups updwtmp updwtmpx)
+AC_CHECK_FUNCS(sysctl)
 
 dnl
 dnl Check for usefull external programs
diff --git a/mbsebbs/newuser.c b/mbsebbs/newuser.c
index 5f2d9d09..7426ae2c 100644
--- a/mbsebbs/newuser.c
+++ b/mbsebbs/newuser.c
@@ -196,6 +196,7 @@ int newuser(int rows)
     l_date = localtime(&Time_Now);
     ltime = time(NULL);
 
+    usrconfig.GraphMode = TRUE; /* Default set it to ANSI */
     if (CFG.iAnsi) {
 	Enter(2);
 	/* Do you want ANSI and graphics mode [Y/n]: */
@@ -204,13 +205,8 @@ int newuser(int rows)
 	alarm_on();
  	i = toupper(getchar());
 
-	if (i == Keystroke(44, 0) || i == '\n')
-	    usrconfig.GraphMode = TRUE;
-	else
+	if (i == Keystroke(44, 1))
 	    usrconfig.GraphMode = FALSE;
-    } else {
-	usrconfig.GraphMode = TRUE; /* Default set it to ANSI */
-	Enter(1);
     }
     exitinfo.GraphMode = usrconfig.GraphMode;
     TermInit(exitinfo.GraphMode, 80, 24);