diff --git a/ChangeLog b/ChangeLog index b883f08e..56df0c43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,10 @@ v0.39.9 29-Jan-2004 Added experimental code for telnet outbound connections. This code is not compiled by default so don't worry or bother. + mbsetup: + Clearing the working message is now only done by the keyboard + read function. + v0.39.8 26-Jan-2004 - 29-Jan-2004 diff --git a/html/index.htm.in b/html/index.htm.in index 6a5c7d7f..4d4365d6 100644 --- a/html/index.htm.in +++ b/html/index.htm.in @@ -16,7 +16,7 @@
MBSE

MBSE BBS System Guide @VERSION@

-
Last update 21-Jan-2004
+
Last update 01-Feb-2004

Introduction

@@ -108,8 +108,6 @@
  • mbsetup, The setup program
  • mbstat, The bbs status change program
  • mbtask, The taskmanager for the bbs system
    • -
  • mbtelnetd, The incoming telnet proxy
    • -
  • mbtelind, The telnet input proxy daemon
  • mbtoberep, The toberep.data lister
  • mbuser, The userbase maintenance program
  • mbuseradd, The useradd wrapper
    • diff --git a/html/programs/index.htm b/html/programs/index.htm index d72b74b9..5d39b69a 100644 --- a/html/programs/index.htm +++ b/html/programs/index.htm @@ -14,7 +14,7 @@
    -
    Last update 26-Nov-2003
    +
    Last update 01-Feb-2004

    MBSE BBS Programs.

    diff --git a/mbcico/opentcp.c b/mbcico/opentcp.c index 2a6bc081..59da95f5 100644 --- a/mbcico/opentcp.c +++ b/mbcico/opentcp.c @@ -224,6 +224,12 @@ int opentcp(char *name) Syslog('s', "stdout = %d", output_pipe[1]); Syslog('s', "stdin = %d", input_pipe[0]); + if ((input_pipe[0] != 0) || (output_pipe[1] != 1)) { + WriteError("Failed to create pipes on stdin and stdout"); + return -1; + } + + Syslog('+', "Telnet I/O filters installed"); telnet_init(Fdo); /* Do we need that as originating system? */ f_flags=0; diff --git a/mbcico/session.c b/mbcico/session.c index f635b5ab..33e3588f 100644 --- a/mbcico/session.c +++ b/mbcico/session.c @@ -124,7 +124,7 @@ int session(faddr *a, node *nl, int role, int tp, char *dt) * since it's now on stadin and stdout. */ Fdo = dup(0); - Syslog('s', "session: new socket %s", Fdo); + Syslog('s', "session: new socket %d", Fdo); /* * Close stdin and stdout so that when we create the pipes to @@ -188,6 +188,11 @@ int session(faddr *a, node *nl, int role, int tp, char *dt) Syslog('s', "stdout = %d", output_pipe[1]); Syslog('s', "stdin = %d", input_pipe[0]); + if ((input_pipe[0] != 0) || (output_pipe[1] != 1)) { + WriteError("Failed to create pipes on stdin and stdout"); + die(MBERR_TTYIO_ERROR); + } + Syslog('+', "Telnet I/O filters installed"); telnet_init(Fdo); } #endif diff --git a/mbsetup/ledit.c b/mbsetup/ledit.c index d38672c4..a21ff34c 100644 --- a/mbsetup/ledit.c +++ b/mbsetup/ledit.c @@ -4,7 +4,7 @@ * Purpose ...............: Line Editor * ***************************************************************************** - * Copyright (C) 1997-2002 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -371,7 +371,6 @@ char *select_show(int max) } working(2, 0, 0); - working(0, 0, 0); } return menu; @@ -424,7 +423,6 @@ char *select_record(int max, int items) break; working(2, 0, 0); - working(0, 0, 0); } return menu; @@ -575,7 +573,6 @@ char *select_pick(int max, int items) break; working(2, 0, 0); - working(0, 0, 0); } return menu; @@ -688,7 +685,6 @@ int select_menu_sub(int max, int items, char *hlp) return pick; working(2, 0, 0); - working(0, 0, 0); } } @@ -842,7 +838,6 @@ char *edit_jam(int y, int x, int l, char *line, char *help) } free(from); free(too); - working(0, 0, 0); } else if (strlen(s) == 0) { /* * If no new path, report diff --git a/mbsetup/m_archive.c b/mbsetup/m_archive.c index eb83b8f5..d1d3b3e6 100644 --- a/mbsetup/m_archive.c +++ b/mbsetup/m_archive.c @@ -4,7 +4,7 @@ * Purpose ...............: Setup Archive structure. * ***************************************************************************** - * Copyright (C) 1997-2003 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -536,7 +536,6 @@ int EditArchRec(int Area) fclose(fil); crc = 0xffffffff; crc = upd_crc32((char *)&archiver, crc, sizeof(archiver)); - working(0, 0, 0); set_color(WHITE, BLACK); mvprintw( 5, 2, "3. EDIT ARCHIVER"); @@ -585,7 +584,6 @@ int EditArchRec(int Area) fclose(fil); ArchUpdated = 1; working(1, 0, 0); - working(0, 0, 0); } } IsDoing("Browsing Menu"); @@ -636,7 +634,6 @@ void EditArchive(void) working(2, 0, 0); return; } - working(0, 0, 0); o = 0; for (;;) { @@ -688,7 +685,6 @@ void EditArchive(void) working(3, 0, 0); } else working(2, 0, 0); - working(0, 0, 0); } if (strncmp(pick, "N", 1) == 0) @@ -740,7 +736,6 @@ char *PickArchive(char *shdr) return Arch; } - working(0, 0, 0); clr_index(); set_color(WHITE, BLACK); diff --git a/mbsetup/m_bbslist.c b/mbsetup/m_bbslist.c index add8585f..90b86e3c 100644 --- a/mbsetup/m_bbslist.c +++ b/mbsetup/m_bbslist.c @@ -4,7 +4,7 @@ * Purpose ...............: Setup BBS lists. * ***************************************************************************** - * Copyright (C) 1997-2002 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -219,7 +219,6 @@ int EditBBSlistRec(int Area) fclose(fil); crc = 0xffffffff; crc = upd_crc32((char *)&bbs, crc, sizeof(bbs)); - working(0, 0, 0); set_color(WHITE, BLACK); mvprintw( 4, 1, "8.6.1 EDIT BBSLIST"); @@ -283,7 +282,6 @@ int EditBBSlistRec(int Area) fclose(fil); BBSlistUpdated = 1; working(1, 0, 0); - working(0, 0, 0); } } IsDoing("Browsing Menu"); @@ -352,7 +350,6 @@ void EditBBSlist(void) working(2, 0, 0); return; } - working(0, 0, 0); o = 0; for (;;) { @@ -390,7 +387,6 @@ void EditBBSlist(void) fclose(fil); } } - working(0, 0, 0); strcpy(pick, select_record(records,20)); if (strncmp(pick, "-", 1) == 0) { @@ -405,7 +401,6 @@ void EditBBSlist(void) working(1, 0, 0); } else working(2, 0, 0); - working(0, 0, 0); } if (strncmp(pick, "N", 1) == 0) @@ -467,7 +462,6 @@ void PurgeBBSlist(void) if (!bbs.Available) iCount++; } - working(0, 0, 0); sprintf(temp, "%d records, %d records to purge", recno, iCount); mvprintw(7, 6, temp); @@ -491,7 +485,6 @@ void PurgeBBSlist(void) if ((rename("tmp.1", sFileName)) != 0) working(2, 0, 0); unlink("tmp.1"); - working(0, 0, 0); } } diff --git a/mbsetup/m_domain.c b/mbsetup/m_domain.c index 5ce601d2..35b614d8 100644 --- a/mbsetup/m_domain.c +++ b/mbsetup/m_domain.c @@ -4,7 +4,7 @@ * Purpose ...............: Domain Setup * ***************************************************************************** - * Copyright (C) 1997-2002 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -260,7 +260,6 @@ int EditDomainRec(int Area) fclose(fil); crc = 0xffffffff; crc = upd_crc32((char *)&domtrans, crc, domainhdr.recsize); - working(0, 0, 0); for (;;) { DomainScreen(); @@ -285,7 +284,6 @@ int EditDomainRec(int Area) fwrite(&domtrans, domainhdr.recsize, 1, fil); fclose(fil); DomainUpdated = 1; - working(0, 0, 0); } } IsDoing("Browsing Menu"); @@ -331,7 +329,6 @@ void EditDomain(void) working(2, 0, 0); return; } - working(0, 0, 0); o = 0; for (;;) { @@ -366,7 +363,6 @@ void EditDomain(void) fclose(fil); } } - working(0, 0, 0); strcpy(pick, select_menurec(records)); if (strncmp(pick, "-", 1) == 0) { @@ -382,7 +378,6 @@ void EditDomain(void) working(1, 0, 0); } else working(2, 0, 0); - working(0, 0, 0); } if (strncmp(pick, "D", 1) == 0) { diff --git a/mbsetup/m_farea.c b/mbsetup/m_farea.c index a7e70a6d..d7de0256 100644 --- a/mbsetup/m_farea.c +++ b/mbsetup/m_farea.c @@ -4,7 +4,7 @@ * Purpose ...............: File Setup Program * ***************************************************************************** - * Copyright (C) 1997-2002 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -277,7 +277,6 @@ int EditFileRec(int Area) fclose(fil); crc = 0xffffffff; crc = upd_crc32((char *)&area, crc, areahdr.recsize); - working(0, 0, 0); FileScreen(); for (;;) { @@ -326,7 +325,6 @@ int EditFileRec(int Area) fclose(fil); FileUpdated = 1; Syslog('+', "Updated file area %d", Area); - working(0, 0, 0); } } IsDoing("Browsing Menu"); @@ -361,7 +359,6 @@ int EditFileRec(int Area) Force = TRUE; FileForced = TRUE; Syslog('+', "Moved %d files", count); - working(0, 0, 0); } } break; @@ -486,7 +483,6 @@ void EditFilearea(void) working(2, 0, 0); return; } - working(0, 0, 0); o = 0; if (! check_free()) return; @@ -526,7 +522,6 @@ void EditFilearea(void) fclose(fil); } } - working(0, 0, 0); strcpy(pick, select_filearea(records, 20)); if (strncmp(pick, "-", 1) == 0) { @@ -542,7 +537,6 @@ void EditFilearea(void) working(1, 0, 0); } else working(2, 0, 0); - working(0, 0, 0); } if (strncmp(pick, "M", 1) == 0) { @@ -641,7 +635,6 @@ void EditFilearea(void) Syslog('+', "Updated %d ticareas", count); } Syslog('+', "Moved filearea %d to %d", from, too); - working(0, 0, 0); } } fclose(fil); @@ -686,7 +679,6 @@ long PickFilearea(char *shdr) return 0; } - working(0, 0, 0); for (;;) { clr_index(); @@ -724,7 +716,6 @@ long PickFilearea(char *shdr) fclose(fil); } } - working(0, 0, 0); strcpy(pick, select_pick(records, 20)); if (strncmp(pick, "-", 1) == 0) diff --git a/mbsetup/m_fdb.c b/mbsetup/m_fdb.c index 1285e7c5..d0c8c544 100644 --- a/mbsetup/m_fdb.c +++ b/mbsetup/m_fdb.c @@ -4,7 +4,7 @@ * Purpose ...............: Edit Files DataBase. * ***************************************************************************** - * Copyright (C) 1999-2002 + * Copyright (C) 1999-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -199,7 +199,6 @@ void E_F(long areanr) y++; } } - working(0, 0, 0); if (records) if (records > 10) @@ -291,7 +290,6 @@ void EditFDB() working(2, 0, 0); return; } - working(0, 0, 0); o = 0; for (;;) { @@ -329,7 +327,6 @@ void EditFDB() fclose(fil); } } - working(0, 0, 0); strcpy(pick, select_pick(records, 20)); if (strncmp(pick, "-", 1) == 0) { diff --git a/mbsetup/m_ff.c b/mbsetup/m_ff.c index a1e31695..68d5ce65 100644 --- a/mbsetup/m_ff.c +++ b/mbsetup/m_ff.c @@ -4,7 +4,7 @@ * Purpose ...............: Filefind Setup * ***************************************************************************** - * Copyright (C) 1997-2002 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -261,7 +261,6 @@ int EditFfRec(int Area) fclose(fil); crc = 0xffffffff; crc = upd_crc32((char *)&scanmgr, crc, scanmgrhdr.recsize); - working(0, 0, 0); for (;;) { FFScreen(); @@ -294,7 +293,6 @@ int EditFfRec(int Area) fwrite(&scanmgr, scanmgrhdr.recsize, 1, fil); fclose(fil); FilefindUpdated = 1; - working(0, 0, 0); } } IsDoing("Browsing Menu"); @@ -349,7 +347,6 @@ void EditFilefind(void) working(2, 0, 0); return; } - working(0, 0, 0); o = 0; for (;;) { @@ -387,7 +384,6 @@ void EditFilefind(void) fclose(fil); } } - working(0, 0, 0); strcpy(pick, select_record(records, 20)); if (strncmp(pick, "-", 1) == 0) { @@ -402,7 +398,6 @@ void EditFilefind(void) working(1, 0, 0); } else working(2, 0, 0); - working(0, 0, 0); } if (strncmp(pick, "N", 1) == 0) diff --git a/mbsetup/m_fgroup.c b/mbsetup/m_fgroup.c index 1f5d5ff3..eca36f3e 100644 --- a/mbsetup/m_fgroup.c +++ b/mbsetup/m_fgroup.c @@ -4,7 +4,7 @@ * Purpose ...............: Setup FGroups. * ***************************************************************************** - * Copyright (C) 1997-2002 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -253,7 +253,6 @@ int CheckFgroup(void) working(1, 0, 0); ncnt = GroupInNode(fgroup.Name, FALSE); tcnt = GroupInTic(fgroup.Name); - working(0, 0, 0); if (ncnt || tcnt) { errmsg((char *)"Error, %d node(s) and/or %d tic area(s) connected", ncnt, tcnt); return TRUE; @@ -341,7 +340,6 @@ int EditFGrpRec(int Area) fclose(fil); crc = 0xffffffff; crc = upd_crc32((char *)&fgroup, crc, sizeof(fgroup)); - working(0, 0, 0); FgScreen(); for (;;) { @@ -403,7 +401,6 @@ int EditFGrpRec(int Area) fclose(fil); FGrpUpdated = 1; working(1, 0, 0); - working(0, 0, 0); } } IsDoing("Browsing Menu"); @@ -523,7 +520,6 @@ void EditFGroup(void) working(2, 0, 0); return; } - working(0, 0, 0); o = 0; if (! check_free()) return; @@ -563,7 +559,6 @@ void EditFGroup(void) fclose(fil); } } - working(0, 0, 0); strcpy(pick, select_record(records, 20)); if (strncmp(pick, "-", 1) == 0) { @@ -580,7 +575,6 @@ void EditFGroup(void) working(1, 0, 0); } else working(2, 0, 0); - working(0, 0, 0); } else { errmsg("Cannot add group, change global setting in menu 1.11.5"); } @@ -635,7 +629,6 @@ char *PickFGroup(char *shdr) return FGrp; } - working(0, 0, 0); for (;;) { clr_index(); @@ -673,7 +666,6 @@ char *PickFGroup(char *shdr) fclose(fil); } } - working(0, 0, 0); strcpy(pick, select_pick(records, 20)); if (strncmp(pick, "-", 1) == 0) { diff --git a/mbsetup/m_fido.c b/mbsetup/m_fido.c index 7aa07e62..c05850e1 100644 --- a/mbsetup/m_fido.c +++ b/mbsetup/m_fido.c @@ -4,7 +4,7 @@ * Purpose ...............: Setup Fidonet structure. * ***************************************************************************** - * Copyright (C) 1997-2002 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -253,7 +253,6 @@ int EditFidoRec(int Area) fclose(fil); crc = 0xffffffff; crc = upd_crc32((char *)&fidonet, crc, sizeof(fidonet)); - working(0, 0, 0); set_color(WHITE, BLACK); mvprintw( 5, 6, "2. EDIT FIDONET NETWORK"); @@ -311,7 +310,6 @@ int EditFidoRec(int Area) fclose(fil); FidoUpdated = 1; working(1, 0, 0); - working(0, 0, 0); } } IsDoing("Browsing Menu"); @@ -338,7 +336,6 @@ int EditFidoRec(int Area) (char *)"The top ^fidonet aka^ for this nodelist (zone:net/node)")); if ((strstr(temp, ":") == NULL) || (strstr(temp, "/") == NULL)) { working(2, 0, 0); - working(0, 0, 0); } } while ((strstr(temp, ":") == NULL) || (strstr(temp, "/") == NULL)); fidonet.seclist[j-6].zone = atoi(strtok(temp, ":")); @@ -391,7 +388,6 @@ void EditFidonet(void) } IsDoing("Browsing Menu"); - working(0, 0, 0); if (! check_free()) return; @@ -442,7 +438,6 @@ void EditFidonet(void) working(1, 0, 0); } else working(2, 0, 0); - working(0, 0, 0); } if ((atoi(pick) >= 1) && (atoi(pick) <= records)) diff --git a/mbsetup/m_global.c b/mbsetup/m_global.c index f459fdb1..d81ccc3d 100644 --- a/mbsetup/m_global.c +++ b/mbsetup/m_global.c @@ -112,9 +112,7 @@ int cf_open(void) clr_index(); working(1, 0, 0); IsDoing("Edit Global"); - working(1, 0, 0); if (0 == config_read()) { - working(0, 0, 0); return 0; } @@ -129,7 +127,6 @@ void cf_close(void) working(1, 0, 0); if (config_write() != 0) working(2, 0, 0); - working(0, 0, 0); } @@ -733,7 +730,6 @@ void e_ticconf(void) CFG.tic_systems = temp; if ((OpenTicarea() == 0)) CloseTicarea(TRUE); - working(0, 0, 0); } break; case 5: temp = CFG.tic_groups; @@ -745,7 +741,6 @@ void e_ticconf(void) CFG.tic_groups = temp; if ((OpenNoderec() == 0)) CloseNoderec(TRUE); - working(0, 0, 0); } break; case 6: E_INT( 12,18, CFG.tic_dupes, "Enter the maximum number of ^dupes^ in the dupe database.") @@ -845,7 +840,6 @@ void e_fidomailcfg(void) CFG.toss_systems = temp; if ((OpenMsgarea() == 0)) CloseMsgarea(TRUE); - working(0, 0, 0); } break; case 12:temp = CFG.toss_groups; @@ -857,7 +851,6 @@ void e_fidomailcfg(void) CFG.toss_groups = temp; if ((OpenNoderec() == 0)) CloseNoderec(TRUE); - working(0, 0, 0); } break; case 13:E_BOOL(12,58, CFG.addr4d, "Use ^4d^ addressing instead of ^5d^ addressing.") @@ -1064,7 +1057,6 @@ void e_newfiles(void) CFG.new_groups = temp; if (OpenNewfiles() == 0) CloseNewfiles(TRUE); - working(0, 0, 0); } break; } diff --git a/mbsetup/m_hatch.c b/mbsetup/m_hatch.c index 242fb647..dd595955 100644 --- a/mbsetup/m_hatch.c +++ b/mbsetup/m_hatch.c @@ -4,7 +4,7 @@ * Purpose ...............: Hatch Setup * ***************************************************************************** - * Copyright (C) 1997-2002 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -359,7 +359,6 @@ int EditHatchRec(int Area) fclose(fil); crc = 0xffffffff; crc = upd_crc32((char *)&hatch, crc, hatchhdr.recsize); - working(0, 0, 0); for (;;) { HatchScreen(); @@ -428,7 +427,6 @@ int EditHatchRec(int Area) fwrite(&hatch, hatchhdr.recsize, 1, fil); fclose(fil); HatchUpdated = 1; - working(0, 0, 0); } } IsDoing("Browsing Menu"); @@ -479,7 +477,6 @@ void EditHatch(void) working(2, 0, 0); return; } - working(0, 0, 0); o = 0; for (;;) { @@ -517,7 +514,6 @@ void EditHatch(void) fclose(fil); } } - working(0, 0, 0); strcpy(pick, select_record(records, 20)); if (strncmp(pick, "-", 1) == 0) { @@ -532,7 +528,6 @@ void EditHatch(void) working(1, 0, 0); } else working(2, 0, 0); - working(0, 0, 0); } if (strncmp(pick, "N", 1) == 0) diff --git a/mbsetup/m_lang.c b/mbsetup/m_lang.c index 69ca37e5..0aaf942e 100644 --- a/mbsetup/m_lang.c +++ b/mbsetup/m_lang.c @@ -4,7 +4,7 @@ * Purpose ...............: Setup Languages. * ***************************************************************************** - * Copyright (C) 1997-2003 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -323,7 +323,6 @@ int EditLangRec(int Area) fclose(fil); crc = 0xffffffff; crc = upd_crc32((char *)&lang, crc, sizeof(lang)); - working(0, 0, 0); s_lang(); for (;;) { @@ -354,7 +353,6 @@ int EditLangRec(int Area) fclose(fil); LangUpdated = 1; working(1, 0, 0); - working(0, 0, 0); } } IsDoing("Browsing Menu"); @@ -402,7 +400,6 @@ void EditLanguage(void) working(2, 0, 0); return; } - working(0, 0, 0); for (;;) { clr_index(); @@ -446,7 +443,6 @@ void EditLanguage(void) working(1, 0, 0); } else working(2, 0, 0); - working(0, 0, 0); } if ((atoi(pick) >= 1) && (atoi(pick) <= records)) @@ -488,7 +484,6 @@ int PickLanguage(char *nr) return Lang; } - working(0, 0, 0); clr_index(); set_color(WHITE, BLACK); diff --git a/mbsetup/m_limits.c b/mbsetup/m_limits.c index e1ba1a21..de08dc94 100644 --- a/mbsetup/m_limits.c +++ b/mbsetup/m_limits.c @@ -4,7 +4,7 @@ * Purpose ...............: Setup Limits. * ***************************************************************************** - * Copyright (C) 1997-2002 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -295,7 +295,6 @@ int EditLimRec(int Area) fclose(fil); crc = 0xffffffff; crc = upd_crc32((char *)&LIMIT, crc, sizeof(LIMIT)); - working(0, 0, 0); set_color(WHITE, BLACK); mvprintw( 5, 6, "8.1 EDIT SECURITY LIMIT"); @@ -334,7 +333,6 @@ int EditLimRec(int Area) fclose(fil); LimUpdated = 1; working(1, 0, 0); - working(0, 0, 0); } } IsDoing("Browsing Menu"); @@ -380,7 +378,6 @@ void EditLimits(void) working(2, 0, 0); return; } - working(0, 0, 0); for (;;) { clr_index(); @@ -428,7 +425,6 @@ void EditLimits(void) working(1, 0, 0); } else working(2, 0, 0); - working(0, 0, 0); } if ((atoi(pick) >= 1) && (atoi(pick) <= records)) @@ -470,7 +466,6 @@ char *PickLimits(int nr) return Lim; } - working(0, 0, 0); clr_index(); set_color(WHITE, BLACK); diff --git a/mbsetup/m_magic.c b/mbsetup/m_magic.c index 862b751d..a122ffbe 100644 --- a/mbsetup/m_magic.c +++ b/mbsetup/m_magic.c @@ -4,7 +4,7 @@ * Purpose ...............: Edit Magics * ***************************************************************************** - * Copyright (C) 1997-2002 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -307,7 +307,6 @@ int EditMagicRec(int Area) fclose(fil); crc = 0xffffffff; crc = upd_crc32((char *)&magic, crc, sizeof(magic)); - working(0, 0, 0); for (;;) { ScreenM(); @@ -343,7 +342,6 @@ int EditMagicRec(int Area) fwrite(&magic, sizeof(magic), 1, fil); fclose(fil); MagicUpdated = 1; - working(0, 0, 0); } } IsDoing("Browsing Menu"); @@ -409,7 +407,6 @@ void EditMagics(void) working(2, 0, 0); return; } - working(0, 0, 0); o = 0; for (;;) { @@ -447,7 +444,6 @@ void EditMagics(void) fclose(fil); } } - working(0, 0, 0); strcpy(pick, select_record(records, 20)); if (strncmp(pick, "-", 1) == 0) { @@ -462,7 +458,6 @@ void EditMagics(void) working(1, 0, 0); } else working(2, 0, 0); - working(0, 0, 0); } if (strncmp(pick, "N", 1) == 0) diff --git a/mbsetup/m_marea.c b/mbsetup/m_marea.c index 26d5d7ff..1dc1f4c6 100644 --- a/mbsetup/m_marea.c +++ b/mbsetup/m_marea.c @@ -4,7 +4,7 @@ * Purpose ...............: Message Areas Setup * ***************************************************************************** - * Copyright (C) 1997-2003 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -541,9 +541,6 @@ long LoadMsgRec(int Area, int work) sysconnect System; int i; - if (work) - working(1, 0, 0); - sprintf(mfile, "%s/etc/mareas.temp", getenv("MBSE_ROOT")); if ((fil = fopen(mfile, "r")) == NULL) { working(2, 0, 0); @@ -573,8 +570,6 @@ long LoadMsgRec(int Area, int work) MsgCrc = upd_crc32((char *)&System, MsgCrc, sizeof(sysconnect)); } fclose(fil); - if (work) - working(0, 0, 0); return offset; } @@ -615,8 +610,6 @@ int SaveMsgRec(int Area, int work) fclose(fil); fclose(tfil); tfil = NULL; - if (work) - working(0, 0, 0); return 0; } @@ -669,7 +662,6 @@ void MsgGlobal(void) fclose(fil); sort_grlist(&mgr); } - working(0, 0, 0); /* * Initialize some variables @@ -995,7 +987,6 @@ void MsgGlobal(void) tfil = NULL; } - working(0, 0, 0); mvprintw(LINES -3, 6,"Made %d changes in %d possible areas", Done, Total); (void)readkey(LINES -3, 50, LIGHTGRAY, BLACK); if (Done) @@ -1362,7 +1353,6 @@ void EditMsgarea(void) working(2, 0, 0); return; } - working(0, 0, 0); o = 0; if (! check_free()) return; @@ -1398,7 +1388,6 @@ void EditMsgarea(void) fclose(fil); } } - working(0, 0, 0); strcpy(pick, select_area(records, 10)); if (strncmp(pick, "-", 1) == 0) { @@ -1414,7 +1403,6 @@ void EditMsgarea(void) working(1, 0, 0); } else working(2, 0, 0); - working(0, 0, 0); } if (strncmp(pick, "G", 1) == 0) { @@ -1526,7 +1514,6 @@ char *PickMsgarea(char *shdr) return '\0'; } - working(0, 0, 0); for (;;) { clr_index(); @@ -1565,7 +1552,6 @@ char *PickMsgarea(char *shdr) fclose(fil); } } - working(0, 0, 0); strcpy(pick, select_pick(records, 20)); if (strncmp(pick, "-", 1) == 0) diff --git a/mbsetup/m_menu.c b/mbsetup/m_menu.c index b1445e6b..f7cced98 100644 --- a/mbsetup/m_menu.c +++ b/mbsetup/m_menu.c @@ -4,7 +4,7 @@ * Purpose ...............: Edit BBS menus * ***************************************************************************** - * Copyright (C) 1997-2003 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -88,7 +88,6 @@ char *select_menurec(int max) break; working(2, 0, 0); - working(0, 0, 0); } return menu; } @@ -259,56 +258,48 @@ void Edit_A_Menu(void) E_STR(17,16,14, menus.DoorName, (char *)"The ^name^ of the door to show to the users") } else { working(2, 0, 0); - working(0, 0, 0); } break; case 11:if (le_int(menus.MenuType) == 7) { menus.Y2Kdoorsys = edit_bool(18,16, menus.Y2Kdoorsys, (char *)"Create ^door.sys^ with 4 digit yearnumbers"); } else { working(2, 0, 0); - working(0, 0, 0); } break; case 12:if (le_int(menus.MenuType) == 7) { menus.NoDoorsys = edit_bool(13,58, menus.NoDoorsys, (char *)"Suppress writing ^door.sys^ dropfile"); } else { working(2, 0, 0); - working(0, 0, 0); } break; case 13:if (le_int(menus.MenuType) == 7) { menus.Comport = edit_bool(14,58, menus.Comport, (char *)"Write real ^COM port^ in door.sys for Vmodem patch"); } else { working(2, 0, 0); - working(0, 0, 0); } break; case 14:if (le_int(menus.MenuType) == 7) { menus.NoSuid = edit_bool(15,58, menus.NoSuid, (char *)"Run the door as ^real user (nosuid)^"); } else { working(2, 0, 0); - working(0, 0, 0); } break; case 15:if (le_int(menus.MenuType) == 7) { menus.NoPrompt = edit_bool(16,58, menus.NoPrompt, (char *)"^Don't display prompt^ when door is finished"); } else { working(2, 0, 0); - working(0, 0, 0); } break; case 16:if (le_int(menus.MenuType) == 7) { menus.SingleUser = edit_bool(17,58, menus.SingleUser, (char *)"Set if door is for ^single user^ only"); } else { working(2, 0, 0); - working(0, 0, 0); } break; case 17:if (le_int(menus.MenuType) == 7) { menus.HideDoor = edit_bool(18,58, menus.HideDoor, (char *)"^Hide door^ from user display lists"); } else { working(2, 0, 0); - working(0, 0, 0); } break; } @@ -385,7 +376,6 @@ void EditMenu(char *Name) } } - working(0, 0, 0); strcpy(pick, select_menurec(records)); if (strncmp(pick, "-", 1) == 0) { @@ -405,7 +395,6 @@ void EditMenu(char *Name) fclose(fil); chmod(temp, 0640); } - working(0, 0, 0); } } fclose(tmp); @@ -421,7 +410,6 @@ void EditMenu(char *Name) fseek(tmp, 0, SEEK_END); fwrite(&menus, sizeof(menus), 1, tmp); records++; - working(0, 0, 0); } if (strncmp(pick, "D", 1) == 0) { @@ -497,7 +485,6 @@ void EditMenu(char *Name) fseek(tmp, offset, SEEK_SET); fwrite(&menus, sizeof(menus), 1, tmp); MenuUpdated = TRUE; - working(0, 0, 0); } } } @@ -533,7 +520,6 @@ void EditMenus(void) } } closedir(dp); - working(0, 0, 0); } set_color(WHITE, BLACK); diff --git a/mbsetup/m_mgroup.c b/mbsetup/m_mgroup.c index 9cbec8bd..82b16697 100644 --- a/mbsetup/m_mgroup.c +++ b/mbsetup/m_mgroup.c @@ -4,7 +4,7 @@ * Purpose ...............: Setup MGroups. * ***************************************************************************** - * Copyright (C) 1997-2002 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -281,7 +281,6 @@ int CheckMgroup(void) working(1, 0, 0); ncnt = GroupInNode(mgroup.Name, TRUE); mcnt = GroupInMarea(mgroup.Name); - working(0, 0, 0); if (ncnt || mcnt) { errmsg((char *)"Error, %d node(s) and/or %d message area(s) connected", ncnt, mcnt); return TRUE; @@ -322,7 +321,6 @@ int EditMGrpRec(int Area) fclose(fil); crc = 0xffffffff; crc = upd_crc32((char *)&mgroup, crc, sizeof(mgroup)); - working(0, 0, 0); MgScreen(); for (;;) { @@ -369,7 +367,6 @@ int EditMGrpRec(int Area) fclose(fil); MGrpUpdated = 1; working(1, 0, 0); - working(0, 0, 0); } } IsDoing("Browsing Menu"); @@ -457,7 +454,6 @@ void EditMGroup(void) working(2, 0, 0); return; } - working(0, 0, 0); o = 0; if (! check_free()) return; @@ -497,7 +493,6 @@ void EditMGroup(void) fclose(fil); } } - working(0, 0, 0); strcpy(pick, select_record(records, 20)); if (strncmp(pick, "-", 1) == 0) { @@ -514,7 +509,6 @@ void EditMGroup(void) working(1, 0, 0); } else working(2, 0, 0); - working(0, 0, 0); } else { errmsg("Cannot add group, change global setting in menu 1.12.12"); } @@ -570,7 +564,6 @@ char *PickMGroup(char *shdr) return MGrp; } - working(0, 0, 0); for (;;) { clr_index(); @@ -608,7 +601,6 @@ char *PickMGroup(char *shdr) fclose(fil); } } - working(0, 0, 0); strcpy(pick, select_pick(records, 20)); if (strncmp(pick, "-", 1) == 0) diff --git a/mbsetup/m_modem.c b/mbsetup/m_modem.c index b10c3a3c..a10f453e 100644 --- a/mbsetup/m_modem.c +++ b/mbsetup/m_modem.c @@ -4,7 +4,7 @@ * Purpose ...............: Setup Modem structure. * ***************************************************************************** - * Copyright (C) 1997-2002 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -428,7 +428,6 @@ int EditModemRec(int Area) fclose(fil); crc = 0xffffffff; crc = upd_crc32((char *)&modem, crc, sizeof(modem)); - working(0, 0, 0); Modem_Screen(); for (;;) { @@ -466,7 +465,6 @@ int EditModemRec(int Area) fclose(fil); ModemUpdated = 1; working(1, 0, 0); - working(0, 0, 0); } } IsDoing("Browsing Menu"); @@ -530,7 +528,6 @@ void EditModem(void) working(2, 0, 0); return; } - working(0, 0, 0); for (;;) { clr_index(); @@ -579,7 +576,6 @@ void EditModem(void) working(1, 0, 0); } else working(2, 0, 0); - working(0, 0, 0); } if ((atoi(pick) >= 1) && (atoi(pick) <= records)) @@ -620,7 +616,6 @@ char *PickModem(char *shdr) return '\0'; } - working(0, 0, 0); for (;;) { clr_index(); @@ -658,7 +653,6 @@ char *PickModem(char *shdr) fclose(fil); } } - working(0, 0, 0); strcpy(pick, select_pick(records, 20)); if (strncmp(pick, "-", 1) == 0) diff --git a/mbsetup/m_new.c b/mbsetup/m_new.c index 38d6af68..57c2d714 100644 --- a/mbsetup/m_new.c +++ b/mbsetup/m_new.c @@ -4,7 +4,7 @@ * Purpose ...............: Newfiles Setup * ***************************************************************************** - * Copyright (C) 1997-2002 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -346,7 +346,6 @@ int EditNewRec(int Area) fclose(fil); crc = 0xffffffff; crc = upd_crc32((char *)&newfiles, crc, newfileshdr.recsize); - working(0, 0, 0); for (;;) { NewScreen(); @@ -400,7 +399,6 @@ int EditNewRec(int Area) fclose(fil); NewUpdated = 1; - working(0, 0, 0); } } tidy_grlist(&fgr); @@ -458,7 +456,6 @@ void EditNewfiles(void) working(2, 0, 0); return; } - working(0, 0, 0); o = 0; for (;;) { @@ -496,7 +493,6 @@ void EditNewfiles(void) fclose(fil); } } - working(0, 0, 0); strcpy(pick, select_record(records, 20)); if (strncmp(pick, "-", 1) == 0) { @@ -512,7 +508,6 @@ void EditNewfiles(void) working(1, 0, 0); } else working(2, 0, 0); - working(0, 0, 0); } else { errmsg("Cannot add, change global setting in menu 1.14.3"); } diff --git a/mbsetup/m_ngroup.c b/mbsetup/m_ngroup.c index 5392be18..9745fca2 100644 --- a/mbsetup/m_ngroup.c +++ b/mbsetup/m_ngroup.c @@ -4,7 +4,7 @@ * Purpose ...............: Setup NGroups. * ***************************************************************************** - * Copyright (C) 1997-2002 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -262,7 +262,6 @@ int EditNGrpRec(int Area) fclose(fil); crc = 0xffffffff; crc = upd_crc32((char *)&ngroup, crc, sizeof(ngroup)); - working(0, 0, 0); NgScreen(); for (;;) { @@ -289,7 +288,6 @@ int EditNGrpRec(int Area) fclose(fil); NGrpUpdated = 1; working(1, 0, 0); - working(0, 0, 0); } } IsDoing("Browsing Menu"); @@ -332,7 +330,6 @@ void EditNGroup(void) working(2, 0, 0); return; } - working(0, 0, 0); o = 0; for (;;) { @@ -370,7 +367,6 @@ void EditNGroup(void) fclose(fil); } } - working(0, 0, 0); strcpy(pick, select_record(records, 20)); if (strncmp(pick, "-", 1) == 0) { @@ -385,7 +381,6 @@ void EditNGroup(void) working(1, 0, 0); } else working(2, 0, 0); - working(0, 0, 0); } if (strncmp(pick, "N", 1) == 0) @@ -437,7 +432,6 @@ char *PickNGroup(char *shdr) return MGrp; } - working(0, 0, 0); for (;;) { clr_index(); @@ -475,7 +469,6 @@ char *PickNGroup(char *shdr) fclose(fil); } } - working(0, 0, 0); strcpy(pick, select_pick(records, 20)); if (strncmp(pick, "-", 1) == 0) diff --git a/mbsetup/m_node.c b/mbsetup/m_node.c index 0fb9b096..415e4978 100644 --- a/mbsetup/m_node.c +++ b/mbsetup/m_node.c @@ -376,7 +376,6 @@ int CheckAka(fidoaddr A) working(1, 0, 0); mcnt = NodeInMarea(A); tcnt = NodeInTic(A); - working(0, 0, 0); if (mcnt || tcnt) { errmsg((char *)"Error aka connected to %d message and/or %d tic areas", mcnt, tcnt); return TRUE; @@ -755,7 +754,6 @@ void GeneralEdit(void) if (nodes.Aka[i].zone) count += NodeInMarea(nodes.Aka[i]); if (count) { - working(0, 0, 0); errmsg((char *)"Node is connected to %d message areas", count); break; } @@ -763,7 +761,6 @@ void GeneralEdit(void) for (i = 0; i < 20; i++) if (nodes.Aka[i].zone) count += NodeInTic(nodes.Aka[i]); - working(0, 0, 0); if (count) { errmsg((char *)"Node is connected to %d tic areas", count); break; @@ -1085,7 +1082,6 @@ int EditNodeRec(int Area) fclose(fil); crc = 0xffffffff; crc = upd_crc32((char *)&nodes, crc, nodeshdr.recsize); - working(0, 0, 0); for (;;) { clr_index(); @@ -1147,7 +1143,6 @@ int EditNodeRec(int Area) fclose(fil); NodeUpdated = 1; - working(0, 0, 0); } } tidy_grlist(&egr); @@ -1207,7 +1202,6 @@ void EditNodes(void) working(2, 0, 0); return; } - working(0, 0, 0); o = 0; if (! check_free()) return; @@ -1247,7 +1241,6 @@ void EditNodes(void) fclose(fil); } } - working(0, 0, 0); strcpy(pick, select_record(records, 20)); if (strncmp(pick, "-", 1) == 0) { @@ -1264,7 +1257,6 @@ void EditNodes(void) working(1, 0, 0); } else working(2, 0, 0); - working(0, 0, 0); } else { if ((records + 1) > CFG.toss_systems) { errmsg("Cannot add node, change global setting in menu 1.11.11"); @@ -1360,7 +1352,6 @@ fidoaddr PullUplink(char *Hdr) fclose(fil); } } - working(0, 0, 0); strcpy(pick, select_pick(records, 20)); if (strncmp(pick, "-", 1) == 0) { diff --git a/mbsetup/m_ol.c b/mbsetup/m_ol.c index 65bbe15d..abcf273c 100644 --- a/mbsetup/m_ol.c +++ b/mbsetup/m_ol.c @@ -4,7 +4,7 @@ * Purpose ...............: Setup Oneliners. * ***************************************************************************** - * Copyright (C) 1997-2002 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -242,7 +242,6 @@ int EditOnelRec(int Area) fclose(fil); crc = 0xffffffff; crc = upd_crc32((char *)&ol, crc, sizeof(ol)); - working(0, 0, 0); set_color(WHITE, BLACK); mvprintw( 5, 2, "8.7.1 EDIT ONELINER"); @@ -275,7 +274,6 @@ int EditOnelRec(int Area) fclose(fil); OnelUpdated = 1; working(1, 0, 0); - working(0, 0, 0); } } IsDoing("Browsing Menu"); @@ -318,7 +316,6 @@ void EditOneline(void) working(2, 0, 0); return; } - working(0, 0, 0); o = 0; for (;;) { @@ -356,7 +353,6 @@ void EditOneline(void) fclose(fil); } } - working(0, 0, 0); strcpy(pick, select_record(records,20)); if (strncmp(pick, "-", 1) == 0) { @@ -371,7 +367,6 @@ void EditOneline(void) working(1, 0, 0); } else working(2, 0, 0); - working(0, 0, 0); } if (strncmp(pick, "N", 1) == 0) @@ -433,7 +428,6 @@ void PurgeOneline(void) if (!ol.Available) iCount++; } - working(0, 0, 0); sprintf(temp, "%d records, %d records to purge", recno, iCount); mvprintw(7, 6, temp); @@ -462,7 +456,6 @@ void PurgeOneline(void) if ((rename("tmp.1", sFileName)) != 0) working(2, 0, 0); unlink("tmp.1"); - working(0, 0, 0); free(sFileName); Syslog('+', "Purged %d out of %d oneliners", iCount, recno); } @@ -499,7 +492,6 @@ void ImportOneline(void) if ((Imp = fopen(temp, "r")) == NULL) { working(2, 0, 0); - working(0, 0, 0); mvprintw(21, 6, temp); readkey(22, 6, LIGHTGRAY, BLACK); free(temp); @@ -526,7 +518,6 @@ void ImportOneline(void) */ if ((pOneline = fopen(temp, "a+")) == NULL) { working(2, 0, 0); - working(0, 0, 0); fclose(Imp); mvprintw(21, 6, temp); readkey(22, 6, LIGHTGRAY, BLACK); @@ -555,7 +546,6 @@ void ImportOneline(void) fclose(Imp); fclose(pOneline); - working(0, 0, 0); sprintf(temp, "Imported %d oneliners, skipped %d long/empty lines", recno, skipped); Syslog('+', temp); diff --git a/mbsetup/m_protocol.c b/mbsetup/m_protocol.c index 5d9eb3eb..703fe720 100644 --- a/mbsetup/m_protocol.c +++ b/mbsetup/m_protocol.c @@ -4,7 +4,7 @@ * Purpose ...............: Setup Protocols. * ***************************************************************************** - * Copyright (C) 1997-2002 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -315,7 +315,6 @@ int EditProtRec(int Area) fclose(fil); crc = 0xffffffff; crc = upd_crc32((char *)&PROT, crc, sizeof(PROT)); - working(0, 0, 0); s_protrec(); @@ -349,7 +348,6 @@ int EditProtRec(int Area) fclose(fil); ProtUpdated = 1; working(1, 0, 0); - working(0, 0, 0); } } IsDoing("Browsing Menu"); @@ -399,7 +397,6 @@ void EditProtocol(void) working(2, 0, 0); return; } - working(0, 0, 0); for (;;) { clr_index(); @@ -444,7 +441,6 @@ void EditProtocol(void) working(1, 0, 0); } else working(2, 0, 0); - working(0, 0, 0); } if ((atoi(pick) >= 1) && (atoi(pick) <= records)) @@ -486,7 +482,6 @@ char *PickProtocol(int nr) return Prot; } - working(0, 0, 0); clr_index(); set_color(WHITE, BLACK); diff --git a/mbsetup/m_route.c b/mbsetup/m_route.c index d480e3e4..d16cd8fa 100644 --- a/mbsetup/m_route.c +++ b/mbsetup/m_route.c @@ -4,7 +4,7 @@ * Purpose ...............: Routing Setup * ***************************************************************************** - * Copyright (C) 1997-2002 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -342,7 +342,6 @@ int EditRouteRec(int Area) fclose(fil); crc = 0xffffffff; crc = upd_crc32((char *)&route, crc, routehdr.recsize); - working(0, 0, 0); RouteScreen(); for (;;) { @@ -370,7 +369,6 @@ int EditRouteRec(int Area) fwrite(&route, routehdr.recsize, 1, fil); fclose(fil); RouteUpdated = 1; - working(0, 0, 0); } } free(mfile); @@ -434,7 +432,6 @@ void EditRoute(void) working(2, 0, 0); return; } - working(0, 0, 0); o = 0; temp = calloc(PATH_MAX, sizeof(char)); @@ -472,7 +469,6 @@ void EditRoute(void) fclose(fil); } } - working(0, 0, 0); strcpy(pick, select_record(records, 10)); if (strncmp(pick, "-", 1) == 0) { @@ -488,7 +484,6 @@ void EditRoute(void) working(1, 0, 0); } else working(2, 0, 0); - working(0, 0, 0); } if (strncmp(pick, "N", 1) == 0) diff --git a/mbsetup/m_service.c b/mbsetup/m_service.c index 4d303277..49eb2a18 100644 --- a/mbsetup/m_service.c +++ b/mbsetup/m_service.c @@ -4,7 +4,7 @@ * Purpose ...............: Service Setup * ***************************************************************************** - * Copyright (C) 1997-2002 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -269,7 +269,6 @@ int EditServiceRec(int Area) fclose(fil); crc = 0xffffffff; crc = upd_crc32((char *)&servrec, crc, servhdr.recsize); - working(0, 0, 0); for (;;) { ServiceScreen(); @@ -294,7 +293,6 @@ int EditServiceRec(int Area) fwrite(&servrec, servhdr.recsize, 1, fil); fclose(fil); ServiceUpdated = 1; - working(0, 0, 0); } } IsDoing("Browsing Menu"); @@ -337,7 +335,6 @@ void EditService(void) working(2, 0, 0); return; } - working(0, 0, 0); o = 0; for (;;) { @@ -375,7 +372,6 @@ void EditService(void) fclose(fil); } } - working(0, 0, 0); strcpy(pick, select_record(records, 20)); if (strncmp(pick, "-", 1) == 0) { @@ -390,7 +386,6 @@ void EditService(void) working(1, 0, 0); } else working(2, 0, 0); - working(0, 0, 0); } if (strncmp(pick, "N", 1) == 0) diff --git a/mbsetup/m_ticarea.c b/mbsetup/m_ticarea.c index ecf32f11..cf3e3a15 100644 --- a/mbsetup/m_ticarea.c +++ b/mbsetup/m_ticarea.c @@ -4,7 +4,7 @@ * Purpose ...............: TIC Areas Setup Program * ***************************************************************************** - * Copyright (C) 1997-2003 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -488,8 +488,6 @@ long LoadTicRec(int Area, int work) TicCrc = upd_crc32((char *)&System, TicCrc, sizeof(sysconnect)); } fclose(fil); - if (work) - working(0, 0, 0); return offset; } @@ -529,8 +527,6 @@ int SaveTicRec(int Area, int work) fclose(fil); fclose(ttfil); ttfil = NULL; - if (work) - working(0, 0, 0); return 0; } @@ -581,7 +577,6 @@ void TicGlobal(void) fclose(fil); sort_grlist(&mgr); } - working(0, 0, 0); /* * Initialize some variables @@ -799,7 +794,6 @@ void TicGlobal(void) fclose(ttfil); } - working(0, 0, 0); mvprintw(LINES -3, 6,"Made %d changes in %d possible areas", Done, Total); (void)readkey(LINES -3, 50, LIGHTGRAY, BLACK); if (Done) @@ -1026,7 +1020,6 @@ void EditTicarea(void) working(2, 0, 0); return; } - working(0, 0, 0); o = 0; if (! check_free()) return; @@ -1063,7 +1056,6 @@ Comment); fclose(fil); } } - working(0, 0, 0); strcpy(pick, select_area(records, 10)); if (strncmp(pick, "-", 1) == 0) { @@ -1079,7 +1071,6 @@ Comment); working(1, 0, 0); } else working(2, 0, 0); - working(0, 0, 0); } if (strncmp(pick, "G", 1) == 0) { @@ -1138,7 +1129,6 @@ char *PickTicarea(char *shdr) return Buf; } - working(0, 0, 0); for(;;) { clr_index(); @@ -1172,7 +1162,6 @@ char *PickTicarea(char *shdr) fclose(fil); } } - working(0, 0, 0); strcpy(pick, select_pick(records, 10)); if (strncmp(pick, "-", 1) == 0) diff --git a/mbsetup/m_tty.c b/mbsetup/m_tty.c index 269e9cbb..548eae97 100644 --- a/mbsetup/m_tty.c +++ b/mbsetup/m_tty.c @@ -4,7 +4,7 @@ * Purpose ...............: Setup Ttyinfo structure. * ***************************************************************************** - * Copyright (C) 1997-2002 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -338,7 +338,6 @@ int EditTtyRec(int Area) fclose(fil); crc = 0xffffffff; crc = upd_crc32((char *)&ttyinfo, crc, sizeof(ttyinfo)); - working(0, 0, 0); TtyScreen(); for (;;) { @@ -374,7 +373,6 @@ int EditTtyRec(int Area) fclose(fil); TtyUpdated = 1; working(1, 0, 0); - working(0, 0, 0); } } IsDoing("Browsing Menu"); @@ -449,7 +447,6 @@ void EditTtyinfo(void) working(2, 0, 0); return; } - working(0, 0, 0); o = 0; for (;;) { @@ -500,7 +497,6 @@ void EditTtyinfo(void) working(1, 0, 0); } else working(2, 0, 0); - working(0, 0, 0); } if (strncmp(pick, "N", 1) == 0) diff --git a/mbsetup/m_users.c b/mbsetup/m_users.c index 787dcc33..4f1191c1 100644 --- a/mbsetup/m_users.c +++ b/mbsetup/m_users.c @@ -4,7 +4,7 @@ * Purpose ...............: Edit Users * ***************************************************************************** - * Copyright (C) 1997-2002 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -168,7 +168,6 @@ void CloseUsers(int force) } } chmod(fin, 0660); - working(1, 0, 0); unlink(fout); } @@ -392,7 +391,6 @@ int EditUsrRec2(void) } else { working(2, 0, 0); } - working(0, 0, 0); break; case 10:strcpy(usrconfig.sSex, tl(edit_str(15,17,7, usrconfig.sSex, (char *)"^Male^ or ^Female^"))); break; @@ -463,7 +461,6 @@ int EditUsrRec(int Area) fclose(fil); crc = 0xffffffff; crc = upd_crc32((char *)&usrconfig, crc, sizeof(usrconfig)); - working(0, 0, 0); Screen1(); for (;;) { @@ -484,7 +481,6 @@ int EditUsrRec(int Area) fwrite(&usrconfig, sizeof(usrconfig), 1, fil); fclose(fil); UsrUpdated = 1; - working(0, 0, 0); } } IsDoing("Browsing Menu"); @@ -565,7 +561,6 @@ void EditUsers(void) working(2, 0, 0); return; } - working(0, 0, 0); o = 0; if (! check_free()) return; @@ -605,7 +600,6 @@ void EditUsers(void) fclose(fil); } } - working(0, 0, 0); strcpy(pick, select_record(records, 20)); if (strncmp(pick, "-", 1) == 0) { @@ -621,7 +615,6 @@ void EditUsers(void) working(1, 0, 0); } else working(2, 0, 0); - working(0, 0, 0); } if (strncmp(pick, "N", 1) == 0) diff --git a/mbsetup/m_virus.c b/mbsetup/m_virus.c index be171140..356500d9 100644 --- a/mbsetup/m_virus.c +++ b/mbsetup/m_virus.c @@ -4,7 +4,7 @@ * Purpose ...............: Setup Virus structure. * ***************************************************************************** - * Copyright (C) 1997-2002 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -215,7 +215,6 @@ void CloseVirus(int force) } } chmod(fin, 0640); - working(1, 0, 0); unlink(fout); } @@ -270,7 +269,6 @@ int EditVirRec(int Area) fclose(fil); crc = 0xffffffff; crc = upd_crc32((char *)&virscan, crc, sizeof(virscan)); - working(0, 0, 0); set_color(WHITE, BLACK); mvprintw( 5, 2, "4. EDIT VIRUS SCANNER"); @@ -306,7 +304,6 @@ int EditVirRec(int Area) fwrite(&virscan, sizeof(virscan), 1, fil); fclose(fil); VirUpdated = 1; - working(0, 0, 0); } } IsDoing("Browsing Menu"); @@ -351,7 +348,6 @@ void EditVirus(void) working(2, 0, 0); return; } - working(0, 0, 0); for (;;) { clr_index(); @@ -399,7 +395,6 @@ void EditVirus(void) working(3, 0, 0); } else working(2, 0, 0); - working(0, 0, 0); } if ((atoi(pick) >= 1) && (atoi(pick) <= records)) diff --git a/mbsetup/mbsetup.c b/mbsetup/mbsetup.c index cf47b0c2..a9c58f39 100644 --- a/mbsetup/mbsetup.c +++ b/mbsetup/mbsetup.c @@ -4,7 +4,7 @@ * Purpose ...............: Setup Program * ***************************************************************************** - * Copyright (C) 1997-2002 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -346,8 +346,6 @@ void site_docs(void) Syslog('+', "Statistics created"); - working(0, 0, 0); - center_addstr(LINES -4, (char *)"Press any key"); readkey(LINES -4, COLS / 2 + 8, LIGHTGRAY, BLACK); return; @@ -394,7 +392,6 @@ void initdatabases(void) InitRoute(); if (!init) { - working(0, 0, 0); clr_index(); } } diff --git a/mbsetup/mutil.c b/mbsetup/mutil.c index b0bed617..1ec94ac4 100644 --- a/mbsetup/mutil.c +++ b/mbsetup/mutil.c @@ -4,7 +4,7 @@ * Purpose ...............: Menu Utils * ***************************************************************************** - * Copyright (C) 1997-2002 + * Copyright (C) 1997-2004 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -44,6 +44,7 @@ unsigned char readkey(int y, int x, int fg, int bg) int rc = -1, i; unsigned char ch = 0; + working(0, 0, 0); if ((ttyfd = open("/dev/tty", O_RDWR|O_NONBLOCK)) < 0) { perror("open 9"); exit(MBERR_TTYIO_ERROR);