summaryrefslogtreecommitdiffstats
path: root/mbbsd/mbbsd.c
diff options
context:
space:
mode:
Diffstat (limited to 'mbbsd/mbbsd.c')
-rw-r--r--mbbsd/mbbsd.c18
1 files changed, 14 insertions, 4 deletions
diff --git a/mbbsd/mbbsd.c b/mbbsd/mbbsd.c
index 1b932dad..c0455df1 100644
--- a/mbbsd/mbbsd.c
+++ b/mbbsd/mbbsd.c
@@ -510,8 +510,8 @@ inline static void mkuserdir(char *userid)
static void
login_query()
{
-#ifdef GB_CONVERT
- /* uid 加一位, for gb login */
+#ifdef CONVERT
+ /* uid 加一位, for converting login */
char uid[IDLEN + 2], passbuf[PASSLEN];
int attempts, len;
#else
@@ -545,11 +545,15 @@ login_query()
getdata(20, 0, "請輸入代號,或以[guest]參觀,以[new]註冊:",
uid, sizeof(uid), DOECHO);
-#ifdef GB_CONVERT
+#ifdef CONVERT
/* switch to gb mode if uid end with '.' */
len = strlen(uid);
if (uid[0] && uid[len - 1] == '.') {
- set_converting_type(1);
+ set_converting_type(GBCONVERT);
+ uid[len - 1] = 0;
+ }
+ else if (uid[0] && uid[len - 1] == ',') {
+ set_converting_type(UCSCONVERT);
uid[len - 1] = 0;
}
else if (len >= IDLEN + 1)
@@ -1258,6 +1262,12 @@ main(int argc, char *argv[], char *envp[])
signal(SIGUSR2, SIG_IGN);
attach_SHM();
+#ifdef CONVERT
+/* initiate the converting object before fork()
+ * to avoid copy on write each time */
+ ucs_converting_init();
+#endif
+
if( (argc == 3 && shell_login(argc, argv, envp)) ||
(argc != 3 && daemon_login(argc, argv, envp)) )
start_client();