remove deep_copy function, rename initncurses to initcurses

git-svn-id: svn://katsu.triplehelix.org/dgamelaunch/trunk@169 db0b04b0-f4d1-0310-9a6d-de3e77497b0e

diff --git a/dgamelaunch.c b/dgamelaunch.c
index 3fe31b45ec15437b2a767cd8b32c153358b0ad46..c624fae461b29eaf857ef7f99b86f6ed418b8efb 100644 (file)
--- a/dgamelaunch.c
+++ b/dgamelaunch.c
@@ -539,7 +539,7 @@ inprogressmenu ()
               refresh ();
               endwin ();
               ttyplay_main (ttyrecname, 1, 0);
-              initncurses ();
+              initcurses ();
             }
         }
 
@@ -748,11 +748,14 @@ freefile ()
   /* free existing mem, clear existing entries */
   for (i = 0; i < f_num; i++)
     {
-      free (users[i]->password);
-      free (users[i]->username);
-      free (users[i]->email);
-      free (users[i]->env);
-      free (users[i]);
+      if (users[i] != me)
+      {
+       free (users[i]->password);
+       free (users[i]->username);
+       free (users[i]->email);
+       free (users[i]->env);
+       free (users[i]);
+      }
     }
 
   if (users)
@@ -765,7 +768,7 @@ freefile ()
 /* ************************************************************* */
 
 void
-initncurses ()
+initcurses ()
 {
   initscr ();
   cbreak ();
@@ -777,20 +780,6 @@ initncurses ()
 
 /* ************************************************************* */
 
-struct dg_user *
-deep_copy (struct dg_user *src)
-{
-  struct dg_user *dest = malloc (sizeof (struct dg_user));
-
-  dest->username = strdup (src->username);
-  dest->email = strdup (src->email);
-  dest->env = strdup (src->env);
-  dest->password = strdup (src->password);
-  dest->flags = src->flags;
-
-  return dest;
-}
-
 void
 loginprompt ()
 {
@@ -826,7 +815,7 @@ loginprompt ()
 
       if ((me_index = userexist (user_buf)) != -1)
         {
-          me = deep_copy (users[me_index]);
+          me = users[me_index];
           error = 0;
         }
     }
@@ -1457,7 +1446,7 @@ main (int argc, char** argv)
   if (readfile (0))
     graceful_exit (110);
 
-  initncurses ();
+  initcurses ();
   while ((userchoice != 'p') | (!loggedin))
     {
       drawmenu ();

diff --git a/dgamelaunch.h b/dgamelaunch.h
index 0f7a13552a8f7b6ae82bd42655d76287246b5b02..48bf81602ba09b47284827768ae23331642261b4 100644 (file)
--- a/dgamelaunch.h
+++ b/dgamelaunch.h
@@ -71,8 +71,7 @@ extern int changepw (void);
 extern void domailuser (char *username);
 extern void drawmenu (void);
 extern void freefile (void);
-extern void initncurses (void);
-extern struct dg_user *deep_copy (struct dg_user *src);
+extern void initcurses (void);
 extern void loginprompt (void);
 extern void newuser (void);
 extern int passwordgood (char *cpw);

diff --git a/ee.c b/ee.c
index d062b3e1d0512de625dccefeeeaa9b7fec8b2f28..9c8bb176ec0d290da72b410e48277dca5a67a278 100644 (file)
--- a/ee.c
+++ b/ee.c
@@ -49,7 +49,7 @@
  |     proprietary information which is protected by
  |     copyright.  All rights are reserved.
  |
- |     $Header: /var/cvs/dgamelaunch/ee.c,v 1.8 2004/01/26 08:09:39 joshk Exp $
+ |     $Header: /var/cvs/dgamelaunch/ee.c,v 1.9 2004/01/26 08:29:04 joshk Exp $
  |
  */
 
@@ -62,7 +62,7 @@ char *ee_long_notice[] = {
        "copyright.  All rights are reserved."
        };
 
-char *version = "@(#) ee, version 1.4.1  $Revision: 1.8 $";
+char *version = "@(#) ee, version 1.4.1  $Revision: 1.9 $";
 
 #include <curses.h>
 #include <signal.h>
@@ -2846,14 +2846,13 @@ struct menu_entries menu_list[];
                if (input == -1)
                        exit(0);
 
-               if (((tolower(input) >= 'a') && (tolower(input) <= 'z')) || 
-                   ((input >= '0') && (input <= '9')))
+               if (isalnum(tolower(input)))
                {
-                       if ((tolower(input) >= 'a') && (tolower(input) <= 'z'))
+                       if (isalpha(tolower(input)))
                        {
                                temp = 1 + tolower(input) - 'a';
                        }
-                       else if ((input >= '0') && (input <= '9'))
+                       else if (isdigit(input))
                        {
                                temp = (2 + 'z' - 'a') + (input - '0');
                        }

diff --git a/ttyplay.c b/ttyplay.c
index d57d8a10a504493528d6c375773834ef87d161d3..b01f9f35be8d3e086b33231e9075a3a0d6781d5d 100644 (file)
--- a/ttyplay.c
+++ b/ttyplay.c
@@ -47,7 +47,7 @@
 #include "stripgfx.h"
 
 extern void domailuser (char *);
-extern void initncurses (void);
+extern void initcurses (void);
 extern char *chosen_name;
 extern int loggedin;
 
@@ -208,7 +208,7 @@ ttypread (FILE * fp, Header * h, char **buf, int pread)
             case 'm':
               if (loggedin)
                 {
-                  initncurses ();
+                  initcurses ();
                   domailuser (chosen_name);
                  /* XXX jilles: just quit out after mail for now */
 #if 0