Patches from Matt with slight mod from me to do without strlen. Also modified lprintf...

[citadel.git] / citadel / routines.c

diff --git a/citadel/routines.c b/citadel/routines.c
index 6e509e3350c8d95602aec2095eeb12b3755fcbd4..30db9a5ce161671d2e6bc7cb987d78d1c8d531ce 100644 (file)
--- a/citadel/routines.c
+++ b/citadel/routines.c
@@ -59,7 +59,7 @@ struct utmp *getutline(struct utmp *ut);
 #define IFNAIDE if (axlevel<6)
 
 extern unsigned userflags;
-extern char *axdefs[7];
+//extern char *axdefs[8];
 extern char sigcaught;
 extern char rc_floor_mode;
 extern int rc_ansi_color;
@@ -84,7 +84,7 @@ void hit_any_key(CtdlIPC *ipc) {      /* hit any key to continue */
        color(COLOR_POP);
        stty_ctdl(0);
        b=inkey();
-       for (a=0; !IsEmptyStr(&ipc->ServInfo.moreprompt[0]); ++a)
+       for (a=0; !IsEmptyStr(&ipc->ServInfo.moreprompt[a]); ++a)
                scr_putc(' ');
        scr_putc(13);
        stty_ctdl(1);
@@ -159,7 +159,10 @@ void edituser(CtdlIPC *ipc, int cmd)
 
        if (cmd == 96) {
                scr_printf("Do you want to delete this user? ");
-               if (!yesno()) return;
+               if (!yesno()) {
+                       free(user);
+                       return;
+               }
                user->axlevel = 0;
        }