diff --git a/src/encode/base64.c b/src/encode/base64.c index f4baf95c8bc5bb2585563ae03e28a0abd9f9451c..0d3aaa945b5999a61d17270665b49f0e479773e7 100644 --- a/src/encode/base64.c +++ b/src/encode/base64.c @@ -49,11 +49,11 @@ int b64_decode(char *target, size_t tlen, const char *source, size_t slen) working <<= 6; i = strchr(base64alphabet, (char)*inp); if (i == NULL) { - return(-1); + return -1; } if (*i == '=') { /* pad char */ if ((working & 0xFF) != 0) - return(-1); + return -1; break; } bits += 6; @@ -65,22 +65,22 @@ int b64_decode(char *target, size_t tlen, const char *source, size_t slen) } if (outp == outend) { *(--outp) = 0; - return(-1); + return -1; } *outp = 0; - return(outp - target); + return outp - target; } static int add_char(char *pos, char ch, int done, char *end) { if (pos >= end) { - return(1); + return 1; } if (done) *pos = base64alphabet[64]; else *pos = base64alphabet[(int)ch]; - return(0); + return 0; } int b64_encode(char *target, size_t tlen, const char *source, size_t slen) { @@ -97,7 +97,7 @@ int b64_encode(char *target, size_t tlen, const char *source, size_t slen) { if (source == target) { tmpbuf = (char *)malloc(tlen); if (tmpbuf == NULL) - return(-1); + return -1; outp = tmpbuf; } else @@ -111,7 +111,7 @@ int b64_encode(char *target, size_t tlen, const char *source, size_t slen) { enc = (enc & 0xFC) >> 2; if (add_char(outp++, enc, done, outend)) { FREE_AND_NULL(tmpbuf); - return(-1); + return -1; } if (inp >= inend) enc = buf; @@ -119,7 +119,7 @@ int b64_encode(char *target, size_t tlen, const char *source, size_t slen) { enc = buf | ((*inp & 0xF0) >> 4); if (add_char(outp++, enc, done, outend)) { FREE_AND_NULL(tmpbuf); - return(-1); + return -1; } if (inp == inend) done = 1; @@ -132,7 +132,7 @@ int b64_encode(char *target, size_t tlen, const char *source, size_t slen) { } if (add_char(outp++, enc, done, outend)) { FREE_AND_NULL(tmpbuf); - return(-1); + return -1; } if (inp == inend) done = 1; @@ -140,7 +140,7 @@ int b64_encode(char *target, size_t tlen, const char *source, size_t slen) { enc = ((int)*(inp++)) & 0x3F; if (add_char(outp++, enc, done, outend)) { FREE_AND_NULL(tmpbuf); - return(-1); + return -1; } if (inp == inend) done = 1; diff --git a/src/encode/lzh.c b/src/encode/lzh.c index 8a89ed683e3c2fc0cc966375b0af0f155e4bcdda..1518d7f3b87789956459a33bb6edfacc11ac2e9d 100644 --- a/src/encode/lzh.c +++ b/src/encode/lzh.c @@ -297,7 +297,7 @@ static bool lzh_getbit(lzh_decode_t* lzh, const uint8_t *inbuf, uint32_t *incnt, ret = !!(lzh->getbuf & 0x8000); lzh->getbuf <<= 1; lzh->getlen--; - return (ret); + return ret; } static uint8_t lzh_getbyte(lzh_decode_t* lzh, const uint8_t *inbuf, uint32_t *incnt, uint32_t inlen) /* get a byte */ @@ -596,7 +596,7 @@ uint32_t lzh_encode(const uint8_t *inbuf, uint32_t inlen, uint8_t *outbuf, size_ inlen = LE_INT32(inlen); outlen = sizeof(inlen); if (!inlen) - return(0); + return 0; lzh_start_huff(&lzh.huff); lzh_init_tree(&lzh); s = 0; @@ -648,7 +648,7 @@ uint32_t lzh_encode(const uint8_t *inbuf, uint32_t inlen, uint8_t *outbuf, size_ printf("output/input: %.3f\n", (double)outlen / inlen); */ - return(outlen); + return outlen; } /* Decoding/Uncompressing */ @@ -672,7 +672,7 @@ uint32_t lzh_decode(const uint8_t *inbuf, uint32_t inlen, uint8_t *outbuf, size_ return 0; incnt += sizeof(textsize); if (textsize == 0) - return(textsize); + return textsize; lzh_start_huff(&lzh.huff); for (i = 0; i < LZH_STRBUF_SZ - LZH_LOOKAHD_SZ; i++) *(lzh.text_buf + i) = ' '; @@ -712,7 +712,7 @@ uint32_t lzh_decode(const uint8_t *inbuf, uint32_t inlen, uint8_t *outbuf, size_ printf("%12ld\n", count); ***/ - return(count); + return count; } #ifdef LZH_TEST diff --git a/src/encode/uucode.c b/src/encode/uucode.c index 9a9ec69e05b04a02fa0ffa07dfef2dbda7f2da39..218bef03673413571e10341145e08ab34afa78de 100644 --- a/src/encode/uucode.c +++ b/src/encode/uucode.c @@ -64,7 +64,7 @@ int uudecode(char *target, size_t tlen, const char *source, size_t slen) #if 0 if (block != len) { fprintf(stderr, "block (%d) != len (%d)\n", block, len); - return(-1); + return -1; } #endif while (rd < slen && source[rd] > ' ') @@ -73,7 +73,7 @@ int uudecode(char *target, size_t tlen, const char *source, size_t slen) rd++; /* skip whitespace separating blocks/lines */ } - return(wr); + return wr; } #define BIAS(b) if ((b) == 0) (b) = '`'; else (b) += ' '; @@ -89,7 +89,7 @@ int uuencode(char *target, size_t tlen, const char *source, size_t slen) slen = strlen(source); if (tlen < 3) - return(-1); + return -1; tlen -= 3; /* reserve room for terminator */ while (rd <= slen && wr < tlen) { len = 45; @@ -122,7 +122,7 @@ int uuencode(char *target, size_t tlen, const char *source, size_t slen) if (wr < tlen) target[wr++] = 0; - return(wr); + return wr; } #ifdef UUDECODE_TEST @@ -135,7 +135,7 @@ static char* truncstr(char* str, const char* set) if (p != NULL) *p = 0; - return(p); + return p; } int main(int argc, char**argv) diff --git a/src/encode/yenc.c b/src/encode/yenc.c index 70cae5b9e69aee5762d34406ed7bfe63f4e58538..c1f0a17051ba599570a4c2f61c280ce4d23ae975 100644 --- a/src/encode/yenc.c +++ b/src/encode/yenc.c @@ -45,7 +45,7 @@ int ydecode(char *target, size_t tlen, const char *source, size_t slen) target[wr++] = ch; } - return(wr); + return wr; } int yencode(char *target, size_t tlen, const char *source, size_t slen) @@ -78,7 +78,7 @@ int yencode(char *target, size_t tlen, const char *source, size_t slen) if (wr < tlen) target[wr++] = 0; - return(wr); + return wr; } #if defined(YDECODE_TEST) @@ -91,7 +91,7 @@ static char* truncstr(char* str, const char* set) if (p != NULL) *p = 0; - return(p); + return p; } int main(int argc, char**argv) diff --git a/src/hash/md5.c b/src/hash/md5.c index 621db890c89d71d56372d36e1f298716efddfbd7..27dbcd6a408b39042aad511365880b69e793bdf6 100644 --- a/src/hash/md5.c +++ b/src/hash/md5.c @@ -265,7 +265,7 @@ BYTE* MD5_calc(BYTE digest[MD5_DIGEST_SIZE], const void* buf, size_t len) MD5_digest(&ctx, buf, len); MD5_close(&ctx, digest); - return(digest); + return digest; } /* conversion for 16 character binary md5 to hex */ diff --git a/src/sbbs3/ans2asc.c b/src/sbbs3/ans2asc.c index 6a64290e02dd589b64494f659dc28a07bc8dd32e..4914ee0af03d5c429fcec3ead1791791459ce90b 100644 --- a/src/sbbs3/ans2asc.c +++ b/src/sbbs3/ans2asc.c @@ -71,7 +71,7 @@ int main(int argc, char **argv) if (argc < 2) { print_usage(argv[0]); - return(0); + return 0; } for (i = 1; i < argc; i++) { @@ -111,12 +111,12 @@ int main(int argc, char **argv) } else if (in == stdin) { if ((in = fopen(argv[i], "rb")) == NULL) { perror(argv[i]); - return(1); + return 1; } } else if (out == stdout) { if ((out = fopen(argv[i], "wb")) == NULL) { perror(argv[i]); - return(1); + return 1; } } } @@ -338,6 +338,6 @@ int main(int argc, char **argv) fprintf(out, "\r\n"); if (pause) fprintf(out, "%sp", ctrl_a); - return(0); + return 0; } diff --git a/src/sbbs3/ansiterm.cpp b/src/sbbs3/ansiterm.cpp index e9801a365424e123cbd2846ba491d92a9e4af9d7..a61d71e9163e88266361409adf5f4206a18ca706 100644 --- a/src/sbbs3/ansiterm.cpp +++ b/src/sbbs3/ansiterm.cpp @@ -35,51 +35,51 @@ const char *sbbs_t::ansi(int atr) /* Special case */ case ANSI_NORMAL: - return("\x1b[0m"); + return "\x1b[0m"; case BLINK: case BG_BRIGHT: - return("\x1b[5m"); + return "\x1b[5m"; /* Foreground */ case HIGH: - return("\x1b[1m"); + return "\x1b[1m"; case BLACK: - return("\x1b[30m"); + return "\x1b[30m"; case RED: - return("\x1b[31m"); + return "\x1b[31m"; case GREEN: - return("\x1b[32m"); + return "\x1b[32m"; case BROWN: - return("\x1b[33m"); + return "\x1b[33m"; case BLUE: - return("\x1b[34m"); + return "\x1b[34m"; case MAGENTA: - return("\x1b[35m"); + return "\x1b[35m"; case CYAN: - return("\x1b[36m"); + return "\x1b[36m"; case LIGHTGRAY: - return("\x1b[37m"); + return "\x1b[37m"; /* Background */ case BG_BLACK: - return("\x1b[40m"); + return "\x1b[40m"; case BG_RED: - return("\x1b[41m"); + return "\x1b[41m"; case BG_GREEN: - return("\x1b[42m"); + return "\x1b[42m"; case BG_BROWN: - return("\x1b[43m"); + return "\x1b[43m"; case BG_BLUE: - return("\x1b[44m"); + return "\x1b[44m"; case BG_MAGENTA: - return("\x1b[45m"); + return "\x1b[45m"; case BG_CYAN: - return("\x1b[46m"); + return "\x1b[46m"; case BG_LIGHTGRAY: - return("\x1b[47m"); + return "\x1b[47m"; } - return("-Invalid use of ansi()-"); + return "-Invalid use of ansi()-"; } /* insure str is at least 14 bytes in size! */ @@ -264,11 +264,11 @@ bool sbbs_t::ansi_getxy(int* x, int* y) } if (time(NULL) - start > TIMEOUT_ANSI_GETXY) { lprintf(LOG_NOTICE, "!TIMEOUT in ansi_getxy"); - return(false); + return false; } } - return(true); + return true; } bool sbbs_t::ansi_gotoxy(int x, int y) diff --git a/src/sbbs3/answer.cpp b/src/sbbs3/answer.cpp index 08d9750efdc25d595b086be831642920fbeef14f..3b785e1cd681b24b92842365a8973a724e1a7a09 100644 --- a/src/sbbs3/answer.cpp +++ b/src/sbbs3/answer.cpp @@ -537,7 +537,7 @@ bool sbbs_t::answer() bputs(text[InvalidLogon]); hangup(); useron.number = 0; - return(false); + return false; } } } @@ -677,7 +677,7 @@ bool sbbs_t::answer() if (!online) { useron.number = 0; - return(false); + return false; } if (!(telnet_mode & TELNET_MODE_OFF)) { @@ -772,19 +772,19 @@ bool sbbs_t::answer() exec_bin(cfg.login_mod, &main_csi); } else /* auto logon here */ if (logon() == false) - return(false); + return false; } if (!useron.number) hangup(); if (!online) - return(false); + return false; if (!(sys_status & SS_USERON)) { errormsg(WHERE, ERR_CHK, "User not logged on", sys_status); hangup(); - return(false); + return false; } if (useron.pass[0]) @@ -792,5 +792,5 @@ bool sbbs_t::answer() if (!term_output_disabled) max_socket_inactivity = startup->max_session_inactivity; - return(true); + return true; } diff --git a/src/sbbs3/ars.c b/src/sbbs3/ars.c index 4bee34c0842c7c97b0b997dd3f837a3e6032f6c2..214854e2cdccd31e301b8d10e349bc2fa5df8c86 100644 --- a/src/sbbs3/ars.c +++ b/src/sbbs3/ars.c @@ -688,13 +688,13 @@ uchar* arstr(ushort* count, const char* str, scfg_t* cfg, uchar* ar_buf) if ((ar_buf = (uchar *)calloc(j + 4, 1)) == NULL) { /* Padded for ushort dereferencing */ if (count) (*count) = 0; - return(NULL); + return NULL; } } memcpy(ar_buf, ar, j); if (count) (*count) = j; - return(ar_buf); + return ar_buf; } #ifdef ARS_VERIFY /* Verification for arstr() */ @@ -1053,7 +1053,7 @@ char *decompile_ars(uchar *ars, int len) break; default: printf("Error decoding AR: %02Xh, offset: %u\n", *in, in - ars); - return("Unknown ARS String"); + return "Unknown ARS String"; } switch (*in) { case AR_TIME: @@ -1155,7 +1155,7 @@ char *decompile_ars(uchar *ars, int len) } } *out = 0; - return(buf); + return buf; } void main(void) diff --git a/src/sbbs3/asc2ans.c b/src/sbbs3/asc2ans.c index 71ffba9659ef7375e3b5aac6bc5dc50782166cd2..43e93e07e8c6525e8abfbd850babd5f69f0954fe 100644 --- a/src/sbbs3/asc2ans.c +++ b/src/sbbs3/asc2ans.c @@ -54,7 +54,7 @@ int main(int argc, char **argv) if (argc < 2) { print_usage(argv[0]); - return(0); + return 0; } for (i = 1; i < argc; i++) { @@ -68,12 +68,12 @@ int main(int argc, char **argv) } else if (in == stdin) { if ((in = fopen(argv[i], "rb")) == NULL) { perror(argv[i]); - return(1); + return 1; } } else if (out == stdout) { if ((out = fopen(argv[i], "wb")) == NULL) { perror(argv[i]); - return(1); + return 1; } } } @@ -223,7 +223,7 @@ int main(int argc, char **argv) fputc(ch, out); } - return(0); + return 0; } diff --git a/src/sbbs3/atcodes.cpp b/src/sbbs3/atcodes.cpp index dc01fa7d1a12ac5fe5316df6d666e2e83e546001..d1ef55592804c1431975bfa02d196c0ed53e4a13 100644 --- a/src/sbbs3/atcodes.cpp +++ b/src/sbbs3/atcodes.cpp @@ -125,10 +125,10 @@ int sbbs_t::show_atcode(const char *instr, JSObject* obj) SAFECOPY(str, instr); tp = strchr(str + 1, '@'); if (!tp) /* no terminating @ */ - return(0); + return 0; sp = strchr(str + 1, ' '); if (sp && sp < tp) /* space before terminating @ */ - return(0); + return 0; len = (tp - str) + 1; (*tp) = 0; sp = (str + 1); @@ -174,7 +174,7 @@ int sbbs_t::show_atcode(const char *instr, JSObject* obj) cp = atcode(sp, str2, sizeof(str2), &pmode, fmt.align == fmt.center, obj); if (cp == NULL) - return(0); + return 0; char separated[128]; if (fmt.thousep) @@ -229,7 +229,7 @@ int sbbs_t::show_atcode(const char *instr, JSObject* obj) } else bprintf(pmode, "%.*s", fmt.disp_len, cp); - return(len); + return len; } static const char* getpath(scfg_t* cfg, const char* path) @@ -422,15 +422,15 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, if (strncmp(sp, "WIDE:", 5) == 0) { wide(sp + 5); - return(nulstr); + return nulstr; } if (!strcmp(sp, "VER")) - return(VERSION); + return VERSION; if (!strcmp(sp, "REV")) { safe_snprintf(str, maxlen, "%c", REVISION); - return(str); + return str; } if (!strcmp(sp, "FULL_VER")) { @@ -439,34 +439,34 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, #if defined(_DEBUG) strcat(str, " Debug"); #endif - return(str); + return str; } if (!strcmp(sp, "VER_NOTICE")) - return(VERSION_NOTICE); + return VERSION_NOTICE; if (!strcmp(sp, "OS_VER")) - return(os_version(str, maxlen)); + return os_version(str, maxlen); if (strcmp(sp, "OS_CPU") == 0) - return(os_cpuarch(str, maxlen)); + return os_cpuarch(str, maxlen); #ifdef JAVASCRIPT if (!strcmp(sp, "JS_VER")) - return((char *)JS_GetImplementationVersion()); + return (char *)JS_GetImplementationVersion(); #endif if (!strcmp(sp, "PLATFORM")) - return(PLATFORM_DESC); + return PLATFORM_DESC; if (!strcmp(sp, "COPYRIGHT")) - return(COPYRIGHT_NOTICE); + return COPYRIGHT_NOTICE; if (!strcmp(sp, "COMPILER")) { char compiler[32]; DESCRIBE_COMPILER(compiler); strncpy(str, compiler, maxlen); - return(str); + return str; } if (strcmp(sp, "GIT_HASH") == 0) @@ -500,43 +500,43 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, , (uint)(up / (60L * 60L)) , (uint)((up / 60L) % 60L) ); - return(str); + return str; } if (!strcmp(sp, "SERVED")) { extern volatile uint served; safe_snprintf(str, maxlen, "%u", served); - return(str); + return str; } if (!strcmp(sp, "SOCKET_LIB")) - return(socklib_version(str, maxlen, SOCKLIB_DESC)); + return socklib_version(str, maxlen, SOCKLIB_DESC); if (!strcmp(sp, "MSG_LIB")) { safe_snprintf(str, maxlen, "SMBLIB %s", smb_lib_ver()); - return(str); + return str; } if (!strcmp(sp, "BBS") || !strcmp(sp, "BOARDNAME")) - return(cfg.sys_name); + return cfg.sys_name; if (!strcmp(sp, "BAUD") || !strcmp(sp, "BPS")) { safe_snprintf(str, maxlen, "%u", cur_output_rate ? cur_output_rate : cur_rate); - return(str); + return str; } if (!strcmp(sp, "CPS")) { safe_snprintf(str, maxlen, "%u", cur_cps); - return(str); + return str; } if (!strcmp(sp, "COLS")) { safe_snprintf(str, maxlen, "%u", cols); - return(str); + return str; } if (!strcmp(sp, "ROWS")) { safe_snprintf(str, maxlen, "%u", rows); - return(str); + return str; } if (strcmp(sp, "TERM") == 0) return term_type(); @@ -545,10 +545,10 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, return term_charset(); if (!strcmp(sp, "CONN")) - return(connection); + return connection; if (!strcmp(sp, "SYSOP")) - return(cfg.sys_op); + return cfg.sys_op; if (strcmp(sp, "SYSAVAIL") == 0) return text[sysop_available(&cfg) ? LiSysopAvailable : LiSysopNotAvailable]; @@ -557,15 +557,15 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, return text[sysop_available(&cfg) ? Yes : No]; if (!strcmp(sp, "LOCATION")) - return(cfg.sys_location); + return cfg.sys_location; if (strcmp(sp, "NODE") == 0 || strcmp(sp, "NN") == 0) { safe_snprintf(str, maxlen, "%u", cfg.node_num); - return(str); + return str; } if (strcmp(sp, "TNODES") == 0 || strcmp(sp, "TNODE") == 0 || strcmp(sp, "TN") == 0) { safe_snprintf(str, maxlen, "%u", cfg.sys_nodes); - return(str); + return str; } if (strcmp(sp, "ANODES") == 0 || strcmp(sp, "ANODE") == 0 || strcmp(sp, "AN") == 0) { safe_snprintf(str, maxlen, "%u", count_nodes(/* self: */ true)); @@ -602,20 +602,20 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, return (useron.chat & CHAT_SPLITP) ? text[On] : text[Off]; if (!strcmp(sp, "INETADDR")) - return(cfg.sys_inetaddr); + return cfg.sys_inetaddr; if (!strcmp(sp, "HOSTNAME")) return server_host_name(); if (!strcmp(sp, "FIDOADDR")) { if (cfg.total_faddrs) - return(smb_faddrtoa(&cfg.faddr[0], str)); - return(nulstr); + return smb_faddrtoa(&cfg.faddr[0], str); + return nulstr; } if (!strcmp(sp, "EMAILADDR")) - return(usermailaddr(&cfg, str - , (cfg.inetmail_misc & NMAIL_ALIAS) || (useron.rest & FLAG('O')) ? useron.alias : useron.name)); + return usermailaddr(&cfg, str + , (cfg.inetmail_misc & NMAIL_ALIAS) || (useron.rest & FLAG('O')) ? useron.alias : useron.name); if (strcmp(sp, "NETMAIL") == 0) return useron.netmail; @@ -738,7 +738,7 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, } if (!strcmp(sp, "QWKID")) - return(cfg.sys_id); + return cfg.sys_id; if (!strcmp(sp, "TIME") || !strcmp(sp, "SYSTIME") || !strcmp(sp, "TIME_UTC")) { now = time(NULL); @@ -755,11 +755,11 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, , tm.tm_hour == 0 ? 12 : tm.tm_hour > 12 ? tm.tm_hour - 12 : tm.tm_hour, tm.tm_min, tm.tm_hour > 11 ? "pm":"am"); - return(str); + return str; } if (!strcmp(sp, "TIMEZONE")) - return(smb_zonestr(sys_timezone(&cfg), str)); + return smb_zonestr(sys_timezone(&cfg), str); if (!strcmp(sp, "DATE") || !strcmp(sp, "SYSDATE") || !strcmp(sp, "DATE_UTC")) { now = time(NULL); @@ -789,7 +789,7 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, } if (!strcmp(sp, "DATETIME")) - return(timestr(time(NULL))); + return timestr(time(NULL)); if (!strcmp(sp, "DATETIME_UTC")) return timestr(time(NULL) - (xpTimeZone_local() * 60)); @@ -816,12 +816,12 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, for (i = 0; i < cfg.total_subs; i++) l += getposts(&cfg, i); /* l=total posts */ safe_snprintf(str, maxlen, "%lu", l); - return(str); + return str; } if (!strcmp(sp, "TUSER")) { safe_snprintf(str, maxlen, "%u", total_users(&cfg)); - return(str); + return str; } if (!strcmp(sp, "TFILE")) { @@ -829,7 +829,7 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, for (i = 0; i < cfg.total_dirs; i++) l += getfiles(&cfg, i); safe_snprintf(str, maxlen, "%lu", l); - return(str); + return str; } if (strncmp(sp, "FILES:", 6) == 0) { // Number of files in specified directory @@ -906,16 +906,16 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, if (!strcmp(sp, "TCALLS") || !strcmp(sp, "NUMCALLS")) { getstats(&cfg, 0, &stats); safe_snprintf(str, maxlen, "%u", stats.logons); - return(str); + return str; } if (!strcmp(sp, "PREVON") || !strcmp(sp, "LASTCALLERNODE") || !strcmp(sp, "LASTCALLERSYSTEM")) - return(lastuseron); + return lastuseron; if (!strcmp(sp, "CLS") || !strcmp(sp, "CLEAR")) { CLS; - return(nulstr); + return nulstr; } if (strcmp(sp, "GETDIM") == 0) { @@ -925,39 +925,39 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, if (strcmp(sp, "GETKEY") == 0) { getkey(); - return(nulstr); + return nulstr; } if (strcmp(sp, "CONTINUE") == 0) { char ch = getkey(K_UPPER); if (ch == no_key() || ch == quit_key()) sys_status |= SS_ABORT; - return(nulstr); + return nulstr; } if (strncmp(sp, "WAIT:", 5) == 0) { inkey(K_NONE, atoi(sp + 5) * 100); - return(nulstr); + return nulstr; } if (!strcmp(sp, "PAUSE") || !strcmp(sp, "MORE")) { pause(); - return(nulstr); + return nulstr; } if (!strcmp(sp, "RESETPAUSE")) { lncntr = 0; - return(nulstr); + return nulstr; } if (!strcmp(sp, "NOPAUSE") || !strcmp(sp, "POFF")) { sys_status ^= SS_PAUSEOFF; - return(nulstr); + return nulstr; } if (!strcmp(sp, "PON") || !strcmp(sp, "AUTOMORE")) { sys_status ^= SS_PAUSEON; - return(nulstr); + return nulstr; } if (strncmp(sp, "FILL:", 5) == 0) { @@ -1017,12 +1017,12 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, /* STOP */ if (!strcmp(sp, "BELL") || !strcmp(sp, "BEEP")) - return("\a"); + return "\a"; if (!strcmp(sp, "EVENT")) { if (event_time == 0) - return("<none>"); - return(timestr(event_time)); + return "<none>"; + return timestr(event_time); } /* LASTCALL */ @@ -1036,49 +1036,49 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, getnodedat(i, &node); printnodedat(i, &node); } - return(nulstr); + return nulstr; } if (!strcmp(sp, "WHO")) { whos_online(true); - return(nulstr); + return nulstr; } /* User Codes */ if (!strcmp(sp, "USER") || !strcmp(sp, "ALIAS") || !strcmp(sp, "NAME")) - return(useron.alias); + return useron.alias; if (!strcmp(sp, "FIRST")) { safe_snprintf(str, maxlen, "%s", useron.alias); tp = strchr(str, ' '); if (tp) *tp = 0; - return(str); + return str; } if (!strcmp(sp, "USERNUM")) { safe_snprintf(str, maxlen, "%u", useron.number); - return(str); + return str; } if (!strcmp(sp, "PHONE") || !strcmp(sp, "HOMEPHONE") || !strcmp(sp, "DATAPHONE") || !strcmp(sp, "DATA")) - return(useron.phone); + return useron.phone; if (!strcmp(sp, "ADDR1")) - return(useron.address); + return useron.address; if (!strcmp(sp, "FROM")) - return(useron.location); + return useron.location; if (!strcmp(sp, "CITY")) { safe_snprintf(str, maxlen, "%s", useron.location); char* p = strchr(str, ','); if (p) { *p = 0; - return(str); + return str; } - return(nulstr); + return nulstr; } if (!strcmp(sp, "STATE")) { @@ -1087,16 +1087,16 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, p++; if (*p == ' ') p++; - return(p); + return p; } - return(nulstr); + return nulstr; } if (!strcmp(sp, "CPU")) - return(useron.comp); + return useron.comp; if (!strcmp(sp, "HOST")) - return(client_name); + return client_name; if (!strcmp(sp, "BDATE")) return getbirthdstr(&cfg, useron.birth, str, maxlen); @@ -1118,12 +1118,12 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, if (!strcmp(sp, "AGE")) { safe_snprintf(str, maxlen, "%u", getage(&cfg, useron.birth)); - return(str); + return str; } if (!strcmp(sp, "CALLS") || !strcmp(sp, "NUMTIMESON")) { safe_snprintf(str, maxlen, "%u", useron.logons); - return(str); + return str; } if (strcmp(sp, "PWAGE") == 0) { @@ -1147,7 +1147,7 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, if (!strcmp(sp, "SEC") || !strcmp(sp, "SECURITY")) { safe_snprintf(str, maxlen, "%u", useron.level); - return(str); + return str; } if (!strcmp(sp, "SINCE")) @@ -1166,28 +1166,28 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, if (!strcmp(sp, "TIMEON") || !strcmp(sp, "TIMEUSED")) { now = time(NULL); safe_snprintf(str, maxlen, "%u", (uint)(now - logontime) / 60); - return(str); + return str; } if (!strcmp(sp, "TUSED")) { /* Synchronet only */ now = time(NULL); - return(sectostr((uint)(now - logontime), str) + 1); + return sectostr((uint)(now - logontime), str) + 1; } if (!strcmp(sp, "TLEFT")) { /* Synchronet only */ gettimeleft(); - return(sectostr(timeleft, str) + 1); + return sectostr(timeleft, str) + 1; } if (!strcmp(sp, "TPERD")) /* Synchronet only */ - return(sectostr(cfg.level_timeperday[useron.level], str) + 4); + return sectostr(cfg.level_timeperday[useron.level], str) + 4; if (!strcmp(sp, "TPERC")) /* Synchronet only */ - return(sectostr(cfg.level_timepercall[useron.level], str) + 4); + return sectostr(cfg.level_timepercall[useron.level], str) + 4; if (strcmp(sp, "MPERC") == 0 || strcmp(sp, "TIMELIMIT") == 0) { safe_snprintf(str, maxlen, "%u", cfg.level_timepercall[useron.level]); - return(str); + return str; } if (strcmp(sp, "MPERD") == 0) { @@ -1218,11 +1218,11 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, if (!strcmp(sp, "MINLEFT") || !strcmp(sp, "LEFT") || !strcmp(sp, "TIMELEFT")) { gettimeleft(); safe_snprintf(str, maxlen, "%u", timeleft / 60); - return(str); + return str; } if (!strcmp(sp, "LASTON")) - return(timestr(useron.laston)); + return timestr(useron.laston); if (!strcmp(sp, "LASTDATEON")) return datestr(useron.laston); @@ -1248,11 +1248,11 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, , tm.tm_hour == 0 ? 12 : tm.tm_hour > 12 ? tm.tm_hour - 12 : tm.tm_hour, tm.tm_min, tm.tm_hour > 11 ? "pm":"am"); - return(str); + return str; } if (!strcmp(sp, "FIRSTON")) - return(timestr(useron.firston)); + return timestr(useron.firston); if (!strcmp(sp, "FIRSTDATEON")) return datestr(useron.firston); @@ -1278,7 +1278,7 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, , tm.tm_hour == 0 ? 12 : tm.tm_hour > 12 ? tm.tm_hour - 12 : tm.tm_hour, tm.tm_min, tm.tm_hour > 11 ? "pm":"am"); - return(str); + return str; } if (strcmp(sp, "EMAILS") == 0) { @@ -1345,37 +1345,37 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, if (!strcmp(sp, "MSGLEFT") || !strcmp(sp, "MSGSLEFT")) { safe_snprintf(str, maxlen, "%u", useron.posts); - return(str); + return str; } if (!strcmp(sp, "MSGREAD")) { safe_snprintf(str, maxlen, "%u", posts_read); - return(str); + return str; } if (!strcmp(sp, "FREESPACE")) { safe_snprintf(str, maxlen, "%" PRIu64, getfreediskspace(cfg.temp_dir, 0)); - return(str); + return str; } if (!strcmp(sp, "FREESPACEK")) { safe_snprintf(str, maxlen, "%" PRIu64, getfreediskspace(cfg.temp_dir, 1024)); - return(str); + return str; } if (strcmp(sp, "FREESPACEM") == 0) { safe_snprintf(str, maxlen, "%" PRIu64, getfreediskspace(cfg.temp_dir, 1024 * 1024)); - return(str); + return str; } if (strcmp(sp, "FREESPACEG") == 0) { safe_snprintf(str, maxlen, "%" PRIu64, getfreediskspace(cfg.temp_dir, 1024 * 1024 * 1024)); - return(str); + return str; } if (strcmp(sp, "FREESPACET") == 0) { safe_snprintf(str, maxlen, "%" PRIu64, getfreediskspace(cfg.temp_dir, 1024 * 1024 * 1024) / 1024); - return(str); + return str; } if (strcmp(sp, "MINSPACE") == 0) { @@ -1385,32 +1385,32 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, if (!strcmp(sp, "UPBYTES")) { safe_snprintf(str, maxlen, "%" PRIu64, useron.ulb); - return(str); + return str; } if (!strcmp(sp, "UPK")) { safe_snprintf(str, maxlen, "%" PRIu64, useron.ulb / 1024L); - return(str); + return str; } if (!strcmp(sp, "UPS") || !strcmp(sp, "UPFILES")) { safe_snprintf(str, maxlen, "%u", useron.uls); - return(str); + return str; } if (!strcmp(sp, "DLBYTES")) { safe_snprintf(str, maxlen, "%" PRIu64, useron.dlb); - return(str); + return str; } if (!strcmp(sp, "DOWNK")) { safe_snprintf(str, maxlen, "%" PRIu64, useron.dlb / 1024L); - return(str); + return str; } if (!strcmp(sp, "DOWNS") || !strcmp(sp, "DLFILES")) { safe_snprintf(str, maxlen, "%u", useron.dls); - return(str); + return str; } if (strcmp(sp, "PCR") == 0) { @@ -1451,33 +1451,33 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, } if (!strcmp(sp, "NEWFILETIME")) - return(timestr(ns_time)); + return timestr(ns_time); /* MAXDL */ if (!strcmp(sp, "MAXDK") || !strcmp(sp, "DLKLIMIT") || !strcmp(sp, "KBLIMIT")) { safe_snprintf(str, maxlen, "%" PRIu64, cfg.level_freecdtperday[useron.level] / 1024L); - return(str); + return str; } if (!strcmp(sp, "DAYBYTES")) { /* amt of free cdts used today */ safe_snprintf(str, maxlen, "%" PRIu64, cfg.level_freecdtperday[useron.level] - useron.freecdt); - return(str); + return str; } if (!strcmp(sp, "BYTELIMIT")) { safe_snprintf(str, maxlen, "%" PRIu64, cfg.level_freecdtperday[useron.level]); - return(str); + return str; } if (!strcmp(sp, "KBLEFT")) { safe_snprintf(str, maxlen, "%" PRIu64, user_available_credits(&useron) / 1024UL); - return(str); + return str; } if (!strcmp(sp, "BYTESLEFT")) { safe_snprintf(str, maxlen, "%" PRIu64, user_available_credits(&useron)); - return(str); + return str; } if (strcmp(sp, "CREDITS") == 0) { @@ -1494,17 +1494,17 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, safe_snprintf(str, maxlen, "%s %s" , usrgrps ? cfg.grp[usrgrp[curgrp]]->sname :nulstr , usrgrps ? cfg.sub[usrsub[curgrp][cursub[curgrp]]]->sname : nulstr); - return(str); + return str; } if (!strcmp(sp, "CONFNUM")) { safe_snprintf(str, maxlen, "%u %u", curgrp + 1, cursub[curgrp] + 1); - return(str); + return str; } if (!strcmp(sp, "NUMDIR")) { safe_snprintf(str, maxlen, "%u %u", usrlibs ? curlib + 1 : 0, usrlibs ? curdir[curlib] + 1 : 0); - return(str); + return str; } if (!strcmp(sp, "EXDATE") || !strcmp(sp, "EXPDATE")) @@ -1528,28 +1528,28 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, if (l < 0) l = 0; safe_snprintf(str, maxlen, "%lu", l / (1440L * 60L)); - return(str); + return str; } if (strcmp(sp, "NOTE") == 0 || strcmp(sp, "MEMO1") == 0) return useron.note; if (strcmp(sp, "REALNAME") == 0 || !strcmp(sp, "MEMO2") || !strcmp(sp, "COMPANY")) - return(useron.name); + return useron.name; if (!strcmp(sp, "ZIP")) - return(useron.zipcode); + return useron.zipcode; if (!strcmp(sp, "HANGUP")) { hangup(); - return(nulstr); + return nulstr; } /* Synchronet Specific */ if (!strncmp(sp, "SETSTR:", 7)) { strcpy(main_csi.str, sp + 7); - return(nulstr); + return nulstr; } if (strcmp(sp, "STR") == 0) { @@ -1575,7 +1575,7 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, if (!strncmp(sp, "EXEC:", 5)) { exec_bin(sp + 5, &main_csi); - return(nulstr); + return nulstr; } if (!strncmp(sp, "EXEC_XTRN:", 10)) { @@ -1584,95 +1584,95 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, break; if (i < cfg.total_xtrns) exec_xtrn(i); - return(nulstr); + return nulstr; } if (!strncmp(sp, "MENU:", 5)) { menu(sp + 5); - return(nulstr); + return nulstr; } if (!strncmp(sp, "CONDMENU:", 9)) { menu(sp + 9, P_NOERROR); - return(nulstr); + return nulstr; } if (!strncmp(sp, "TYPE:", 5)) { printfile(cmdstr(sp + 5, nulstr, nulstr, str), 0); - return(nulstr); + return nulstr; } if (!strncmp(sp, "INCLUDE:", 8)) { printfile(cmdstr(sp + 8, nulstr, nulstr, str), P_NOCRLF | P_SAVEATR); - return(nulstr); + return nulstr; } if (!strcmp(sp, "QUESTION")) - return(question); + return question; if (!strcmp(sp, "HANDLE")) - return(useron.handle); + return useron.handle; if (strcmp(sp, "LASTIP") == 0) return useron.ipaddr; if (!strcmp(sp, "CID") || !strcmp(sp, "IP")) - return(cid); + return cid; if (!strcmp(sp, "LOCAL-IP")) - return(local_addr); + return local_addr; if (!strcmp(sp, "CRLF")) - return("\r\n"); + return "\r\n"; if (!strcmp(sp, "PUSHXY")) { ansi_save(); - return(nulstr); + return nulstr; } if (!strcmp(sp, "POPXY")) { ansi_restore(); - return(nulstr); + return nulstr; } if (!strcmp(sp, "HOME")) { cursor_home(); - return(nulstr); + return nulstr; } if (!strcmp(sp, "CLRLINE")) { clearline(); - return(nulstr); + return nulstr; } if (!strcmp(sp, "CLR2EOL") || !strcmp(sp, "CLREOL")) { cleartoeol(); - return(nulstr); + return nulstr; } if (!strcmp(sp, "CLR2EOS")) { cleartoeos(); - return(nulstr); + return nulstr; } if (!strncmp(sp, "UP:", 3)) { cursor_up(atoi(sp + 3)); - return(str); + return str; } if (!strncmp(sp, "DOWN:", 5)) { cursor_down(atoi(sp + 5)); - return(str); + return str; } if (!strncmp(sp, "LEFT:", 5)) { cursor_left(atoi(sp + 5)); - return(str); + return str; } if (!strncmp(sp, "RIGHT:", 6)) { cursor_right(atoi(sp + 6)); - return(str); + return str; } if (!strncmp(sp, "GOTOXY:", 7)) { @@ -1681,27 +1681,27 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, cp++; cursor_xy(atoi(sp + 7), atoi(cp)); } - return(nulstr); + return nulstr; } if (!strcmp(sp, "GRP")) { if (SMB_IS_OPEN(&smb)) { if (smb.subnum == INVALID_SUB) - return("Local"); + return "Local"; if (subnum_is_valid(smb.subnum)) - return(cfg.grp[cfg.sub[smb.subnum]->grp]->sname); + return cfg.grp[cfg.sub[smb.subnum]->grp]->sname; } - return(usrgrps ? cfg.grp[usrgrp[curgrp]]->sname : nulstr); + return usrgrps ? cfg.grp[usrgrp[curgrp]]->sname : nulstr; } if (!strcmp(sp, "GRPL")) { if (SMB_IS_OPEN(&smb)) { if (smb.subnum == INVALID_SUB) - return("Local"); + return "Local"; if (subnum_is_valid(smb.subnum)) - return(cfg.grp[cfg.sub[smb.subnum]->grp]->lname); + return cfg.grp[cfg.sub[smb.subnum]->grp]->lname; } - return(usrgrps ? cfg.grp[usrgrp[curgrp]]->lname : nulstr); + return usrgrps ? cfg.grp[usrgrp[curgrp]]->lname : nulstr; } if (!strcmp(sp, "GN")) { @@ -1710,7 +1710,7 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, else ugrp = usrgrps ? curgrp + 1 : 0; safe_snprintf(str, maxlen, "%u", ugrp); - return(str); + return str; } if (!strcmp(sp, "GL")) { @@ -1719,7 +1719,7 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, else ugrp = usrgrps ? curgrp + 1 : 0; safe_snprintf(str, maxlen, "%-4u", ugrp); - return(str); + return str; } if (!strcmp(sp, "GR")) { @@ -1728,27 +1728,27 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, else ugrp = usrgrps ? curgrp + 1 : 0; safe_snprintf(str, maxlen, "%4u", ugrp); - return(str); + return str; } if (!strcmp(sp, "SUB")) { if (SMB_IS_OPEN(&smb)) { if (smb.subnum == INVALID_SUB) - return("Mail"); + return "Mail"; else if (subnum_is_valid(smb.subnum)) - return(cfg.sub[smb.subnum]->sname); + return cfg.sub[smb.subnum]->sname; } - return(usrgrps ? cfg.sub[usrsub[curgrp][cursub[curgrp]]]->sname : nulstr); + return usrgrps ? cfg.sub[usrsub[curgrp][cursub[curgrp]]]->sname : nulstr; } if (!strcmp(sp, "SUBL")) { if (SMB_IS_OPEN(&smb)) { if (smb.subnum == INVALID_SUB) - return("Mail"); + return "Mail"; else if (subnum_is_valid(smb.subnum)) - return(cfg.sub[smb.subnum]->lname); + return cfg.sub[smb.subnum]->lname; } - return(usrgrps ? cfg.sub[usrsub[curgrp][cursub[curgrp]]]->lname : nulstr); + return usrgrps ? cfg.sub[usrsub[curgrp][cursub[curgrp]]]->lname : nulstr; } if (!strcmp(sp, "SN")) { @@ -1757,7 +1757,7 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, else usub = usrgrps ? cursub[curgrp] + 1 : 0; safe_snprintf(str, maxlen, "%u", usub); - return(str); + return str; } if (!strcmp(sp, "SL")) { @@ -1766,7 +1766,7 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, else usub = usrgrps ? cursub[curgrp] + 1 : 0; safe_snprintf(str, maxlen, "%-4u", usub); - return(str); + return str; } if (!strcmp(sp, "SR")) { @@ -1775,49 +1775,49 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, else usub = usrgrps ? cursub[curgrp] + 1 : 0; safe_snprintf(str, maxlen, "%4u", usub); - return(str); + return str; } if (!strcmp(sp, "LIB")) - return(usrlibs ? cfg.lib[usrlib[curlib]]->sname : nulstr); + return usrlibs ? cfg.lib[usrlib[curlib]]->sname : nulstr; if (!strcmp(sp, "LIBL")) - return(usrlibs ? cfg.lib[usrlib[curlib]]->lname : nulstr); + return usrlibs ? cfg.lib[usrlib[curlib]]->lname : nulstr; if (!strcmp(sp, "LN")) { safe_snprintf(str, maxlen, "%u", usrlibs ? curlib + 1 : 0); - return(str); + return str; } if (!strcmp(sp, "LL")) { safe_snprintf(str, maxlen, "%-4u", usrlibs ? curlib + 1 : 0); - return(str); + return str; } if (!strcmp(sp, "LR")) { safe_snprintf(str, maxlen, "%4u", usrlibs ? curlib + 1 : 0); - return(str); + return str; } if (!strcmp(sp, "DIR")) - return(usrlibs ? cfg.dir[usrdir[curlib][curdir[curlib]]]->sname :nulstr); + return usrlibs ? cfg.dir[usrdir[curlib][curdir[curlib]]]->sname :nulstr; if (!strcmp(sp, "DIRL")) - return(usrlibs ? cfg.dir[usrdir[curlib][curdir[curlib]]]->lname : nulstr); + return usrlibs ? cfg.dir[usrdir[curlib][curdir[curlib]]]->lname : nulstr; if (!strcmp(sp, "DN")) { safe_snprintf(str, maxlen, "%u", usrlibs ? curdir[curlib] + 1 : 0); - return(str); + return str; } if (!strcmp(sp, "DL")) { safe_snprintf(str, maxlen, "%-4u", usrlibs ? curdir[curlib] + 1 : 0); - return(str); + return str; } if (!strcmp(sp, "DR")) { safe_snprintf(str, maxlen, "%4u", usrlibs ? curdir[curlib] + 1 : 0); - return(str); + return str; } if (!strcmp(sp, "NOACCESS")) { @@ -1827,88 +1827,88 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, safe_snprintf(str, maxlen, noaccess_str, wday[noaccess_val]); else safe_snprintf(str, maxlen, noaccess_str, noaccess_val); - return(str); + return str; } if (!strcmp(sp, "LAST")) { tp = strrchr(useron.alias, ' '); if (tp) tp++; else tp = useron.alias; - return(tp); + return tp; } if (!strcmp(sp, "REAL") || !strcmp(sp, "FIRSTREAL")) { safe_snprintf(str, maxlen, "%s", useron.name); tp = strchr(str, ' '); if (tp) *tp = 0; - return(str); + return str; } if (!strcmp(sp, "LASTREAL")) { tp = strrchr(useron.name, ' '); if (tp) tp++; else tp = useron.name; - return(tp); + return tp; } if (!strcmp(sp, "MAILR")) { safe_snprintf(str, maxlen, "%u", getmail(&cfg, useron.number, /* Sent: */ FALSE, /* attr: */ MSG_READ)); - return(str); + return str; } if (!strcmp(sp, "MAILU")) { safe_snprintf(str, maxlen, "%u", getmail(&cfg, useron.number, /* Sent: */ FALSE, /* attr: */ ~MSG_READ)); - return(str); + return str; } if (!strcmp(sp, "MAILW")) { safe_snprintf(str, maxlen, "%u", getmail(&cfg, useron.number, /* Sent: */ FALSE, /* attr: */ 0)); - return(str); + return str; } if (!strcmp(sp, "MAILP")) { safe_snprintf(str, maxlen, "%u", getmail(&cfg, useron.number, /* Sent: */ TRUE, /* attr: */ 0)); - return(str); + return str; } if (!strcmp(sp, "SPAMW")) { safe_snprintf(str, maxlen, "%u", getmail(&cfg, useron.number, /* Sent: */ FALSE, /* attr: */ MSG_SPAM)); - return(str); + return str; } if (!strncmp(sp, "MAILR:", 6) || !strncmp(sp, "MAILR#", 6)) { safe_snprintf(str, maxlen, "%u", getmail(&cfg, atoi(sp + 6), /* Sent: */ FALSE, /* attr: */ MSG_READ)); - return(str); + return str; } if (!strncmp(sp, "MAILU:", 6) || !strncmp(sp, "MAILU#", 6)) { safe_snprintf(str, maxlen, "%u", getmail(&cfg, atoi(sp + 6), /* Sent: */ FALSE, /* attr: */ ~MSG_READ)); - return(str); + return str; } if (!strncmp(sp, "MAILW:", 6) || !strncmp(sp, "MAILW#", 6)) { safe_snprintf(str, maxlen, "%u", getmail(&cfg, atoi(sp + 6), /* Sent: */ FALSE, /* attr: */ 0)); - return(str); + return str; } if (!strncmp(sp, "MAILP:", 6) || !strncmp(sp, "MAILP#", 6)) { safe_snprintf(str, maxlen, "%u", getmail(&cfg, atoi(sp + 6), /* Sent: */ TRUE, /* attr: */ 0)); - return(str); + return str; } if (!strncmp(sp, "SPAMW:", 6) || !strncmp(sp, "SPAMW#", 6)) { safe_snprintf(str, maxlen, "%u", getmail(&cfg, atoi(sp + 6), /* Sent: */ FALSE, /* attr: */ MSG_SPAM)); - return(str); + return str; } if (!strcmp(sp, "MSGREPLY")) { safe_snprintf(str, maxlen, "%c", cfg.sys_misc & SM_RA_EMU ? 'R' : 'A'); - return(str); + return str; } if (!strcmp(sp, "MSGREREAD")) { safe_snprintf(str, maxlen, "%c", cfg.sys_misc & SM_RA_EMU ? 'A' : 'R'); - return(str); + return str; } if (!strncmp(sp, "STATS.", 6)) { @@ -1938,7 +1938,7 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, safe_snprintf(str, maxlen, "%u", stats.ftoday); else if (!strcmp(sp, "NUSERS")) safe_snprintf(str, maxlen, "%u", stats.nusers); - return(str); + return str; } /* Message header codes */ @@ -1953,7 +1953,7 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, , smb_netaddrstr(¤t_msg->to_net, tmp)); } else return current_msg_to == nullptr ? current_msg->to : current_msg_to; - return(str); + return str; } if (!strcmp(sp, "MSG_TO_NAME") && current_msg != nullptr) { if (pmode != NULL) @@ -1970,24 +1970,24 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, } if (!strcmp(sp, "MSG_TO_EXT") && current_msg != NULL) { if (current_msg->to_ext == NULL) - return(nulstr); - return(current_msg->to_ext); + return nulstr; + return current_msg->to_ext; } if (!strcmp(sp, "MSG_TO_NET") && current_msg != NULL) { if (current_msg->to_net.addr == NULL) return nulstr; - return(smb_netaddrstr(¤t_msg->to_net, str)); + return smb_netaddrstr(¤t_msg->to_net, str); } if (!strcmp(sp, "MSG_TO_NETTYPE") && current_msg != NULL) { if (current_msg->to_net.type == NET_NONE) return nulstr; - return(smb_nettype((enum smb_net_type)current_msg->to_net.type)); + return smb_nettype((enum smb_net_type)current_msg->to_net.type); } if (!strcmp(sp, "MSG_CC") && current_msg != NULL) - return(current_msg->cc_list == NULL ? nulstr : current_msg->cc_list); + return current_msg->cc_list == NULL ? nulstr : current_msg->cc_list; if (!strcmp(sp, "MSG_FROM") && current_msg != nullptr) { if (current_msg->hdr.attr & MSG_ANONYMOUS && !SYSOP) - return(text[Anonymous]); + return text[Anonymous]; if (pmode != NULL) *pmode |= (current_msg->hdr.auxattr & MSG_HFIELDS_UTF8); if (current_msg->from_ext != NULL) @@ -1997,11 +1997,11 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, , smb_netaddrstr(¤t_msg->from_net, tmp)); } else return current_msg_from == nullptr ? current_msg->from : current_msg_from; - return(str); + return str; } if (!strcmp(sp, "MSG_FROM_NAME") && current_msg != nullptr) { if (current_msg->hdr.attr & MSG_ANONYMOUS && !SYSOP) - return(text[Anonymous]); + return text[Anonymous]; if (pmode != NULL) *pmode |= (current_msg->hdr.auxattr & MSG_HFIELDS_UTF8); return current_msg_from == nullptr ? current_msg->from : current_msg_from; @@ -2018,19 +2018,19 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, if (!strcmp(sp, "MSG_FROM_EXT") && current_msg != NULL) { if (!(current_msg->hdr.attr & MSG_ANONYMOUS) || SYSOP) if (current_msg->from_ext != NULL) - return(current_msg->from_ext); - return(nulstr); + return current_msg->from_ext; + return nulstr; } if (!strcmp(sp, "MSG_FROM_NET") && current_msg != NULL) { if (current_msg->from_net.addr != NULL && (!(current_msg->hdr.attr & MSG_ANONYMOUS) || SYSOP)) - return(smb_netaddrstr(¤t_msg->from_net, str)); - return(nulstr); + return smb_netaddrstr(¤t_msg->from_net, str); + return nulstr; } if (!strcmp(sp, "MSG_FROM_NETTYPE") && current_msg != NULL) { if (current_msg->from_net.type == NET_NONE) return nulstr; - return(smb_nettype((enum smb_net_type)current_msg->from_net.type)); + return smb_nettype((enum smb_net_type)current_msg->from_net.type); } if (!strcmp(sp, "MSG_SUBJECT") && current_msg != nullptr) { if (pmode != NULL) @@ -2038,22 +2038,22 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, return current_msg_subj == nullptr ? current_msg->subj : current_msg_subj; } if (!strcmp(sp, "MSG_SUMMARY") && current_msg != NULL) - return(current_msg->summary == NULL ? nulstr : current_msg->summary); + return current_msg->summary == NULL ? nulstr : current_msg->summary; if (!strcmp(sp, "MSG_TAGS") && current_msg != NULL) - return(current_msg->tags == NULL ? nulstr : current_msg->tags); + return current_msg->tags == NULL ? nulstr : current_msg->tags; if (!strcmp(sp, "MSG_DATE") && current_msg != NULL) - return(timestr(smb_time(current_msg->hdr.when_written))); + return timestr(smb_time(current_msg->hdr.when_written)); if (!strcmp(sp, "MSG_DATE_UTC") && current_msg != NULL) - return(timestr(smb_time(current_msg->hdr.when_written) - (smb_tzutc(current_msg->hdr.when_written.zone) * 60))); + return timestr(smb_time(current_msg->hdr.when_written) - (smb_tzutc(current_msg->hdr.when_written.zone) * 60)); if (!strcmp(sp, "MSG_IMP_DATE") && current_msg != NULL) - return(timestr(current_msg->hdr.when_imported.time)); + return timestr(current_msg->hdr.when_imported.time); if (!strcmp(sp, "MSG_AGE") && current_msg != NULL) return age_of_posted_item(str, maxlen , smb_time(current_msg->hdr.when_written) - (smb_tzutc(current_msg->hdr.when_written.zone) * 60)); if (!strcmp(sp, "MSG_TIMEZONE") && current_msg != NULL) - return(smb_zonestr(current_msg->hdr.when_written.zone, NULL)); + return smb_zonestr(current_msg->hdr.when_written.zone, NULL); if (!strcmp(sp, "MSG_IMP_TIMEZONE") && current_msg != NULL) - return(smb_zonestr(current_msg->hdr.when_imported.zone, NULL)); + return smb_zonestr(current_msg->hdr.when_imported.zone, NULL); if (!strcmp(sp, "MSG_ATTR") && current_msg != NULL) { uint16_t attr = current_msg->hdr.attr; uint16_t poll = attr & MSG_POLL_VOTE_MASK; @@ -2075,7 +2075,7 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, , poll == MSG_POLL ? "Poll " :nulstr , poll == MSG_POLL && auxattr & POLL_CLOSED ? "(Closed) " :nulstr ); - return(str); + return str; } if (!strcmp(sp, "MSG_AUXATTR") && current_msg != NULL) { safe_snprintf(str, maxlen, "%s%s%s%s%s%s%s" @@ -2087,7 +2087,7 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, , current_msg->hdr.auxattr & MSG_CONFIRMREQ ? "ConfirmReq " :nulstr , current_msg->hdr.auxattr & MSG_NODISP ? "DontDisplay " :nulstr ); - return(str); + return str; } if (!strcmp(sp, "MSG_NETATTR") && current_msg != NULL) { safe_snprintf(str, maxlen, "%s%s%s%s%s%s%s%s" @@ -2100,31 +2100,31 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, , current_msg->hdr.netattr & NETMSG_IMMEDIATE ? "Immediate " :nulstr , current_msg->hdr.netattr & NETMSG_DIRECT ? "Direct " :nulstr ); - return(str); + return str; } if (!strcmp(sp, "MSG_ID") && current_msg != NULL) - return(current_msg->id == NULL ? nulstr : current_msg->id); + return current_msg->id == NULL ? nulstr : current_msg->id; if (!strcmp(sp, "MSG_REPLY_ID") && current_msg != NULL) - return(current_msg->reply_id == NULL ? nulstr : current_msg->reply_id); + return current_msg->reply_id == NULL ? nulstr : current_msg->reply_id; if (!strcmp(sp, "MSG_NUM") && current_msg != NULL) { safe_snprintf(str, maxlen, "%lu", (ulong)current_msg->hdr.number); - return(str); + return str; } if (!strcmp(sp, "MSG_SCORE") && current_msg != NULL) { safe_snprintf(str, maxlen, "%ld", (long)current_msg->upvotes - (long)current_msg->downvotes); - return(str); + return str; } if (!strcmp(sp, "MSG_UPVOTES") && current_msg != NULL) { safe_snprintf(str, maxlen, "%lu", (ulong)current_msg->upvotes); - return(str); + return str; } if (!strcmp(sp, "MSG_DOWNVOTES") && current_msg != NULL) { safe_snprintf(str, maxlen, "%lu", (ulong)current_msg->downvotes); - return(str); + return str; } if (!strcmp(sp, "MSG_TOTAL_VOTES") && current_msg != NULL) { safe_snprintf(str, maxlen, "%lu", (ulong)current_msg->total_votes); - return(str); + return str; } if (!strcmp(sp, "MSG_VOTED")) return (current_msg != NULL && current_msg->user_voted) ? text[PollAnswerChecked] : nulstr; @@ -2155,7 +2155,7 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, , cfg.sub[smb.subnum]->sname); else strncpy(str, "Email", maxlen); - return(str); + return str; } if (!strcmp(sp, "SMB_AREA_DESC")) { if (subnum_is_valid(smb.subnum)) @@ -2164,76 +2164,76 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, , cfg.sub[smb.subnum]->lname); else strncpy(str, "Personal Email", maxlen); - return(str); + return str; } if (!strcmp(sp, "SMB_GROUP")) { if (subnum_is_valid(smb.subnum)) - return(cfg.grp[cfg.sub[smb.subnum]->grp]->sname); - return(nulstr); + return cfg.grp[cfg.sub[smb.subnum]->grp]->sname; + return nulstr; } if (!strcmp(sp, "SMB_GROUP_DESC")) { if (subnum_is_valid(smb.subnum)) - return(cfg.grp[cfg.sub[smb.subnum]->grp]->lname); - return(nulstr); + return cfg.grp[cfg.sub[smb.subnum]->grp]->lname; + return nulstr; } if (!strcmp(sp, "SMB_GROUP_NUM")) { if (subnum_is_valid(smb.subnum)) safe_snprintf(str, maxlen, "%u", getusrgrp(smb.subnum)); - return(str); + return str; } if (!strcmp(sp, "SMB_SUB")) { if (smb.subnum == INVALID_SUB) - return("Mail"); + return "Mail"; else if (subnum_is_valid(smb.subnum)) - return(cfg.sub[smb.subnum]->sname); - return(nulstr); + return cfg.sub[smb.subnum]->sname; + return nulstr; } if (!strcmp(sp, "SMB_SUB_DESC")) { if (smb.subnum == INVALID_SUB) - return("Mail"); + return "Mail"; else if (subnum_is_valid(smb.subnum)) - return(cfg.sub[smb.subnum]->lname); - return(nulstr); + return cfg.sub[smb.subnum]->lname; + return nulstr; } if (!strcmp(sp, "SMB_SUB_CODE")) { if (smb.subnum == INVALID_SUB) - return("MAIL"); + return "MAIL"; else if (subnum_is_valid(smb.subnum)) - return(cfg.sub[smb.subnum]->code); - return(nulstr); + return cfg.sub[smb.subnum]->code; + return nulstr; } if (!strcmp(sp, "SMB_SUB_NUM")) { if (subnum_is_valid(smb.subnum)) safe_snprintf(str, maxlen, "%u", getusrsub(smb.subnum)); - return(str); + return str; } if (!strcmp(sp, "SMB_MSGS")) { safe_snprintf(str, maxlen, "%lu", (ulong)smb.msgs); - return(str); + return str; } if (!strcmp(sp, "SMB_CURMSG")) { safe_snprintf(str, maxlen, "%lu", (ulong)(smb.curmsg + 1)); - return(str); + return str; } if (!strcmp(sp, "SMB_LAST_MSG")) { safe_snprintf(str, maxlen, "%lu", (ulong)smb.status.last_msg); - return(str); + return str; } if (!strcmp(sp, "SMB_MAX_MSGS")) { safe_snprintf(str, maxlen, "%lu", (ulong)smb.status.max_msgs); - return(str); + return str; } if (!strcmp(sp, "SMB_MAX_CRCS")) { safe_snprintf(str, maxlen, "%lu", (ulong)smb.status.max_crcs); - return(str); + return str; } if (!strcmp(sp, "SMB_MAX_AGE")) { safe_snprintf(str, maxlen, "%hu", smb.status.max_age); - return(str); + return str; } if (!strcmp(sp, "SMB_TOTAL_MSGS")) { safe_snprintf(str, maxlen, "%lu", (ulong)smb.status.total_msgs); - return(str); + return str; } /* Currently viewed file */ diff --git a/src/sbbs3/baja.c b/src/sbbs3/baja.c index d07b8073ba085ba852b5e046dd39601f4146e996..ef015c88ffa25636ae877a3fdeb5ea0e2337f19d 100644 --- a/src/sbbs3/baja.c +++ b/src/sbbs3/baja.c @@ -36,51 +36,51 @@ #include "cmdshell.h" #include "ars_defs.h" #include "crc32.h" -#include "genwrap.h" /* portability wrappers */ -#include "dirwrap.h" /* MAX_PATH */ +#include "genwrap.h" /* portability wrappers */ +#include "dirwrap.h" /* MAX_PATH */ #ifdef __BORLANDC__ -unsigned _stklen=20000; /* Set stack size in code, not header */ +unsigned _stklen = 20000; /* Set stack size in code, not header */ #endif -char **label_name=NULL - ,**goto_file=NULL - ,**goto_label=NULL - ,**call_file=NULL - ,**call_label=NULL; +char ** label_name = NULL +, **goto_file = NULL +, **goto_label = NULL +, **call_file = NULL +, **call_label = NULL; -uint32_t *var_name=NULL,vars=0; +uint32_t *var_name = NULL, vars = 0; -char **define_str=NULL - ,**define_val=NULL; +char ** define_str = NULL +, **define_val = NULL; -char *linestr="%s %d: %s\n"; -char tmp[256]; +char * linestr = "%s %d: %s\n"; +char tmp[256]; -uint *label_indx=NULL - ,*goto_indx=NULL - ,*goto_line=NULL - ,*call_indx=NULL - ,*call_line=NULL; +uint * label_indx = NULL +, *goto_indx = NULL +, *goto_line = NULL +, *call_indx = NULL +, *call_line = NULL; -char bin_file[MAX_PATH+1]; -char output_dir[MAX_PATH+1]; -char include_dir[MAX_PATH+1]; +char bin_file[MAX_PATH + 1]; +char output_dir[MAX_PATH + 1]; +char include_dir[MAX_PATH + 1]; -uint display=0,line=0,labels=0,gotos=0,calls=0,defines=0,case_sens=0; -BOOL pause_on_error=FALSE; +uint display = 0, line = 0, labels = 0, gotos = 0, calls = 0, defines = 0, case_sens = 0; +BOOL pause_on_error = FALSE; -FILE *out=NULL; +FILE *out = NULL; void bail(int retval) { - if(out) + if (out) fclose(out); - if(retval!=0) { - if(bin_file[0]!=0) + if (retval != 0) { + if (bin_file[0] != 0) remove(bin_file); - if(pause_on_error) { + if (pause_on_error) { printf("\nHit enter to contiue..."); getchar(); } @@ -94,3387 +94,3843 @@ void bail(int retval) /****************************************************************************/ uint32_t ahtoul(char *str) { - uint32_t l,val=0; + uint32_t l, val = 0; - while((l=(*str++)|0x20)!=0x20) - val=(l&0xf)+(l>>6&1)*9+val*16; - return(val); + while ((l = (*str++) | 0x20) != 0x20) + val = (l & 0xf) + (l >> 6 & 1) * 9 + val * 16; + return val; } /* C Escape char */ uchar cesc(char ch) { - switch(ch) { + switch (ch) { case 'e': - return(ESC); + return ESC; case 'r': - return(CR); + return CR; case 'n': - return(LF); + return LF; case 't': - return(TAB); + return TAB; case 'b': - return(BS); + return BS; case 'a': - return(BEL); + return BEL; case 'f': - return(FF); + return FF; case 'v': - return(11); + return 11; default: - return(ch); + return ch; } } int32_t val(char *src, char *p) { static int inside; - int32_t l; + int32_t l; - if(IS_DIGIT(*p) || *p=='-') /* Dec, Hex, or Oct */ - l=strtol(p,&p,0); - else if(*p=='\'') { /* Char */ + if (IS_DIGIT(*p) || *p == '-') /* Dec, Hex, or Oct */ + l = strtol(p, &p, 0); + else if (*p == '\'') { /* Char */ p++; - if(*p=='\\') { + if (*p == '\\') { p++; - l=cesc(*p); } + l = cesc(*p); + } else - l=*p; - p++; } - else if(*p=='.') /* Bit */ - l=1L<<strtol(p+1,&p,0); + l = *p; + p++; + } + else if (*p == '.') /* Bit */ + l = 1L << strtol(p + 1, &p, 0); else { printf("!SYNTAX ERROR (expecting integer constant):\n"); - printf(linestr,src,line,*p ? p : "<end of line>"); + printf(linestr, src, line, *p ? p : "<end of line>"); bail(1); - return(0); } - if(inside) { - return(l); } - inside=1; - while(*p) - switch(*(p++)) { + return 0; + } + if (inside) { + return l; + } + inside = 1; + while (*p) + switch (*(p++)) { case '+': - l+=val(src,p); + l += val(src, p); break; case '-': - l-=val(src,p); + l -= val(src, p); break; case '*': - l*=val(src,p); + l *= val(src, p); break; case '/': - l/=val(src,p); + l /= val(src, p); break; case '%': - l%=val(src,p); + l %= val(src, p); break; case '&': - l&=val(src,p); + l &= val(src, p); break; case '|': - l|=val(src,p); + l |= val(src, p); break; case '~': - l&=~val(src,p); + l &= ~val(src, p); break; case '^': - l^=val(src,p); + l ^= val(src, p); break; case '>': - if(*p=='>') { + if (*p == '>') { p++; - l>>=val(src,p); } + l >>= val(src, p); + } break; case '<': - if(*p=='<') { + if (*p == '<') { p++; - l<<=val(src,p); } + l <<= val(src, p); + } break; case ' ': case '#': - inside=0; - return(l); } - inside=0; - return(l); + inside = 0; + return l; + } + inside = 0; + return l; } void writecstr(char *p) { char str[1024]; - int j=0,inquotes=0; + int j = 0, inquotes = 0; - while(*p) { - if(*p=='"') { /* ignore quotes */ - if(inquotes) + while (*p) { + if (*p == '"') { /* ignore quotes */ + if (inquotes) break; - inquotes=1; + inquotes = 1; p++; - continue; } - if(*p=='\\') { /* escape */ + continue; + } + if (*p == '\\') { /* escape */ p++; - if(IS_DIGIT(*p)) { - sprintf(tmp,"%.3s",p); - str[j]=atoi(tmp); /* decimal, NOT octal */ - if(IS_DIGIT(*(++p))) /* skip up to 3 digits */ - if(IS_DIGIT(*(++p))) + if (IS_DIGIT(*p)) { + sprintf(tmp, "%.3s", p); + str[j] = atoi(tmp); /* decimal, NOT octal */ + if (IS_DIGIT(*(++p))) /* skip up to 3 digits */ + if (IS_DIGIT(*(++p))) p++; j++; - continue; } - switch(*(p++)) { + continue; + } + switch (*(p++)) { case 'x': - tmp[0]=*(p++); - tmp[1]=0; - if(isxdigit((uchar)*p)) { /* if another hex digit, skip too */ - tmp[1]=*(p++); - tmp[2]=0; } - str[j]=(char)ahtoul(tmp); + tmp[0] = *(p++); + tmp[1] = 0; + if (isxdigit((uchar) * p)) { /* if another hex digit, skip too */ + tmp[1] = *(p++); + tmp[2] = 0; + } + str[j] = (char)ahtoul(tmp); break; case 'e': - str[j]=ESC; + str[j] = ESC; break; case 'r': - str[j]=CR; + str[j] = CR; break; case 'n': - str[j]=LF; + str[j] = LF; break; case 't': - str[j]=TAB; + str[j] = TAB; break; case 'b': - str[j]=BS; + str[j] = BS; break; case 'a': - str[j]=BEL; + str[j] = BEL; break; case 'f': - str[j]=FF; + str[j] = FF; break; case 'v': - str[j]=11; /* VT */ + str[j] = 11; /* VT */ break; default: - str[j]=*(p-1); - break; } + str[j] = *(p - 1); + break; + } j++; - continue; } - str[j++]=*(p++); } - str[j]=0; - fwrite(str,1,j+1,out); + continue; + } + str[j++] = *(p++); + } + str[j] = 0; + fwrite(str, 1, j + 1, out); } void writestr(char *p) { char str[1024]; - int j=0; + int j = 0; - while(*p) { - if(*p=='"') { /* ignore quotes */ + while (*p) { + if (*p == '"') { /* ignore quotes */ p++; - continue; } - if(*p=='\\' && *(p+1)=='"' && *(p+2)) + continue; + } + if (*p == '\\' && *(p + 1) == '"' && *(p + 2)) p++; - str[j++]=*(p++); } - str[j]=0; - fwrite(str,1,j+1,out); + str[j++] = *(p++); + } + str[j] = 0; + fwrite(str, 1, j + 1, out); } void cvttab(char *str) { int i; - for(i=0;str[i];i++) - if(str[i]==TAB) - str[i]=' '; + for (i = 0; str[i]; i++) + if (str[i] == TAB) + str[i] = ' '; } void newvar(char* src, char *in) { - char name[128]; - int32_t i,l; + char name[128]; + int32_t i, l; - if(IS_DIGIT(*in)) { + if (IS_DIGIT(*in)) { printf("!SYNTAX ERROR (illegal variable name):\n"); - printf(linestr,src,line,(char*)in); - bail(1); + printf(linestr, src, line, (char*)in); + bail(1); } - sprintf(name,"%.80s",in); - if(strncmp(name,"var_",4)==0) /* decompiled source? */ - l=strtoul(name+4,NULL,16); + sprintf(name, "%.80s", in); + if (strncmp(name, "var_", 4) == 0) /* decompiled source? */ + l = strtoul(name + 4, NULL, 16); else { - if(!case_sens) + if (!case_sens) strupr(name); - l=crc32(name,0); - for(i=0;i<vars;i++) - if(var_name[i]==l) + l = crc32(name, 0); + for (i = 0; i < vars; i++) + if (var_name[i] == l) break; - if(i<vars) + if (i < vars) return; } - if((var_name=(uint32_t *)realloc_or_free(var_name,sizeof(int32_t)*(vars+1)))==NULL) { - printf("Too many (%"PRIu32") variables!\n",vars); - bail(1); } - var_name[vars]=l; - if(display) - printf("newvar(%08"PRIX32")=%s\n",l,in); + if ((var_name = (uint32_t *)realloc_or_free(var_name, sizeof(int32_t) * (vars + 1))) == NULL) { + printf("Too many (%" PRIu32 ") variables!\n", vars); + bail(1); + } + var_name[vars] = l; + if (display) + printf("newvar(%08" PRIX32 ")=%s\n", l, in); vars++; } void writecrc(char *src, char *in) { - char name[128]; - char* p; - int32_t l; - int i; + char name[128]; + char* p; + int32_t l; + int i; /* Automatically terminate variable name Oct-09-2000 rswindell */ - sprintf(name,"%.80s",in); - p=strchr(name,' '); - if(p) *p=0; - - if(!stricmp(name,"STR") || !name[0]) - l=0; - else if(strncmp(name,"var_",4)==0) /* decompiled source? */ - l=strtoul(name+4,NULL,16); + sprintf(name, "%.80s", in); + p = strchr(name, ' '); + if (p) *p = 0; + + if (!stricmp(name, "STR") || !name[0]) + l = 0; + else if (strncmp(name, "var_", 4) == 0) /* decompiled source? */ + l = strtoul(name + 4, NULL, 16); else { - if(!case_sens) + if (!case_sens) strupr(name); - l=crc32(name,0); + l = crc32(name, 0); - for(i=0;i<vars;i++) - if(var_name[i]==l) + for (i = 0; i < vars; i++) + if (var_name[i] == l) break; - if(i==vars) { + if (i == vars) { printf("!SYNTAX ERROR (expecting variable name):\n"); - printf(linestr,src,line,*in ? (char*)in : "<end of line>"); - bail(1); + printf(linestr, src, line, *in ? (char*)in : "<end of line>"); + bail(1); } } - fwrite(&l,4,1,out); + fwrite(&l, 4, 1, out); } int32_t isvar(char *arg) { - char name[128],*p; - int32_t i,l; - - if(!arg || !(*arg) || IS_DIGIT(*arg)) - return(0); - - sprintf(name,"%.80s",arg); - if((p=strchr(name,' '))!=NULL) /* Truncate at first space */ - *p=0; - if(strncmp(name,"var_",4)==0) /* decompiled source? */ - return(strtoul(name+4,NULL,16)); - if(!case_sens) + char name[128], *p; + int32_t i, l; + + if (!arg || !(*arg) || IS_DIGIT(*arg)) + return 0; + + sprintf(name, "%.80s", arg); + if ((p = strchr(name, ' ')) != NULL) /* Truncate at first space */ + *p = 0; + if (strncmp(name, "var_", 4) == 0) /* decompiled source? */ + return strtoul(name + 4, NULL, 16); + if (!case_sens) strupr(name); - l=crc32(name,0); + l = crc32(name, 0); - for(i=0;i<vars;i++) - if(var_name[i]==l) + for (i = 0; i < vars; i++) + if (var_name[i] == l) break; - if(i==vars) - return(0); - return(l); + if (i == vars) + return 0; + return l; } int str_cmp(char *s1, char *s2) { - if(case_sens) - return(strcmp(s1,s2)); - return(stricmp(s1,s2)); + if (case_sens) + return strcmp(s1, s2); + return stricmp(s1, s2); } void expdefs(char *line) { - char str[512],*p,*sp,sav[2]={0}; - int i; + char str[512], *p, *sp, sav[2] = {0}; + int i; + + str[0] = 0; + for (p = line; *p; p++) { + if (*p == ' ') { + strcat(str, " "); + continue; + } + + if (*p == '"') { /* Skip quoted text */ + sp = strchr(p + 1, '"'); + if (sp) *sp = 0; + strcat(str, p); + if (!sp) + break; + strcat(str, "\""); + p += strlen(p); + continue; + } - str[0]=0; - for(p=line;*p;p++) { - if(*p==' ') { - strcat(str," "); - continue; } - - if(*p=='"') { /* Skip quoted text */ - sp=strchr(p+1,'"'); - if(sp) *sp=0; - strcat(str,p); - if(!sp) - break; - strcat(str,"\""); - p+=strlen(p); - continue; } - - for(sp=p;*sp;sp++) - if(!IS_ALPHANUMERIC(*sp) && *sp!='_') - break; - sav[0]=*sp; /* Save delimiter */ - sav[1]=0; - *sp=0; - for(i=0;i<defines;i++) - if(!str_cmp(define_str[i],p)) - break; - if(i<defines) - strcat(str,define_val[i]); + for (sp = p; *sp; sp++) + if (!IS_ALPHANUMERIC(*sp) && *sp != '_') + break; + sav[0] = *sp; /* Save delimiter */ + sav[1] = 0; + *sp = 0; + for (i = 0; i < defines; i++) + if (!str_cmp(define_str[i], p)) + break; + if (i < defines) + strcat(str, define_val[i]); else - strcat(str,p); - if(!sav[0]) /* Last argument */ + strcat(str, p); + if (!sav[0]) /* Last argument */ break; - p+=strlen(p); - strcat(str,sav); /* Restore delimiter */ - } - strcpy(line,str); + p += strlen(p); + strcat(str, sav); /* Restore delimiter */ + } + strcpy(line, str); } -#define SKIPCTRLSP(p) while(*(p)<=' ' && *(p)>0) (p)++ +#define SKIPCTRLSP(p) while (*(p) <= ' ' && *(p) > 0) (p) ++ void compile(char *src) { - char *str,*save,*p,*sp,*tp,*arg,*arg2,*arg3,*arg4,ch; - uchar *ar; - char path[MAX_PATH+1]; + char * str, *save, *p, *sp, *tp, *arg, *arg2, *arg3, *arg4, ch; + uchar * ar; + char path[MAX_PATH + 1]; uint16_t i; - uint16_t j; - int32_t l; - int savline; - FILE *in; + uint16_t j; + int32_t l; + int savline; + FILE * in; - if((in=fopen(src,"rb"))==NULL) { - printf("error %d opening %s for read\n",errno,src); - bail(1); } - line=0; + if ((in = fopen(src, "rb")) == NULL) { + printf("error %d opening %s for read\n", errno, src); + bail(1); + } + line = 0; - if((str=malloc(1024))==NULL) { + if ((str = malloc(1024)) == NULL) { printf("malloc error\n"); bail(1); } - if((save=malloc(1024))==NULL) { + if ((save = malloc(1024)) == NULL) { printf("malloc error\n"); bail(1); } - while(!feof(in) && !ferror(in)) { - if(!fgets(str,1000,in)) + while (!feof(in) && !ferror(in)) { + if (!fgets(str, 1000, in)) break; truncsp(str); cvttab(str); line++; - strcpy(save,str); - p=str; + strcpy(save, str); + p = str; SKIPCTRLSP(p); /* look for beginning of command */ - if((*p)==0) - continue; - if(*p=='#') /* remarks start with # */ - continue; - expdefs(p); /* expand defines */ - if(display) - printf("%s\n",p); - sp=strchr(p,' '); - arg=arg2=arg3=arg4=""; - if(sp) { - *sp=0; - arg=sp+1; + if ((*p) == 0) + continue; + if (*p == '#') /* remarks start with # */ + continue; + expdefs(p); /* expand defines */ + if (display) + printf("%s\n", p); + sp = strchr(p, ' '); + arg = arg2 = arg3 = arg4 = ""; + if (sp) { + *sp = 0; + arg = sp + 1; SKIPCTRLSP(arg); - sp=strchr(arg,' '); - if(sp) { - arg2=sp+1; + sp = strchr(arg, ' '); + if (sp) { + arg2 = sp + 1; SKIPCTRLSP(arg2); - sp=strchr(arg2,' '); - if(sp) { - arg3=sp+1; + sp = strchr(arg2, ' '); + if (sp) { + arg3 = sp + 1; SKIPCTRLSP(arg3); - sp=strchr(arg3,' '); - if(sp) { - arg4=sp+1; + sp = strchr(arg3, ' '); + if (sp) { + arg4 = sp + 1; SKIPCTRLSP(arg4); } } } } - if(!stricmp(p,"!INCLUDE")) { - savline=line; - sp=strchr(arg,' '); - if(sp) *sp=0; - sprintf(path,"%s%s",include_dir,arg); + if (!stricmp(p, "!INCLUDE")) { + savline = line; + sp = strchr(arg, ' '); + if (sp) *sp = 0; + sprintf(path, "%s%s", include_dir, arg); fexistcase(path); compile(path); - line=savline; - continue; + line = savline; + continue; } - if(!stricmp(p,"!DEFINE")) { /* define */ - sp=strchr(arg,' '); - if(sp) - *sp=0; + if (!stricmp(p, "!DEFINE")) { /* define */ + sp = strchr(arg, ' '); + if (sp) + *sp = 0; else break; - tp=strrchr(arg2,'\"'); - if(!tp) - tp=arg2; - sp=strchr(tp,'#'); - if(sp) - *sp=0; + tp = strrchr(arg2, '\"'); + if (!tp) + tp = arg2; + sp = strchr(tp, '#'); + if (sp) + *sp = 0; truncsp(arg2); - if((define_str=(char **)realloc_or_free(define_str,sizeof(char *)*(defines+1))) - ==NULL) { + if ((define_str = (char **)realloc_or_free(define_str, sizeof(char *) * (defines + 1))) + == NULL) { printf("Too many defines.\n"); - bail(1); } - if((define_str[defines]=(char *)malloc(strlen(arg)+1))==NULL) { + bail(1); + } + if ((define_str[defines] = (char *)malloc(strlen(arg) + 1)) == NULL) { printf("Too many defines.\n"); - bail(1); } - if((define_val=(char **)realloc_or_free(define_val,sizeof(char *)*(defines+1))) - ==NULL) { + bail(1); + } + if ((define_val = (char **)realloc_or_free(define_val, sizeof(char *) * (defines + 1))) + == NULL) { printf("Too many defines.\n"); - bail(1); } - if((define_val[defines]=(char *)malloc(strlen(arg2)+1))==NULL) { + bail(1); + } + if ((define_val[defines] = (char *)malloc(strlen(arg2) + 1)) == NULL) { printf("Too many defines.\n"); - bail(1); } - strcpy(define_str[defines],arg); - strcpy(define_val[defines],arg2); + bail(1); + } + strcpy(define_str[defines], arg); + strcpy(define_val[defines], arg2); defines++; - continue; } - - if(!stricmp(p,"!GLOBAL")) { /* declare global variables */ - if(!(*arg)) break; - for(p=arg;*p && *p!='#';) { - sp=strchr(p,' '); - if(sp) *sp=0; - newvar(src,p); - if(!sp) + continue; + } + + if (!stricmp(p, "!GLOBAL")) { /* declare global variables */ + if (!(*arg)) break; + for (p = arg; *p && *p != '#';) { + sp = strchr(p, ' '); + if (sp) *sp = 0; + newvar(src, p); + if (!sp) break; - p=sp+1; + p = sp + 1; SKIPCTRLSP(p); } - continue; } + continue; + } - if(!stricmp(p,"PATCH")) { - if(!(*arg)) break; - p=arg; - while(*p) { + if (!stricmp(p, "PATCH")) { + if (!(*arg)) break; + p = arg; + while (*p) { SKIPCTRLSP(p); - tmp[0]=*p++; - tmp[1]=*p++; - tmp[2]=0; - if(!tmp[0]) + tmp[0] = *p++; + tmp[1] = *p++; + tmp[2] = 0; + if (!tmp[0]) break; - ch=ahtoul(tmp); - fputc(ch,out); } - continue; } + ch = ahtoul(tmp); + fputc(ch, out); + } + continue; + } - if(!stricmp(p,"SHOW_VARS")) { - fputc(CS_VAR_INSTRUCTION,out); - fputc(SHOW_VARS,out); - continue; } + if (!stricmp(p, "SHOW_VARS")) { + fputc(CS_VAR_INSTRUCTION, out); + fputc(SHOW_VARS, out); + continue; + } - if(!stricmp(p,"COMPARE_ARS")) { - if(!(*arg)) break; + if (!stricmp(p, "COMPARE_ARS")) { + if (!(*arg)) break; strupr(arg); - ar=arstr(&i,arg,NULL,NULL); - if(ar != NULL) { - fprintf(out,"%c%c",CS_COMPARE_ARS,(uchar)i); - fwrite(ar,i,1,out); + ar = arstr(&i, arg, NULL, NULL); + if (ar != NULL) { + fprintf(out, "%c%c", CS_COMPARE_ARS, (uchar)i); + fwrite(ar, i, 1, out); free(ar); } - continue; } - - if(!stricmp(p,"CHKSYSPASS")) { - fprintf(out,"%c",CS_CHKSYSPASS); - continue; } - if(!stricmp(p,"INFO_SYSTEM")) { - fprintf(out,"%c",CS_INFO_SYSTEM); - continue; } - if(!stricmp(p,"INFO_SUBBOARD")) { - fprintf(out,"%c",CS_INFO_SUBBOARD); - continue; } - if(!stricmp(p,"INFO_DIRECTORY")) { - fprintf(out,"%c",CS_INFO_DIRECTORY); - continue; } - if(!stricmp(p,"INFO_VERSION")) { - fprintf(out,"%c",CS_INFO_VERSION); - continue; } - if(!stricmp(p,"INFO_USER")) { - fprintf(out,"%c",CS_INFO_USER); - continue; } - if(!stricmp(p,"INFO_XFER_POLICY")) { - fprintf(out,"%c",CS_INFO_XFER_POLICY); - continue; } - if(!stricmp(p,"LOGKEY")) { - fprintf(out,"%c",CS_LOGKEY); - continue; } - if(!stricmp(p,"LOGKEY_COMMA")) { - fprintf(out,"%c",CS_LOGKEY_COMMA); - continue; } - if(!stricmp(p,"LOGSTR")) { - fprintf(out,"%c",CS_LOGSTR); - continue; } - - if(!stricmp(p,"ONLINE")) { - fprintf(out,"%c%c",CS_ONE_MORE_BYTE,CS_ONLINE); - continue; } - if(!stricmp(p,"OFFLINE")) { - fprintf(out,"%c%c",CS_ONE_MORE_BYTE,CS_OFFLINE); - continue; } - if(!stricmp(p,"NEWUSER")) { - fprintf(out,"%c%c",CS_ONE_MORE_BYTE,CS_NEWUSER); - continue; } - if(!stricmp(p,"LOGON")) { - fprintf(out,"%c%c",CS_ONE_MORE_BYTE,CS_LOGON); - continue; } - if(!stricmp(p,"LOGOUT")) { - fprintf(out,"%c%c",CS_ONE_MORE_BYTE,CS_LOGOUT); - continue; } - if(!stricmp(p,"EXIT")) { - fprintf(out,"%c%c",CS_ONE_MORE_BYTE,CS_EXIT); - continue; } - - if(!stricmp(p,"LOOP") || !stricmp(p,"LOOP_BEGIN")) { - fprintf(out,"%c%c",CS_ONE_MORE_BYTE,CS_LOOP_BEGIN); - continue; } - if(!stricmp(p,"CONTINUE") || !stricmp(p,"CONTINUE_LOOP")) { - fprintf(out,"%c%c",CS_ONE_MORE_BYTE,CS_CONTINUE_LOOP); - continue; } - if(!stricmp(p,"BREAK") || !stricmp(p,"BREAK_LOOP")) { - fprintf(out,"%c%c",CS_ONE_MORE_BYTE,CS_BREAK_LOOP); - continue; } - if(!stricmp(p,"END_LOOP")) { - fprintf(out,"%c%c",CS_ONE_MORE_BYTE,CS_END_LOOP); - continue; } - - if(!stricmp(p,"USER_EVENT")) { - if(!(*arg)) - break; - if((l=isvar(arg))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(2,out); /* int offset */ - fputc(1,out); /* int length */ - ch=0; } /* place holder */ + continue; + } + + if (!stricmp(p, "CHKSYSPASS")) { + fprintf(out, "%c", CS_CHKSYSPASS); + continue; + } + if (!stricmp(p, "INFO_SYSTEM")) { + fprintf(out, "%c", CS_INFO_SYSTEM); + continue; + } + if (!stricmp(p, "INFO_SUBBOARD")) { + fprintf(out, "%c", CS_INFO_SUBBOARD); + continue; + } + if (!stricmp(p, "INFO_DIRECTORY")) { + fprintf(out, "%c", CS_INFO_DIRECTORY); + continue; + } + if (!stricmp(p, "INFO_VERSION")) { + fprintf(out, "%c", CS_INFO_VERSION); + continue; + } + if (!stricmp(p, "INFO_USER")) { + fprintf(out, "%c", CS_INFO_USER); + continue; + } + if (!stricmp(p, "INFO_XFER_POLICY")) { + fprintf(out, "%c", CS_INFO_XFER_POLICY); + continue; + } + if (!stricmp(p, "LOGKEY")) { + fprintf(out, "%c", CS_LOGKEY); + continue; + } + if (!stricmp(p, "LOGKEY_COMMA")) { + fprintf(out, "%c", CS_LOGKEY_COMMA); + continue; + } + if (!stricmp(p, "LOGSTR")) { + fprintf(out, "%c", CS_LOGSTR); + continue; + } + + if (!stricmp(p, "ONLINE")) { + fprintf(out, "%c%c", CS_ONE_MORE_BYTE, CS_ONLINE); + continue; + } + if (!stricmp(p, "OFFLINE")) { + fprintf(out, "%c%c", CS_ONE_MORE_BYTE, CS_OFFLINE); + continue; + } + if (!stricmp(p, "NEWUSER")) { + fprintf(out, "%c%c", CS_ONE_MORE_BYTE, CS_NEWUSER); + continue; + } + if (!stricmp(p, "LOGON")) { + fprintf(out, "%c%c", CS_ONE_MORE_BYTE, CS_LOGON); + continue; + } + if (!stricmp(p, "LOGOUT")) { + fprintf(out, "%c%c", CS_ONE_MORE_BYTE, CS_LOGOUT); + continue; + } + if (!stricmp(p, "EXIT")) { + fprintf(out, "%c%c", CS_ONE_MORE_BYTE, CS_EXIT); + continue; + } + + if (!stricmp(p, "LOOP") || !stricmp(p, "LOOP_BEGIN")) { + fprintf(out, "%c%c", CS_ONE_MORE_BYTE, CS_LOOP_BEGIN); + continue; + } + if (!stricmp(p, "CONTINUE") || !stricmp(p, "CONTINUE_LOOP")) { + fprintf(out, "%c%c", CS_ONE_MORE_BYTE, CS_CONTINUE_LOOP); + continue; + } + if (!stricmp(p, "BREAK") || !stricmp(p, "BREAK_LOOP")) { + fprintf(out, "%c%c", CS_ONE_MORE_BYTE, CS_BREAK_LOOP); + continue; + } + if (!stricmp(p, "END_LOOP")) { + fprintf(out, "%c%c", CS_ONE_MORE_BYTE, CS_END_LOOP); + continue; + } + + if (!stricmp(p, "USER_EVENT")) { + if (!(*arg)) + break; + if ((l = isvar(arg)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(2, out); /* int offset */ + fputc(1, out); /* int length */ + ch = 0; + } /* place holder */ else - ch=val(src,arg); - fprintf(out,"%c%c",CS_TWO_MORE_BYTES,CS_USER_EVENT); - fwrite(&ch,1,1,out); - continue; } - - if(!stricmp(p,"PUT_NODE")) { - fprintf(out,"%c",CS_PUT_NODE); - continue; } - if(!stricmp(p,"SYNC")) { - fprintf(out,"%c",CS_SYNC); - continue; } - if(!stricmp(p,"ASYNC")) { - fprintf(out,"%c",CS_ASYNC); - continue; } - if(!stricmp(p,"RIOSYNC")) { /* deprecated */ - fprintf(out,"%c",CS_SYNC); - continue; } - if(!stricmp(p,"GETTIMELEFT")) { - fprintf(out,"%c",CS_GETTIMELEFT); - continue; } - if(!stricmp(p,"SAVELINE")) { - fprintf(out,"%c",CS_SAVELINE); - continue; } - if(!stricmp(p,"RESTORELINE")) { - fprintf(out,"%c",CS_RESTORELINE); - continue; } - if(!stricmp(p,"IF_TRUE") || !stricmp(p,"IF_EQUAL")) { - fprintf(out,"%c",CS_IF_TRUE); - continue; } - if(!stricmp(p,"IF_FALSE") || !stricmp(p,"IF_NOT_EQUAL")) { - fprintf(out,"%c",CS_IF_FALSE); - continue; } - if(!stricmp(p,"IF_GREATER")) { - fprintf(out,"%c",CS_IF_GREATER); - continue; } - if(!stricmp(p,"IF_GREATER_OR_EQUAL") - || !stricmp(p,"IF_EQUAL_OR_GREATER")) { - fprintf(out,"%c",CS_IF_GREATER_OR_EQUAL); - continue; } - if(!stricmp(p,"IF_LESS")) { - fprintf(out,"%c",CS_IF_LESS); - continue; } - if(!stricmp(p,"IF_LESS_OR_EQUAL") - || !stricmp(p,"IF_EQUAL_OR_LESS")) { - fprintf(out,"%c",CS_IF_LESS_OR_EQUAL); - continue; } - if(!stricmp(p,"ENDIF") || !stricmp(p,"END_IF")) { - fprintf(out,"%c",CS_ENDIF); - continue; } - if(!stricmp(p,"ELSE")) { - fprintf(out,"%c",CS_ELSE); - continue; } - if(p[0]==':') { /* :label */ + ch = val(src, arg); + fprintf(out, "%c%c", CS_TWO_MORE_BYTES, CS_USER_EVENT); + fwrite(&ch, 1, 1, out); + continue; + } + + if (!stricmp(p, "PUT_NODE")) { + fprintf(out, "%c", CS_PUT_NODE); + continue; + } + if (!stricmp(p, "SYNC")) { + fprintf(out, "%c", CS_SYNC); + continue; + } + if (!stricmp(p, "ASYNC")) { + fprintf(out, "%c", CS_ASYNC); + continue; + } + if (!stricmp(p, "RIOSYNC")) { /* deprecated */ + fprintf(out, "%c", CS_SYNC); + continue; + } + if (!stricmp(p, "GETTIMELEFT")) { + fprintf(out, "%c", CS_GETTIMELEFT); + continue; + } + if (!stricmp(p, "SAVELINE")) { + fprintf(out, "%c", CS_SAVELINE); + continue; + } + if (!stricmp(p, "RESTORELINE")) { + fprintf(out, "%c", CS_RESTORELINE); + continue; + } + if (!stricmp(p, "IF_TRUE") || !stricmp(p, "IF_EQUAL")) { + fprintf(out, "%c", CS_IF_TRUE); + continue; + } + if (!stricmp(p, "IF_FALSE") || !stricmp(p, "IF_NOT_EQUAL")) { + fprintf(out, "%c", CS_IF_FALSE); + continue; + } + if (!stricmp(p, "IF_GREATER")) { + fprintf(out, "%c", CS_IF_GREATER); + continue; + } + if (!stricmp(p, "IF_GREATER_OR_EQUAL") + || !stricmp(p, "IF_EQUAL_OR_GREATER")) { + fprintf(out, "%c", CS_IF_GREATER_OR_EQUAL); + continue; + } + if (!stricmp(p, "IF_LESS")) { + fprintf(out, "%c", CS_IF_LESS); + continue; + } + if (!stricmp(p, "IF_LESS_OR_EQUAL") + || !stricmp(p, "IF_EQUAL_OR_LESS")) { + fprintf(out, "%c", CS_IF_LESS_OR_EQUAL); + continue; + } + if (!stricmp(p, "ENDIF") || !stricmp(p, "END_IF")) { + fprintf(out, "%c", CS_ENDIF); + continue; + } + if (!stricmp(p, "ELSE")) { + fprintf(out, "%c", CS_ELSE); + continue; + } + if (p[0] == ':') { /* :label */ p++; - sp=strchr(p,' '); - if(sp) - *sp=0; - for(i=0;i<labels;i++) - if(!stricmp(label_name[i],p)) + sp = strchr(p, ' '); + if (sp) + *sp = 0; + for (i = 0; i < labels; i++) + if (!stricmp(label_name[i], p)) break; - if(i<labels) { + if (i < labels) { printf("!SYNTAX ERROR (duplicate label name):\n"); - printf(linestr,src,line,p); - bail(1); } - if((label_name=(char **)realloc_or_free(label_name,sizeof(char *)*(labels+1))) - ==NULL) { + printf(linestr, src, line, p); + bail(1); + } + if ((label_name = (char **)realloc_or_free(label_name, sizeof(char *) * (labels + 1))) + == NULL) { printf("Too many labels.\n"); - bail(1); } - if((label_indx=(uint *)realloc_or_free(label_indx,sizeof(int)*(labels+1))) - ==NULL) { + bail(1); + } + if ((label_indx = (uint *)realloc_or_free(label_indx, sizeof(int) * (labels + 1))) + == NULL) { printf("Too many labels.\n"); - bail(1); } - if((label_name[labels]=(char *)malloc(strlen(p)+1))==NULL) { + bail(1); + } + if ((label_name[labels] = (char *)malloc(strlen(p) + 1)) == NULL) { printf("Too many labels.\n"); - bail(1); } - strcpy(label_name[labels],p); - label_indx[labels]=ftell(out); + bail(1); + } + strcpy(label_name[labels], p); + label_indx[labels] = ftell(out); labels++; - continue; } - if(!stricmp(p,"GOTO")) { /* goto */ - if(!(*arg)) break; - sp=strchr(arg,' '); - if(sp) - *sp=0; - if((goto_label=(char **)realloc_or_free(goto_label,sizeof(char *)*(gotos+1))) - ==NULL) { + continue; + } + if (!stricmp(p, "GOTO")) { /* goto */ + if (!(*arg)) break; + sp = strchr(arg, ' '); + if (sp) + *sp = 0; + if ((goto_label = (char **)realloc_or_free(goto_label, sizeof(char *) * (gotos + 1))) + == NULL) { printf("Too many gotos.\n"); - bail(1); } - if((goto_file=(char **)realloc_or_free(goto_file,sizeof(char *)*(gotos+1))) - ==NULL) { + bail(1); + } + if ((goto_file = (char **)realloc_or_free(goto_file, sizeof(char *) * (gotos + 1))) + == NULL) { printf("Too many gotos.\n"); - bail(1); } - if((goto_indx=(uint *)realloc_or_free(goto_indx,sizeof(int)*(gotos+1))) - ==NULL) { + bail(1); + } + if ((goto_indx = (uint *)realloc_or_free(goto_indx, sizeof(int) * (gotos + 1))) + == NULL) { printf("Too many gotos.\n"); - bail(1); } - if((goto_line=(uint *)realloc_or_free(goto_line,sizeof(int)*(gotos+1))) - ==NULL) { + bail(1); + } + if ((goto_line = (uint *)realloc_or_free(goto_line, sizeof(int) * (gotos + 1))) + == NULL) { printf("Too many gotos.\n"); - bail(1); } - if((goto_label[gotos]=(char *)malloc(strlen(arg)+1))==NULL) { + bail(1); + } + if ((goto_label[gotos] = (char *)malloc(strlen(arg) + 1)) == NULL) { printf("Too many gotos.\n"); - bail(1); } - if((goto_file[gotos]=(char *)malloc(strlen(str)+1))==NULL) { + bail(1); + } + if ((goto_file[gotos] = (char *)malloc(strlen(str) + 1)) == NULL) { printf("Too many gotos.\n"); - bail(1); } - strcpy(goto_label[gotos],arg); - strcpy(goto_file[gotos],str); - goto_indx[gotos]=ftell(out); - goto_line[gotos]=line; + bail(1); + } + strcpy(goto_label[gotos], arg); + strcpy(goto_file[gotos], str); + goto_indx[gotos] = ftell(out); + goto_line[gotos] = line; gotos++; - fprintf(out,"%c%c%c",CS_GOTO,0xff,0xff); - continue; } - if(!stricmp(p,"CALL")) { /* call */ - if(!(*arg)) break; - sp=strchr(arg,' '); - if(sp) - *sp=0; - if((call_label=(char **)realloc_or_free(call_label,sizeof(char *)*(calls+1))) - ==NULL) { + fprintf(out, "%c%c%c", CS_GOTO, 0xff, 0xff); + continue; + } + if (!stricmp(p, "CALL")) { /* call */ + if (!(*arg)) break; + sp = strchr(arg, ' '); + if (sp) + *sp = 0; + if ((call_label = (char **)realloc_or_free(call_label, sizeof(char *) * (calls + 1))) + == NULL) { printf("Too many calls.\n"); - bail(1); } - if((call_file=(char **)realloc_or_free(call_file,sizeof(char *)*(calls+1))) - ==NULL) { + bail(1); + } + if ((call_file = (char **)realloc_or_free(call_file, sizeof(char *) * (calls + 1))) + == NULL) { printf("Too many calls.\n"); - bail(1); } - if((call_indx=(uint *)realloc_or_free(call_indx,sizeof(int)*(calls+1))) - ==NULL) { + bail(1); + } + if ((call_indx = (uint *)realloc_or_free(call_indx, sizeof(int) * (calls + 1))) + == NULL) { printf("Too many calls.\n"); - bail(1); } - if((call_line=(uint *)realloc_or_free(call_line,sizeof(int)*(calls+1))) - ==NULL) { + bail(1); + } + if ((call_line = (uint *)realloc_or_free(call_line, sizeof(int) * (calls + 1))) + == NULL) { printf("Too many calls.\n"); - bail(1); } - if((call_label[calls]=(char *)malloc(strlen(arg)+1))==NULL) { + bail(1); + } + if ((call_label[calls] = (char *)malloc(strlen(arg) + 1)) == NULL) { printf("Too many calls.\n"); - bail(1); } - if((call_file[calls]=(char *)malloc(strlen(src)+1))==NULL) { + bail(1); + } + if ((call_file[calls] = (char *)malloc(strlen(src) + 1)) == NULL) { printf("Too many calls.\n"); - bail(1); } + bail(1); + } - strcpy(call_label[calls],arg); - strcpy(call_file[calls],src); - call_indx[calls]=ftell(out); - call_line[calls]=line; + strcpy(call_label[calls], arg); + strcpy(call_file[calls], src); + call_indx[calls] = ftell(out); + call_line[calls] = line; calls++; - fprintf(out,"%c%c%c",CS_CALL,0xff,0xff); - continue; } - - if(!stricmp(p,"RETURN")) { - fprintf(out,"%c",CS_RETURN); - continue; } - if(!stricmp(p,"CMD_HOME")) { - fprintf(out,"%c",CS_CMD_HOME); - continue; } - if(!stricmp(p,"CMDKEY")) { - if(!(*arg)) break; - if(!stricmp(arg,"DIGIT")) - ch=CS_DIGIT; - else if(!stricmp(arg,"EDIGIT")) - ch=CS_EDIGIT; + fprintf(out, "%c%c%c", CS_CALL, 0xff, 0xff); + continue; + } + + if (!stricmp(p, "RETURN")) { + fprintf(out, "%c", CS_RETURN); + continue; + } + if (!stricmp(p, "CMD_HOME")) { + fprintf(out, "%c", CS_CMD_HOME); + continue; + } + if (!stricmp(p, "CMDKEY")) { + if (!(*arg)) break; + if (!stricmp(arg, "DIGIT")) + ch = CS_DIGIT; + else if (!stricmp(arg, "EDIGIT")) + ch = CS_EDIGIT; else - ch=toupper(*arg); - if(ch=='/') - ch=*(arg+1)|0x80; /* high bit indicates slash required */ - else if(ch=='^' && (*(arg+1)>=0x40)) - ch=*(arg+1)-0x40; /* ctrl char */ - else if(ch=='\\') - ch=cesc(*(arg+1)); - else if(ch=='\'') - ch=*(arg+1); - fprintf(out,"%c%c",CS_CMDKEY,ch); - continue; } - if(!stricmp(p,"CMDCHAR")) { - if(!(*arg)) break; - fprintf(out,"%c%c",CS_CMDKEY,*arg); - continue; } - if(!stricmp(p,"SETLOGIC") || !stricmp(p,"SET_LOGIC")) { - if(!(*arg)) break; - if(!stricmp(arg,"TRUE") || !stricmp(arg,"EQUAL")) - ch=LOGIC_TRUE; - else if(!stricmp(arg,"GREATER")) - ch=LOGIC_GREATER; - else if(!stricmp(arg,"LESS")) - ch=LOGIC_LESS; + ch = toupper(*arg); + if (ch == '/') + ch = *(arg + 1) | 0x80; /* high bit indicates slash required */ + else if (ch == '^' && (*(arg + 1) >= 0x40)) + ch = *(arg + 1) - 0x40; /* ctrl char */ + else if (ch == '\\') + ch = cesc(*(arg + 1)); + else if (ch == '\'') + ch = *(arg + 1); + fprintf(out, "%c%c", CS_CMDKEY, ch); + continue; + } + if (!stricmp(p, "CMDCHAR")) { + if (!(*arg)) break; + fprintf(out, "%c%c", CS_CMDKEY, *arg); + continue; + } + if (!stricmp(p, "SETLOGIC") || !stricmp(p, "SET_LOGIC")) { + if (!(*arg)) break; + if (!stricmp(arg, "TRUE") || !stricmp(arg, "EQUAL")) + ch = LOGIC_TRUE; + else if (!stricmp(arg, "GREATER")) + ch = LOGIC_GREATER; + else if (!stricmp(arg, "LESS")) + ch = LOGIC_LESS; else - ch=LOGIC_FALSE; - fprintf(out,"%c%c",CS_SETLOGIC,ch); - continue; } - - if(!stricmp(p,"DEFINE_STR_VAR") || !stricmp(p,"STR")) { - if(!(*arg)) break; - for(p=arg;*p && *p!='#';) { - sp=strchr(p,' '); - if(sp) *sp=0; - fputc(CS_VAR_INSTRUCTION,out); - fputc(DEFINE_STR_VAR,out); - newvar(src,p); - writecrc(src,p); - if(!sp) + ch = LOGIC_FALSE; + fprintf(out, "%c%c", CS_SETLOGIC, ch); + continue; + } + + if (!stricmp(p, "DEFINE_STR_VAR") || !stricmp(p, "STR")) { + if (!(*arg)) break; + for (p = arg; *p && *p != '#';) { + sp = strchr(p, ' '); + if (sp) *sp = 0; + fputc(CS_VAR_INSTRUCTION, out); + fputc(DEFINE_STR_VAR, out); + newvar(src, p); + writecrc(src, p); + if (!sp) break; - p=sp+1; + p = sp + 1; SKIPCTRLSP(p); } - continue; } - if(!stricmp(p,"DEFINE_INT_VAR") || !stricmp(p,"INT")) { - if(!(*arg)) break; - for(p=arg;*p && *p!='#';) { - sp=strchr(p,' '); - if(sp) *sp=0; - fputc(CS_VAR_INSTRUCTION,out); - fputc(DEFINE_INT_VAR,out); - newvar(src,p); - writecrc(src,p); - if(!sp) + continue; + } + if (!stricmp(p, "DEFINE_INT_VAR") || !stricmp(p, "INT")) { + if (!(*arg)) break; + for (p = arg; *p && *p != '#';) { + sp = strchr(p, ' '); + if (sp) *sp = 0; + fputc(CS_VAR_INSTRUCTION, out); + fputc(DEFINE_INT_VAR, out); + newvar(src, p); + writecrc(src, p); + if (!sp) break; - p=sp+1; + p = sp + 1; SKIPCTRLSP(p); } - continue; } - if(!stricmp(p,"DEFINE_GLOBAL_STR_VAR") || !stricmp(p,"GLOBAL_STR")) { - if(!(*arg)) break; - for(p=arg;*p && *p!='#';) { - sp=strchr(p,' '); - if(sp) *sp=0; - fputc(CS_VAR_INSTRUCTION,out); - fputc(DEFINE_GLOBAL_STR_VAR,out); - newvar(src,p); - writecrc(src,p); - if(!sp) + continue; + } + if (!stricmp(p, "DEFINE_GLOBAL_STR_VAR") || !stricmp(p, "GLOBAL_STR")) { + if (!(*arg)) break; + for (p = arg; *p && *p != '#';) { + sp = strchr(p, ' '); + if (sp) *sp = 0; + fputc(CS_VAR_INSTRUCTION, out); + fputc(DEFINE_GLOBAL_STR_VAR, out); + newvar(src, p); + writecrc(src, p); + if (!sp) break; - p=sp+1; + p = sp + 1; SKIPCTRLSP(p); } - continue; } - if(!stricmp(p,"DEFINE_GLOBAL_INT_VAR") || !stricmp(p,"GLOBAL_INT")) { - if(!(*arg)) break; - for(p=arg;*p && *p!='#';) { - sp=strchr(p,' '); - if(sp) *sp=0; - fputc(CS_VAR_INSTRUCTION,out); - fputc(DEFINE_GLOBAL_INT_VAR,out); - newvar(src,p); - writecrc(src,p); - if(!sp) + continue; + } + if (!stricmp(p, "DEFINE_GLOBAL_INT_VAR") || !stricmp(p, "GLOBAL_INT")) { + if (!(*arg)) break; + for (p = arg; *p && *p != '#';) { + sp = strchr(p, ' '); + if (sp) *sp = 0; + fputc(CS_VAR_INSTRUCTION, out); + fputc(DEFINE_GLOBAL_INT_VAR, out); + newvar(src, p); + writecrc(src, p); + if (!sp) break; - p=sp+1; + p = sp + 1; SKIPCTRLSP(p); } - continue; } + continue; + } - if(!stricmp(p,"LOGIN")) { - if(!(*arg)) break; - fputc(CS_STR_FUNCTION,out); - fputc(CS_LOGIN,out); + if (!stricmp(p, "LOGIN")) { + if (!(*arg)) break; + fputc(CS_STR_FUNCTION, out); + fputc(CS_LOGIN, out); writecstr(arg); - continue; } + continue; + } - if(!stricmp(p,"LOAD_TEXT")) { - if(!(*arg)) break; - fputc(CS_STR_FUNCTION,out); - fputc(CS_LOAD_TEXT,out); + if (!stricmp(p, "LOAD_TEXT")) { + if (!(*arg)) break; + fputc(CS_STR_FUNCTION, out); + fputc(CS_LOAD_TEXT, out); writestr(arg); - continue; } - - if(!stricmp(p,"SET_STR_VAR") - || (!stricmp(p,"SET") && strchr(arg,'"'))) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(SET_STR_VAR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); + continue; + } + + if (!stricmp(p, "SET_STR_VAR") + || (!stricmp(p, "SET") && strchr(arg, '"'))) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(SET_STR_VAR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); writecstr(arg2); - continue; } - if(!stricmp(p,"CAT_STR_VAR") - || (!stricmp(p,"STRCAT") && strchr(arg,'"'))) { - fputc(CS_VAR_INSTRUCTION,out); - fputc(CAT_STR_VAR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); + continue; + } + if (!stricmp(p, "CAT_STR_VAR") + || (!stricmp(p, "STRCAT") && strchr(arg, '"'))) { + fputc(CS_VAR_INSTRUCTION, out); + fputc(CAT_STR_VAR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); writecstr(arg2); - continue; } - if((!stricmp(p,"STRSTR") || !stricmp(p,"COMPARE_SUBSTR")) - && strchr(arg,'"')) { - fputc(CS_VAR_INSTRUCTION,out); - fputc(STRSTR_VAR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); + continue; + } + if ((!stricmp(p, "STRSTR") || !stricmp(p, "COMPARE_SUBSTR")) + && strchr(arg, '"')) { + fputc(CS_VAR_INSTRUCTION, out); + fputc(STRSTR_VAR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); writecstr(arg2); - continue; } - if(!stricmp(p,"STRSTR") || !stricmp(p,"COMPARE_SUBSTR")) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(STRSTR_VARS,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - writecrc(src,arg2); - continue; } - if(!stricmp(p,"COPY_CHAR") || !stricmp(p,"COPY_KEY")) { - if(!(*arg)) break; - fprintf(out,"%c%c",CS_VAR_INSTRUCTION,COPY_CHAR); - writecrc(src,arg); - continue; } - if(!stricmp(p,"COPY_FIRST_CHAR")) { - if(!(*arg) || !(*arg2)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(COPY_FIRST_CHAR,out); - writecrc(src,arg); - writecrc(src,arg2); - continue; } - if(!stricmp(p,"COMPARE_FIRST_CHAR")) { - if(!(*arg) || !(*arg2)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(COMPARE_FIRST_CHAR,out); - writecrc(src,arg); - fputc((uchar)val(src,arg2),out); - continue; } - if(!stricmp(p,"CAT_STR_VARS") || !stricmp(p,"STRCAT")) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(CAT_STR_VARS,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - writecrc(src,arg2); - continue; } - if(!stricmp(p,"FORMAT") || !stricmp(p,"SPRINTF")) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(FORMAT_STR_VAR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); /* Write destination variable */ + continue; + } + if (!stricmp(p, "STRSTR") || !stricmp(p, "COMPARE_SUBSTR")) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(STRSTR_VARS, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + if (!stricmp(p, "COPY_CHAR") || !stricmp(p, "COPY_KEY")) { + if (!(*arg)) break; + fprintf(out, "%c%c", CS_VAR_INSTRUCTION, COPY_CHAR); + writecrc(src, arg); + continue; + } + if (!stricmp(p, "COPY_FIRST_CHAR")) { + if (!(*arg) || !(*arg2)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(COPY_FIRST_CHAR, out); + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + if (!stricmp(p, "COMPARE_FIRST_CHAR")) { + if (!(*arg) || !(*arg2)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(COMPARE_FIRST_CHAR, out); + writecrc(src, arg); + fputc((uchar)val(src, arg2), out); + continue; + } + if (!stricmp(p, "CAT_STR_VARS") || !stricmp(p, "STRCAT")) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(CAT_STR_VARS, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + if (!stricmp(p, "FORMAT") || !stricmp(p, "SPRINTF")) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(FORMAT_STR_VAR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); /* Write destination variable */ p++; SKIPCTRLSP(p); - arg=p; - p=strrchr(arg,'"'); - if(!p) + arg = p; + p = strrchr(arg, '"'); + if (!p) break; - *p=0; + *p = 0; p++; SKIPCTRLSP(p); writecstr(arg); /* Write string */ - l=ftell(out); - fputc(0,out); /* Write total number of args */ - i=0; - while(p && *p) { - arg=p; - p=strchr(arg,' '); - if(p) { - *p=0; - p++; } - writecrc(src,arg); - i++; } - fseek(out,l,SEEK_SET); - fputc((char)i,out); - fseek(out,i*4,SEEK_CUR); - continue; } - - if(!stricmp(p,"STRFTIME") || !stricmp(p,"FTIME_STR")) { - if(!(*arg) || !(*arg2) || !(*arg3)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(FORMAT_TIME_STR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); /* Write destination variable */ + l = ftell(out); + fputc(0, out); /* Write total number of args */ + i = 0; + while (p && *p) { + arg = p; + p = strchr(arg, ' '); + if (p) { + *p = 0; + p++; + } + writecrc(src, arg); + i++; + } + fseek(out, l, SEEK_SET); + fputc((char)i, out); + fseek(out, i * 4, SEEK_CUR); + continue; + } + + if (!stricmp(p, "STRFTIME") || !stricmp(p, "FTIME_STR")) { + if (!(*arg) || !(*arg2) || !(*arg3)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(FORMAT_TIME_STR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); /* Write destination variable */ p++; SKIPCTRLSP(p); - arg=p; - p=strrchr(arg,'"'); - if(!p) + arg = p; + p = strrchr(arg, '"'); + if (!p) break; - *p=0; + *p = 0; writecstr(arg); /* Write string */ p++; SKIPCTRLSP(p); - writecrc(src,p); - continue; } - - if(!stricmp(p,"TIME_STR")) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(TIME_STR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - writecrc(src,arg2); - continue; } - - if(!stricmp(p,"DATE_STR")) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(DATE_STR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - writecrc(src,arg2); - continue; } - - if(!stricmp(p,"SECOND_STR")) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(SECOND_STR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - writecrc(src,arg2); - continue; } - - - if(!stricmp(p,"SET_INT_VAR") - || (!stricmp(p,"SET") && *arg2!='"')) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(SET_INT_VAR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - l=val(src,arg2); - fwrite(&l,4,1,out); - continue; } - - if(!stricmp(p,"COMPARE_STR_VAR") || - (!stricmp(p,"COMPARE") && *arg2=='"')) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(COMPARE_STR_VAR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); + writecrc(src, p); + continue; + } + + if (!stricmp(p, "TIME_STR")) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(TIME_STR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + + if (!stricmp(p, "DATE_STR")) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(DATE_STR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + + if (!stricmp(p, "SECOND_STR")) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(SECOND_STR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + + + if (!stricmp(p, "SET_INT_VAR") + || (!stricmp(p, "SET") && *arg2 != '"')) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(SET_INT_VAR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + l = val(src, arg2); + fwrite(&l, 4, 1, out); + continue; + } + + if (!stricmp(p, "COMPARE_STR_VAR") || + (!stricmp(p, "COMPARE") && *arg2 == '"')) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(COMPARE_STR_VAR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); writecstr(arg2); - continue; } - - if(!stricmp(p,"COMPARE_STRN_VAR") || - ((!stricmp(p,"STRNCMP") || !stricmp(p,"COMPARE_STRN")) - && *arg3 && strchr(arg3,'"'))) { - if((l=isvar(arg))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(2,out); /* int offset */ - fputc(1,out); /* int length */ - i=0; } /* place holder */ + continue; + } + + if (!stricmp(p, "COMPARE_STRN_VAR") || + ((!stricmp(p, "STRNCMP") || !stricmp(p, "COMPARE_STRN")) + && *arg3 && strchr(arg3, '"'))) { + if ((l = isvar(arg)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(2, out); /* int offset */ + fputc(1, out); /* int length */ + i = 0; + } /* place holder */ else - i=val(src,arg); - fputc(CS_VAR_INSTRUCTION,out); - fputc(STRNCMP_VAR,out); - fwrite(&i,1,1,out); /* Length */ - p=strchr(arg2,' '); - if(!p) - break; - *p=0; + i = val(src, arg); + fputc(CS_VAR_INSTRUCTION, out); + fputc(STRNCMP_VAR, out); + fwrite(&i, 1, 1, out); /* Length */ + p = strchr(arg2, ' '); + if (!p) + break; + *p = 0; p++; SKIPCTRLSP(p); - writecrc(src,arg2); + writecrc(src, arg2); writecstr(p); - continue; } - - if(!stricmp(p,"COMPARE_STRN_VARS") || !stricmp(p,"STRNCMP") - || !stricmp(p,"COMPARE_STRN")) { - if(!(*arg) || !(*arg2) || !(*arg3)) - break; - if((l=isvar(arg))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(2,out); /* int offset */ - fputc(1,out); /* int length */ - i=0; } /* place holder */ - else - i=val(src,arg); - fputc(CS_VAR_INSTRUCTION,out); - fputc(STRNCMP_VARS,out); + continue; + } - fwrite(&i,1,1,out); /* Length */ - p=strchr(arg2,' '); - if(!p) - break; - *p=0; - p++; - SKIPCTRLSP(p); - writecrc(src,arg2); - writecrc(src,p); - continue; } - - if(!stricmp(p,"COMPARE_INT_VAR") || - (!stricmp(p,"COMPARE") - && (IS_DIGIT(*arg2) || atol(arg2) || *arg2=='\'' || *arg2=='.'))) { - if(!(*arg)) break; - - fputc(CS_VAR_INSTRUCTION,out); - fputc(COMPARE_INT_VAR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - l=val(src,arg2); - fwrite(&l,4,1,out); - continue; } - - if(!stricmp(p,"COMPARE")) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(COMPARE_VARS,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - writecrc(src,arg2); - continue; } - if(!stricmp(p,"COPY")) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(COPY_VAR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - writecrc(src,arg2); - continue; } - if(!stricmp(p,"SWAP")) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(SWAP_VARS,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - writecrc(src,arg2); - continue; } - - if(!stricmp(p,"TIME")) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(TIME_INT_VAR,out); - writecrc(src,arg); - continue; } - - if(!stricmp(p,"DATE_INT")) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(DATE_STR_TO_INT,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - writecrc(src,arg2); - continue; } - - if(!stricmp(p,"CRC16")) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(CRC16_TO_INT,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - writecrc(src,arg2); - continue; } - - if(!stricmp(p,"CRC32")) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(CRC32_TO_INT,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - writecrc(src,arg2); - continue; } - - if(!stricmp(p,"CHKSUM")) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(CHKSUM_TO_INT,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - writecrc(src,arg2); - continue; } - - if(!stricmp(p,"ADD_INT_VAR") - || (!stricmp(p,"ADD") - && (IS_DIGIT(*arg2) || atol(arg2) || *arg2=='\'' || *arg2=='.'))) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(ADD_INT_VAR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - l=val(src,arg2); - if(!l) - break; - fwrite(&l,4,1,out); - continue; } - if(!stricmp(p,"ADD_INT_VARS") || !stricmp(p,"ADD")) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(ADD_INT_VARS,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - writecrc(src,arg2); - continue; } - - if(!stricmp(p,"SUB_INT_VAR") - || (!stricmp(p,"SUB") - && (IS_DIGIT(*arg2) || atol(arg2) || *arg2=='\'' || *arg2=='.'))) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(SUB_INT_VAR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - l=val(src,arg2); - if(!l) - break; - fwrite(&l,4,1,out); - continue; } - if(!stricmp(p,"SUB_INT_VARS") || !stricmp(p,"SUB")) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(SUB_INT_VARS,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - writecrc(src,arg2); - continue; } - - if(!stricmp(p,"MUL_INT_VAR") - || (!stricmp(p,"MUL") - && (IS_DIGIT(*arg2) || atol(arg2) || *arg2=='\'' || *arg2=='.'))) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(MUL_INT_VAR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - l=val(src,arg2); - if(!l) - break; - fwrite(&l,4,1,out); - continue; } - if(!stricmp(p,"MUL_INT_VARS") || !stricmp(p,"MUL")) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(MUL_INT_VARS,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - writecrc(src,arg2); - continue; } - - if(!stricmp(p,"DIV_INT_VAR") - || (!stricmp(p,"DIV") - && (IS_DIGIT(*arg2) || atol(arg2) || *arg2=='\'' || *arg2=='.'))) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(DIV_INT_VAR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - l=val(src,arg2); - if(!l) - break; - fwrite(&l,4,1,out); - continue; } - if(!stricmp(p,"DIV_INT_VARS") || !stricmp(p,"DIV")) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(DIV_INT_VARS,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - writecrc(src,arg2); - continue; } - - if(!stricmp(p,"MOD_INT_VAR") - || (!stricmp(p,"MOD") - && (IS_DIGIT(*arg2) || atol(arg2) || *arg2=='\'' || *arg2=='.'))) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(MOD_INT_VAR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - l=val(src,arg2); - if(!l) - break; - fwrite(&l,4,1,out); - continue; } - if(!stricmp(p,"MOD_INT_VARS") || !stricmp(p,"MOD")) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(MOD_INT_VARS,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - writecrc(src,arg2); - continue; } - - if(!stricmp(p,"AND_INT_VAR") - || (!stricmp(p,"AND") - && (IS_DIGIT(*arg2) || atol(arg2) || *arg2=='\'' || *arg2=='.'))) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(AND_INT_VAR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - l=val(src,arg2); - fwrite(&l,4,1,out); - continue; } - if(!stricmp(p,"AND_INT_VARS") || !stricmp(p,"AND")) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(AND_INT_VARS,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - writecrc(src,arg2); - continue; } - - if(!stricmp(p,"COMPARE_ANY_BITS") || !stricmp(p,"COMPARE_ALL_BITS")) { - if(!(*arg) || !(*arg2)) - break; - if((l=isvar(arg2))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(6,out); /* int offset */ - fputc(4,out); /* int length */ - l=0; } /* place holder */ - else - l=val(src,arg2); - fprintf(out,"%c%c",CS_VAR_INSTRUCTION - ,!stricmp(p,"COMPARE_ANY_BITS") ? COMPARE_ANY_BITS : COMPARE_ALL_BITS); - writecrc(src,arg); - fwrite(&l,sizeof(l),1,out); - continue; - } - - if(!stricmp(p,"OR_INT_VAR") - || (!stricmp(p,"OR") - && (IS_DIGIT(*arg2) || atol(arg2) || *arg2=='\'' || *arg2=='.'))) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(OR_INT_VAR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - l=val(src,arg2); - fwrite(&l,4,1,out); - continue; } - if(!stricmp(p,"OR_INT_VARS") || !stricmp(p,"OR")) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(OR_INT_VARS,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - writecrc(src,arg2); - continue; } - - if(!stricmp(p,"NOT_INT_VAR") - || (!stricmp(p,"NOT") - && (IS_DIGIT(*arg2) || atol(arg2) || *arg2=='\'' || *arg2=='.'))) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(NOT_INT_VAR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - l=val(src,arg2); - fwrite(&l,4,1,out); - continue; } - if(!stricmp(p,"NOT_INT_VARS") || !stricmp(p,"NOT")) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(NOT_INT_VARS,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - writecrc(src,arg2); - continue; } - - if(!stricmp(p,"XOR_INT_VAR") - || (!stricmp(p,"XOR") - && (IS_DIGIT(*arg2) || atol(arg2) || *arg2=='\'' || *arg2=='.'))) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(XOR_INT_VAR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - l=val(src,arg2); - fwrite(&l,4,1,out); - continue; } - if(!stricmp(p,"XOR_INT_VARS") || !stricmp(p,"XOR")) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(XOR_INT_VARS,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - writecrc(src,arg2); - continue; } - - if(!stricmp(p,"RANDOM_INT_VAR") || !stricmp(p,"RANDOM")) { - if(!(*arg)) break; - if((l=isvar(arg2))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(6,out); /* int offset */ - fputc(4,out); /* int length */ - l=0; } /* place holder */ - else - l=val(src,arg2); - fputc(CS_VAR_INSTRUCTION,out); - fputc(RANDOM_INT_VAR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - fwrite(&l,4,1,out); - continue; } - - if(!stricmp(p,"SWITCH")) { - if(!(*arg)) break; - fputc(CS_SWITCH,out); - writecrc(src,arg); - continue; } - if(!stricmp(p,"END_SWITCH")) { - fputc(CS_END_SWITCH,out); - continue; } - if(!stricmp(p,"CASE")) { - if(!(*arg)) break; - fputc(CS_CASE,out); - l=val(src,arg); - fwrite(&l,4,1,out); - continue; } - if(!stricmp(p,"DEFAULT")) { - fputc(CS_DEFAULT,out); - continue; } - if(!stricmp(p,"END_CASE")) { - fputc(CS_END_CASE,out); - continue; } - - if(!stricmp(p,"PRINT") && !strchr(arg,'"') && !strchr(arg,'\\') - && !strchr(arg,' ')) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - fputc(PRINT_VAR,out); - writecrc(src,arg); - continue; } - - if(!stricmp(p,"PRINTF") || !stricmp(p,"LPRINTF") || !stricmp(p,"PRINTF_LOCAL")) { - if(!(*arg)) break; - fputc(CS_VAR_INSTRUCTION,out); - if(!stricmp(p,"PRINTF")) - fputc(VAR_PRINTF,out); + if (!stricmp(p, "COMPARE_STRN_VARS") || !stricmp(p, "STRNCMP") + || !stricmp(p, "COMPARE_STRN")) { + if (!(*arg) || !(*arg2) || !(*arg3)) + break; + if ((l = isvar(arg)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(2, out); /* int offset */ + fputc(1, out); /* int length */ + i = 0; + } /* place holder */ else - fputc(VAR_PRINTF_LOCAL,out); - p=strrchr(arg,'"'); - if(!p) + i = val(src, arg); + fputc(CS_VAR_INSTRUCTION, out); + fputc(STRNCMP_VARS, out); + + fwrite(&i, 1, 1, out); /* Length */ + p = strchr(arg2, ' '); + if (!p) break; - *p=0; + *p = 0; p++; SKIPCTRLSP(p); - writecstr(arg); /* Write string */ - l=ftell(out); - fputc(0,out); /* Write total number of args */ - i=0; - while(p && *p) { - arg=p; - p=strchr(arg,' '); - if(p) { - *p=0; - p++; } - writecrc(src,arg); - i++; } - fseek(out,l,SEEK_SET); - fputc((char)i,out); - fseek(out,i*4,SEEK_CUR); - continue; } - - if(!stricmp(p,"FOPEN")) { - if(!(*arg) || !(*arg2) || !(*arg3)) break; - if((l=isvar(arg2))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(6,out); /* int offset */ - fputc(2,out); /* int length */ - i=0; } /* place holder */ - else - i=val(src,arg2); + writecrc(src, arg2); + writecrc(src, p); + continue; + } - fputc(CS_FIO_FUNCTION,out); - if(*arg3=='"') - fputc(FIO_OPEN,out); - else - fputc(FIO_OPEN_VAR,out); - p=strchr(arg,' '); - if(!p) + if (!stricmp(p, "COMPARE_INT_VAR") || + (!stricmp(p, "COMPARE") + && (IS_DIGIT(*arg2) || atol(arg2) || *arg2 == '\'' || *arg2 == '.'))) { + if (!(*arg)) break; + + fputc(CS_VAR_INSTRUCTION, out); + fputc(COMPARE_INT_VAR, out); + p = strchr(arg, ' '); + if (!p) break; - *p=0; - writecrc(src,arg); - p=strchr(arg2,' '); - if(!p) + *p = 0; + writecrc(src, arg); + l = val(src, arg2); + fwrite(&l, 4, 1, out); + continue; + } + + if (!stricmp(p, "COMPARE")) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(COMPARE_VARS, out); + p = strchr(arg, ' '); + if (!p) break; - *p=0; - p++; - fwrite(&i,2,1,out); - SKIPCTRLSP(p); - if(*p=='"') - writestr(p); - else - writecrc(src,p); - continue; } - if(!stricmp(p,"FCLOSE")) { - if(!(*arg)) break; - fputc(CS_FIO_FUNCTION,out); - fputc(FIO_CLOSE,out); - writecrc(src,arg); - continue; } - if(!stricmp(p,"FFLUSH")) { - if(!(*arg)) break; - fputc(CS_FIO_FUNCTION,out); - fputc(FIO_FLUSH,out); - writecrc(src,arg); - continue; } - if(!stricmp(p,"FREAD")) { - if(!(*arg)) break; - - fputc(CS_FIO_FUNCTION,out); - if(!(*arg3) || IS_DIGIT(*arg3) || atoi(arg3)) - fputc(FIO_READ,out); - else - fputc(FIO_READ_VAR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); /* File handle */ - p=strchr(arg2,' '); - if(p) - *p=0; - writecrc(src,arg2); /* Variable */ - if(IS_DIGIT(*arg3)) - i=val(src,arg3); /* Length */ - else - i=0; - if(i || !(*arg3)) - fwrite(&i,2,1,out); + *p = 0; + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + if (!stricmp(p, "COPY")) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(COPY_VAR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + if (!stricmp(p, "SWAP")) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(SWAP_VARS, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + + if (!stricmp(p, "TIME")) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(TIME_INT_VAR, out); + writecrc(src, arg); + continue; + } + + if (!stricmp(p, "DATE_INT")) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(DATE_STR_TO_INT, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + + if (!stricmp(p, "CRC16")) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(CRC16_TO_INT, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + + if (!stricmp(p, "CRC32")) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(CRC32_TO_INT, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + + if (!stricmp(p, "CHKSUM")) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(CHKSUM_TO_INT, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + + if (!stricmp(p, "ADD_INT_VAR") + || (!stricmp(p, "ADD") + && (IS_DIGIT(*arg2) || atol(arg2) || *arg2 == '\'' || *arg2 == '.'))) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(ADD_INT_VAR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + l = val(src, arg2); + if (!l) + break; + fwrite(&l, 4, 1, out); + continue; + } + if (!stricmp(p, "ADD_INT_VARS") || !stricmp(p, "ADD")) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(ADD_INT_VARS, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + + if (!stricmp(p, "SUB_INT_VAR") + || (!stricmp(p, "SUB") + && (IS_DIGIT(*arg2) || atol(arg2) || *arg2 == '\'' || *arg2 == '.'))) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(SUB_INT_VAR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + l = val(src, arg2); + if (!l) + break; + fwrite(&l, 4, 1, out); + continue; + } + if (!stricmp(p, "SUB_INT_VARS") || !stricmp(p, "SUB")) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(SUB_INT_VARS, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + + if (!stricmp(p, "MUL_INT_VAR") + || (!stricmp(p, "MUL") + && (IS_DIGIT(*arg2) || atol(arg2) || *arg2 == '\'' || *arg2 == '.'))) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(MUL_INT_VAR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + l = val(src, arg2); + if (!l) + break; + fwrite(&l, 4, 1, out); + continue; + } + if (!stricmp(p, "MUL_INT_VARS") || !stricmp(p, "MUL")) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(MUL_INT_VARS, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + + if (!stricmp(p, "DIV_INT_VAR") + || (!stricmp(p, "DIV") + && (IS_DIGIT(*arg2) || atol(arg2) || *arg2 == '\'' || *arg2 == '.'))) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(DIV_INT_VAR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + l = val(src, arg2); + if (!l) + break; + fwrite(&l, 4, 1, out); + continue; + } + if (!stricmp(p, "DIV_INT_VARS") || !stricmp(p, "DIV")) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(DIV_INT_VARS, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + + if (!stricmp(p, "MOD_INT_VAR") + || (!stricmp(p, "MOD") + && (IS_DIGIT(*arg2) || atol(arg2) || *arg2 == '\'' || *arg2 == '.'))) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(MOD_INT_VAR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + l = val(src, arg2); + if (!l) + break; + fwrite(&l, 4, 1, out); + continue; + } + if (!stricmp(p, "MOD_INT_VARS") || !stricmp(p, "MOD")) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(MOD_INT_VARS, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + + if (!stricmp(p, "AND_INT_VAR") + || (!stricmp(p, "AND") + && (IS_DIGIT(*arg2) || atol(arg2) || *arg2 == '\'' || *arg2 == '.'))) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(AND_INT_VAR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + l = val(src, arg2); + fwrite(&l, 4, 1, out); + continue; + } + if (!stricmp(p, "AND_INT_VARS") || !stricmp(p, "AND")) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(AND_INT_VARS, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + + if (!stricmp(p, "COMPARE_ANY_BITS") || !stricmp(p, "COMPARE_ALL_BITS")) { + if (!(*arg) || !(*arg2)) + break; + if ((l = isvar(arg2)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(6, out); /* int offset */ + fputc(4, out); /* int length */ + l = 0; + } /* place holder */ + else + l = val(src, arg2); + fprintf(out, "%c%c", CS_VAR_INSTRUCTION + , !stricmp(p, "COMPARE_ANY_BITS") ? COMPARE_ANY_BITS : COMPARE_ALL_BITS); + writecrc(src, arg); + fwrite(&l, sizeof(l), 1, out); + continue; + } + + if (!stricmp(p, "OR_INT_VAR") + || (!stricmp(p, "OR") + && (IS_DIGIT(*arg2) || atol(arg2) || *arg2 == '\'' || *arg2 == '.'))) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(OR_INT_VAR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + l = val(src, arg2); + fwrite(&l, 4, 1, out); + continue; + } + if (!stricmp(p, "OR_INT_VARS") || !stricmp(p, "OR")) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(OR_INT_VARS, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + + if (!stricmp(p, "NOT_INT_VAR") + || (!stricmp(p, "NOT") + && (IS_DIGIT(*arg2) || atol(arg2) || *arg2 == '\'' || *arg2 == '.'))) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(NOT_INT_VAR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + l = val(src, arg2); + fwrite(&l, 4, 1, out); + continue; + } + if (!stricmp(p, "NOT_INT_VARS") || !stricmp(p, "NOT")) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(NOT_INT_VARS, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + + if (!stricmp(p, "XOR_INT_VAR") + || (!stricmp(p, "XOR") + && (IS_DIGIT(*arg2) || atol(arg2) || *arg2 == '\'' || *arg2 == '.'))) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(XOR_INT_VAR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + l = val(src, arg2); + fwrite(&l, 4, 1, out); + continue; + } + if (!stricmp(p, "XOR_INT_VARS") || !stricmp(p, "XOR")) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(XOR_INT_VARS, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + + if (!stricmp(p, "RANDOM_INT_VAR") || !stricmp(p, "RANDOM")) { + if (!(*arg)) break; + if ((l = isvar(arg2)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(6, out); /* int offset */ + fputc(4, out); /* int length */ + l = 0; + } /* place holder */ + else + l = val(src, arg2); + fputc(CS_VAR_INSTRUCTION, out); + fputc(RANDOM_INT_VAR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + fwrite(&l, 4, 1, out); + continue; + } + + if (!stricmp(p, "SWITCH")) { + if (!(*arg)) break; + fputc(CS_SWITCH, out); + writecrc(src, arg); + continue; + } + if (!stricmp(p, "END_SWITCH")) { + fputc(CS_END_SWITCH, out); + continue; + } + if (!stricmp(p, "CASE")) { + if (!(*arg)) break; + fputc(CS_CASE, out); + l = val(src, arg); + fwrite(&l, 4, 1, out); + continue; + } + if (!stricmp(p, "DEFAULT")) { + fputc(CS_DEFAULT, out); + continue; + } + if (!stricmp(p, "END_CASE")) { + fputc(CS_END_CASE, out); + continue; + } + + if (!stricmp(p, "PRINT") && !strchr(arg, '"') && !strchr(arg, '\\') + && !strchr(arg, ' ')) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + fputc(PRINT_VAR, out); + writecrc(src, arg); + continue; + } + + if (!stricmp(p, "PRINTF") || !stricmp(p, "LPRINTF") || !stricmp(p, "PRINTF_LOCAL")) { + if (!(*arg)) break; + fputc(CS_VAR_INSTRUCTION, out); + if (!stricmp(p, "PRINTF")) + fputc(VAR_PRINTF, out); + else + fputc(VAR_PRINTF_LOCAL, out); + p = strrchr(arg, '"'); + if (!p) + break; + *p = 0; + p++; + SKIPCTRLSP(p); + writecstr(arg); /* Write string */ + l = ftell(out); + fputc(0, out); /* Write total number of args */ + i = 0; + while (p && *p) { + arg = p; + p = strchr(arg, ' '); + if (p) { + *p = 0; + p++; + } + writecrc(src, arg); + i++; + } + fseek(out, l, SEEK_SET); + fputc((char)i, out); + fseek(out, i * 4, SEEK_CUR); + continue; + } + + if (!stricmp(p, "FOPEN")) { + if (!(*arg) || !(*arg2) || !(*arg3)) break; + if ((l = isvar(arg2)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(6, out); /* int offset */ + fputc(2, out); /* int length */ + i = 0; + } /* place holder */ + else + i = val(src, arg2); + + fputc(CS_FIO_FUNCTION, out); + if (*arg3 == '"') + fputc(FIO_OPEN, out); + else + fputc(FIO_OPEN_VAR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + p = strchr(arg2, ' '); + if (!p) + break; + *p = 0; + p++; + fwrite(&i, 2, 1, out); + SKIPCTRLSP(p); + if (*p == '"') + writestr(p); + else + writecrc(src, p); + continue; + } + if (!stricmp(p, "FCLOSE")) { + if (!(*arg)) break; + fputc(CS_FIO_FUNCTION, out); + fputc(FIO_CLOSE, out); + writecrc(src, arg); + continue; + } + if (!stricmp(p, "FFLUSH")) { + if (!(*arg)) break; + fputc(CS_FIO_FUNCTION, out); + fputc(FIO_FLUSH, out); + writecrc(src, arg); + continue; + } + if (!stricmp(p, "FREAD")) { + if (!(*arg)) break; + + fputc(CS_FIO_FUNCTION, out); + if (!(*arg3) || IS_DIGIT(*arg3) || atoi(arg3)) + fputc(FIO_READ, out); + else + fputc(FIO_READ_VAR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); /* File handle */ + p = strchr(arg2, ' '); + if (p) + *p = 0; + writecrc(src, arg2); /* Variable */ + if (IS_DIGIT(*arg3)) + i = val(src, arg3); /* Length */ else - writecrc(src,arg3); - continue; } - if(!stricmp(p,"FWRITE")) { - if(!(*arg)) break; - fputc(CS_FIO_FUNCTION,out); - if(!(*arg3) || IS_DIGIT(*arg3) || atoi(arg3)) - fputc(FIO_WRITE,out); + i = 0; + if (i || !(*arg3)) + fwrite(&i, 2, 1, out); + else + writecrc(src, arg3); + continue; + } + if (!stricmp(p, "FWRITE")) { + if (!(*arg)) break; + fputc(CS_FIO_FUNCTION, out); + if (!(*arg3) || IS_DIGIT(*arg3) || atoi(arg3)) + fputc(FIO_WRITE, out); else - fputc(FIO_WRITE_VAR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); /* File handle */ - p=strchr(arg2,' '); - if(p) - *p=0; - writecrc(src,arg2); /* Variable */ - if(IS_DIGIT(*arg3)) - i=val(src,arg3); /* Length */ + fputc(FIO_WRITE_VAR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); /* File handle */ + p = strchr(arg2, ' '); + if (p) + *p = 0; + writecrc(src, arg2); /* Variable */ + if (IS_DIGIT(*arg3)) + i = val(src, arg3); /* Length */ else - i=0; - if(i || !(*arg3)) - fwrite(&i,2,1,out); + i = 0; + if (i || !(*arg3)) + fwrite(&i, 2, 1, out); else - writecrc(src,arg3); - continue; } - if(!stricmp(p,"FGET_LENGTH") - || !stricmp(p,"FGETLENGTH") - || !stricmp(p,"GETFLENGTH")) { - if(!(*arg) || !(*arg2)) break; - fputc(CS_FIO_FUNCTION,out); - fputc(FIO_GET_LENGTH,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); /* File handle */ - writecrc(src,arg2); /* Variable */ - continue; } - if(!stricmp(p,"FREAD_LINE")) { - if(!(*arg) || !(*arg2)) break; - fputc(CS_FIO_FUNCTION,out); - fputc(FIO_READ_LINE,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); /* File handle */ - writecrc(src,arg2); /* Variable */ - continue; } - if(!stricmp(p,"FEOF")) { - if(!(*arg)) break; - fputc(CS_FIO_FUNCTION,out); - fputc(FIO_EOF,out); - writecrc(src,arg); - continue; } - if(!stricmp(p,"FGET_POS")) { - if(!(*arg) || !(*arg2)) break; - fputc(CS_FIO_FUNCTION,out); - fputc(FIO_GET_POS,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); /* File handle */ - writecrc(src,arg2); /* Variable */ - continue; } - if(!stricmp(p,"FSET_POS") || !stricmp(p,"FSEEK")) { - if(!(*arg)) break; - fputc(CS_FIO_FUNCTION,out); - if(IS_DIGIT(*arg2) || atol(arg2)) - fputc(FIO_SEEK,out); + writecrc(src, arg3); + continue; + } + if (!stricmp(p, "FGET_LENGTH") + || !stricmp(p, "FGETLENGTH") + || !stricmp(p, "GETFLENGTH")) { + if (!(*arg) || !(*arg2)) break; + fputc(CS_FIO_FUNCTION, out); + fputc(FIO_GET_LENGTH, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); /* File handle */ + writecrc(src, arg2); /* Variable */ + continue; + } + if (!stricmp(p, "FREAD_LINE")) { + if (!(*arg) || !(*arg2)) break; + fputc(CS_FIO_FUNCTION, out); + fputc(FIO_READ_LINE, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); /* File handle */ + writecrc(src, arg2); /* Variable */ + continue; + } + if (!stricmp(p, "FEOF")) { + if (!(*arg)) break; + fputc(CS_FIO_FUNCTION, out); + fputc(FIO_EOF, out); + writecrc(src, arg); + continue; + } + if (!stricmp(p, "FGET_POS")) { + if (!(*arg) || !(*arg2)) break; + fputc(CS_FIO_FUNCTION, out); + fputc(FIO_GET_POS, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); /* File handle */ + writecrc(src, arg2); /* Variable */ + continue; + } + if (!stricmp(p, "FSET_POS") || !stricmp(p, "FSEEK")) { + if (!(*arg)) break; + fputc(CS_FIO_FUNCTION, out); + if (IS_DIGIT(*arg2) || atol(arg2)) + fputc(FIO_SEEK, out); else - fputc(FIO_SEEK_VAR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); /* File handle */ - p=strchr(arg2,' '); - if(p) - *p=0; - if(atol(arg2) || IS_DIGIT(*arg2)) { - l=val(src,arg2); - fwrite(&l,4,1,out); } + fputc(FIO_SEEK_VAR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); /* File handle */ + p = strchr(arg2, ' '); + if (p) + *p = 0; + if (atol(arg2) || IS_DIGIT(*arg2)) { + l = val(src, arg2); + fwrite(&l, 4, 1, out); + } else - writecrc(src,arg2); /* Offset variable */ - i=0; - if(p) { + writecrc(src, arg2); /* Offset variable */ + i = 0; + if (p) { p++; SKIPCTRLSP(p); - i=atoi(p); - if(!stricmp(p,"CUR")) - i=SEEK_CUR; - else if(!stricmp(p,"END")) - i=SEEK_END; } - fwrite(&i,2,1,out); - continue; } - if(!stricmp(p,"FLOCK")) { - if(!(*arg)) break; - fputc(CS_FIO_FUNCTION,out); - if(IS_DIGIT(*arg2) || atol(arg2)) - fputc(FIO_LOCK,out); + i = atoi(p); + if (!stricmp(p, "CUR")) + i = SEEK_CUR; + else if (!stricmp(p, "END")) + i = SEEK_END; + } + fwrite(&i, 2, 1, out); + continue; + } + if (!stricmp(p, "FLOCK")) { + if (!(*arg)) break; + fputc(CS_FIO_FUNCTION, out); + if (IS_DIGIT(*arg2) || atol(arg2)) + fputc(FIO_LOCK, out); else - fputc(FIO_LOCK_VAR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); /* File handle */ - if(atol(arg2) || IS_DIGIT(*arg2)) { - l=val(src,arg2); - if(!l) + fputc(FIO_LOCK_VAR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); /* File handle */ + if (atol(arg2) || IS_DIGIT(*arg2)) { + l = val(src, arg2); + if (!l) break; - fwrite(&l,4,1,out); } + fwrite(&l, 4, 1, out); + } else - writecrc(src,arg2); /* Length variable */ - continue; } - if(!stricmp(p,"FUNLOCK")) { - if(!(*arg)) break; - fputc(CS_FIO_FUNCTION,out); - if(IS_DIGIT(*arg2) || atol(arg2)) - fputc(FIO_UNLOCK,out); + writecrc(src, arg2); /* Length variable */ + continue; + } + if (!stricmp(p, "FUNLOCK")) { + if (!(*arg)) break; + fputc(CS_FIO_FUNCTION, out); + if (IS_DIGIT(*arg2) || atol(arg2)) + fputc(FIO_UNLOCK, out); else - fputc(FIO_UNLOCK_VAR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); /* File handle */ - if(atol(arg2) || IS_DIGIT(*arg2)) { - l=val(src,arg2); - if(!l) + fputc(FIO_UNLOCK_VAR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); /* File handle */ + if (atol(arg2) || IS_DIGIT(*arg2)) { + l = val(src, arg2); + if (!l) break; - fwrite(&l,4,1,out); } + fwrite(&l, 4, 1, out); + } else - writecrc(src,arg2); /* Length variable */ - continue; } - if(!stricmp(p,"FSET_LENGTH")) { - if(!(*arg)) break; - fputc(CS_FIO_FUNCTION,out); - if(IS_DIGIT(*arg2) || atol(arg2)) - fputc(FIO_SET_LENGTH,out); + writecrc(src, arg2); /* Length variable */ + continue; + } + if (!stricmp(p, "FSET_LENGTH")) { + if (!(*arg)) break; + fputc(CS_FIO_FUNCTION, out); + if (IS_DIGIT(*arg2) || atol(arg2)) + fputc(FIO_SET_LENGTH, out); else - fputc(FIO_SET_LENGTH_VAR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); /* File handle */ - if(atol(arg2) || IS_DIGIT(*arg2)) { - l=val(src,arg2); - fwrite(&l,4,1,out); } + fputc(FIO_SET_LENGTH_VAR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); /* File handle */ + if (atol(arg2) || IS_DIGIT(*arg2)) { + l = val(src, arg2); + fwrite(&l, 4, 1, out); + } else - writecrc(src,arg2); /* Length variable */ - continue; } - if(!stricmp(p,"FPRINTF")) { - if(!(*arg)) break; - fputc(CS_FIO_FUNCTION,out); - fputc(FIO_PRINTF,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); /* Write destination variable */ + writecrc(src, arg2); /* Length variable */ + continue; + } + if (!stricmp(p, "FPRINTF")) { + if (!(*arg)) break; + fputc(CS_FIO_FUNCTION, out); + fputc(FIO_PRINTF, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); /* Write destination variable */ p++; SKIPCTRLSP(p); - arg=p; - p=strrchr(arg,'"'); - if(!p) + arg = p; + p = strrchr(arg, '"'); + if (!p) break; - *p=0; + *p = 0; p++; SKIPCTRLSP(p); writecstr(arg); /* Write string */ - l=ftell(out); - fputc(0,out); /* Write total number of args */ - i=0; - while(p && *p) { - arg=p; - p=strchr(arg,' '); - if(p) { - *p=0; - p++; } - writecrc(src,arg); - i++; } - fseek(out,l,SEEK_SET); - fputc((char)i,out); - fseek(out,i*4,SEEK_CUR); - continue; } - if(!stricmp(p,"FSET_ETX")) { - if(!(*arg)) break; - if((l=isvar(arg))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(2,out); /* int offset */ - fputc(1,out); /* int length */ - ch=0; } /* place holder */ + l = ftell(out); + fputc(0, out); /* Write total number of args */ + i = 0; + while (p && *p) { + arg = p; + p = strchr(arg, ' '); + if (p) { + *p = 0; + p++; + } + writecrc(src, arg); + i++; + } + fseek(out, l, SEEK_SET); + fputc((char)i, out); + fseek(out, i * 4, SEEK_CUR); + continue; + } + if (!stricmp(p, "FSET_ETX")) { + if (!(*arg)) break; + if ((l = isvar(arg)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(2, out); /* int offset */ + fputc(1, out); /* int length */ + ch = 0; + } /* place holder */ else - ch=val(src,arg); - - fputc(CS_FIO_FUNCTION,out); - fputc(FIO_SET_ETX,out); - fwrite(&ch,1,1,out); - continue; } - if(!stricmp(p,"FGET_TIME")) { - if(!(*arg) || !(*arg2)) break; - fputc(CS_FIO_FUNCTION,out); - fputc(FIO_GET_TIME,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); /* File handle */ - writecrc(src,arg2); /* Variable */ - continue; } - if(!stricmp(p,"FSET_TIME")) { - if(!(*arg) || !(*arg2)) break; - fputc(CS_FIO_FUNCTION,out); - fputc(FIO_SET_TIME,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); /* File handle */ - writecrc(src,arg2); /* Variable */ - continue; } - if(!stricmp(p,"REMOVE_FILE")) { - if(!(*arg)) break; - fputc(CS_FIO_FUNCTION,out); - fputc(REMOVE_FILE,out); - writecrc(src,arg); /* Str var */ - continue; } - if(!stricmp(p,"RENAME_FILE")) { - if(!(*arg) || !(*arg2)) break; - fputc(CS_FIO_FUNCTION,out); - fputc(RENAME_FILE,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); /* str var */ - writecrc(src,arg2); /* str var */ - continue; } - if(!stricmp(p,"COPY_FILE")) { - if(!(*arg) || !(*arg2)) break; - fputc(CS_FIO_FUNCTION,out); - fputc(COPY_FILE,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); /* str var */ - writecrc(src,arg2); /* str var */ - continue; } - if(!stricmp(p,"MOVE_FILE")) { - if(!(*arg) || !(*arg2)) break; - fputc(CS_FIO_FUNCTION,out); - fputc(MOVE_FILE,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); /* str var */ - writecrc(src,arg2); /* str var */ - continue; } - if(!stricmp(p,"GET_FILE_ATTRIB")) { - if(!(*arg) || !(*arg2)) break; - fputc(CS_FIO_FUNCTION,out); - fputc(GET_FILE_ATTRIB,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); /* str var */ - writecrc(src,arg2); /* int var */ - continue; } - if(!stricmp(p,"SET_FILE_ATTRIB")) { - if(!(*arg) || !(*arg2)) break; - fputc(CS_FIO_FUNCTION,out); - fputc(SET_FILE_ATTRIB,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); /* str var */ - writecrc(src,arg2); /* int var */ - continue; } - if(!stricmp(p,"RMDIR") || !stricmp(p,"REMOVE_DIR")) { - if(!(*arg)) break; - fputc(CS_FIO_FUNCTION,out); - fputc(REMOVE_DIR,out); - writecrc(src,arg); /* Str var */ - continue; } - if(!stricmp(p,"MKDIR") || !stricmp(p,"MAKE_DIR")) { - if(!(*arg)) break; - fputc(CS_FIO_FUNCTION,out); - fputc(MAKE_DIR,out); - writecrc(src,arg); /* Str var */ - continue; } - if(!stricmp(p,"CHDIR") || !stricmp(p,"CHANGE_DIR")) { - if(!(*arg)) break; + ch = val(src, arg); + + fputc(CS_FIO_FUNCTION, out); + fputc(FIO_SET_ETX, out); + fwrite(&ch, 1, 1, out); + continue; + } + if (!stricmp(p, "FGET_TIME")) { + if (!(*arg) || !(*arg2)) break; + fputc(CS_FIO_FUNCTION, out); + fputc(FIO_GET_TIME, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); /* File handle */ + writecrc(src, arg2); /* Variable */ + continue; + } + if (!stricmp(p, "FSET_TIME")) { + if (!(*arg) || !(*arg2)) break; + fputc(CS_FIO_FUNCTION, out); + fputc(FIO_SET_TIME, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); /* File handle */ + writecrc(src, arg2); /* Variable */ + continue; + } + if (!stricmp(p, "REMOVE_FILE")) { + if (!(*arg)) break; + fputc(CS_FIO_FUNCTION, out); + fputc(REMOVE_FILE, out); + writecrc(src, arg); /* Str var */ + continue; + } + if (!stricmp(p, "RENAME_FILE")) { + if (!(*arg) || !(*arg2)) break; + fputc(CS_FIO_FUNCTION, out); + fputc(RENAME_FILE, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); /* str var */ + writecrc(src, arg2); /* str var */ + continue; + } + if (!stricmp(p, "COPY_FILE")) { + if (!(*arg) || !(*arg2)) break; + fputc(CS_FIO_FUNCTION, out); + fputc(COPY_FILE, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); /* str var */ + writecrc(src, arg2); /* str var */ + continue; + } + if (!stricmp(p, "MOVE_FILE")) { + if (!(*arg) || !(*arg2)) break; + fputc(CS_FIO_FUNCTION, out); + fputc(MOVE_FILE, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); /* str var */ + writecrc(src, arg2); /* str var */ + continue; + } + if (!stricmp(p, "GET_FILE_ATTRIB")) { + if (!(*arg) || !(*arg2)) break; + fputc(CS_FIO_FUNCTION, out); + fputc(GET_FILE_ATTRIB, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); /* str var */ + writecrc(src, arg2); /* int var */ + continue; + } + if (!stricmp(p, "SET_FILE_ATTRIB")) { + if (!(*arg) || !(*arg2)) break; + fputc(CS_FIO_FUNCTION, out); + fputc(SET_FILE_ATTRIB, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); /* str var */ + writecrc(src, arg2); /* int var */ + continue; + } + if (!stricmp(p, "RMDIR") || !stricmp(p, "REMOVE_DIR")) { + if (!(*arg)) break; + fputc(CS_FIO_FUNCTION, out); + fputc(REMOVE_DIR, out); + writecrc(src, arg); /* Str var */ + continue; + } + if (!stricmp(p, "MKDIR") || !stricmp(p, "MAKE_DIR")) { + if (!(*arg)) break; + fputc(CS_FIO_FUNCTION, out); + fputc(MAKE_DIR, out); + writecrc(src, arg); /* Str var */ + continue; + } + if (!stricmp(p, "CHDIR") || !stricmp(p, "CHANGE_DIR")) { + if (!(*arg)) break; printf("!WARNING: CHANGE_DIR deprecated in Synchronet v3+\n"); - printf(linestr,src,line,save); - fputc(CS_FIO_FUNCTION,out); - fputc(CHANGE_DIR,out); - writecrc(src,arg); /* Str var */ - continue; } - if(!stricmp(p,"OPEN_DIR")) { - if(!(*arg) || !(*arg2)) break; - fputc(CS_FIO_FUNCTION,out); - fputc(OPEN_DIR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); /* int var */ - writecrc(src,arg2); /* str var */ - continue; } - if(!stricmp(p,"READ_DIR")) { - if(!(*arg) || !(*arg2)) break; - fputc(CS_FIO_FUNCTION,out); - fputc(READ_DIR,out); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); /* int var */ - writecrc(src,arg2); /* str var */ - continue; } - if(!stricmp(p,"REWIND_DIR")) { - if(!(*arg)) break; - fputc(CS_FIO_FUNCTION,out); - fputc(REWIND_DIR,out); - writecrc(src,arg); /* int var */ - continue; } - if(!stricmp(p,"CLOSE_DIR")) { - if(!(*arg)) break; - fputc(CS_FIO_FUNCTION,out); - fputc(CLOSE_DIR,out); - writecrc(src,arg); /* int var */ - continue; } + printf(linestr, src, line, save); + fputc(CS_FIO_FUNCTION, out); + fputc(CHANGE_DIR, out); + writecrc(src, arg); /* Str var */ + continue; + } + if (!stricmp(p, "OPEN_DIR")) { + if (!(*arg) || !(*arg2)) break; + fputc(CS_FIO_FUNCTION, out); + fputc(OPEN_DIR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); /* int var */ + writecrc(src, arg2); /* str var */ + continue; + } + if (!stricmp(p, "READ_DIR")) { + if (!(*arg) || !(*arg2)) break; + fputc(CS_FIO_FUNCTION, out); + fputc(READ_DIR, out); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); /* int var */ + writecrc(src, arg2); /* str var */ + continue; + } + if (!stricmp(p, "REWIND_DIR")) { + if (!(*arg)) break; + fputc(CS_FIO_FUNCTION, out); + fputc(REWIND_DIR, out); + writecrc(src, arg); /* int var */ + continue; + } + if (!stricmp(p, "CLOSE_DIR")) { + if (!(*arg)) break; + fputc(CS_FIO_FUNCTION, out); + fputc(CLOSE_DIR, out); + writecrc(src, arg); /* int var */ + continue; + } /* NET_FUNCTIONS */ - if(!stricmp(p,"SOCKET_OPEN")) { - if(!(*arg)) break; - fprintf(out,"%c%c",CS_NET_FUNCTION,CS_SOCKET_OPEN); - writecrc(src,arg); /* int var (socket) */ + if (!stricmp(p, "SOCKET_OPEN")) { + if (!(*arg)) break; + fprintf(out, "%c%c", CS_NET_FUNCTION, CS_SOCKET_OPEN); + writecrc(src, arg); /* int var (socket) */ + continue; + } + if (!stricmp(p, "SOCKET_CLOSE")) { + if (!(*arg)) break; + fprintf(out, "%c%c", CS_NET_FUNCTION, CS_SOCKET_CLOSE); + writecrc(src, arg); /* int var (socket) */ + continue; + } + if (!stricmp(p, "SOCKET_CHECK")) { + if (!(*arg)) break; + fprintf(out, "%c%c", CS_NET_FUNCTION, CS_SOCKET_CHECK); + writecrc(src, arg); /* int var (socket) */ + continue; + } + if (!stricmp(p, "SOCKET_CONNECT")) { + if (!(*arg) || !(*arg2) || !(*arg3)) break; + + /* TCP port */ + if ((l = isvar(arg3)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(10, out); /* int offset */ + fputc(2, out); /* int length */ + i = 0; + } /* place holder */ + else + i = val(src, arg3); + + fprintf(out, "%c%c", CS_NET_FUNCTION, CS_SOCKET_CONNECT); + writecrc(src, arg); /* int var (socket) */ + writecrc(src, arg2); /* str var (address) */ + fwrite(&i, 2, 1, out); + continue; + } + if (!stricmp(p, "SOCKET_ACCEPT")) { + if (!(*arg)) break; + fprintf(out, "%c%c", CS_NET_FUNCTION, CS_SOCKET_ACCEPT); + writecrc(src, arg); /* int var (socket) */ + continue; + } + if (!stricmp(p, "SOCKET_NREAD")) { + if (!(*arg) || !(*arg2)) break; + fprintf(out, "%c%c", CS_NET_FUNCTION, CS_SOCKET_NREAD); + writecrc(src, arg); /* int var (socket) */ + writecrc(src, arg2); /* int var (nbytes) */ + continue; + } + if (!stricmp(p, "SOCKET_READ") + || !stricmp(p, "SOCKET_READLINE") + || !stricmp(p, "SOCKET_PEEK")) { + if (!(*arg) || !(*arg2)) break; + + /* length */ + if (!(*arg3)) + i = 0; + else if ((l = isvar(arg3)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(10, out); /* int offset */ + fputc(2, out); /* int length */ + i = 0; + } /* place holder */ + else + i = val(src, arg3); + + if (!stricmp(p, "SOCKET_READ")) + ch = CS_SOCKET_READ; + else if (!stricmp(p, "SOCKET_READLINE")) + ch = CS_SOCKET_READLINE; + else + ch = CS_SOCKET_PEEK; + fprintf(out, "%c%c", CS_NET_FUNCTION, ch); + writecrc(src, arg); /* int var (socket) */ + writecrc(src, arg2); /* str var (buffer) */ + fwrite(&i, sizeof(i), 1, out); /* word (length) */ + continue; + } + if (!stricmp(p, "SOCKET_WRITE")) { + if (!(*arg) || !(*arg2)) break; + fprintf(out, "%c%c", CS_NET_FUNCTION, CS_SOCKET_WRITE); + writecrc(src, arg); /* int var (socket) */ + writecrc(src, arg2); /* str var (buffer) */ + continue; + } + + /* FTP functions */ + if (!stricmp(p, "FTP_LOGIN")) { + if (!(*arg) || !(*arg2) || !(*arg3)) break; + fprintf(out, "%c%c", CS_NET_FUNCTION, CS_FTP_LOGIN); + writecrc(src, arg); /* int var (socket) */ + writecrc(src, arg2); /* int var (user) */ + writecrc(src, arg3); /* int var (password) */ + continue; + } + if (!stricmp(p, "FTP_LOGOUT")) { + if (!(*arg)) break; + fprintf(out, "%c%c", CS_NET_FUNCTION, CS_FTP_LOGOUT); + writecrc(src, arg); /* int var (socket) */ + continue; + } + if (!stricmp(p, "FTP_PWD")) { + if (!(*arg)) break; + fprintf(out, "%c%c", CS_NET_FUNCTION, CS_FTP_PWD); + writecrc(src, arg); /* int var (socket) */ + continue; + } + if (!stricmp(p, "FTP_CWD")) { + if (!(*arg) || !(*arg2)) break; + fprintf(out, "%c%c", CS_NET_FUNCTION, CS_FTP_CWD); + writecrc(src, arg); /* int var (socket) */ + writecrc(src, arg2); /* str var (path) */ + continue; + } + if (!stricmp(p, "FTP_DIR")) { + if (!(*arg) || !(*arg2)) break; + fprintf(out, "%c%c", CS_NET_FUNCTION, CS_FTP_DIR); + writecrc(src, arg); /* int var (socket) */ + writecrc(src, arg2); /* str var (path) */ + continue; + } + if (!stricmp(p, "FTP_GET")) { + if (!(*arg) || !(*arg2) || !(*arg3)) break; + fprintf(out, "%c%c", CS_NET_FUNCTION, CS_FTP_GET); + writecrc(src, arg); /* int var (socket) */ + writecrc(src, arg2); /* str var (src path) */ + writecrc(src, arg3); /* str var (dest path) */ + continue; + } + if (!stricmp(p, "FTP_PUT")) { + if (!(*arg) || !(*arg2) || !(*arg3)) break; + fprintf(out, "%c%c", CS_NET_FUNCTION, CS_FTP_PUT); + writecrc(src, arg); /* int var (socket) */ + writecrc(src, arg2); /* str var (src path) */ + writecrc(src, arg3); /* str var (dest path) */ + continue; + } + if (!stricmp(p, "FTP_DELETE")) { + if (!(*arg) || !(*arg2)) break; + fprintf(out, "%c%c", CS_NET_FUNCTION, CS_FTP_DELETE); + writecrc(src, arg); /* int var (socket) */ + writecrc(src, arg2); /* str var (path) */ + continue; + } + if (!stricmp(p, "FTP_RENAME")) { + if (!(*arg) || !(*arg2) || !(*arg3)) break; + fprintf(out, "%c%c", CS_NET_FUNCTION, CS_FTP_RENAME); + writecrc(src, arg); /* int var (socket) */ + writecrc(src, arg2); /* str var (org name) */ + writecrc(src, arg3); /* str var (new name) */ + continue; + } + + if (!stricmp(p, "NODE_ACTION")) { + if (!(*arg)) break; + if ((l = isvar(arg)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(1, out); /* int offset */ + fputc(1, out); /* int length */ + ch = 0; + } /* place holder */ + else + ch = val(src, arg); + + fprintf(out, "%c%c", CS_NODE_ACTION, ch); + continue; + } + if (!stricmp(p, "NODE_STATUS")) { + if (!(*arg)) break; + if ((l = isvar(arg)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(1, out); /* int offset */ + fputc(1, out); /* int length */ + ch = 0; + } /* place holder */ + else + ch = val(src, arg); + + fprintf(out, "%c%c", CS_NODE_STATUS, ch); + continue; + } + if (!stricmp(p, "END_CMD") || !stricmp(p, "ENDCMD")) { + fprintf(out, "%c", CS_END_CMD); + continue; + } + if (!stricmp(p, "CMD_POP") || !stricmp(p, "CMDPOP")) { + fprintf(out, "%c", CS_CMD_POP); + continue; + } + if (!stricmp(p, "CLS")) { + fprintf(out, "%c", CS_CLS); + continue; + } + if (!stricmp(p, "CRLF")) { + fprintf(out, "%c", CS_CRLF); + continue; + } + if (!stricmp(p, "PAUSE")) { + fprintf(out, "%c", CS_PAUSE); + continue; + } + if (!stricmp(p, "PAUSE_RESET")) { + fprintf(out, "%c", CS_PAUSE_RESET); + continue; + } + if (!stricmp(p, "CLEAR_ABORT")) { + fprintf(out, "%c", CS_CLEAR_ABORT); + continue; + } + if (!stricmp(p, "GETLINES")) { + fprintf(out, "%c", CS_GETLINES); + continue; + } + if (!stricmp(p, "GETFILESPEC")) { + fprintf(out, "%c", CS_GETFILESPEC); + continue; + } + if (!stricmp(p, "FINDUSER")) { + fprintf(out, "%c", CS_FINDUSER); + continue; + } + if (!stricmp(p, "MATCHUSER")) { + fprintf(out, "%c%c", CS_VAR_INSTRUCTION, MATCHUSER); + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + + if (!stricmp(p, "LOG")) { + if (!(*arg)) break; + fprintf(out, "%c", CS_LOG); + writecstr(arg); + continue; + } + if (!stricmp(p, "MNEMONICS")) { + if (!(*arg)) break; + fprintf(out, "%c", CS_MNEMONICS); + writecstr(arg); + continue; + } + if (!stricmp(p, "PRINT")) { + if (!(*arg)) break; + fprintf(out, "%c", CS_PRINT); + if (strstr(arg, "%s") != NULL) { + printf("!WARNING: PRINT \"%%s\" is a security hole if STR contains unvalidated input\n"); + printf(linestr, src, line, save); + } + writecstr(arg); + continue; + } + if (!stricmp(p, "PRINT_LOCAL")) { + if (!(*arg)) break; + fprintf(out, "%c", CS_PRINT_LOCAL); + writecstr(arg); + continue; + } + if (!stricmp(p, "PRINT_REMOTE")) { + if (!(*arg)) break; + fprintf(out, "%c", CS_PRINT_REMOTE); + writecstr(arg); + continue; + } + if (!stricmp(p, "PRINTFILE")) { + if (!(*arg)) break; + if (*arg == '"') { /* NEED TO SUPPORT MODE HERE */ + fprintf(out, "%c", CS_PRINTFILE); + writestr(arg); + } + else { + if ((l = isvar(arg2)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(6, out); /* int offset */ + fputc(2, out); /* int length */ + i = 0; + } /* place holder */ + else + i = val(src, arg2); + + fprintf(out, "%c%c", CS_VAR_INSTRUCTION, PRINTFILE_VAR_MODE); + p = strchr(arg, ' '); + if (p) *p = 0; + writecrc(src, arg); + fwrite(&i, 2, 1, out); + } + continue; + } + if (!stricmp(p, "PRINTTAIL")) { + if (!(*arg) || !(*arg2)) + break; + if ((l = isvar(arg3)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(8, out); /* int offset */ + fputc(1, out); /* int length */ + j = 0; + } /* place holder */ + else + j = val(src, arg3); + + fprintf(out, "%c%c", CS_VAR_INSTRUCTION, PRINTTAIL_VAR_MODE); + p = strchr(arg, ' '); + if (p) *p = 0; + writecrc(src, arg); + i = val(src, arg2); + fwrite(&i, 2, 1, out); + fwrite(&j, 1, 1, out); + continue; + } + + if (!stricmp(p, "PRINTFILE_STR")) { + fprintf(out, "%c", CS_PRINTFILE_STR); + continue; + } + if (!stricmp(p, "PRINTFILE_LOCAL")) { + if (!(*arg)) break; + fprintf(out, "%c", CS_PRINTFILE_LOCAL); + writestr(arg); + continue; + } + if (!stricmp(p, "PRINTFILE_REMOTE")) { + if (!(*arg)) break; + fprintf(out, "%c", CS_PRINTFILE_REMOTE); + writestr(arg); + continue; + } + + if (!stricmp(p, "TELNET_GATE")) { + if (!(*arg)) break; + if ((l = isvar(arg2)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(2, out); /* int offset */ + fputc(4, out); /* int length */ + l = 0; + } /* place holder */ + else if (*arg2) + l = val(src, arg2); + else + l = 0; + + if (*arg == '"') { + fprintf(out, "%c%c", CS_VAR_INSTRUCTION, TELNET_GATE_STR); + fwrite(&l, 4, 1, out); + writestr(arg); + } else { + fprintf(out, "%c%c", CS_VAR_INSTRUCTION, TELNET_GATE_VAR); + fwrite(&l, 4, 1, out); + p = strchr(arg, ' '); + if (p) *p = 0; + writecrc(src, arg); + } + continue; + } + + if (!stricmp(p, "EXEC")) { + if (!(*arg)) break; + fprintf(out, "%c", CS_EXEC); + writestr(arg); + continue; + } + if (!stricmp(p, "EXEC_INT")) { + if (!(*arg)) break; + fprintf(out, "%c", CS_EXEC_INT); + writestr(arg); + continue; + } + if (!stricmp(p, "EXEC_BIN")) { + if (!(*arg)) break; + fprintf(out, "%c", CS_EXEC_BIN); + writestr(arg); + continue; + } + if (!stricmp(p, "EXEC_XTRN")) { + if (!(*arg)) break; + fprintf(out, "%c", CS_EXEC_XTRN); + writestr(arg); + continue; + } + + if (!stricmp(p, "SELECT_SHELL")) { + fprintf(out, "%c", CS_SELECT_SHELL); + continue; + } + if (!stricmp(p, "SET_SHELL")) { + fprintf(out, "%c", CS_SET_SHELL); + continue; + } + if (!stricmp(p, "SELECT_EDITOR")) { + fprintf(out, "%c", CS_SELECT_EDITOR); + continue; + } + if (!stricmp(p, "SET_EDITOR")) { + fprintf(out, "%c", CS_SET_EDITOR); + continue; + } + + if (!stricmp(p, "YES_NO")) { + if (!(*arg)) break; + fprintf(out, "%c", CS_YES_NO); + writecstr(arg); + continue; + } + if (!stricmp(p, "NO_YES")) { + if (!(*arg)) break; + fprintf(out, "%c", CS_NO_YES); + writecstr(arg); + continue; + } + if (!stricmp(p, "MENU")) { + if (!(*arg)) break; + fprintf(out, "%c", CS_MENU); + writestr(arg); + continue; + } + if (!stricmp(p, "SET_MENU_DIR")) { + if (!(*arg)) break; + fprintf(out, "%c", CS_SET_MENU_DIR); + writestr(arg); + continue; + } + if (!stricmp(p, "SET_MENU_FILE")) { + if (!(*arg)) break; + fprintf(out, "%c", CS_SET_MENU_FILE); + writestr(arg); + continue; + } + if (!stricmp(p, "SEND_FILE_VIA")) { + if (!(*arg) || !(*arg2)) break; + if (*arg2 == '"') { + fprintf(out, "%c%c%c", CS_VAR_INSTRUCTION, SEND_FILE_VIA, *arg); + writestr(arg2); + } + else { + fprintf(out, "%c%c%c", CS_VAR_INSTRUCTION, SEND_FILE_VIA_VAR, *arg); + writecrc(src, arg2); + } + continue; + } + if (!stricmp(p, "RECEIVE_FILE_VIA")) { + if (!(*arg) || !(*arg2)) break; + if (*arg2 == '"') { + fprintf(out, "%c%c%c", CS_VAR_INSTRUCTION, RECEIVE_FILE_VIA, *arg); + writestr(arg2); + } + else { + fprintf(out, "%c%c%c", CS_VAR_INSTRUCTION, RECEIVE_FILE_VIA_VAR, *arg); + writecrc(src, arg2); + } + continue; + } + if (!stricmp(p, "CHKFILE")) { + if (!(*arg)) break; + if (*arg == '"') { + fprintf(out, "%c", CS_CHKFILE); + writestr(arg); + } + else { + fprintf(out, "%c%c", CS_VAR_INSTRUCTION, CHKFILE_VAR); + writecrc(src, arg); + } + continue; + } + if (!stricmp(p, "GET_FILE_LENGTH")) { + if (!(*arg) || !(*arg2)) + break; + fprintf(out, "%c%c", CS_VAR_INSTRUCTION, FLENGTH_TO_INT); + p = strchr(arg, ' '); + if (p) *p = 0; + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + if (!stricmp(p, "GET_FILE_TIME")) { + if (!(*arg) || !(*arg2)) + break; + fprintf(out, "%c%c", CS_VAR_INSTRUCTION, FTIME_TO_INT); + p = strchr(arg, ' '); + if (p) *p = 0; + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + if (!stricmp(p, "CHARVAL")) { + if (!(*arg) || !(*arg2)) + break; + fprintf(out, "%c%c", CS_VAR_INSTRUCTION, CHARVAL_TO_INT); + p = strchr(arg, ' '); + if (p) *p = 0; + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + if (!stricmp(p, "SETSTR")) { + if (!(*arg)) break; + fprintf(out, "%c", CS_SETSTR); + writecstr(arg); + continue; + } + if (!stricmp(p, "COMPARE_STR")) { + if (!(*arg)) break; + fprintf(out, "%c", CS_COMPARE_STR); + writecstr(arg); + continue; + } + if (!stricmp(p, "GET_TEMPLATE")) { + if (!(*arg)) break; + fprintf(out, "%c", CS_GET_TEMPLATE); + writestr(arg); + continue; + } + if (!stricmp(p, "READ_SIF")) { + if (!(*arg)) break; + fprintf(out, "%c", CS_READ_SIF); + writestr(arg); + continue; + } + if (!stricmp(p, "CREATE_SIF")) { + if (!(*arg)) break; + fprintf(out, "%c", CS_CREATE_SIF); + writestr(arg); + continue; + } + if (!stricmp(p, "TRASHCAN")) { + if (!(*arg)) break; + fprintf(out, "%c", CS_TRASHCAN); + writestr(arg); + continue; + } + if (!stricmp(p, "CMDSTR")) { + if (!(*arg)) break; + fprintf(out, "%c", CS_CMDSTR); + writecstr(arg); + continue; + } + if (!stricmp(p, "CMDKEYS")) { + if (!(*arg)) break; + fprintf(out, "%c", CS_CMDKEYS); + for (p = arg; *p && *p != '#'; p++) { + ch = *p; + if (ch == '"') + continue; + if (ch == '/') { + p++; + ch = *p | 0x80; + } /* high bit indicates slash required */ + else if (ch == '^' && *(p + 1) >= 0x40) { + p++; + ch = *p; + ch -= 0x40; + } + else if (ch == '\\') { + p++; + ch = cesc(*p); + } + fputc(ch, out); + } + fputc(0, out); + continue; + } + if (!stricmp(p, "COMPARE_WORD")) { + if (!(*arg)) break; + fprintf(out, "%c", CS_COMPARE_WORD); + writecstr(arg); + continue; + } + if (!stricmp(p, "GETSTR")) { + p = strchr(arg, ' '); + if (p) *p = 0; + if ((!(*arg) || IS_DIGIT(*arg) || !stricmp(arg, "STR")) && !(*arg3)) + fprintf(out, "%c%c", CS_GETSTR, atoi(arg) ? atoi(arg) + : *arg2 ? atoi(arg2) : 128); + else { + if ((l = isvar(arg2)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(6, out); /* int offset */ + fputc(1, out); /* int length */ + i = 0; + } /* place holder */ + else if (*arg2) + i = val(src, arg2); + else + i = 0; + + fprintf(out, "%c%c", CS_VAR_INSTRUCTION + , *arg3 ? GETSTR_MODE : GETSTR_VAR); + writecrc(src, arg); + + if (!i) i = 128; + fwrite(&i, 1, 1, out); + if (*arg3) { + l = val(src, arg3); + fwrite(&l, 4, 1, out); + } + } + continue; + } + if (!stricmp(p, "GETNUM")) { + if (!(*arg)) break; + p = strchr(arg, ' '); + if (p) *p = 0; + if (IS_DIGIT(*arg)) { + i = val(src, arg); + fprintf(out, "%c", CS_GETNUM); + fwrite(&i, 2, 1, out); + } + else { + if ((l = isvar(arg2)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(6, out); /* int offset */ + fputc(2, out); /* int length */ + i = 0; + } /* place holder */ + else + i = val(src, arg2); + + fprintf(out, "%c%c", CS_VAR_INSTRUCTION, GETNUM_VAR); + writecrc(src, arg); + fwrite(&i, 2, 1, out); + } + continue; + } + if (!stricmp(p, "MSWAIT")) { + if (!(*arg)) break; + if ((l = isvar(arg)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(1, out); /* int offset */ + fputc(2, out); /* int length */ + i = 0; + } /* place holder */ + else + i = val(src, arg); + + fprintf(out, "%c", CS_MSWAIT); + fwrite(&i, 2, 1, out); + continue; + } + if (!stricmp(p, "GETLINE")) { + p = strchr(arg, ' '); + if (p) *p = 0; + if (!(*arg) || IS_DIGIT(*arg)) + fprintf(out, "%c%c", CS_GETLINE, *arg ? atoi(arg) :128); + else { + if ((l = isvar(arg2)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(6, out); /* int offset */ + fputc(1, out); /* int length */ + i = 0; + } /* place holder */ + else + i = val(src, arg2); + + fprintf(out, "%c%c", CS_VAR_INSTRUCTION, GETLINE_VAR); + writecrc(src, arg); + if (!i) i = 128; + fwrite(&i, 1, 1, out); + } + continue; + } + if (!stricmp(p, "GETSTRUPR")) { + p = strchr(arg, ' '); + if (p) *p = 0; + if (!(*arg) || IS_DIGIT(*arg)) + fprintf(out, "%c%c", CS_GETSTRUPR, *arg ? atoi(arg) :128); + else { + if ((l = isvar(arg2)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(6, out); /* int offset */ + fputc(1, out); /* int length */ + i = 0; + } /* place holder */ + else + i = val(src, arg2); + + fprintf(out, "%c%c", CS_VAR_INSTRUCTION, GETSTRUPR_VAR); + writecrc(src, arg); + if (!i) i = 128; + fwrite(&i, 1, 1, out); + } + continue; + } + if (!stricmp(p, "GETNAME")) { + p = strchr(arg, ' '); + if (p) *p = 0; + if (!(*arg) || IS_DIGIT(*arg)) + fprintf(out, "%c%c", CS_GETNAME, *arg ? atoi(arg) :25); + else { + if ((l = isvar(arg2)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(6, out); /* int offset */ + fputc(1, out); /* int length */ + i = 0; + } /* place holder */ + else + i = atoi(arg2); + + fprintf(out, "%c%c", CS_VAR_INSTRUCTION, GETNAME_VAR); + writecrc(src, arg); + if (!i) i = 128; + fwrite(&i, 1, 1, out); + } + continue; + } + if (!stricmp(p, "SHIFT_STR")) { + if (!(*arg)) break; + p = strchr(arg, ' '); + if (p) *p = 0; + if (IS_DIGIT(*arg)) + fprintf(out, "%c%c", CS_SHIFT_STR, atoi(arg)); + else { + if ((l = isvar(arg2)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(6, out); /* int offset */ + fputc(1, out); /* int length */ + i = 0; + } /* place holder */ + else + i = atoi(arg2); + + fprintf(out, "%c%c", CS_VAR_INSTRUCTION, SHIFT_STR_VAR); + writecrc(src, arg); + if (!i) i = 128; + fwrite(&i, 1, 1, out); + } + continue; + } + if (!stricmp(p, "SHIFT_TO_FIRST_CHAR") || !stricmp(p, "SHIFT_TO_LAST_CHAR")) { + if (!(*arg) || !(*arg2)) break; + if ((l = isvar(arg2)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(6, out); /* int offset */ + fputc(1, out); /* int length */ + ch = 0; + } /* place holder */ + else + ch = val(src, arg2); + + fprintf(out, "%c%c", CS_VAR_INSTRUCTION + , !stricmp(p, "SHIFT_TO_FIRST_CHAR") ? SHIFT_TO_FIRST_CHAR : SHIFT_TO_LAST_CHAR); + writecrc(src, arg); + fwrite(&ch, sizeof(ch), 1, out); + continue; + } + if (!stricmp(p, "TRUNCSP")) { + fprintf(out, "%c%c", CS_VAR_INSTRUCTION, TRUNCSP_STR_VAR); + writecrc(src, arg); + continue; + } + if (!stricmp(p, "STRIP_CTRL")) { + fprintf(out, "%c%c", CS_VAR_INSTRUCTION, STRIP_CTRL_STR_VAR); + writecrc(src, arg); + continue; + } + if (!stricmp(p, "STRUPR")) { + fprintf(out, "%c%c", CS_VAR_INSTRUCTION, STRUPR_VAR); + writecrc(src, arg); + continue; + } + if (!stricmp(p, "STRLWR")) { + fprintf(out, "%c%c", CS_VAR_INSTRUCTION, STRLWR_VAR); + writecrc(src, arg); + continue; + } + if (!stricmp(p, "STRLEN")) { + if (!(*arg)) break; + fprintf(out, "%c%c", CS_VAR_INSTRUCTION, STRLEN_INT_VAR); + p = strchr(arg, ' '); + if (!p) + break; + *p = 0; + writecrc(src, arg); + writecrc(src, arg2); + continue; + } + if (!stricmp(p, "REPLACE_TEXT")) { + if (!(*arg) || !(*arg2)) break; + if ((l = isvar(arg)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(1, out); /* int offset */ + fputc(2, out); /* int length */ + i = 0; + } /* place holder */ + else + i = val(src, arg); + + fprintf(out, "%c", CS_REPLACE_TEXT); + fwrite(&i, 2, 1, out); + writecstr(arg2); + continue; + } + if (!stricmp(p, "REVERT_TEXT")) { + if (!(*arg)) break; + if (!stricmp(arg, "ALL")) + i = 0xffff; + else { + if ((l = isvar(arg)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(1, out); /* int offset */ + fputc(2, out); /* int length */ + i = 0; + } /* place holder */ + else + i = val(src, arg); + } + + fprintf(out, "%c", CS_REVERT_TEXT); + fwrite(&i, 2, 1, out); + continue; + } + if (!stricmp(p, "TOGGLE_USER_MISC") + || !stricmp(p, "COMPARE_USER_MISC")) { + if (!(*arg)) break; + + if ((l = isvar(arg)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(1, out); /* int offset */ + fputc(4, out); /* int length */ + l = 0; + } /* place holder */ + else + l = val(src, arg); + + if (!stricmp(p, "TOGGLE_USER_MISC")) + fprintf(out, "%c", CS_TOGGLE_USER_MISC); + else + fprintf(out, "%c", CS_COMPARE_USER_MISC); + fwrite(&l, 4, 1, out); + continue; + } + + if (!stricmp(p, "TOGGLE_USER_CHAT") + || !stricmp(p, "COMPARE_USER_CHAT")) { + if (!(*arg)) break; + + if ((l = isvar(arg)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(1, out); /* int offset */ + fputc(4, out); /* int length */ + l = 0; + } /* place holder */ + else + l = val(src, arg); + + if (!stricmp(p, "TOGGLE_USER_CHAT")) + fprintf(out, "%c", CS_TOGGLE_USER_CHAT); + else + fprintf(out, "%c", CS_COMPARE_USER_CHAT); + fwrite(&l, 4, 1, out); + continue; + } + + if (!stricmp(p, "TOGGLE_USER_QWK") + || !stricmp(p, "COMPARE_USER_QWK")) { + if (!(*arg)) break; + + if ((l = isvar(arg)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(1, out); /* int offset */ + fputc(4, out); /* int length */ + l = 0; + } /* place holder */ + else + l = val(src, arg); + + if (!stricmp(p, "TOGGLE_USER_QWK")) + fprintf(out, "%c", CS_TOGGLE_USER_QWK); + else + fprintf(out, "%c", CS_COMPARE_USER_QWK); + fwrite(&l, 4, 1, out); + continue; + } + + if (!stricmp(p, "TOGGLE_NODE_MISC") + || !stricmp(p, "COMPARE_NODE_MISC")) { + if (!(*arg)) break; + + if ((l = isvar(arg)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(1, out); /* int offset */ + fputc(2, out); /* int length */ + i = 0; + } /* place holder */ + else + i = val(src, arg); + + if (!stricmp(p, "TOGGLE_NODE_MISC")) + fprintf(out, "%c", CS_TOGGLE_NODE_MISC); + else + fprintf(out, "%c", CS_COMPARE_NODE_MISC); + fwrite(&i, 2, 1, out); + continue; + } + + if (!stricmp(p, "TOGGLE_USER_FLAG")) { + if (!(*arg)) break; + p = arg; + fprintf(out, "%c%c", CS_TOGGLE_USER_FLAG, toupper(*p++)); + SKIPCTRLSP(p); + fprintf(out, "%c", toupper(*p)); + continue; + } + + if (!stricmp(p, "SET_USER_LEVEL")) { + if (!(*arg)) break; + + if ((l = isvar(arg)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(1, out); /* int offset */ + fputc(1, out); /* int length */ + ch = 0; + } /* place holder */ + else + ch = val(src, arg); + + fprintf(out, "%c%c", CS_SET_USER_LEVEL, ch); + continue; + } + + if (!stricmp(p, "SET_USER_STRING")) { + if (!(*arg)) break; + + if ((l = isvar(arg)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(1, out); /* int offset */ + fputc(1, out); /* int length */ + ch = 0; + } /* place holder */ + else + ch = val(src, arg); + + fprintf(out, "%c%c", CS_SET_USER_STRING, ch); + continue; + } + + + if (!stricmp(p, "ADJUST_USER_CREDITS")) { + if (!(*arg)) break; + + if ((l = isvar(arg)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(1, out); /* int offset */ + fputc(2, out); /* int length */ + i = 0; + } /* place holder */ + else + i = val(src, arg); + + fprintf(out, "%c", CS_ADJUST_USER_CREDITS); + fwrite(&i, 2, 1, out); + continue; + } + + if (!stricmp(p, "ADJUST_USER_MINUTES")) { + if (!(*arg)) break; + + if ((l = isvar(arg)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(1, out); /* int offset */ + fputc(2, out); /* int length */ + i = 0; + } /* place holder */ + else + i = val(src, arg); + + fprintf(out, "%c", CS_ADJUST_USER_MINUTES); + fwrite(&i, 2, 1, out); + continue; + } + + if (!stricmp(p, "SHOW_MEM")) { + fprintf(out, "%c", CS_SHOW_MEM); + continue; + } + if (!stricmp(p, "GURU_LOG")) { + fprintf(out, "%c", CS_GURU_LOG); + continue; + } + if (!stricmp(p, "ERROR_LOG")) { + fprintf(out, "%c", CS_ERROR_LOG); + continue; + } + if (!stricmp(p, "SYSTEM_LOG")) { + fprintf(out, "%c", CS_SYSTEM_LOG); + continue; + } + if (!stricmp(p, "SYSTEM_YLOG")) { + fprintf(out, "%c", CS_SYSTEM_YLOG); + continue; + } + if (!stricmp(p, "SYSTEM_STATS")) { + fprintf(out, "%c", CS_SYSTEM_STATS); + continue; + } + if (!stricmp(p, "NODE_STATS")) { + fprintf(out, "%c", CS_NODE_STATS); + continue; + } + if (!stricmp(p, "CHANGE_USER")) { + fprintf(out, "%c", CS_CHANGE_USER); + continue; + } + if (!stricmp(p, "ANSI_CAPTURE")) { + fprintf(out, "%c", CS_ANSI_CAPTURE); + continue; + } + if (!stricmp(p, "LIST_TEXT_FILE")) { + fprintf(out, "%c", CS_LIST_TEXT_FILE); + continue; + } + if (!stricmp(p, "EDIT_TEXT_FILE")) { + fprintf(out, "%c", CS_EDIT_TEXT_FILE); + continue; + } + + + if (!stricmp(p, "COMPARE_KEY")) { + if (!stricmp(arg, "DIGIT")) + ch = CS_DIGIT; + else if (!stricmp(arg, "EDIGIT")) + ch = CS_EDIGIT; + else + ch = toupper(*arg); + if (ch == '/') + ch = (*arg) | 0x80; /* high bit indicates slash required */ + else if (ch == '^' && (*(arg + 1)) >= 0x40) + ch = (*(arg + 1)) - 0x40; /* ctrl char */ + else if (ch == '\\') + ch = cesc(*(arg + 1)); + else if (ch == '\'') + ch = *(arg + 1); + fprintf(out, "%c%c", CS_COMPARE_KEY, ch); + continue; + } + if (!stricmp(p, "COMPARE_CHAR")) { + ch = *arg; + fprintf(out, "%c%c", CS_COMPARE_CHAR, ch); + continue; + } + if (!stricmp(p, "COMPARE_KEYS")) { + fputc(CS_COMPARE_KEYS, out); + for (p = arg; *p && *p != '#'; p++) { + ch = *p; + if (ch == '"') + continue; + if (ch == '/') { + p++; + ch = *p | 0x80; + } /* high bit indicates slash required */ + else if (ch == '^' && *(p + 1) >= 0x40) { + p++; + ch = *p; + ch -= 0x40; + } + else if (ch == '\\') { + p++; + ch = cesc(*p); + } + fputc(ch, out); + } + fputc(0, out); + continue; + } + if (!stricmp(p, "GETCMD")) { + fprintf(out, "%c", CS_GETCMD); + writecstr(arg); + continue; + } + if (!stricmp(p, "INKEY")) { + fprintf(out, "%c", CS_INKEY); + continue; + } + if (!stricmp(p, "INCHAR")) { + fprintf(out, "%c", CS_INCHAR); + continue; + } + if (!stricmp(p, "GETKEY")) { + fprintf(out, "%c", CS_GETKEY); + continue; + } + if (!stricmp(p, "GETCHAR")) { + fprintf(out, "%c", CS_GETCHAR); + continue; + } + if (!stricmp(p, "GETKEYE")) { + fprintf(out, "%c", CS_GETKEYE); + continue; + } + if (!stricmp(p, "UNGETKEY")) { + fprintf(out, "%c", CS_UNGETKEY); + continue; + } + if (!stricmp(p, "UNGETSTR")) { + fprintf(out, "%c", CS_UNGETSTR); + continue; + } + if (!stricmp(p, "PRINTKEY")) { + fprintf(out, "%c", CS_PRINTKEY); + continue; + } + if (!stricmp(p, "PRINTSTR")) { + fprintf(out, "%c", CS_PRINTSTR); + continue; + } + + /* FUNCTIONS */ + + if (!stricmp(p, "NODELIST_ALL")) { + fprintf(out, "%c", CS_NODELIST_ALL); + continue; + } + if (!stricmp(p, "NODELIST_USERS")) { + fprintf(out, "%c", CS_NODELIST_USERS); + continue; + } + + if (!stricmp(p, "USERLIST_ALL")) { + fprintf(out, "%c", CS_USERLIST_ALL); + continue; + } + if (!stricmp(p, "USERLIST_SUB")) { + fprintf(out, "%c", CS_USERLIST_SUB); + continue; + } + if (!stricmp(p, "USERLIST_DIR")) { + fprintf(out, "%c", CS_USERLIST_DIR); + continue; + } + if (!stricmp(p, "USERLIST_LOGONS")) { + fprintf(out, "%c", CS_USERLIST_LOGONS); + continue; + } + + if (!stricmp(p, "HANGUP")) { + fprintf(out, "%c", CS_HANGUP); + continue; + } + + if (!stricmp(p, "LOGOFF")) { + fprintf(out, "%c", CS_LOGOFF); + continue; + } + + if (!stricmp(p, "LOGOFF_FAST")) { + fprintf(out, "%c", CS_LOGOFF_FAST); + continue; + } + + if (!stricmp(p, "AUTO_MESSAGE")) { + fprintf(out, "%c", CS_AUTO_MESSAGE); + continue; + } + + if (!stricmp(p, "MINUTE_BANK")) { + fprintf(out, "%c", CS_MINUTE_BANK); + continue; + } + + if (!stricmp(p, "USER_EDIT")) { + fprintf(out, "%c", CS_USER_EDIT); + continue; + } + + if (!stricmp(p, "USER_DEFAULTS")) { + fprintf(out, "%c", CS_USER_DEFAULTS); + continue; + } + + if (!stricmp(p, "PAGE_SYSOP")) { + fprintf(out, "%c", CS_PAGE_SYSOP); + continue; + } + if (!stricmp(p, "PAGE_GURU")) { + fprintf(out, "%c", CS_PAGE_GURU); + continue; + } + if (!stricmp(p, "SPY")) { + fprintf(out, "%c", CS_SPY); + continue; + } + + + if (!stricmp(p, "PRIVATE_CHAT")) { + fprintf(out, "%c", CS_PRIVATE_CHAT); + continue; + } + + if (!stricmp(p, "PRIVATE_MESSAGE")) { + fprintf(out, "%c", CS_PRIVATE_MESSAGE); + continue; + } + + if (!stricmp(p, "MULTINODE_CHAT")) { + if (!(*arg)) + ch = 1; + else { + if ((l = isvar(arg)) != 0) { + fputc(CS_USE_INT_VAR, out); + fwrite(&l, 4, 1, out); /* variable */ + fputc(1, out); /* int offset */ + fputc(1, out); /* int length */ + ch = 0; + } /* place holder */ + else + ch = val(src, arg); + } + + fprintf(out, "%c%c", CS_MULTINODE_CHAT, ch); + continue; + } + + if (!stricmp(p, "MAIL_READ")) { + fprintf(out, "%c", CS_MAIL_READ); + continue; + } + if (!stricmp(p, "MAIL_READ_SENT")) { /* Kill/read sent mail */ + fprintf(out, "%c", CS_MAIL_READ_SENT); + continue; + } + if (!stricmp(p, "MAIL_READ_ALL")) { + fprintf(out, "%c", CS_MAIL_READ_ALL); + continue; + } + if (!stricmp(p, "MAIL_SEND")) { /* Send E-mail */ + fprintf(out, "%c", CS_MAIL_SEND); continue; } - if(!stricmp(p,"SOCKET_CLOSE")) { - if(!(*arg)) break; - fprintf(out,"%c%c",CS_NET_FUNCTION,CS_SOCKET_CLOSE); - writecrc(src,arg); /* int var (socket) */ + if (!stricmp(p, "MAIL_SEND_FEEDBACK")) { /* Feedback */ + fprintf(out, "%c", CS_MAIL_SEND_FEEDBACK); continue; } - if(!stricmp(p,"SOCKET_CHECK")) { - if(!(*arg)) break; - fprintf(out,"%c%c",CS_NET_FUNCTION,CS_SOCKET_CHECK); - writecrc(src,arg); /* int var (socket) */ + if (!stricmp(p, "MAIL_SEND_NETMAIL")) { + fprintf(out, "%c", CS_MAIL_SEND_NETMAIL); + continue; + } + if (!stricmp(p, "MAIL_SEND_NETFILE")) { + fprintf(out, "%c", CS_MAIL_SEND_NETFILE); + continue; + } + if (!stricmp(p, "MAIL_SEND_FILE")) { /* Upload Attached File to E-mail */ + fprintf(out, "%c", CS_MAIL_SEND_FILE); + continue; + } + if (!stricmp(p, "MAIL_SEND_BULK")) { + fprintf(out, "%c", CS_MAIL_SEND_BULK); continue; } - if(!stricmp(p,"SOCKET_CONNECT")) { - if(!(*arg) || !(*arg2) || !(*arg3)) break; - /* TCP port */ - if((l=isvar(arg3))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(10,out); /* int offset */ - fputc(2,out); /* int length */ - i=0; } /* place holder */ - else - i=val(src,arg3); - fprintf(out,"%c%c",CS_NET_FUNCTION,CS_SOCKET_CONNECT); - writecrc(src,arg); /* int var (socket) */ - writecrc(src,arg2); /* str var (address) */ - fwrite(&i,2,1,out); + if (!stricmp(p, "MSG_SET_AREA")) { + fprintf(out, "%c", CS_MSG_SET_AREA); continue; } - if(!stricmp(p,"SOCKET_ACCEPT")) { - if(!(*arg)) break; - fprintf(out,"%c%c",CS_NET_FUNCTION,CS_SOCKET_ACCEPT); - writecrc(src,arg); /* int var (socket) */ + if (!stricmp(p, "MSG_SET_GROUP")) { + fprintf(out, "%c", CS_MSG_SET_GROUP); continue; } - if(!stricmp(p,"SOCKET_NREAD")) { - if(!(*arg) || !(*arg2)) break; - fprintf(out,"%c%c",CS_NET_FUNCTION,CS_SOCKET_NREAD); - writecrc(src,arg); /* int var (socket) */ - writecrc(src,arg2); /* int var (nbytes) */ + if (!stricmp(p, "MSG_SELECT_AREA")) { + fprintf(out, "%c", CS_MSG_SELECT_AREA); continue; } - if(!stricmp(p,"SOCKET_READ") - || !stricmp(p,"SOCKET_READLINE") - || !stricmp(p,"SOCKET_PEEK")) { - if(!(*arg) || !(*arg2)) break; - - /* length */ - if(!(*arg3)) - i=0; - else if((l=isvar(arg3))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(10,out); /* int offset */ - fputc(2,out); /* int length */ - i=0; } /* place holder */ - else - i=val(src,arg3); - - if(!stricmp(p,"SOCKET_READ")) - ch=CS_SOCKET_READ; - else if(!stricmp(p,"SOCKET_READLINE")) - ch=CS_SOCKET_READLINE; - else - ch=CS_SOCKET_PEEK; - fprintf(out,"%c%c",CS_NET_FUNCTION,ch); - writecrc(src,arg); /* int var (socket) */ - writecrc(src,arg2); /* str var (buffer) */ - fwrite(&i,sizeof(i),1,out); /* word (length) */ + if (!stricmp(p, "MSG_SHOW_GROUPS")) { + fprintf(out, "%c", CS_MSG_SHOW_GROUPS); continue; } - if(!stricmp(p,"SOCKET_WRITE")) { - if(!(*arg) || !(*arg2)) break; - fprintf(out,"%c%c",CS_NET_FUNCTION,CS_SOCKET_WRITE); - writecrc(src,arg); /* int var (socket) */ - writecrc(src,arg2); /* str var (buffer) */ + if (!stricmp(p, "MSG_SHOW_SUBBOARDS")) { + fprintf(out, "%c", CS_MSG_SHOW_SUBBOARDS); continue; } - - /* FTP functions */ - if(!stricmp(p,"FTP_LOGIN")) { - if(!(*arg) || !(*arg2) || !(*arg3)) break; - fprintf(out,"%c%c",CS_NET_FUNCTION,CS_FTP_LOGIN); - writecrc(src,arg); /* int var (socket) */ - writecrc(src,arg2); /* int var (user) */ - writecrc(src,arg3); /* int var (password) */ + if (!stricmp(p, "MSG_GROUP_UP")) { + fprintf(out, "%c", CS_MSG_GROUP_UP); continue; } - if(!stricmp(p,"FTP_LOGOUT")) { - if(!(*arg)) break; - fprintf(out,"%c%c",CS_NET_FUNCTION,CS_FTP_LOGOUT); - writecrc(src,arg); /* int var (socket) */ + if (!stricmp(p, "MSG_GROUP_DOWN")) { + fprintf(out, "%c", CS_MSG_GROUP_DOWN); continue; } - if(!stricmp(p,"FTP_PWD")) { - if(!(*arg)) break; - fprintf(out,"%c%c",CS_NET_FUNCTION,CS_FTP_PWD); - writecrc(src,arg); /* int var (socket) */ + if (!stricmp(p, "MSG_SUBBOARD_UP")) { + fprintf(out, "%c", CS_MSG_SUBBOARD_UP); continue; } - if(!stricmp(p,"FTP_CWD")) { - if(!(*arg) || !(*arg2)) break; - fprintf(out,"%c%c",CS_NET_FUNCTION,CS_FTP_CWD); - writecrc(src,arg); /* int var (socket) */ - writecrc(src,arg2); /* str var (path) */ + if (!stricmp(p, "MSG_SUBBOARD_DOWN")) { + fprintf(out, "%c", CS_MSG_SUBBOARD_DOWN); continue; } - if(!stricmp(p,"FTP_DIR")) { - if(!(*arg) || !(*arg2)) break; - fprintf(out,"%c%c",CS_NET_FUNCTION,CS_FTP_DIR); - writecrc(src,arg); /* int var (socket) */ - writecrc(src,arg2); /* str var (path) */ + if (!stricmp(p, "MSG_GET_SUB_NUM")) { + fprintf(out, "%c", CS_MSG_GET_SUB_NUM); continue; } - if(!stricmp(p,"FTP_GET")) { - if(!(*arg) || !(*arg2) || !(*arg3)) break; - fprintf(out,"%c%c",CS_NET_FUNCTION,CS_FTP_GET); - writecrc(src,arg); /* int var (socket) */ - writecrc(src,arg2); /* str var (src path) */ - writecrc(src,arg3); /* str var (dest path) */ + if (!stricmp(p, "MSG_GET_GRP_NUM")) { + fprintf(out, "%c", CS_MSG_GET_GRP_NUM); continue; } - if(!stricmp(p,"FTP_PUT")) { - if(!(*arg) || !(*arg2) || !(*arg3)) break; - fprintf(out,"%c%c",CS_NET_FUNCTION,CS_FTP_PUT); - writecrc(src,arg); /* int var (socket) */ - writecrc(src,arg2); /* str var (src path) */ - writecrc(src,arg3); /* str var (dest path) */ + if (!stricmp(p, "MSG_READ")) { + fprintf(out, "%c", CS_MSG_READ); continue; } - if(!stricmp(p,"FTP_DELETE")) { - if(!(*arg) || !(*arg2)) break; - fprintf(out,"%c%c",CS_NET_FUNCTION,CS_FTP_DELETE); - writecrc(src,arg); /* int var (socket) */ - writecrc(src,arg2); /* str var (path) */ + if (!stricmp(p, "MSG_POST")) { + fprintf(out, "%c", CS_MSG_POST); continue; } - if(!stricmp(p,"FTP_RENAME")) { - if(!(*arg) || !(*arg2) || !(*arg3)) break; - fprintf(out,"%c%c",CS_NET_FUNCTION,CS_FTP_RENAME); - writecrc(src,arg); /* int var (socket) */ - writecrc(src,arg2); /* str var (org name) */ - writecrc(src,arg3); /* str var (new name) */ + if (!stricmp(p, "MSG_QWK")) { + fprintf(out, "%c", CS_MSG_QWK); continue; } - - if(!stricmp(p,"NODE_ACTION")) { - if(!(*arg)) break; - if((l=isvar(arg))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(1,out); /* int offset */ - fputc(1,out); /* int length */ - ch=0; } /* place holder */ - else - ch=val(src,arg); - - fprintf(out,"%c%c",CS_NODE_ACTION,ch); - continue; } - if(!stricmp(p,"NODE_STATUS")) { - if(!(*arg)) break; - if((l=isvar(arg))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(1,out); /* int offset */ - fputc(1,out); /* int length */ - ch=0; } /* place holder */ - else - ch=val(src,arg); - - fprintf(out,"%c%c",CS_NODE_STATUS,ch); - continue; } - if(!stricmp(p,"END_CMD") || !stricmp(p,"ENDCMD")) { - fprintf(out,"%c",CS_END_CMD); - continue; } - if(!stricmp(p,"CMD_POP") || !stricmp(p,"CMDPOP")) { - fprintf(out,"%c",CS_CMD_POP); - continue; } - if(!stricmp(p,"CLS")) { - fprintf(out,"%c",CS_CLS); - continue; } - if(!stricmp(p,"CRLF")) { - fprintf(out,"%c",CS_CRLF); - continue; } - if(!stricmp(p,"PAUSE")) { - fprintf(out,"%c",CS_PAUSE); - continue; } - if(!stricmp(p,"PAUSE_RESET")) { - fprintf(out,"%c",CS_PAUSE_RESET); - continue; } - if(!stricmp(p,"CLEAR_ABORT")) { - fprintf(out,"%c",CS_CLEAR_ABORT); - continue; } - if(!stricmp(p,"GETLINES")) { - fprintf(out,"%c",CS_GETLINES); - continue; } - if(!stricmp(p,"GETFILESPEC")) { - fprintf(out,"%c",CS_GETFILESPEC); - continue; } - if(!stricmp(p,"FINDUSER")) { - fprintf(out,"%c",CS_FINDUSER); - continue; } - if(!stricmp(p,"MATCHUSER")) { - fprintf(out,"%c%c",CS_VAR_INSTRUCTION,MATCHUSER); - writecrc(src,arg); - writecrc(src,arg2); - continue; } - - if(!stricmp(p,"LOG")) { - if(!(*arg)) break; - fprintf(out,"%c",CS_LOG); - writecstr(arg); - continue; } - if(!stricmp(p,"MNEMONICS")) { - if(!(*arg)) break; - fprintf(out,"%c",CS_MNEMONICS); - writecstr(arg); - continue; } - if(!stricmp(p,"PRINT")) { - if(!(*arg)) break; - fprintf(out,"%c",CS_PRINT); - if(strstr(arg,"%s")!=NULL) { - printf("!WARNING: PRINT \"%%s\" is a security hole if STR contains unvalidated input\n"); - printf(linestr,src,line,save); - } - writecstr(arg); - continue; } - if(!stricmp(p,"PRINT_LOCAL")) { - if(!(*arg)) break; - fprintf(out,"%c",CS_PRINT_LOCAL); - writecstr(arg); - continue; } - if(!stricmp(p,"PRINT_REMOTE")) { - if(!(*arg)) break; - fprintf(out,"%c",CS_PRINT_REMOTE); - writecstr(arg); - continue; } - if(!stricmp(p,"PRINTFILE")) { - if(!(*arg)) break; - if(*arg=='"') { /* NEED TO SUPPORT MODE HERE */ - fprintf(out,"%c",CS_PRINTFILE); - writestr(arg); } - else { - if((l=isvar(arg2))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(6,out); /* int offset */ - fputc(2,out); /* int length */ - i=0; } /* place holder */ - else - i=val(src,arg2); - - fprintf(out,"%c%c",CS_VAR_INSTRUCTION,PRINTFILE_VAR_MODE); - p=strchr(arg,' '); - if(p) *p=0; - writecrc(src,arg); - fwrite(&i,2,1,out); } - continue; } - if(!stricmp(p,"PRINTTAIL")) { - if(!(*arg) || !(*arg2)) - break; - if((l=isvar(arg3))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(8,out); /* int offset */ - fputc(1,out); /* int length */ - j=0; } /* place holder */ - else - j=val(src,arg3); - - fprintf(out,"%c%c",CS_VAR_INSTRUCTION,PRINTTAIL_VAR_MODE); - p=strchr(arg,' '); - if(p) *p=0; - writecrc(src,arg); - i=val(src,arg2); - fwrite(&i,2,1,out); - fwrite(&j,1,1,out); - continue; } - - if(!stricmp(p,"PRINTFILE_STR")) { - fprintf(out,"%c",CS_PRINTFILE_STR); - continue; } - if(!stricmp(p,"PRINTFILE_LOCAL")) { - if(!(*arg)) break; - fprintf(out,"%c",CS_PRINTFILE_LOCAL); - writestr(arg); - continue; } - if(!stricmp(p,"PRINTFILE_REMOTE")) { - if(!(*arg)) break; - fprintf(out,"%c",CS_PRINTFILE_REMOTE); - writestr(arg); - continue; } - - if(!stricmp(p,"TELNET_GATE")) { - if(!(*arg)) break; - if((l=isvar(arg2))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(2,out); /* int offset */ - fputc(4,out); /* int length */ - l=0; } /* place holder */ - else if(*arg2) - l=val(src,arg2); - else - l=0; - - if(*arg=='"') { - fprintf(out,"%c%c",CS_VAR_INSTRUCTION,TELNET_GATE_STR); - fwrite(&l,4,1,out); - writestr(arg); - } else { - fprintf(out,"%c%c",CS_VAR_INSTRUCTION,TELNET_GATE_VAR); - fwrite(&l,4,1,out); - p=strchr(arg,' '); - if(p) *p=0; - writecrc(src,arg); - } - continue; + if (!stricmp(p, "MSG_PTRS_CFG")) { + fprintf(out, "%c", CS_MSG_PTRS_CFG); + continue; + } + if (!stricmp(p, "MSG_PTRS_REINIT")) { + fprintf(out, "%c", CS_MSG_PTRS_REINIT); + continue; + } + if (!stricmp(p, "MSG_NEW_SCAN_CFG")) { + fprintf(out, "%c", CS_MSG_NEW_SCAN_CFG); + continue; + } + if (!stricmp(p, "MSG_NEW_SCAN")) { + fprintf(out, "%c", CS_MSG_NEW_SCAN); + continue; + } + if (!stricmp(p, "MSG_NEW_SCAN_SUB")) { + fprintf(out, "%c", CS_MSG_NEW_SCAN_SUB); + continue; + } + if (!stricmp(p, "MSG_NEW_SCAN_ALL")) { + fprintf(out, "%c", CS_MSG_NEW_SCAN_ALL); + continue; + } + if (!stricmp(p, "MSG_CONT_SCAN")) { + fprintf(out, "%c", CS_MSG_CONT_SCAN); + continue; + } + if (!stricmp(p, "MSG_CONT_SCAN_ALL")) { + fprintf(out, "%c", CS_MSG_CONT_SCAN_ALL); + continue; + } + if (!stricmp(p, "MSG_BROWSE_SCAN")) { + fprintf(out, "%c", CS_MSG_BROWSE_SCAN); + continue; + } + if (!stricmp(p, "MSG_BROWSE_SCAN_ALL")) { + fprintf(out, "%c", CS_MSG_BROWSE_SCAN_ALL); + continue; + } + if (!stricmp(p, "MSG_FIND_TEXT")) { + fprintf(out, "%c", CS_MSG_FIND_TEXT); + continue; + } + if (!stricmp(p, "MSG_FIND_TEXT_ALL")) { + fprintf(out, "%c", CS_MSG_FIND_TEXT_ALL); + continue; + } + if (!stricmp(p, "MSG_YOUR_SCAN_CFG")) { + fprintf(out, "%c", CS_MSG_YOUR_SCAN_CFG); + continue; + } + if (!stricmp(p, "MSG_YOUR_SCAN")) { + fprintf(out, "%c", CS_MSG_YOUR_SCAN); + continue; + } + if (!stricmp(p, "MSG_YOUR_SCAN_ALL")) { + fprintf(out, "%c", CS_MSG_YOUR_SCAN_ALL); + continue; + } + if (!stricmp(p, "MSG_LIST")) { + fprintf(out, "%c", CS_MSG_LIST); + continue; + } + if (!stricmp(p, "CHAT_SECTION")) { + fprintf(out, "%c", CS_CHAT_SECTION); + continue; + } + if (!stricmp(p, "TEXT_FILE_SECTION")) { + fprintf(out, "%c", CS_TEXT_FILE_SECTION); + continue; + } + if (!stricmp(p, "XTRN_EXEC")) { + fprintf(out, "%c", CS_XTRN_EXEC); + continue; + } + if (!stricmp(p, "XTRN_SECTION")) { + fprintf(out, "%c", CS_XTRN_SECTION); + continue; } - if(!stricmp(p,"EXEC")) { - if(!(*arg)) break; - fprintf(out,"%c",CS_EXEC); - writestr(arg); - continue; } - if(!stricmp(p,"EXEC_INT")) { - if(!(*arg)) break; - fprintf(out,"%c",CS_EXEC_INT); - writestr(arg); - continue; } - if(!stricmp(p,"EXEC_BIN")) { - if(!(*arg)) break; - fprintf(out,"%c",CS_EXEC_BIN); - writestr(arg); - continue; } - if(!stricmp(p,"EXEC_XTRN")) { - if(!(*arg)) break; - fprintf(out,"%c",CS_EXEC_XTRN); - writestr(arg); - continue; } - - if(!stricmp(p,"SELECT_SHELL")) { - fprintf(out,"%c",CS_SELECT_SHELL); - continue; } - if(!stricmp(p,"SET_SHELL")) { - fprintf(out,"%c",CS_SET_SHELL); - continue; } - if(!stricmp(p,"SELECT_EDITOR")) { - fprintf(out,"%c",CS_SELECT_EDITOR); - continue; } - if(!stricmp(p,"SET_EDITOR")) { - fprintf(out,"%c",CS_SET_EDITOR); - continue; } - - if(!stricmp(p,"YES_NO")) { - if(!(*arg)) break; - fprintf(out,"%c",CS_YES_NO); - writecstr(arg); - continue; } - if(!stricmp(p,"NO_YES")) { - if(!(*arg)) break; - fprintf(out,"%c",CS_NO_YES); - writecstr(arg); - continue; } - if(!stricmp(p,"MENU")) { - if(!(*arg)) break; - fprintf(out,"%c",CS_MENU); - writestr(arg); - continue; } - if(!stricmp(p,"SET_MENU_DIR")) { - if(!(*arg)) break; - fprintf(out,"%c",CS_SET_MENU_DIR); - writestr(arg); - continue; } - if(!stricmp(p,"SET_MENU_FILE")) { - if(!(*arg)) break; - fprintf(out,"%c",CS_SET_MENU_FILE); - writestr(arg); - continue; } - if(!stricmp(p,"SEND_FILE_VIA")) { - if(!(*arg) || !(*arg2)) break; - if(*arg2=='"') { - fprintf(out,"%c%c%c",CS_VAR_INSTRUCTION,SEND_FILE_VIA,*arg); - writestr(arg2); } - else { - fprintf(out,"%c%c%c",CS_VAR_INSTRUCTION,SEND_FILE_VIA_VAR,*arg); - writecrc(src,arg2); } - continue; } - if(!stricmp(p,"RECEIVE_FILE_VIA")) { - if(!(*arg) || !(*arg2)) break; - if(*arg2=='"') { - fprintf(out,"%c%c%c",CS_VAR_INSTRUCTION,RECEIVE_FILE_VIA,*arg); - writestr(arg2); } - else { - fprintf(out,"%c%c%c",CS_VAR_INSTRUCTION,RECEIVE_FILE_VIA_VAR,*arg); - writecrc(src,arg2); } - continue; } - if(!stricmp(p,"CHKFILE")) { - if(!(*arg)) break; - if(*arg=='"') { - fprintf(out,"%c",CS_CHKFILE); - writestr(arg); } - else { - fprintf(out,"%c%c",CS_VAR_INSTRUCTION,CHKFILE_VAR); - writecrc(src,arg); } - continue; } - if(!stricmp(p,"GET_FILE_LENGTH")) { - if(!(*arg) || !(*arg2)) - break; - fprintf(out,"%c%c",CS_VAR_INSTRUCTION,FLENGTH_TO_INT); - p=strchr(arg,' '); - if(p) *p=0; - writecrc(src,arg); - writecrc(src,arg2); - continue; } - if(!stricmp(p,"GET_FILE_TIME")) { - if(!(*arg) || !(*arg2)) - break; - fprintf(out,"%c%c",CS_VAR_INSTRUCTION,FTIME_TO_INT); - p=strchr(arg,' '); - if(p) *p=0; - writecrc(src,arg); - writecrc(src,arg2); - continue; } - if(!stricmp(p,"CHARVAL")) { - if(!(*arg) || !(*arg2)) - break; - fprintf(out,"%c%c",CS_VAR_INSTRUCTION,CHARVAL_TO_INT); - p=strchr(arg,' '); - if(p) *p=0; - writecrc(src,arg); - writecrc(src,arg2); - continue; } - if(!stricmp(p,"SETSTR")) { - if(!(*arg)) break; - fprintf(out,"%c",CS_SETSTR); - writecstr(arg); - continue; } - if(!stricmp(p,"COMPARE_STR")) { - if(!(*arg)) break; - fprintf(out,"%c",CS_COMPARE_STR); - writecstr(arg); - continue; } - if(!stricmp(p,"GET_TEMPLATE")) { - if(!(*arg)) break; - fprintf(out,"%c",CS_GET_TEMPLATE); - writestr(arg); - continue; } - if(!stricmp(p,"READ_SIF")) { - if(!(*arg)) break; - fprintf(out,"%c",CS_READ_SIF); - writestr(arg); - continue; } - if(!stricmp(p,"CREATE_SIF")) { - if(!(*arg)) break; - fprintf(out,"%c",CS_CREATE_SIF); - writestr(arg); - continue; } - if(!stricmp(p,"TRASHCAN")) { - if(!(*arg)) break; - fprintf(out,"%c",CS_TRASHCAN); - writestr(arg); - continue; } - if(!stricmp(p,"CMDSTR")) { - if(!(*arg)) break; - fprintf(out,"%c",CS_CMDSTR); - writecstr(arg); - continue; } - if(!stricmp(p,"CMDKEYS")) { - if(!(*arg)) break; - fprintf(out,"%c",CS_CMDKEYS); - for(p=arg;*p && *p!='#';p++) { - ch=*p; - if(ch=='"') - continue; - if(ch=='/') { - p++; - ch=*p|0x80; } /* high bit indicates slash required */ - else if(ch=='^' && *(p+1)>=0x40) { - p++; - ch=*p; - ch-=0x40; } - else if(ch=='\\') { - p++; - ch=cesc(*p); } - fputc(ch,out); } - fputc(0,out); - continue; } - if(!stricmp(p,"COMPARE_WORD")) { - if(!(*arg)) break; - fprintf(out,"%c",CS_COMPARE_WORD); - writecstr(arg); - continue; } - if(!stricmp(p,"GETSTR")) { - p=strchr(arg,' '); - if(p) *p=0; - if((!(*arg) || IS_DIGIT(*arg) || !stricmp(arg,"STR")) && !(*arg3)) - fprintf(out,"%c%c",CS_GETSTR,atoi(arg) ? atoi(arg) - : *arg2 ? atoi(arg2) : 128); - else { - if((l=isvar(arg2))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(6,out); /* int offset */ - fputc(1,out); /* int length */ - i=0; } /* place holder */ - else if(*arg2) - i=val(src,arg2); - else - i=0; - - fprintf(out,"%c%c",CS_VAR_INSTRUCTION - ,*arg3 ? GETSTR_MODE : GETSTR_VAR); - writecrc(src,arg); - - if(!i) i=128; - fwrite(&i,1,1,out); - if(*arg3) { - l=val(src,arg3); - fwrite(&l,4,1,out); } } - continue; } - if(!stricmp(p,"GETNUM")) { - if(!(*arg)) break; - p=strchr(arg,' '); - if(p) *p=0; - if(IS_DIGIT(*arg)) { - i=val(src,arg); - fprintf(out,"%c",CS_GETNUM); - fwrite(&i,2,1,out); } - else { - if((l=isvar(arg2))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(6,out); /* int offset */ - fputc(2,out); /* int length */ - i=0; } /* place holder */ - else - i=val(src,arg2); - - fprintf(out,"%c%c",CS_VAR_INSTRUCTION,GETNUM_VAR); - writecrc(src,arg); - fwrite(&i,2,1,out); } - continue; } - if(!stricmp(p,"MSWAIT")) { - if(!(*arg)) break; - if((l=isvar(arg))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(1,out); /* int offset */ - fputc(2,out); /* int length */ - i=0; } /* place holder */ - else - i=val(src,arg); - - fprintf(out,"%c",CS_MSWAIT); - fwrite(&i,2,1,out); - continue; } - if(!stricmp(p,"GETLINE")) { - p=strchr(arg,' '); - if(p) *p=0; - if(!(*arg) || IS_DIGIT(*arg)) - fprintf(out,"%c%c",CS_GETLINE,*arg ? atoi(arg) :128); - else { - if((l=isvar(arg2))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(6,out); /* int offset */ - fputc(1,out); /* int length */ - i=0; } /* place holder */ - else - i=val(src,arg2); - - fprintf(out,"%c%c",CS_VAR_INSTRUCTION,GETLINE_VAR); - writecrc(src,arg); - if(!i) i=128; - fwrite(&i,1,1,out); } - continue; } - if(!stricmp(p,"GETSTRUPR")) { - p=strchr(arg,' '); - if(p) *p=0; - if(!(*arg) || IS_DIGIT(*arg)) - fprintf(out,"%c%c",CS_GETSTRUPR,*arg ? atoi(arg) :128); - else { - if((l=isvar(arg2))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(6,out); /* int offset */ - fputc(1,out); /* int length */ - i=0; } /* place holder */ - else - i=val(src,arg2); - - fprintf(out,"%c%c",CS_VAR_INSTRUCTION,GETSTRUPR_VAR); - writecrc(src,arg); - if(!i) i=128; - fwrite(&i,1,1,out); } - continue; } - if(!stricmp(p,"GETNAME")) { - p=strchr(arg,' '); - if(p) *p=0; - if(!(*arg) || IS_DIGIT(*arg)) - fprintf(out,"%c%c",CS_GETNAME,*arg ? atoi(arg) :25); - else { - if((l=isvar(arg2))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(6,out); /* int offset */ - fputc(1,out); /* int length */ - i=0; } /* place holder */ - else - i=atoi(arg2); - - fprintf(out,"%c%c",CS_VAR_INSTRUCTION,GETNAME_VAR); - writecrc(src,arg); - if(!i) i=128; - fwrite(&i,1,1,out); } - continue; } - if(!stricmp(p,"SHIFT_STR")) { - if(!(*arg)) break; - p=strchr(arg,' '); - if(p) *p=0; - if(IS_DIGIT(*arg)) - fprintf(out,"%c%c",CS_SHIFT_STR,atoi(arg)); - else { - if((l=isvar(arg2))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(6,out); /* int offset */ - fputc(1,out); /* int length */ - i=0; } /* place holder */ - else - i=atoi(arg2); - - fprintf(out,"%c%c",CS_VAR_INSTRUCTION,SHIFT_STR_VAR); - writecrc(src,arg); - if(!i) i=128; - fwrite(&i,1,1,out); } - continue; } - if(!stricmp(p,"SHIFT_TO_FIRST_CHAR") || !stricmp(p,"SHIFT_TO_LAST_CHAR")) { - if(!(*arg) || !(*arg2)) break; - if((l=isvar(arg2))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(6,out); /* int offset */ - fputc(1,out); /* int length */ - ch=0; } /* place holder */ - else - ch=val(src,arg2); - - fprintf(out,"%c%c",CS_VAR_INSTRUCTION - ,!stricmp(p,"SHIFT_TO_FIRST_CHAR") ? SHIFT_TO_FIRST_CHAR : SHIFT_TO_LAST_CHAR); - writecrc(src,arg); - fwrite(&ch,sizeof(ch),1,out); - continue; - } - if(!stricmp(p,"TRUNCSP")) { - fprintf(out,"%c%c",CS_VAR_INSTRUCTION,TRUNCSP_STR_VAR); - writecrc(src,arg); - continue; } - if(!stricmp(p,"STRIP_CTRL")) { - fprintf(out,"%c%c",CS_VAR_INSTRUCTION,STRIP_CTRL_STR_VAR); - writecrc(src,arg); - continue; } - if(!stricmp(p,"STRUPR")) { - fprintf(out,"%c%c",CS_VAR_INSTRUCTION,STRUPR_VAR); - writecrc(src,arg); - continue; } - if(!stricmp(p,"STRLWR")) { - fprintf(out,"%c%c",CS_VAR_INSTRUCTION,STRLWR_VAR); - writecrc(src,arg); - continue; } - if(!stricmp(p,"STRLEN")) { - if(!(*arg)) break; - fprintf(out,"%c%c",CS_VAR_INSTRUCTION,STRLEN_INT_VAR); - p=strchr(arg,' '); - if(!p) - break; - *p=0; - writecrc(src,arg); - writecrc(src,arg2); - continue; } - if(!stricmp(p,"REPLACE_TEXT")) { - if(!(*arg) || !(*arg2)) break; - if((l=isvar(arg))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(1,out); /* int offset */ - fputc(2,out); /* int length */ - i=0; } /* place holder */ - else - i=val(src,arg); - - fprintf(out,"%c",CS_REPLACE_TEXT); - fwrite(&i,2,1,out); - writecstr(arg2); - continue; } - if(!stricmp(p,"REVERT_TEXT")) { - if(!(*arg)) break; - if(!stricmp(arg,"ALL")) - i=0xffff; - else { - if((l=isvar(arg))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(1,out); /* int offset */ - fputc(2,out); /* int length */ - i=0; } /* place holder */ - else - i=val(src,arg); } - - fprintf(out,"%c",CS_REVERT_TEXT); - fwrite(&i,2,1,out); - continue; } - if(!stricmp(p,"TOGGLE_USER_MISC") - || !stricmp(p,"COMPARE_USER_MISC")) { - if(!(*arg)) break; - - if((l=isvar(arg))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(1,out); /* int offset */ - fputc(4,out); /* int length */ - l=0; } /* place holder */ - else - l=val(src,arg); - - if(!stricmp(p,"TOGGLE_USER_MISC")) - fprintf(out,"%c",CS_TOGGLE_USER_MISC); - else - fprintf(out,"%c",CS_COMPARE_USER_MISC); - fwrite(&l,4,1,out); - continue; } - - if(!stricmp(p,"TOGGLE_USER_CHAT") - || !stricmp(p,"COMPARE_USER_CHAT")) { - if(!(*arg)) break; - - if((l=isvar(arg))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(1,out); /* int offset */ - fputc(4,out); /* int length */ - l=0; } /* place holder */ - else - l=val(src,arg); - - if(!stricmp(p,"TOGGLE_USER_CHAT")) - fprintf(out,"%c",CS_TOGGLE_USER_CHAT); - else - fprintf(out,"%c",CS_COMPARE_USER_CHAT); - fwrite(&l,4,1,out); - continue; } - - if(!stricmp(p,"TOGGLE_USER_QWK") - || !stricmp(p,"COMPARE_USER_QWK")) { - if(!(*arg)) break; - - if((l=isvar(arg))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(1,out); /* int offset */ - fputc(4,out); /* int length */ - l=0; } /* place holder */ - else - l=val(src,arg); - - if(!stricmp(p,"TOGGLE_USER_QWK")) - fprintf(out,"%c",CS_TOGGLE_USER_QWK); - else - fprintf(out,"%c",CS_COMPARE_USER_QWK); - fwrite(&l,4,1,out); - continue; } - - if(!stricmp(p,"TOGGLE_NODE_MISC") - || !stricmp(p,"COMPARE_NODE_MISC")) { - if(!(*arg)) break; - - if((l=isvar(arg))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(1,out); /* int offset */ - fputc(2,out); /* int length */ - i=0; } /* place holder */ - else - i=val(src,arg); - - if(!stricmp(p,"TOGGLE_NODE_MISC")) - fprintf(out,"%c",CS_TOGGLE_NODE_MISC); - else - fprintf(out,"%c",CS_COMPARE_NODE_MISC); - fwrite(&i,2,1,out); - continue; } - - if(!stricmp(p,"TOGGLE_USER_FLAG")) { - if(!(*arg)) break; - p=arg; - fprintf(out,"%c%c",CS_TOGGLE_USER_FLAG,toupper(*p++)); - SKIPCTRLSP(p); - fprintf(out,"%c",toupper(*p)); - continue; } - - if(!stricmp(p,"SET_USER_LEVEL")) { - if(!(*arg)) break; - - if((l=isvar(arg))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(1,out); /* int offset */ - fputc(1,out); /* int length */ - ch=0; } /* place holder */ - else - ch=val(src,arg); - - fprintf(out,"%c%c",CS_SET_USER_LEVEL,ch); - continue; } - - if(!stricmp(p,"SET_USER_STRING")) { - if(!(*arg)) break; - - if((l=isvar(arg))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(1,out); /* int offset */ - fputc(1,out); /* int length */ - ch=0; } /* place holder */ - else - ch=val(src,arg); - - fprintf(out,"%c%c",CS_SET_USER_STRING,ch); - continue; } - - - if(!stricmp(p,"ADJUST_USER_CREDITS")) { - if(!(*arg)) break; - - if((l=isvar(arg))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(1,out); /* int offset */ - fputc(2,out); /* int length */ - i=0; } /* place holder */ - else - i=val(src,arg); - - fprintf(out,"%c",CS_ADJUST_USER_CREDITS); - fwrite(&i,2,1,out); - continue; } - - if(!stricmp(p,"ADJUST_USER_MINUTES")) { - if(!(*arg)) break; + if (!stricmp(p, "FILE_SET_AREA")) { + fprintf(out, "%c", CS_FILE_SET_AREA); + continue; + } + if (!stricmp(p, "FILE_SET_LIBRARY")) { + fprintf(out, "%c", CS_FILE_SET_LIBRARY); + continue; + } + if (!stricmp(p, "FILE_SELECT_AREA")) { + fprintf(out, "%c", CS_FILE_SELECT_AREA); + continue; + } + if (!stricmp(p, "FILE_SHOW_LIBRARIES")) { + fprintf(out, "%c", CS_FILE_SHOW_LIBRARIES); + continue; + } + if (!stricmp(p, "FILE_SHOW_DIRECTORIES")) { + fprintf(out, "%c", CS_FILE_SHOW_DIRECTORIES); + continue; + } + if (!stricmp(p, "FILE_LIBRARY_UP")) { + fprintf(out, "%c", CS_FILE_LIBRARY_UP); + continue; + } + if (!stricmp(p, "FILE_LIBRARY_DOWN")) { + fprintf(out, "%c", CS_FILE_LIBRARY_DOWN); + continue; + } + if (!stricmp(p, "FILE_DIRECTORY_UP")) { + fprintf(out, "%c", CS_FILE_DIRECTORY_UP); + continue; + } + if (!stricmp(p, "FILE_DIRECTORY_DOWN")) { + fprintf(out, "%c", CS_FILE_DIRECTORY_DOWN); + continue; + } + if (!stricmp(p, "FILE_GET_DIR_NUM")) { + fprintf(out, "%c", CS_FILE_GET_DIR_NUM); + continue; + } + if (!stricmp(p, "FILE_GET_LIB_NUM")) { + fprintf(out, "%c", CS_FILE_GET_LIB_NUM); + continue; + } + if (!stricmp(p, "FILE_UPLOAD")) { + fprintf(out, "%c", CS_FILE_UPLOAD); + continue; + } + if (!stricmp(p, "FILE_UPLOAD_USER")) { + fprintf(out, "%c", CS_FILE_UPLOAD_USER); + continue; + } + if (!stricmp(p, "FILE_UPLOAD_BULK")) { + fprintf(out, "%c", CS_FILE_UPLOAD_BULK); + continue; + } + if (!stricmp(p, "FILE_UPLOAD_SYSOP")) { + fprintf(out, "%c", CS_FILE_UPLOAD_SYSOP); + continue; + } + if (!stricmp(p, "FILE_RESORT_DIRECTORY")) { + fprintf(out, "%c", CS_FILE_RESORT_DIRECTORY); + continue; + } + if (!stricmp(p, "FILE_SET_ALT_PATH")) { + fprintf(out, "%c", CS_FILE_SET_ALT_PATH); + continue; + } + if (!stricmp(p, "FILE_GET")) { + fprintf(out, "%c", CS_FILE_GET); + continue; + } + if (!stricmp(p, "FILE_SEND")) { + fprintf(out, "%c", CS_FILE_SEND); + continue; + } + if (!stricmp(p, "FILE_PUT")) { + fprintf(out, "%c", CS_FILE_PUT); + continue; + } + if (!stricmp(p, "FILE_RECEIVE")) { + fprintf(out, "%c", CS_FILE_RECEIVE); + continue; + } + if (!stricmp(p, "FILE_FIND_OLD")) { + fprintf(out, "%c", CS_FILE_FIND_OLD); + continue; + } + if (!stricmp(p, "FILE_FIND_OPEN")) { + fprintf(out, "%c", CS_FILE_FIND_OPEN); + continue; + } + if (!stricmp(p, "FILE_FIND_OFFLINE")) { + fprintf(out, "%c", CS_FILE_FIND_OFFLINE); + continue; + } + if (!stricmp(p, "FILE_FIND_OLD_UPLOADS")) { + fprintf(out, "%c", CS_FILE_FIND_OLD_UPLOADS); + continue; + } + if (!stricmp(p, "FILE_DOWNLOAD")) { + fprintf(out, "%c", CS_FILE_DOWNLOAD); + continue; + } + if (!stricmp(p, "FILE_DOWNLOAD_USER")) { + fprintf(out, "%c", CS_FILE_DOWNLOAD_USER); + continue; + } + if (!stricmp(p, "FILE_DOWNLOAD_BATCH")) { + fprintf(out, "%c", CS_FILE_DOWNLOAD_BATCH); + continue; + } + if (!stricmp(p, "FILE_REMOVE")) { + fprintf(out, "%c", CS_FILE_REMOVE); + continue; + } + if (!stricmp(p, "FILE_LIST")) { + fprintf(out, "%c", CS_FILE_LIST); + continue; + } + if (!stricmp(p, "FILE_LIST_EXTENDED")) { + fprintf(out, "%c", CS_FILE_LIST_EXTENDED); + continue; + } + if (!stricmp(p, "FILE_VIEW")) { + fprintf(out, "%c", CS_FILE_VIEW); + continue; + } + if (!stricmp(p, "FILE_FIND_TEXT")) { + fprintf(out, "%c", CS_FILE_FIND_TEXT); + continue; + } + if (!stricmp(p, "FILE_FIND_TEXT_ALL")) { + fprintf(out, "%c", CS_FILE_FIND_TEXT_ALL); + continue; + } + if (!stricmp(p, "FILE_FIND_NAME")) { + fprintf(out, "%c", CS_FILE_FIND_NAME); + continue; + } + if (!stricmp(p, "FILE_FIND_NAME_ALL")) { + fprintf(out, "%c", CS_FILE_FIND_NAME_ALL); + continue; + } + if (!stricmp(p, "FILE_BATCH_SECTION")) { + fprintf(out, "%c", CS_FILE_BATCH_SECTION); + continue; + } + if (!stricmp(p, "FILE_TEMP_SECTION")) { + fprintf(out, "%c", CS_FILE_TEMP_SECTION); + continue; + } + if (!stricmp(p, "FILE_NEW_SCAN")) { + fprintf(out, "%c", CS_FILE_NEW_SCAN); + continue; + } + if (!stricmp(p, "FILE_NEW_SCAN_ALL")) { + fprintf(out, "%c", CS_FILE_NEW_SCAN_ALL); + continue; + } + if (!stricmp(p, "FILE_NEW_SCAN_CFG")) { + fprintf(out, "%c", CS_FILE_NEW_SCAN_CFG); + continue; + } + if (!stricmp(p, "FILE_PTRS_CFG")) { + fprintf(out, "%c", CS_FILE_PTRS_CFG); + continue; + } + if (!stricmp(p, "FILE_BATCH_ADD")) { + fprintf(out, "%c", CS_FILE_BATCH_ADD); + continue; + } + if (!stricmp(p, "FILE_BATCH_ADD_LIST")) { + fprintf(out, "%c", CS_FILE_BATCH_ADD_LIST); + continue; + } + if (!stricmp(p, "FILE_BATCH_CLEAR")) { + fprintf(out, "%c", CS_FILE_BATCH_CLEAR); + continue; + } - if((l=isvar(arg))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(1,out); /* int offset */ - fputc(2,out); /* int length */ - i=0; } /* place holder */ - else - i=val(src,arg); - - fprintf(out,"%c",CS_ADJUST_USER_MINUTES); - fwrite(&i,2,1,out); - continue; } - - if(!stricmp(p,"SHOW_MEM")) { - fprintf(out,"%c",CS_SHOW_MEM); - continue; } - if(!stricmp(p,"GURU_LOG")) { - fprintf(out,"%c",CS_GURU_LOG); - continue; } - if(!stricmp(p,"ERROR_LOG")) { - fprintf(out,"%c",CS_ERROR_LOG); - continue; } - if(!stricmp(p,"SYSTEM_LOG")) { - fprintf(out,"%c",CS_SYSTEM_LOG); - continue; } - if(!stricmp(p,"SYSTEM_YLOG")) { - fprintf(out,"%c",CS_SYSTEM_YLOG); - continue; } - if(!stricmp(p,"SYSTEM_STATS")) { - fprintf(out,"%c",CS_SYSTEM_STATS); - continue; } - if(!stricmp(p,"NODE_STATS")) { - fprintf(out,"%c",CS_NODE_STATS); - continue; } - if(!stricmp(p,"CHANGE_USER")) { - fprintf(out,"%c",CS_CHANGE_USER); - continue; } - if(!stricmp(p,"ANSI_CAPTURE")) { - fprintf(out,"%c",CS_ANSI_CAPTURE); - continue; } - if(!stricmp(p,"LIST_TEXT_FILE")) { - fprintf(out,"%c",CS_LIST_TEXT_FILE); - continue; } - if(!stricmp(p,"EDIT_TEXT_FILE")) { - fprintf(out,"%c",CS_EDIT_TEXT_FILE); - continue; } - - - if(!stricmp(p,"COMPARE_KEY")) { - if(!stricmp(arg,"DIGIT")) - ch=CS_DIGIT; - else if(!stricmp(arg,"EDIGIT")) - ch=CS_EDIGIT; - else - ch=toupper(*arg); - if(ch=='/') - ch=(*arg)|0x80; /* high bit indicates slash required */ - else if(ch=='^' && (*(arg+1))>=0x40) - ch=(*(arg+1))-0x40; /* ctrl char */ - else if(ch=='\\') - ch=cesc(*(arg+1)); - else if(ch=='\'') - ch=*(arg+1); - fprintf(out,"%c%c",CS_COMPARE_KEY,ch); - continue; } - if(!stricmp(p,"COMPARE_CHAR")) { - ch=*arg; - fprintf(out,"%c%c",CS_COMPARE_CHAR,ch); - continue; } - if(!stricmp(p,"COMPARE_KEYS")) { - fputc(CS_COMPARE_KEYS,out); - for(p=arg;*p && *p!='#';p++) { - ch=*p; - if(ch=='"') - continue; - if(ch=='/') { - p++; - ch=*p|0x80; } /* high bit indicates slash required */ - else if(ch=='^' && *(p+1)>=0x40) { - p++; - ch=*p; - ch-=0x40; } - else if(ch=='\\') { - p++; - ch=cesc(*p); } - fputc(ch,out); } - fputc(0,out); - continue; } - if(!stricmp(p,"GETCMD")) { - fprintf(out,"%c",CS_GETCMD); - writecstr(arg); - continue; } - if(!stricmp(p,"INKEY")) { - fprintf(out,"%c",CS_INKEY); - continue; } - if(!stricmp(p,"INCHAR")) { - fprintf(out,"%c",CS_INCHAR); - continue; } - if(!stricmp(p,"GETKEY")) { - fprintf(out,"%c",CS_GETKEY); - continue; } - if(!stricmp(p,"GETCHAR")) { - fprintf(out,"%c",CS_GETCHAR); - continue; } - if(!stricmp(p,"GETKEYE")) { - fprintf(out,"%c",CS_GETKEYE); - continue; } - if(!stricmp(p,"UNGETKEY")) { - fprintf(out,"%c",CS_UNGETKEY); - continue; } - if(!stricmp(p,"UNGETSTR")) { - fprintf(out,"%c",CS_UNGETSTR); - continue; } - if(!stricmp(p,"PRINTKEY")) { - fprintf(out,"%c",CS_PRINTKEY); - continue; } - if(!stricmp(p,"PRINTSTR")) { - fprintf(out,"%c",CS_PRINTSTR); - continue; } + if (!stricmp(p, "INC_MAIN_CMDS")) { + fprintf(out, "%c", CS_INC_MAIN_CMDS); + continue; + } + if (!stricmp(p, "INC_FILE_CMDS")) { + fprintf(out, "%c", CS_INC_FILE_CMDS); + continue; + } - /* FUNCTIONS */ + break; + } - if(!stricmp(p,"NODELIST_ALL")) { - fprintf(out,"%c",CS_NODELIST_ALL); - continue; } - if(!stricmp(p,"NODELIST_USERS")) { - fprintf(out,"%c",CS_NODELIST_USERS); - continue; } - - if(!stricmp(p,"USERLIST_ALL")) { - fprintf(out,"%c",CS_USERLIST_ALL); - continue; } - if(!stricmp(p,"USERLIST_SUB")) { - fprintf(out,"%c",CS_USERLIST_SUB); - continue; } - if(!stricmp(p,"USERLIST_DIR")) { - fprintf(out,"%c",CS_USERLIST_DIR); - continue; } - if(!stricmp(p,"USERLIST_LOGONS")) { - fprintf(out,"%c",CS_USERLIST_LOGONS); - continue; } - - if(!stricmp(p,"HANGUP")) { - fprintf(out,"%c",CS_HANGUP); - continue; } - - if(!stricmp(p,"LOGOFF")) { - fprintf(out,"%c",CS_LOGOFF); - continue; } - - if(!stricmp(p,"LOGOFF_FAST")) { - fprintf(out,"%c",CS_LOGOFF_FAST); - continue; } - - if(!stricmp(p,"AUTO_MESSAGE")) { - fprintf(out,"%c",CS_AUTO_MESSAGE); - continue; } - - if(!stricmp(p,"MINUTE_BANK")) { - fprintf(out,"%c",CS_MINUTE_BANK); - continue; } - - if(!stricmp(p,"USER_EDIT")) { - fprintf(out,"%c",CS_USER_EDIT); - continue; } - - if(!stricmp(p,"USER_DEFAULTS")) { - fprintf(out,"%c",CS_USER_DEFAULTS); - continue; } - - if(!stricmp(p,"PAGE_SYSOP")) { - fprintf(out,"%c",CS_PAGE_SYSOP); - continue; } - if(!stricmp(p,"PAGE_GURU")) { - fprintf(out,"%c",CS_PAGE_GURU); - continue; } - if(!stricmp(p,"SPY")) { - fprintf(out,"%c",CS_SPY); - continue; } - - - if(!stricmp(p,"PRIVATE_CHAT")) { - fprintf(out,"%c",CS_PRIVATE_CHAT); - continue; } - - if(!stricmp(p,"PRIVATE_MESSAGE")) { - fprintf(out,"%c",CS_PRIVATE_MESSAGE); - continue; } - - if(!stricmp(p,"MULTINODE_CHAT")) { - if(!(*arg)) - ch=1; - else { - if((l=isvar(arg))!=0) { - fputc(CS_USE_INT_VAR,out); - fwrite(&l,4,1,out); /* variable */ - fputc(1,out); /* int offset */ - fputc(1,out); /* int length */ - ch=0; } /* place holder */ - else - ch=val(src,arg); - } - fprintf(out,"%c%c",CS_MULTINODE_CHAT,ch); - continue; } - - if(!stricmp(p,"MAIL_READ")) { - fprintf(out,"%c",CS_MAIL_READ); - continue; } - if(!stricmp(p,"MAIL_READ_SENT")) { /* Kill/read sent mail */ - fprintf(out,"%c",CS_MAIL_READ_SENT); - continue; } - if(!stricmp(p,"MAIL_READ_ALL")) { - fprintf(out,"%c",CS_MAIL_READ_ALL); - continue; } - if(!stricmp(p,"MAIL_SEND")) { /* Send E-mail */ - fprintf(out,"%c",CS_MAIL_SEND); - continue; } - if(!stricmp(p,"MAIL_SEND_FEEDBACK")) { /* Feedback */ - fprintf(out,"%c",CS_MAIL_SEND_FEEDBACK); - continue; } - if(!stricmp(p,"MAIL_SEND_NETMAIL")) { - fprintf(out,"%c",CS_MAIL_SEND_NETMAIL); - continue; } - if(!stricmp(p,"MAIL_SEND_NETFILE")) { - fprintf(out,"%c",CS_MAIL_SEND_NETFILE); - continue; } - if(!stricmp(p,"MAIL_SEND_FILE")) { /* Upload Attached File to E-mail */ - fprintf(out,"%c",CS_MAIL_SEND_FILE); - continue; } - if(!stricmp(p,"MAIL_SEND_BULK")) { - fprintf(out,"%c",CS_MAIL_SEND_BULK); - continue; } - - - if(!stricmp(p,"MSG_SET_AREA")) { - fprintf(out,"%c",CS_MSG_SET_AREA); - continue; } - if(!stricmp(p,"MSG_SET_GROUP")) { - fprintf(out,"%c",CS_MSG_SET_GROUP); - continue; } - if(!stricmp(p,"MSG_SELECT_AREA")) { - fprintf(out,"%c",CS_MSG_SELECT_AREA); - continue; } - if(!stricmp(p,"MSG_SHOW_GROUPS")) { - fprintf(out,"%c",CS_MSG_SHOW_GROUPS); - continue; } - if(!stricmp(p,"MSG_SHOW_SUBBOARDS")) { - fprintf(out,"%c",CS_MSG_SHOW_SUBBOARDS); - continue; } - if(!stricmp(p,"MSG_GROUP_UP")) { - fprintf(out,"%c",CS_MSG_GROUP_UP); - continue; } - if(!stricmp(p,"MSG_GROUP_DOWN")) { - fprintf(out,"%c",CS_MSG_GROUP_DOWN); - continue; } - if(!stricmp(p,"MSG_SUBBOARD_UP")) { - fprintf(out,"%c",CS_MSG_SUBBOARD_UP); - continue; } - if(!stricmp(p,"MSG_SUBBOARD_DOWN")) { - fprintf(out,"%c",CS_MSG_SUBBOARD_DOWN); - continue; } - if(!stricmp(p,"MSG_GET_SUB_NUM")) { - fprintf(out,"%c",CS_MSG_GET_SUB_NUM); - continue; } - if(!stricmp(p,"MSG_GET_GRP_NUM")) { - fprintf(out,"%c",CS_MSG_GET_GRP_NUM); - continue; } - if(!stricmp(p,"MSG_READ")) { - fprintf(out,"%c",CS_MSG_READ); - continue; } - if(!stricmp(p,"MSG_POST")) { - fprintf(out,"%c",CS_MSG_POST); - continue; } - if(!stricmp(p,"MSG_QWK")) { - fprintf(out,"%c",CS_MSG_QWK); - continue; } - if(!stricmp(p,"MSG_PTRS_CFG")) { - fprintf(out,"%c",CS_MSG_PTRS_CFG); - continue; } - if(!stricmp(p,"MSG_PTRS_REINIT")) { - fprintf(out,"%c",CS_MSG_PTRS_REINIT); - continue; } - if(!stricmp(p,"MSG_NEW_SCAN_CFG")) { - fprintf(out,"%c",CS_MSG_NEW_SCAN_CFG); - continue; } - if(!stricmp(p,"MSG_NEW_SCAN")) { - fprintf(out,"%c",CS_MSG_NEW_SCAN); - continue; } - if(!stricmp(p,"MSG_NEW_SCAN_SUB")) { - fprintf(out,"%c",CS_MSG_NEW_SCAN_SUB); - continue; } - if(!stricmp(p,"MSG_NEW_SCAN_ALL")) { - fprintf(out,"%c",CS_MSG_NEW_SCAN_ALL); - continue; } - if(!stricmp(p,"MSG_CONT_SCAN")) { - fprintf(out,"%c",CS_MSG_CONT_SCAN); - continue; } - if(!stricmp(p,"MSG_CONT_SCAN_ALL")) { - fprintf(out,"%c",CS_MSG_CONT_SCAN_ALL); - continue; } - if(!stricmp(p,"MSG_BROWSE_SCAN")) { - fprintf(out,"%c",CS_MSG_BROWSE_SCAN); - continue; } - if(!stricmp(p,"MSG_BROWSE_SCAN_ALL")) { - fprintf(out,"%c",CS_MSG_BROWSE_SCAN_ALL); - continue; } - if(!stricmp(p,"MSG_FIND_TEXT")) { - fprintf(out,"%c",CS_MSG_FIND_TEXT); - continue; } - if(!stricmp(p,"MSG_FIND_TEXT_ALL")) { - fprintf(out,"%c",CS_MSG_FIND_TEXT_ALL); - continue; } - if(!stricmp(p,"MSG_YOUR_SCAN_CFG")) { - fprintf(out,"%c",CS_MSG_YOUR_SCAN_CFG); - continue; } - if(!stricmp(p,"MSG_YOUR_SCAN")) { - fprintf(out,"%c",CS_MSG_YOUR_SCAN); - continue; } - if(!stricmp(p,"MSG_YOUR_SCAN_ALL")) { - fprintf(out,"%c",CS_MSG_YOUR_SCAN_ALL); - continue; } - if(!stricmp(p,"MSG_LIST")) { - fprintf(out,"%c",CS_MSG_LIST); - continue; } - if(!stricmp(p,"CHAT_SECTION")) { - fprintf(out,"%c",CS_CHAT_SECTION); - continue; } - if(!stricmp(p,"TEXT_FILE_SECTION")) { - fprintf(out,"%c",CS_TEXT_FILE_SECTION); - continue; } - if(!stricmp(p,"XTRN_EXEC")) { - fprintf(out,"%c",CS_XTRN_EXEC); - continue; } - if(!stricmp(p,"XTRN_SECTION")) { - fprintf(out,"%c",CS_XTRN_SECTION); - continue; } - - if(!stricmp(p,"FILE_SET_AREA")) { - fprintf(out,"%c",CS_FILE_SET_AREA); - continue; } - if(!stricmp(p,"FILE_SET_LIBRARY")) { - fprintf(out,"%c",CS_FILE_SET_LIBRARY); - continue; } - if(!stricmp(p,"FILE_SELECT_AREA")) { - fprintf(out,"%c",CS_FILE_SELECT_AREA); - continue; } - if(!stricmp(p,"FILE_SHOW_LIBRARIES")) { - fprintf(out,"%c",CS_FILE_SHOW_LIBRARIES); - continue; } - if(!stricmp(p,"FILE_SHOW_DIRECTORIES")) { - fprintf(out,"%c",CS_FILE_SHOW_DIRECTORIES); - continue; } - if(!stricmp(p,"FILE_LIBRARY_UP")) { - fprintf(out,"%c",CS_FILE_LIBRARY_UP); - continue; } - if(!stricmp(p,"FILE_LIBRARY_DOWN")) { - fprintf(out,"%c",CS_FILE_LIBRARY_DOWN); - continue; } - if(!stricmp(p,"FILE_DIRECTORY_UP")) { - fprintf(out,"%c",CS_FILE_DIRECTORY_UP); - continue; } - if(!stricmp(p,"FILE_DIRECTORY_DOWN")) { - fprintf(out,"%c",CS_FILE_DIRECTORY_DOWN); - continue; } - if(!stricmp(p,"FILE_GET_DIR_NUM")) { - fprintf(out,"%c",CS_FILE_GET_DIR_NUM); - continue; } - if(!stricmp(p,"FILE_GET_LIB_NUM")) { - fprintf(out,"%c",CS_FILE_GET_LIB_NUM); - continue; } - if(!stricmp(p,"FILE_UPLOAD")) { - fprintf(out,"%c",CS_FILE_UPLOAD); - continue; } - if(!stricmp(p,"FILE_UPLOAD_USER")) { - fprintf(out,"%c",CS_FILE_UPLOAD_USER); - continue; } - if(!stricmp(p,"FILE_UPLOAD_BULK")) { - fprintf(out,"%c",CS_FILE_UPLOAD_BULK); - continue; } - if(!stricmp(p,"FILE_UPLOAD_SYSOP")) { - fprintf(out,"%c",CS_FILE_UPLOAD_SYSOP); - continue; } - if(!stricmp(p,"FILE_RESORT_DIRECTORY")) { - fprintf(out,"%c",CS_FILE_RESORT_DIRECTORY); - continue; } - if(!stricmp(p,"FILE_SET_ALT_PATH")) { - fprintf(out,"%c",CS_FILE_SET_ALT_PATH); - continue; } - if(!stricmp(p,"FILE_GET")) { - fprintf(out,"%c",CS_FILE_GET); - continue; } - if(!stricmp(p,"FILE_SEND")) { - fprintf(out,"%c",CS_FILE_SEND); - continue; } - if(!stricmp(p,"FILE_PUT")) { - fprintf(out,"%c",CS_FILE_PUT); - continue; } - if(!stricmp(p,"FILE_RECEIVE")) { - fprintf(out,"%c",CS_FILE_RECEIVE); - continue; } - if(!stricmp(p,"FILE_FIND_OLD")) { - fprintf(out,"%c",CS_FILE_FIND_OLD); - continue; } - if(!stricmp(p,"FILE_FIND_OPEN")) { - fprintf(out,"%c",CS_FILE_FIND_OPEN); - continue; } - if(!stricmp(p,"FILE_FIND_OFFLINE")) { - fprintf(out,"%c",CS_FILE_FIND_OFFLINE); - continue; } - if(!stricmp(p,"FILE_FIND_OLD_UPLOADS")) { - fprintf(out,"%c",CS_FILE_FIND_OLD_UPLOADS); - continue; } - if(!stricmp(p,"FILE_DOWNLOAD")) { - fprintf(out,"%c",CS_FILE_DOWNLOAD); - continue; } - if(!stricmp(p,"FILE_DOWNLOAD_USER")) { - fprintf(out,"%c",CS_FILE_DOWNLOAD_USER); - continue; } - if(!stricmp(p,"FILE_DOWNLOAD_BATCH")) { - fprintf(out,"%c",CS_FILE_DOWNLOAD_BATCH); - continue; } - if(!stricmp(p,"FILE_REMOVE")) { - fprintf(out,"%c",CS_FILE_REMOVE); - continue; } - if(!stricmp(p,"FILE_LIST")) { - fprintf(out,"%c",CS_FILE_LIST); - continue; } - if(!stricmp(p,"FILE_LIST_EXTENDED")) { - fprintf(out,"%c",CS_FILE_LIST_EXTENDED); - continue; } - if(!stricmp(p,"FILE_VIEW")) { - fprintf(out,"%c",CS_FILE_VIEW); - continue; } - if(!stricmp(p,"FILE_FIND_TEXT")) { - fprintf(out,"%c",CS_FILE_FIND_TEXT); - continue; } - if(!stricmp(p,"FILE_FIND_TEXT_ALL")) { - fprintf(out,"%c",CS_FILE_FIND_TEXT_ALL); - continue; } - if(!stricmp(p,"FILE_FIND_NAME")) { - fprintf(out,"%c",CS_FILE_FIND_NAME); - continue; } - if(!stricmp(p,"FILE_FIND_NAME_ALL")) { - fprintf(out,"%c",CS_FILE_FIND_NAME_ALL); - continue; } - if(!stricmp(p,"FILE_BATCH_SECTION")) { - fprintf(out,"%c",CS_FILE_BATCH_SECTION); - continue; } - if(!stricmp(p,"FILE_TEMP_SECTION")) { - fprintf(out,"%c",CS_FILE_TEMP_SECTION); - continue; } - if(!stricmp(p,"FILE_NEW_SCAN")) { - fprintf(out,"%c",CS_FILE_NEW_SCAN); - continue; } - if(!stricmp(p,"FILE_NEW_SCAN_ALL")) { - fprintf(out,"%c",CS_FILE_NEW_SCAN_ALL); - continue; } - if(!stricmp(p,"FILE_NEW_SCAN_CFG")) { - fprintf(out,"%c",CS_FILE_NEW_SCAN_CFG); - continue; } - if(!stricmp(p,"FILE_PTRS_CFG")) { - fprintf(out,"%c",CS_FILE_PTRS_CFG); - continue; } - if(!stricmp(p,"FILE_BATCH_ADD")) { - fprintf(out,"%c",CS_FILE_BATCH_ADD); - continue; } - if(!stricmp(p,"FILE_BATCH_ADD_LIST")) { - fprintf(out,"%c",CS_FILE_BATCH_ADD_LIST); - continue; } - if(!stricmp(p,"FILE_BATCH_CLEAR")) { - fprintf(out,"%c",CS_FILE_BATCH_CLEAR); - continue; } - - if(!stricmp(p,"INC_MAIN_CMDS")) { - fprintf(out,"%c",CS_INC_MAIN_CMDS); - continue; } - if(!stricmp(p,"INC_FILE_CMDS")) { - fprintf(out,"%c",CS_INC_FILE_CMDS); - continue; } - - break; } - - - if(!feof(in)) { + if (!feof(in)) { printf("!SYNTAX ERROR:\n"); - printf(linestr,src,line,save); - bail(1); } + printf(linestr, src, line, save); + bail(1); + } fclose(in); free(str); free(save); } -char *banner= "\n" - "BAJA v2.34-%s (rev %s) - Synchronet Shell/Module Compiler\n"; +char *banner = "\n" + "BAJA v2.34-%s (rev %s) - Synchronet Shell/Module Compiler\n"; -char *usage= "\n" - "usage: baja [-opts] file[.src]\n" - "\n" - " opts: -d display debug during compile\n" - " -c case sensitive variables, labels, and macros\n" - " -o set output directory (e.g. -o/sbbs/exec)\n" - " -i set include directory (e.g. -i/sbbs/exec)\n" - " -q quiet mode (no banner)\n" - " -p pause on error" - ; +char *usage = "\n" + "usage: baja [-opts] file[.src]\n" + "\n" + " opts: -d display debug during compile\n" + " -c case sensitive variables, labels, and macros\n" + " -o set output directory (e.g. -o/sbbs/exec)\n" + " -i set include directory (e.g. -i/sbbs/exec)\n" + " -q quiet mode (no banner)\n" + " -p pause on error" +; int main(int argc, char **argv) { - char src[MAX_PATH+1]="",*p; - char path[MAX_PATH+1]; - int i,j; - int show_banner=TRUE; + char src[MAX_PATH + 1] = "", *p; + char path[MAX_PATH + 1]; + int i, j; + int show_banner = TRUE; p = getenv("BAJAINCLUDE"); - if(p != NULL) { + if (p != NULL) { SAFECOPY(include_dir, p); backslash(include_dir); } - for(i=1;i<argc;i++) - if(argv[i][0]=='-' + for (i = 1; i < argc; i++) + if (argv[i][0] == '-' #ifdef _WIN32 - || argv[i][0]=='/' + || argv[i][0] == '/' #endif - ) - switch(toupper(argv[i][1])) { + ) + switch (toupper(argv[i][1])) { case 'D': - display=1; + display = 1; break; case 'C': - case_sens=1; + case_sens = 1; break; case 'O': - SAFECOPY(output_dir,argv[i]+2); + SAFECOPY(output_dir, argv[i] + 2); backslash(output_dir); break; case 'I': - SAFECOPY(include_dir,argv[i]+2); + SAFECOPY(include_dir, argv[i] + 2); backslash(include_dir); break; case 'P': - pause_on_error=TRUE; + pause_on_error = TRUE; break; case 'Q': - show_banner=0; + show_banner = 0; break; default: - printf(banner,PLATFORM_DESC,VERSION); + printf(banner, PLATFORM_DESC, VERSION); puts(usage); - bail(1); } + bail(1); + } else SAFECOPY(src, argv[i]); - if(show_banner) - printf(banner,PLATFORM_DESC,VERSION); + if (show_banner) + printf(banner, PLATFORM_DESC, VERSION); - if(!src[0]) { + if (!src[0]) { puts(usage); - bail(1); + bail(1); } - if(include_dir[0]==0) { /* Include directory not specified */ - SAFECOPY(include_dir,src); /* Default to same dir as src file */ - if((p=getfname(include_dir))!=NULL) - *p=0; /* Truncate off the src filename */ + if (include_dir[0] == 0) { /* Include directory not specified */ + SAFECOPY(include_dir, src); /* Default to same dir as src file */ + if ((p = getfname(include_dir)) != NULL) + *p = 0; /* Truncate off the src filename */ } - if(getfext(src)==NULL) - SAFECAT(src,".src"); - - SAFECOPY(bin_file,src); - if((p=getfext(bin_file))!=NULL) - *p=0; - SAFECAT(bin_file,".bin"); - - if(output_dir[0]) { - p=getfname(bin_file); - SAFEPRINTF2(path,"%s%s",output_dir,p); - SAFECOPY(bin_file,path); + if (getfext(src) == NULL) + SAFECAT(src, ".src"); + + SAFECOPY(bin_file, src); + if ((p = getfext(bin_file)) != NULL) + *p = 0; + SAFECAT(bin_file, ".bin"); + + if (output_dir[0]) { + p = getfname(bin_file); + SAFEPRINTF2(path, "%s%s", output_dir, p); + SAFECOPY(bin_file, path); } - if((out=fopen(bin_file,"w+b"))==NULL) { - printf("error %d opening %s for write\n",errno,bin_file); - bail(1); + if ((out = fopen(bin_file, "w+b")) == NULL) { + printf("error %d opening %s for write\n", errno, bin_file); + bail(1); } - printf("\nCompiling %s...\n",src); + printf("\nCompiling %s...\n", src); compile(src); @@ -3484,33 +3940,37 @@ int main(int argc, char **argv) printf("Resolving labels...\n"); - for(i=0;i<gotos;i++) { - for(j=0;j<labels;j++) - if(!stricmp(goto_label[i],label_name[j])) + for (i = 0; i < gotos; i++) { + for (j = 0; j < labels; j++) + if (!stricmp(goto_label[i], label_name[j])) break; - if(j>=labels) { + if (j >= labels) { printf("%s line %d: label (%s) not found.\n" - ,goto_file[i],goto_line[i],goto_label[i]); - bail(1); } - fseek(out,(int32_t)(goto_indx[i]+1),SEEK_SET); - fwrite(&label_indx[j],2,1,out); } - - for(i=0;i<calls;i++) { - for(j=0;j<labels;j++) - if((!case_sens - && !strnicmp(call_label[i],label_name[j],strlen(call_label[i]))) - || (case_sens - && !strncmp(call_label[i],label_name[j],strlen(call_label[i])))) - break; - if(j>=labels) { + , goto_file[i], goto_line[i], goto_label[i]); + bail(1); + } + fseek(out, (int32_t)(goto_indx[i] + 1), SEEK_SET); + fwrite(&label_indx[j], 2, 1, out); + } + + for (i = 0; i < calls; i++) { + for (j = 0; j < labels; j++) + if ((!case_sens + && !strnicmp(call_label[i], label_name[j], strlen(call_label[i]))) + || (case_sens + && !strncmp(call_label[i], label_name[j], strlen(call_label[i])))) + break; + if (j >= labels) { printf("%s line %d: label (%s) not found.\n" - ,call_file[i],call_line[i],call_label[i]); - bail(1); } - fseek(out,(int32_t)(call_indx[i]+1),SEEK_SET); - fwrite(&label_indx[j],2,1,out); } + , call_file[i], call_line[i], call_label[i]); + bail(1); + } + fseek(out, (int32_t)(call_indx[i] + 1), SEEK_SET); + fwrite(&label_indx[j], 2, 1, out); + } printf("\nDone.\n"); - return(0); + return 0; } diff --git a/src/sbbs3/bat_xfer.cpp b/src/sbbs3/bat_xfer.cpp index 3f5a17323204d03a54bcf776e452b0616b75ce00..ab20b2e0512ade43040e5b58a1868a6b5bd29643 100644 --- a/src/sbbs3/bat_xfer.cpp +++ b/src/sbbs3/bat_xfer.cpp @@ -242,7 +242,7 @@ bool sbbs_t::start_batch_download() if (useron.rest & FLAG('D')) { /* Download restriction */ bputs(text[R_Download]); - return(false); + return false; } str_list_t ini = batch_list_read(&cfg, useron.number, XFER_BATCH_DOWNLOAD); @@ -251,7 +251,7 @@ bool sbbs_t::start_batch_download() if (file_count < 1) { bputs(text[DownloadQueueIsEmpty]); iniFreeStringList(ini); - return(false); + return false; } str_list_t filenames = iniGetSectionList(ini, NULL); @@ -311,7 +311,7 @@ bool sbbs_t::start_batch_download() , u64toac(user_available_credits(&useron), tmp)); iniFreeStringList(ini); iniFreeStringList(filenames); - return(false); + return false; } int64_t totalsize = 0; @@ -332,7 +332,7 @@ bool sbbs_t::start_batch_download() if (!(useron.exempt & FLAG('T')) && !SYSOP && totaltime > (int64_t)timeleft) { bputs(text[NotEnoughTimeToDl]); - return(false); + return false; } i = protnum(useron.prot, XFER_BATCH_DOWNLOAD); if (i >= cfg.total_prots) { @@ -343,11 +343,11 @@ bool sbbs_t::start_batch_download() mnemonics(text[ProtocolOrQuit]); ch = (char)getkeys(keys, 0); if (ch == quit_key() || sys_status & SS_ABORT) - return(false); + return false; i = protnum(ch, XFER_BATCH_DOWNLOAD); } if (i >= cfg.total_prots || !create_batchdn_lst((cfg.prot[i]->misc & PROT_NATIVE) ? true:false)) { - return(false); + return false; } xfrprot = i; #if 0 // NFB-TODO: Download events @@ -386,7 +386,7 @@ bool sbbs_t::start_batch_download() if ((np = (char*)realloc(list, list_len + strlen(path) + 1 /* add one for '\0'*/)) == NULL) { free(list); errormsg(WHERE, ERR_ALLOC, "list", list_len + strlen(path)); - return(false); + return false; } list = np; if (!list_len) diff --git a/src/sbbs3/bulkmail.cpp b/src/sbbs3/bulkmail.cpp index bbbfc9e27583b5e80dfa46590a4883d368562727..d5cd78eeb37ac118fab1c852eaa4a70fb7bb39eb 100644 --- a/src/sbbs3/bulkmail.cpp +++ b/src/sbbs3/bulkmail.cpp @@ -55,17 +55,17 @@ bool sbbs_t::bulkmail(uchar *ar) , &editor , &charset)) { bputs(text[Aborted]); - return(false); + return false; } if ((fp = fopen(msgpath, "r")) == NULL) { errormsg(WHERE, ERR_OPEN, msgpath, O_RDONLY); - return(false); + return false; } if ((length = (long)filelength(fileno(fp))) <= 0) { fclose(fp); - return(false); + return false; } bputs(text[WritingIndx]); @@ -74,14 +74,14 @@ bool sbbs_t::bulkmail(uchar *ar) if ((msgbuf = (char*)malloc(length + 1)) == NULL) { fclose(fp); errormsg(WHERE, ERR_ALLOC, msgpath, length + 1); - return(false); + return false; } length = fread(msgbuf, sizeof(char), length, fp); fclose(fp); if (length < 0) { free(msgbuf); errormsg(WHERE, ERR_READ, msgpath, length); - return(false); + return false; } msgbuf[length] = 0; /* ASCIIZ */ @@ -103,7 +103,7 @@ bool sbbs_t::bulkmail(uchar *ar) if (i != 0) { smb_close(&smb); smb_freemsgmem(&msg); - return(false); + return false; } j = lastuser(&cfg); @@ -150,13 +150,13 @@ bool sbbs_t::bulkmail(uchar *ar) if (i != SMB_SUCCESS) { errormsg(WHERE, ERR_OPEN, smb.file, i, smb.last_error); - return(false); + return false; } putuserdec32(useron.number, USER_EMAILS, useron.emails); putuserdec32(useron.number, USER_ETODAY, useron.etoday); - return(true); + return true; } @@ -171,10 +171,10 @@ int sbbs_t::bulkmailhdr(smb_t* smb, smbmsg_t* msg, uint usernum) user.number = usernum; if (getuserdat(&cfg, &user) != 0) - return(0); + return 0; if ((i = smb_copymsgmem(NULL, &newmsg, msg)) != SMB_SUCCESS) - return(i); + return i; SAFECOPY(str, user.alias); smb_hfield_str(&newmsg, RECIPIENT, str); @@ -191,7 +191,7 @@ int sbbs_t::bulkmailhdr(smb_t* smb, smbmsg_t* msg, uint usernum) j = smb_addmsghdr(smb, &newmsg, smb_storage_mode(&cfg, smb)); smb_freemsgmem(&newmsg); if (j != SMB_SUCCESS) - return(j); + return j; lncntr = 0; bprintf(text[Emailing], user.alias, usernum); @@ -214,6 +214,6 @@ int sbbs_t::bulkmailhdr(smb_t* smb, smbmsg_t* msg, uint usernum) SAFEPRINTF(str, text[UserSentYouMail], useron.alias); putsmsg(usernum, str); } - return(0); + return 0; } diff --git a/src/sbbs3/chat.cpp b/src/sbbs3/chat.cpp index 5d3f6425cd04261865d645de2729e4d151e318c2..c8184ebe9ae70374b942b8bdda7f0f691d57f188 100644 --- a/src/sbbs3/chat.cpp +++ b/src/sbbs3/chat.cpp @@ -544,12 +544,12 @@ bool sbbs_t::guru_page(void) if (useron.rest & FLAG('C')) { bputs(text[R_Chat]); - return(false); + return false; } if (!cfg.total_gurus) { bprintf(text[SysopIsNotAvailable], "The Guru"); - return(false); + return false; } if (cfg.total_gurus == 1 && chk_ar(cfg.guru[0]->ar, &useron, &client)) i = 0; @@ -558,12 +558,12 @@ bool sbbs_t::guru_page(void) uselect(1, i, nulstr, cfg.guru[i]->name, cfg.guru[i]->ar); i = uselect(0, 0, 0, 0, 0); if (i < 0) - return(false); + return false; } snprintf(path, sizeof path, "%s%s.dat", cfg.ctrl_dir, cfg.guru[i]->code); if ((file = nopen(path, O_RDONLY)) == -1) { errormsg(WHERE, ERR_OPEN, path, O_RDONLY); - return(false); + return false; } long length = (long)filelength(file); if (length < 0) { @@ -574,7 +574,7 @@ bool sbbs_t::guru_page(void) if ((gurubuf = (char *)malloc(length + 1)) == NULL) { errormsg(WHERE, ERR_ALLOC, path, length + 1); close(file); - return(false); + return false; } if (read(file, gurubuf, length) != length) errormsg(WHERE, ERR_READ, path, length); @@ -582,7 +582,7 @@ bool sbbs_t::guru_page(void) close(file); localguru(gurubuf, i); free(gurubuf); - return(true); + return true; } /****************************************************************************/ @@ -602,7 +602,7 @@ bool sbbs_t::sysop_page(void) if (useron.rest & FLAG('C')) { bputs(text[R_Chat]); - return(false); + return false; } if (sysop_available(&cfg) @@ -650,12 +650,12 @@ bool sbbs_t::sysop_page(void) if (!(sys_status & SS_SYSPAGE)) remove(syspage_semfile); - return(true); + return true; } bprintf(text[SysopIsNotAvailable], cfg.sys_op); - return(false); + return false; } /****************************************************************************/ @@ -666,13 +666,13 @@ bool sbbs_t::chan_access(int cnum) if (!cfg.total_chans || cnum >= cfg.total_chans || !chk_ar(cfg.chan[cnum]->ar, &useron, &client)) { bputs(text[CantAccessThatChannel]); - return(false); + return false; } if (!(useron.exempt & FLAG('J')) && cfg.chan[cnum]->cost > user_available_credits(&useron)) { bputs(text[NotEnoughCredits]); - return(false); + return false; } - return(true); + return true; } /****************************************************************************/ @@ -1194,7 +1194,7 @@ int sbbs_t::getnodetopage(int all, int telegram) if (!j && !telegram) { bputs(text[NoOtherActiveNodes]); - return(0); + return 0; } if (all) @@ -1207,36 +1207,36 @@ int sbbs_t::getnodetopage(int all, int telegram) getstr(str, LEN_ALIAS, K_LINE | K_EDIT | K_AUTODEL); if (sys_status & SS_ABORT) { sys_status &= ~SS_ABORT; - return(0); + return 0; } if (!str[0]) - return(0); + return 0; j = atoi(str); if (j && j <= cfg.sys_lastnode && j <= cfg.sys_nodes) { getnodedat(j, &node); if (node.useron == 0 || (node.status != NODE_INUSE && !SYSOP)) { bprintf(text[NodeNIsNotInUse], j); - return(0); + return 0; } if (telegram && node.misc & (NODE_POFF | NODE_ANON) && !SYSOP) { bprintf(text[CantPageNode], node.misc & NODE_ANON ? text[UNKNOWN_USER] : username(&cfg, node.useron, tmp)); - return(0); + return 0; } SAFECOPY(lastnodemsguser, str); if (telegram) - return(node.useron); - return(j); + return node.useron; + return j; } if (all && !stricmp(str, "ALL")) - return(-1); + return -1; if (str[0] == '\'') { j = finduserstr(0, USER_HANDLE, str + 1); if (!j) { bputs(text[UnknownUser]); - return(0); + return 0; } } else if (str[0] == '#') @@ -1244,12 +1244,12 @@ int sbbs_t::getnodetopage(int all, int telegram) else j = finduser(str); if (!j) - return(0); + return 0; if (j > lastuser(&cfg)) - return(0); + return 0; if (getusermisc(&cfg, j) & (DELETED | INACTIVE)) { /* Deleted or Inactive User */ bputs(text[UnknownUser]); - return(0); + return 0; } for (i = 1; i <= cfg.sys_nodes && i <= cfg.sys_lastnode; i++) { @@ -1259,20 +1259,20 @@ int sbbs_t::getnodetopage(int all, int telegram) if (telegram && node.misc & NODE_POFF && !SYSOP) { bprintf(text[CantPageNode], node.misc & NODE_ANON ? text[UNKNOWN_USER] : username(&cfg, node.useron, tmp)); - return(0); + return 0; } if (telegram) - return(j); + return j; SAFECOPY(lastnodemsguser, str); - return(i); + return i; } } if (telegram) { SAFECOPY(lastnodemsguser, str); - return(j); + return j; } bputs(text[UserNotFound]); - return(0); + return 0; } @@ -1787,7 +1787,7 @@ bool sbbs_t::guruexp(char **ptrptr, char *line) if ((**ptrptr) == ')') { /* expressions of () are always result */ (*ptrptr)++; - return(true); + return true; } while ((**ptrptr) != ')' && (**ptrptr)) { if ((**ptrptr) == '[') { @@ -1904,7 +1904,7 @@ bool sbbs_t::guruexp(char **ptrptr, char *line) } } (*ptrptr)++; /* skip over ')' */ - return(result); + return result; } /****************************************************************************/ diff --git a/src/sbbs3/chk_ar.cpp b/src/sbbs3/chk_ar.cpp index 87545ad7725d5017086b810e6c11d5536524e5c5..180103de9041c267b3d79f0f520c8970aa37089d 100644 --- a/src/sbbs3/chk_ar.cpp +++ b/src/sbbs3/chk_ar.cpp @@ -699,7 +699,7 @@ bool sbbs_t::ar_exp(const uchar **ptrptr, user_t* user, client_t* client) break; } } - return(result); + return result; } bool sbbs_t::chk_ar(const uchar *ar, user_t* user, client_t* client) @@ -707,9 +707,9 @@ bool sbbs_t::chk_ar(const uchar *ar, user_t* user, client_t* client) const uchar *p; if (ar == NULL) - return(true); + return true; p = ar; - return(ar_exp(&p, user, client)); + return ar_exp(&p, user, client); } /****************************************************************************/ @@ -789,16 +789,16 @@ int sbbs_t::getusrgrp(int subnum) int ugrp; if (!subnum_is_valid(subnum)) - return(0); + return 0; if (usrgrps <= 0) - return(0); + return 0; for (ugrp = 0; ugrp < usrgrps; ugrp++) if (usrgrp[ugrp] == cfg.sub[subnum]->grp) break; - return(ugrp + 1); + return ugrp + 1; } int sbbs_t::getusrsub(int subnum) @@ -808,13 +808,13 @@ int sbbs_t::getusrsub(int subnum) ugrp = getusrgrp(subnum); if (ugrp <= 0) - return(0); + return 0; ugrp--; for (usub = 0; usub < usrsubs[ugrp]; usub++) if (usrsub[ugrp][usub] == subnum) break; - return(usub + 1); + return usub + 1; } int sbbs_t::getusrlib(int dirnum) diff --git a/src/sbbs3/chksmb.c b/src/sbbs3/chksmb.c index 38c13bfb5787fb856ef05e98502179132d84f451..808ed81698c0ab310ac3f3266a2236d495a8847c 100644 --- a/src/sbbs3/chksmb.c +++ b/src/sbbs3/chksmb.c @@ -54,7 +54,7 @@ char *ultoac(ulong l, char *string) if (j > 0 && !(k % 3)) string[j--] = ','; } - return(string); + return string; } /****************************************************************************/ @@ -70,7 +70,7 @@ char *faddrtoa(fidoaddr_t addr) sprintf(point, ".%u", addr.point); strcat(str, point); } - return(str); + return str; } char* strip_ctrl(char *str) @@ -88,7 +88,7 @@ char* strip_ctrl(char *str) tmp[j] = 0; strcpy(str, tmp); } - return(str); + return str; } BOOL contains_ctrl_chars(char* str) @@ -321,7 +321,7 @@ int main(int argc, char **argv) == NULL) { printf("Error allocating %lu bytes of memory\n" , (ulong)((shd_hdrs / SHD_BLOCK_LEN) * sizeof(*number))); - return(++errors); + return ++errors; } } else @@ -335,7 +335,7 @@ int main(int argc, char **argv) if (chkalloc && !(smb.status.attr & SMB_HYPERALLOC)) { if ((i = smb_open_ha(&smb)) != 0) { printf("smb_open_ha returned %d: %s\n", i, smb.last_error); - return(++errors); + return ++errors; } if (filelength(fileno(smb.shd_fp)) != smb.status.header_offset + (filelength(fileno(smb.sha_fp)) * SHD_BLOCK_LEN)) @@ -345,7 +345,7 @@ int main(int argc, char **argv) if ((i = smb_open_da(&smb)) != 0) { printf("smb_open_da returned %d: %s\n", i, smb.last_error); - return(++errors); + return ++errors; } if ((filelength(fileno(smb.sda_fp))) / sizeof(uint16_t) != filelength(fileno(smb.sdt_fp)) / SDT_BLOCK_LEN) printf("!Size of SDA file (%lu) does not match SDT file (%lu)\n" @@ -839,11 +839,11 @@ int main(int argc, char **argv) if ((offset = malloc(total * sizeof(*offset))) == NULL) { printf("Error allocating %lu bytes of memory\n", total * sizeof(*offset)); - return(++errors); + return ++errors; } if ((number = malloc(total * sizeof(*number))) == NULL) { printf("Error allocating %lu bytes of memory\n", total * sizeof(*number)); - return(++errors); + return ++errors; } for (l = 0; l < total; l++) { @@ -1191,5 +1191,5 @@ int main(int argc, char **argv) if (errors) printf("\n'fixsmb' can be used to repair many message/file base problems.\n"); - return(errors); + return errors; } diff --git a/src/sbbs3/con_hi.cpp b/src/sbbs3/con_hi.cpp index a692cff9f4a21072d9bd285e0f1e1f00a4a50a37..06efbdaf156865b80e80c825b67e44cf921a4a33 100644 --- a/src/sbbs3/con_hi.cpp +++ b/src/sbbs3/con_hi.cpp @@ -58,17 +58,17 @@ int sbbs_t::uselect(bool add, uint n, const char *title, const char *item, const if (add) { if (ar && !chk_ar(ar, &useron, &client)) - return(0); + return 0; if (!uselect_total) bprintf(text[SelectItemHdr], title); uselect_num[uselect_total++] = n; add_hotspot(uselect_total); bprintf(text[SelectItemFmt], uselect_total, item); - return(0); + return 0; } if (!uselect_total) - return(-1); + return -1; for (u = 0; u < uselect_total; u++) if (uselect_num[u] == n) @@ -82,16 +82,16 @@ int sbbs_t::uselect(bool add, uint n, const char *title, const char *item, const uselect_total = 0; clear_hotspots(); if (i < 0) - return(-1); + return -1; if (!i) { /* User hit ENTER, use default */ for (u = 0; u < t; u++) if (uselect_num[u] == n) - return(uselect_num[u]); + return uselect_num[u]; if (n < t) - return(uselect_num[n]); - return(-1); + return uselect_num[n]; + return -1; } - return(uselect_num[i - 1]); + return uselect_num[i - 1]; } unsigned count_set_bits(long val) @@ -149,7 +149,7 @@ bool sbbs_t::chksyspass(const char* sys_pw) if (online == ON_REMOTE && !(cfg.sys_misc & SM_R_SYSOP)) { logline(LOG_NOTICE, "S!", "Remote sysop access disabled"); - return(false); + return false; } if (time(NULL) - last_sysop_auth < cfg.sys_pass_timeout * 60) return true; @@ -168,8 +168,8 @@ bool sbbs_t::chksyspass(const char* sys_pw) else SAFECOPY(str2, "System password verification failure"); logline(LOG_NOTICE, "S!", str2); - return(false); + return false; } last_sysop_auth = time(NULL); - return(true); + return true; } diff --git a/src/sbbs3/con_out.cpp b/src/sbbs3/con_out.cpp index 658f89358f512d95d1ba88950691a647e025be0d..698f80bc27396785b64017fa0287e34de6128fb1 100644 --- a/src/sbbs3/con_out.cpp +++ b/src/sbbs3/con_out.cpp @@ -59,7 +59,7 @@ int sbbs_t::bputs(const char *str, int mode) return 0; if (online == ON_LOCAL && console & CON_L_ECHO) /* script running as event */ - return(lputs(LOG_INFO, str)); + return lputs(LOG_INFO, str); str = auto_utf8(str, mode); size_t len = strlen(str); @@ -130,7 +130,7 @@ int sbbs_t::bputs(const char *str, int mode) } else outchar(str[l++]); } - return(l); + return l; } /****************************************************************************/ @@ -408,7 +408,7 @@ int sbbs_t::rputs(const char *str, size_t len) lbuf[lbuflen++] = str[l]; // save non-translated char to line buffer } } - return(l); + return l; } /****************************************************************************/ @@ -420,12 +420,12 @@ int sbbs_t::bprintf(const char *fmt, ...) char sbuf[4096]; if (strchr(fmt, '%') == NULL) - return(bputs(fmt)); + return bputs(fmt); va_start(argptr, fmt); vsnprintf(sbuf, sizeof(sbuf), fmt, argptr); sbuf[sizeof(sbuf) - 1] = 0; /* force termination */ va_end(argptr); - return(bputs(sbuf)); + return bputs(sbuf); } /****************************************************************************/ @@ -437,12 +437,12 @@ int sbbs_t::bprintf(int mode, const char *fmt, ...) char sbuf[4096]; if (strchr(fmt, '%') == NULL) - return(bputs(fmt, mode)); + return bputs(fmt, mode); va_start(argptr, fmt); vsnprintf(sbuf, sizeof(sbuf), fmt, argptr); sbuf[sizeof(sbuf) - 1] = 0; /* force termination */ va_end(argptr); - return(bputs(sbuf, mode)); + return bputs(sbuf, mode); } /****************************************************************************/ @@ -457,7 +457,7 @@ int sbbs_t::rprintf(const char *fmt, ...) vsnprintf(sbuf, sizeof(sbuf), fmt, argptr); sbuf[sizeof(sbuf) - 1] = 0; /* force termination */ va_end(argptr); - return(rputs(sbuf)); + return rputs(sbuf); } /****************************************************************************/ @@ -472,7 +472,7 @@ int sbbs_t::comprintf(const char *fmt, ...) vsnprintf(sbuf, sizeof(sbuf), fmt, argptr); sbuf[sizeof(sbuf) - 1] = 0; /* force termination */ va_end(argptr); - return(putcom(sbuf)); + return putcom(sbuf); } /****************************************************************************/ @@ -511,7 +511,7 @@ int sbbs_t::term_supports(int cmp_flags) if ((sys_status & (SS_USERON | SS_NEWUSER)) && (useron.misc & AUTOTERM)) flags |= useron.misc & (NO_EXASCII | SWAP_DELETE | COLOR | ICE_COLOR | MOUSE); - return(cmp_flags ? ((flags & cmp_flags) == cmp_flags) : (flags & TERM_FLAGS)); + return cmp_flags ? ((flags & cmp_flags) == cmp_flags) : (flags & TERM_FLAGS); } char* sbbs_t::term_rows(user_t* user, char* str, size_t size) @@ -1448,11 +1448,11 @@ bool sbbs_t::msgabort(bool clear) if (sys_status & SS_ABORT) { if (clear) sys_status &= ~SS_ABORT; - return(true); + return true; } if (!online) - return(true); - return(false); + return true; + return false; } int sbbs_t::backfill(const char* instr, float pct, int full_attr, int empty_attr) diff --git a/src/sbbs3/data.cpp b/src/sbbs3/data.cpp index 748546d8dd02fd80842da177c0e46ea47161ae8a..619477b37a249719ce388fecb3c27a957a91634e 100644 --- a/src/sbbs3/data.cpp +++ b/src/sbbs3/data.cpp @@ -44,14 +44,14 @@ uint sbbs_t::finduser(const char* name, bool silent_failure) if (i > 0) { username(&cfg, i, buf); if (buf[0] && strcmp(buf, "DELETED USER")) - return(i); + return i; } SAFEPRINTF(path, "%suser/name.dat", cfg.data_dir); if (flength(path) < 1L) - return(0); + return 0; if ((stream = fnopen(&file, path, O_RDONLY)) == NULL) { errormsg(WHERE, ERR_OPEN, path, O_RDONLY); - return(0); + return 0; } SAFEPRINTF3(ynq, "%c%c%c", yes_key(), no_key(), quit_key()); length = (int)filelength(file); @@ -68,7 +68,7 @@ uint sbbs_t::finduser(const char* name, bool silent_failure) continue; if (pass == 1 && matchusername(&cfg, name, buf)) { fclose(stream); - return((l / (LEN_ALIAS + 2)) + 1); + return (l / (LEN_ALIAS + 2)) + 1; } if (pass == 2 && strcasestr(buf, name)) { char tmp[256]; @@ -79,16 +79,16 @@ uint sbbs_t::finduser(const char* name, bool silent_failure) c = (char)getkeys(ynq, 0); if (sys_status & SS_ABORT) { fclose(stream); - return(0); + return 0; } if (c == yes_key()) { fclose(stream); - return((l / (LEN_ALIAS + 2)) + 1); + return (l / (LEN_ALIAS + 2)) + 1; } if (c == quit_key()) { fclose(stream); sys_status |= SS_ABORT; - return(0); + return 0; } } } @@ -97,7 +97,7 @@ uint sbbs_t::finduser(const char* name, bool silent_failure) if (!silent_failure) bputs(text[UnknownUser]); fclose(stream); - return(0); + return 0; } /****************************************************************************/ diff --git a/src/sbbs3/data_ovl.cpp b/src/sbbs3/data_ovl.cpp index 373c22e9214f4dda7431d47a63094a1a9289e18e..3acc10bd1192f515325aa0977885fa63298cae4f 100644 --- a/src/sbbs3/data_ovl.cpp +++ b/src/sbbs3/data_ovl.cpp @@ -86,7 +86,7 @@ uint sbbs_t::finduserstr(uint usernumber, enum user_field fnum, const char* str uint i = ::finduserstr(&cfg, usernumber, fnum, str, del, next, online == ON_REMOTE ? ProgressSearchingUsers : NULL, this); if (online == ON_REMOTE) bputs(text[SearchedForDupes]); - return(i); + return i; } /****************************************************************************/ diff --git a/src/sbbs3/date_str.c b/src/sbbs3/date_str.c index 46e880d6585a28c53f0c1e8049589ce0a6f0643f..2f9c69b2ede801f944a14daf90a5c8d34982a0e6 100644 --- a/src/sbbs3/date_str.c +++ b/src/sbbs3/date_str.c @@ -62,7 +62,7 @@ time32_t dstrtounix(enum date_fmt fmt, const char *instr) struct tm tm; if (instr == NULL || !instr[0] || !strncmp(instr, "00/00/00", 8)) - return(0); + return 0; if (IS_DIGIT(instr[0]) && IS_DIGIT(instr[1]) && IS_DIGIT(instr[3]) && IS_DIGIT(instr[4]) @@ -72,12 +72,12 @@ time32_t dstrtounix(enum date_fmt fmt, const char *instr) p = instr; /* incorrectly formatted */ while (*p && IS_DIGIT(*p)) p++; if (*p == 0) - return(0); + return 0; p++; day = p; while (*p && IS_DIGIT(*p)) p++; if (*p == 0) - return(0); + return 0; p++; sprintf(str, "%02u/%02u/%02u" , atoi(instr) % 100, atoi(day) % 100, atoi(p) % 100); @@ -105,7 +105,7 @@ time32_t dstrtounix(enum date_fmt fmt, const char *instr) if (tm.tm_mon) tm.tm_mon--; /* zero-based month field */ tm.tm_isdst = -1; /* Do not adjust for DST */ - return(mktime32(&tm)); + return mktime32(&tm); } /****************************************************************************/ @@ -198,7 +198,7 @@ char* sectostr(uint sec, char *str) min = (sec / 60) - (hour * 60); sec2 = sec - ((min + (hour * 60)) * 60); sprintf(str, "%2.2d:%2.2d:%2.2d", hour, min, sec2); - return(str); + return str; } /* Returns a shortened version of "HH:MM:SS" formatted seconds value */ @@ -232,7 +232,7 @@ char* tm_as_hhmm(scfg_t* cfg, struct tm* tm, char* str) sprintf(str, "%02d:%02d%c" , tm->tm_hour > 12 ? tm->tm_hour - 12 : tm->tm_hour == 0 ? 12 : tm->tm_hour , tm->tm_min, tm->tm_hour >= 12 ? 'p' : 'a'); - return(str); + return str; } /****************************************************************************/ @@ -267,13 +267,13 @@ char* timestr(scfg_t* cfg, time32_t t, char* str) } if (localtime_r(&intime, &tm) == NULL) { strcpy(str, "Invalid Time"); - return(str); + return str; } if (cfg->sys_misc & SM_MILITARY) { snprintf(str, LEN_DATETIME + 1, "%s %s %02u %4u %02u:%02u:%02u" , w[tm.tm_wday], m[tm.tm_mon], tm.tm_mday, 1900 + tm.tm_year , tm.tm_hour, tm.tm_min, tm.tm_sec); - return(str); + return str; } if (tm.tm_hour >= 12) { if (tm.tm_hour == 12) @@ -291,6 +291,6 @@ char* timestr(scfg_t* cfg, time32_t t, char* str) snprintf(str, LEN_DATETIME + 1, "%s %s %02u %4u %02u:%02u %s" , w[tm.tm_wday], m[tm.tm_mon], tm.tm_mday, 1900 + tm.tm_year , hour, tm.tm_min, mer); - return(str); + return str; } diff --git a/src/sbbs3/download.cpp b/src/sbbs3/download.cpp index 38bed666e28ce81039d7a28f68134562b07016f3..d019dad82a105aee0777ef373785d91cab0b4478 100644 --- a/src/sbbs3/download.cpp +++ b/src/sbbs3/download.cpp @@ -92,16 +92,16 @@ const char* sbbs_t::protcmdline(prot_t* prot, enum XFER_TYPE type) { switch (type) { case XFER_UPLOAD: - return(prot->ulcmd); + return prot->ulcmd; case XFER_DOWNLOAD: - return(prot->dlcmd); + return prot->dlcmd; case XFER_BATCH_UPLOAD: - return(prot->batulcmd); + return prot->batulcmd; case XFER_BATCH_DOWNLOAD: - return(prot->batdlcmd); + return prot->batdlcmd; } - return("invalid transfer type"); + return "invalid transfer type"; } void sbbs_t::data_transfer_begin(uchar& local_binary_tx, uchar& remote_binary_tx) @@ -147,7 +147,7 @@ int sbbs_t::protocol(prot_t* prot, enum XFER_TYPE type autohang = yesno(text[HangUpAfterXferQ]); } if (sys_status & SS_ABORT || !online) { /* if ctrl-c or hangup */ - return(-1); + return -1; } bprintf(text[StartXferNow], prot->name); if (cd) @@ -191,7 +191,7 @@ int sbbs_t::protocol(prot_t* prot, enum XFER_TYPE type if (*elapsed < 0) *elapsed = 0; } - return(i); + return i; } /****************************************************************************/ @@ -298,7 +298,7 @@ bool sbbs_t::checkdszlog(const char* fpath) } } fclose(fp); - return(success); + return success; } diff --git a/src/sbbs3/dupefind.c b/src/sbbs3/dupefind.c index 972062358452629629288efe9c4f99414ed6049c..119c2f948d4c540532e71fca13d690e2524cd494 100644 --- a/src/sbbs3/dupefind.c +++ b/src/sbbs3/dupefind.c @@ -46,7 +46,7 @@ long lputs(char *str) else tmp[k++] = str[i]; tmp[k] = 0; - return(fputs(tmp, stderr)); + return fputs(tmp, stderr); } /****************************************************************************/ @@ -63,7 +63,7 @@ int lprintf(const char *fmat, ...) chcount = vsprintf(sbuf, fmat, argptr); va_end(argptr); lputs(sbuf); - return(chcount); + return chcount; } char *display_filename(scfg_t *cfg, uint dirnum, uint32_t fil_off) @@ -107,7 +107,7 @@ int main(int argc, char **argv) fprintf(stderr, "usage: %s [start] [end]\n", argv[0]); fprintf(stderr, "where: [start] is the starting library number to check\n"); fprintf(stderr, " [end] is the final library number to check\n"); - return(0); + return 0; } memset(&cfg, 0, sizeof(cfg)); @@ -116,7 +116,7 @@ int main(int argc, char **argv) if (!load_cfg(&cfg, /* text: */ NULL, /* prep: */ TRUE, /* node: */ FALSE, str, sizeof(str))) { fprintf(stderr, "!ERROR loading configuration files: %s\n", str); - return(1); + return 1; } if (chdir(cfg.ctrl_dir) != 0) { fprintf(stderr, "ERROR %d (%s) changing directory to: %s" @@ -135,7 +135,7 @@ int main(int argc, char **argv) if ((fcrc = malloc(cfg.total_dirs * sizeof(uint32_t *))) == NULL) { printf("Not enough memory for CRCs.\r\n"); - return(1); + return 1; } memset(fcrc, 0, cfg.total_dirs * sizeof(uint32_t *)); @@ -156,7 +156,7 @@ int main(int argc, char **argv) } if ((fcrc[i] = malloc((smb.status.total_files + 1) * sizeof(uint32_t))) == NULL) { printf("Not enough memory for CRCs.\r\n"); - return(1); + return 1; } j = 0; fcrc[i][j++] = smb.status.total_files; @@ -199,7 +199,7 @@ int main(int argc, char **argv) if ((foundcrc = realloc_or_free(foundcrc , total_found * sizeof(uint32_t))) == NULL) { printf("Out of memory reallocating\r\n"); - return(1); + return 1; } } else @@ -228,6 +228,6 @@ int main(int argc, char **argv) } } } - return(0); + return 0; } diff --git a/src/sbbs3/email.cpp b/src/sbbs3/email.cpp index 9bbd6f6eb47e30d3ad390e7252b3acbeb5a97596..4bd579bce3994584cadf2d3ef13089c7eb74c763 100644 --- a/src/sbbs3/email.cpp +++ b/src/sbbs3/email.cpp @@ -55,29 +55,29 @@ bool sbbs_t::email(int usernumber, const char *top, const char *subj, int mode, if (useron.etoday >= cfg.level_emailperday[useron.level] && !SYSOP && !(useron.exempt & FLAG('M'))) { bputs(text[TooManyEmailsToday]); - return(false); + return false; } user.number = usernumber; if (getuserdat(&cfg, &user) != 0 || (user.misc & (DELETED | INACTIVE))) { bputs(text[UnknownUser]); - return(false); + return false; } bool to_sysop = user_is_sysop(&user); if (to_sysop && useron.rest & FLAG('S') && (cfg.valuser != usernumber || useron.fbacks || useron.emails)) { /* ! val fback */ bprintf(text[R_Feedback], cfg.sys_op); - return(false); + return false; } if (!to_sysop && useron.rest & FLAG('E') && (cfg.valuser != usernumber || useron.fbacks || useron.emails)) { bputs(text[R_Email]); - return(false); + return false; } if ((user.misc & NETMAIL) && (cfg.sys_misc & SM_FWDTONET) && !(mode & WM_NOFWD) && !(useron.rest & FLAG('M'))) { if (is_supported_netmail_addr(&cfg, user.netmail)) { bprintf(text[UserNetMail], user.netmail); if ((mode & WM_FORCEFWD) || yesno(text[ForwardMailQ])) /* Forward to netmail address */ - return(netmail(user.netmail, subj, mode, resmb, remsg)); + return netmail(user.netmail, subj, mode, resmb, remsg); } else { bprintf(text[InvalidNetMailAddr], user.netmail); } @@ -94,7 +94,7 @@ bool sbbs_t::email(int usernumber, const char *top, const char *subj, int mode, && (useron.fbacks || usernumber != cfg.valuser)) { main_csi.logic = LOGIC_TRUE; if (exec_bin(cfg.feedback_mod, &main_csi) != 0 || main_csi.logic != LOGIC_TRUE) - return(false); + return false; } if (cfg.sys_misc & SM_ANON_EM && useron.exempt & FLAG('A') @@ -115,7 +115,7 @@ bool sbbs_t::email(int usernumber, const char *top, const char *subj, int mode, username(&cfg, usernumber, str2); if (!writemsg(msgpath, top, /* subj: */ title, WM_EMAIL | mode, INVALID_SUB, /* to: */ str2, /* from: */ useron.alias, &editor, &charset)) { bputs(text[Aborted]); - return(false); + return false; } if (mode & WM_FILE && !SYSOP && !(cfg.sys_misc & SM_FILE_EM)) { @@ -127,7 +127,7 @@ bool sbbs_t::email(int usernumber, const char *top, const char *subj, int mode, if (!checkfname(title)) { bprintf(text[BadFilename], title); (void)remove(msgpath); - return(false); + return false; } SAFEPRINTF2(str2, "%sfile/%04u.in", cfg.data_dir, usernumber); (void)MKDIR(str2); @@ -135,7 +135,7 @@ bool sbbs_t::email(int usernumber, const char *top, const char *subj, int mode, if (fexistcase(str2)) { bprintf(text[FileAlreadyThere], str2); (void)remove(msgpath); - return(false); + return false; } xfer_prot_menu(XFER_UPLOAD, &useron, keys, sizeof keys); SAFECAT(keys, quit_key(str)); @@ -144,7 +144,7 @@ bool sbbs_t::email(int usernumber, const char *top, const char *subj, int mode, if (ch == quit_key() || sys_status & SS_ABORT) { bputs(text[Aborted]); (void)remove(msgpath); - return(false); + return false; } x = protnum(ch, XFER_UPLOAD); if (x < cfg.total_prots) /* This should be always */ @@ -158,7 +158,7 @@ bool sbbs_t::email(int usernumber, const char *top, const char *subj, int mode, else { bprintf(text[FileNotReceived], title); (void)remove(msgpath); - return(false); + return false; } } @@ -166,20 +166,20 @@ bool sbbs_t::email(int usernumber, const char *top, const char *subj, int mode, if ((i = smb_stack(&smb, SMB_STACK_PUSH)) != 0) { errormsg(WHERE, ERR_OPEN, "MAIL", i); - return(false); + return false; } if ((i = smb_open_sub(&cfg, &smb, INVALID_SUB)) != 0) { smb_stack(&smb, SMB_STACK_POP); errormsg(WHERE, ERR_OPEN, smb.file, i, smb.last_error); - return(false); + return false; } if ((i = smb_locksmbhdr(&smb)) != 0) { smb_close(&smb); smb_stack(&smb, SMB_STACK_POP); errormsg(WHERE, ERR_LOCK, smb.file, i, smb.last_error); - return(false); + return false; } length = (int)flength(msgpath) + 2; /* +2 for translation string */ @@ -189,7 +189,7 @@ bool sbbs_t::email(int usernumber, const char *top, const char *subj, int mode, smb_close(&smb); smb_stack(&smb, SMB_STACK_POP); errormsg(WHERE, ERR_LEN, msgpath, length); - return(false); + return false; } if ((i = smb_open_da(&smb)) != 0) { @@ -197,7 +197,7 @@ bool sbbs_t::email(int usernumber, const char *top, const char *subj, int mode, smb_close(&smb); smb_stack(&smb, SMB_STACK_POP); errormsg(WHERE, ERR_OPEN, smb.file, i, smb.last_error); - return(false); + return false; } if (cfg.sys_misc & SM_FASTMAIL) offset = smb_fallocdat(&smb, length, 1); @@ -211,7 +211,7 @@ bool sbbs_t::email(int usernumber, const char *top, const char *subj, int mode, smb_close(&smb); smb_stack(&smb, SMB_STACK_POP); errormsg(WHERE, ERR_OPEN, msgpath, O_RDONLY | O_BINARY); - return(false); + return false; } smb_fseek(smb.sdt_fp, offset, SEEK_SET); @@ -253,7 +253,7 @@ bool sbbs_t::email(int usernumber, const char *top, const char *subj, int mode, smb_close(&smb); smb_stack(&smb, SMB_STACK_POP); bprintf(text[CantPostMsg], i == SMB_DUPE_MSG ? "duplicate" : "other"); - return(false); + return false; } } @@ -301,7 +301,7 @@ bool sbbs_t::email(int usernumber, const char *top, const char *subj, int mode, if (i != SMB_SUCCESS) { smb_freemsgdat(&smb, offset, length, 1); errormsg(WHERE, ERR_WRITE, smb.file, i, smb.last_error); - return(false); + return false; } if (usernumber == 1) @@ -316,7 +316,7 @@ bool sbbs_t::email(int usernumber, const char *top, const char *subj, int mode, if (mode & WM_FILE && online == ON_REMOTE) autohangup(); if (msgattr & MSG_ANONYMOUS) /* Don't tell user if anonymous */ - return(true); + return true; for (i = 1; i <= cfg.sys_nodes; i++) { /* Tell user, if online */ getnodedat(i, &node); if (node.useron == usernumber && !(node.misc & NODE_POFF) @@ -330,5 +330,5 @@ bool sbbs_t::email(int usernumber, const char *top, const char *subj, int mode, safe_snprintf(str, sizeof(str), text[UserSentYouMail], useron.alias); putsmsg(usernumber, str); } - return(true); + return true; } diff --git a/src/sbbs3/exec.cpp b/src/sbbs3/exec.cpp index a07fb012545c66bd8c8ea21b15c087d07e044b25..60638d28f950aafc43f70bc562089cde8ae90529 100644 --- a/src/sbbs3/exec.cpp +++ b/src/sbbs3/exec.cpp @@ -31,7 +31,7 @@ char ** sbbs_t::getstrvar(csi_t *bin, uint32_t name) if (sysvar_pi >= MAX_SYSVARS) sysvar_pi = 0; switch (name) { case 0: - return((char **)&(bin->str)); + return (char **)&(bin->str); case 0x490873f1: sysvar_p[sysvar_pi] = (char*)useron.alias; break; @@ -85,7 +85,7 @@ char ** sbbs_t::getstrvar(csi_t *bin, uint32_t name) sysvar_p[sysvar_pi] = (char*)cid; break; case 0x15755030: - return((char **)&comspec); + return (char **)&comspec; case 0x5E049062: sysvar_p[sysvar_pi] = question; break; @@ -98,15 +98,15 @@ char ** sbbs_t::getstrvar(csi_t *bin, uint32_t name) if (bin->str_var && bin->str_var_name) for (i = 0; i < bin->str_vars; i++) if (bin->str_var_name[i] == name) - return((char **)&(bin->str_var[i])); + return (char **)&(bin->str_var[i]); if (global_str_var && global_str_var_name) for (i = 0; i < global_str_vars; i++) if (global_str_var_name[i] == name) - return(&(global_str_var[i])); - return(NULL); + return &(global_str_var[i]); + return NULL; } - return((char **)&sysvar_p[sysvar_pi++]); + return (char **)&sysvar_p[sysvar_pi++]; } int32_t * sbbs_t::getintvar(csi_t *bin, uint32_t name) @@ -182,74 +182,74 @@ int32_t * sbbs_t::getintvar(csi_t *bin, uint32_t name) sysvar_l[sysvar_li] = useron.leech; break; case 0x7c602a37: - return((int32_t *)&useron.misc); + return (int32_t *)&useron.misc; case 0x61be0d36: - return((int32_t *)&useron.qwk); + return (int32_t *)&useron.qwk; case 0x665ac227: - return((int32_t *)&useron.chat); + return (int32_t *)&useron.chat; case 0x951341ab: - return((int32_t *)&useron.flags1); + return (int32_t *)&useron.flags1; case 0x0c1a1011: - return((int32_t *)&useron.flags2); + return (int32_t *)&useron.flags2; case 0x7b1d2087: - return((int32_t *)&useron.flags3); + return (int32_t *)&useron.flags3; case 0xe579b524: - return((int32_t *)&useron.flags4); + return (int32_t *)&useron.flags4; case 0x12e7d6d2: - return((int32_t *)&useron.exempt); + return (int32_t *)&useron.exempt; case 0xfed3115d: - return((int32_t *)&useron.rest); + return (int32_t *)&useron.rest; case 0xb65dd6d4: - return((int32_t *)&useron.ulb); + return (int32_t *)&useron.ulb; case 0xabb91f93: - return((int32_t *)&useron.dlb); + return (int32_t *)&useron.dlb; case 0x92fb364f: - return((int32_t *)&useron.cdt); + return (int32_t *)&useron.cdt; case 0xd0a99c72: - return((int32_t *)&useron.min); + return (int32_t *)&useron.min; case 0xd7ae3022: - return((int32_t *)&useron.freecdt); + return (int32_t *)&useron.freecdt; case 0x1ef214ef: - return((int32_t *)&useron.firston); + return (int32_t *)&useron.firston; case 0x0ea515b1: - return((int32_t *)&useron.laston); + return (int32_t *)&useron.laston; case 0x2aaf9bd3: - return((int32_t *)&useron.expire); + return (int32_t *)&useron.expire; case 0x89c91dc8: - return((int32_t *)&useron.pwmod); + return (int32_t *)&useron.pwmod; case 0x5b0d0c54: - return((int32_t *)&useron.ns_time); + return (int32_t *)&useron.ns_time; case 0xae256560: - return((int32_t *)&cur_rate); + return (int32_t *)&cur_rate; case 0x2b3c257f: - return((int32_t *)&cur_cps); + return (int32_t *)&cur_cps; case 0x1c4455ee: - return((int32_t *)&dte_rate); + return (int32_t *)&dte_rate; case 0x7fbf958e: - return((int32_t *)&lncntr); + return (int32_t *)&lncntr; // case 0x5c1c1500: // return((int32_t *)&tos); case 0x613b690e: - return((int32_t *)&rows); + return (int32_t *)&rows; case 0x205ace36: - return((int32_t *)&autoterm); + return (int32_t *)&autoterm; case 0x7d0ed0d1: - return((int32_t *)&console); + return (int32_t *)&console; case 0xbf31a280: - return((int32_t *)&answertime); + return (int32_t *)&answertime; case 0x83aa2a6a: - return((int32_t *)&logontime); + return (int32_t *)&logontime; case 0xb50cb889: - return((int32_t *)&ns_time); + return (int32_t *)&ns_time; case 0xae92d249: - return((int32_t *)&last_ns_time); + return (int32_t *)&last_ns_time; case 0x97f99eef: - return((int32_t *)&online); + return (int32_t *)&online; case 0x381d3c2a: - return((int32_t *)&sys_status); + return (int32_t *)&sys_status; case 0x7e29c819: - return((int32_t *)&cfg.sys_misc); + return (int32_t *)&cfg.sys_misc; case 0x02408dc5: sysvar_l[sysvar_li] = sys_timezone(&cfg); break; @@ -275,7 +275,7 @@ int32_t * sbbs_t::getintvar(csi_t *bin, uint32_t name) sysvar_l[sysvar_li] = cfg.sys_autonode; break; case 0x709c07da: - return((int32_t *)&cfg.node_misc); + return (int32_t *)&cfg.node_misc; case 0xb17e7914: sysvar_l[sysvar_li] = cfg.valuser; break; @@ -286,26 +286,26 @@ int32_t * sbbs_t::getintvar(csi_t *bin, uint32_t name) sysvar_l[sysvar_li] = cfg.new_level; break; case 0xccfe7c5d: - return((int32_t *)&cfg.new_flags1); + return (int32_t *)&cfg.new_flags1; case 0x55f72de7: - return((int32_t *)&cfg.new_flags2); + return (int32_t *)&cfg.new_flags2; case 0x22f01d71: - return((int32_t *)&cfg.new_flags3); + return (int32_t *)&cfg.new_flags3; case 0xbc9488d2: - return((int32_t *)&cfg.new_flags4); + return (int32_t *)&cfg.new_flags4; case 0x4b0aeb24: - return((int32_t *)&cfg.new_exempt); + return (int32_t *)&cfg.new_exempt; case 0x20cb6325: - return((int32_t *)&cfg.new_rest); + return (int32_t *)&cfg.new_rest; case 0x31178ba2: - return((int32_t *)&cfg.new_cdt); + return (int32_t *)&cfg.new_cdt; case 0x7345219f: - return((int32_t *)&cfg.new_min); + return (int32_t *)&cfg.new_min; case 0xb3f64be4: sysvar_l[sysvar_li] = cfg.new_shell; break; case 0xa278584f: - return((int32_t *)&cfg.new_misc); + return (int32_t *)&cfg.new_misc; case 0x7342a625: sysvar_l[sysvar_li] = cfg.new_expire; break; @@ -316,17 +316,17 @@ int32_t * sbbs_t::getintvar(csi_t *bin, uint32_t name) sysvar_l[sysvar_li] = cfg.expired_level; break; case 0x89b69753: - return((int32_t *)&cfg.expired_flags1); + return (int32_t *)&cfg.expired_flags1; case 0x10bfc6e9: - return((int32_t *)&cfg.expired_flags2); + return (int32_t *)&cfg.expired_flags2; case 0x67b8f67f: - return((int32_t *)&cfg.expired_flags3); + return (int32_t *)&cfg.expired_flags3; case 0xf9dc63dc: - return((int32_t *)&cfg.expired_flags4); + return (int32_t *)&cfg.expired_flags4; case 0x0e42002a: - return((int32_t *)&cfg.expired_exempt); + return (int32_t *)&cfg.expired_exempt; case 0x4569c62e: - return((int32_t *)&cfg.expired_rest); + return (int32_t *)&cfg.expired_rest; case 0xfcf3542e: sysvar_l[sysvar_li] = (int32_t)(cfg.min_dspace / 1024); break; @@ -334,7 +334,7 @@ int32_t * sbbs_t::getintvar(csi_t *bin, uint32_t name) sysvar_l[sysvar_li] = cfg.cdt_min_value; break; case 0xfcb5b274: - return((int32_t *)&cfg.cdt_per_dollar); + return (int32_t *)&cfg.cdt_per_dollar; case 0x4db200d2: sysvar_l[sysvar_li] = cfg.leech_pct; break; @@ -342,31 +342,31 @@ int32_t * sbbs_t::getintvar(csi_t *bin, uint32_t name) sysvar_l[sysvar_li] = cfg.leech_sec; break; case 0x396b7167: - return((int32_t *)&cfg.netmail_cost); + return (int32_t *)&cfg.netmail_cost; case 0x5eeaff21: sysvar_l[sysvar_li] = cfg.netmail_misc; break; case 0x82d9484e: - return((int32_t *)&cfg.inetmail_cost); + return (int32_t *)&cfg.inetmail_cost; case 0xe558c608: - return((int32_t *)&cfg.inetmail_misc); + return (int32_t *)&cfg.inetmail_misc; case 0xc6e8539d: - return((int32_t *)&logon_ulb); + return (int32_t *)&logon_ulb; case 0xdb0c9ada: - return((int32_t *)&logon_dlb); + return (int32_t *)&logon_dlb; case 0xac58736f: - return((int32_t *)&logon_uls); + return (int32_t *)&logon_uls; case 0xb1bcba28: - return((int32_t *)&logon_dls); + return (int32_t *)&logon_dls; case 0x9c5051c9: - return((int32_t *)&logon_posts); + return (int32_t *)&logon_posts; case 0xc82ba467: - return((int32_t *)&logon_emails); + return (int32_t *)&logon_emails; case 0x8e395209: - return((int32_t *)&logon_fbacks); + return (int32_t *)&logon_fbacks; case 0x8b12ba9d: - return((int32_t *)&posts_read); + return (int32_t *)&posts_read; case 0xe51c1956: sysvar_l[sysvar_li] = (ulong)logfile_fp; break; @@ -390,21 +390,21 @@ int32_t * sbbs_t::getintvar(csi_t *bin, uint32_t name) break; case 0x1e5052a7: - return((int32_t *)&cfg.max_minutes); + return (int32_t *)&cfg.max_minutes; case 0xedc643f1: - return((int32_t *)&cfg.max_qwkmsgs); + return (int32_t *)&cfg.max_qwkmsgs; case 0x430178ec: - return((int32_t *)&cfg.uq); + return (int32_t *)&cfg.uq; case 0x455CB929: - return(&bin->ftp_mode); + return &bin->ftp_mode; case 0x2105D2B9: - return(&bin->socket_error); + return &bin->socket_error; case 0xA0023A2E: - return((int32_t *)&startup->options); + return (int32_t *)&startup->options; case 0x16E2585F: sysvar_l[sysvar_li] = client_socket; @@ -414,15 +414,15 @@ int32_t * sbbs_t::getintvar(csi_t *bin, uint32_t name) if (bin->int_var && bin->int_var_name) for (i = 0; i < bin->int_vars; i++) if (bin->int_var_name[i] == name) - return(&bin->int_var[i]); + return &bin->int_var[i]; if (global_int_var && global_int_var_name) for (i = 0; i < global_int_vars; i++) if (global_int_var_name[i] == name) - return(&global_int_var[i]); - return(NULL); + return &global_int_var[i]; + return NULL; } - return((int32_t*)&sysvar_l[sysvar_li++]); + return (int32_t*)&sysvar_l[sysvar_li++]; } void sbbs_t::clearvars(csi_t *bin) @@ -499,7 +499,7 @@ char * sbbs_t::copystrvar(csi_t *csi, char *p, char *str) } if (p) strcpy(p, str); - return(p); + return p; } #ifdef JAVASCRIPT @@ -513,7 +513,7 @@ js_OperationCallback(JSContext *cx) JS_SetOperationCallback(cx, NULL); if ((sbbs = (sbbs_t*)JS_GetContextPrivate(cx)) == NULL) { JS_SetOperationCallback(cx, js_OperationCallback); - return(JS_FALSE); + return JS_FALSE; } if (sbbs->js_callback.auto_terminate && !sbbs->online @@ -521,7 +521,7 @@ js_OperationCallback(JSContext *cx) JS_ReportWarning(cx, "Disconnected"); sbbs->js_callback.counter = 0; JS_SetOperationCallback(cx, js_OperationCallback); - return(JS_FALSE); + return JS_FALSE; } ret = js_CommonOperationCallback(cx, &sbbs->js_callback); @@ -750,7 +750,7 @@ int sbbs_t::js_execfile(const char *cmd, const char* startup_dir, JSObject* scop JS_ENDREQUEST(js_cx); - return(result); + return result; } // Execute a JS Module in its own temporary JS runtime and context @@ -798,16 +798,16 @@ int sbbs_t::exec_bin(const char *cmdline, csi_t *csi, const char* startup_dir) #ifdef JAVASCRIPT if ((p = getfext(mod)) != NULL && stricmp(p, ".js") == 0) - return(js_execfile(cmdline, startup_dir)); + return js_execfile(cmdline, startup_dir); if (p == NULL && startup_dir != NULL && *startup_dir) { SAFEPRINTF2(str, "%s%s.js", startup_dir, mod); if (fexistcase(str)) - return(js_execfile(cmdline, startup_dir)); + return js_execfile(cmdline, startup_dir); } if (cfg.mods_dir[0]) { SAFEPRINTF2(str, "%s%s.js", cfg.mods_dir, mod); if (fexistcase(str)) - return(js_execfile(cmdline, startup_dir)); + return js_execfile(cmdline, startup_dir); } #endif @@ -821,7 +821,7 @@ int sbbs_t::exec_bin(const char *cmdline, csi_t *csi, const char* startup_dir) #ifdef JAVASCRIPT SAFEPRINTF2(str, "%s%s.js", cfg.exec_dir, mod); if (fexistcase(str)) - return(js_execfile(cmdline, startup_dir)); + return js_execfile(cmdline, startup_dir); #endif SAFEPRINTF2(str, "%s%s", cfg.exec_dir, modname); @@ -833,7 +833,7 @@ int sbbs_t::exec_bin(const char *cmdline, csi_t *csi, const char* startup_dir) } if ((file = nopen(str, O_RDONLY)) == -1) { errormsg(WHERE, ERR_OPEN, str, O_RDONLY); - return(-1); + return -1; } memcpy(&bin, csi, sizeof(csi_t)); @@ -847,13 +847,13 @@ int sbbs_t::exec_bin(const char *cmdline, csi_t *csi, const char* startup_dir) if ((bin.cs = (uchar *)malloc(bin.length)) == NULL) { close(file); errormsg(WHERE, ERR_ALLOC, str, bin.length); - return(-1); + return -1; } if (read(file, bin.cs, bin.length) != (ssize_t)bin.length) { close(file); errormsg(WHERE, ERR_READ, str, bin.length); free(bin.cs); - return(-1); + return -1; } close(file); @@ -873,7 +873,7 @@ int sbbs_t::exec_bin(const char *cmdline, csi_t *csi, const char* startup_dir) free(bin.cs); csi->logic = bin.logic; // sys_status &=~ SS_ABORT; - return(bin.retval); + return bin.retval; } /****************************************************************************/ @@ -1215,17 +1215,17 @@ int sbbs_t::exec(csi_t *csi) now = time(NULL); if (csi->ip >= csi->cs + csi->length) - return(1); + return 1; if (*csi->ip >= CS_FUNCTIONS) - return(exec_function(csi)); + return exec_function(csi); /**********************************************/ /* Miscellaneous variable length instructions */ /**********************************************/ if (*csi->ip >= CS_MISC) - return(exec_misc(csi, path)); + return exec_misc(csi, path); /********************************/ /* ASCIIZ argument instructions */ @@ -1279,7 +1279,7 @@ int sbbs_t::exec(csi_t *csi) break; } while (*(csi->ip++)); /* Find NULL */ - return(0); + return 0; case CS_LOG: log(cmdstr((char*)csi->ip, path, csi->str, (char*)buf)); break; @@ -1293,7 +1293,7 @@ int sbbs_t::exec(csi_t *csi) while (*(csi->ip++)); /* Find NULL */ skipto(csi, CS_END_CMD); csi->ip++; - return(0); + return 0; } break; case CS_CMDKEYS: @@ -1304,7 +1304,7 @@ int sbbs_t::exec(csi_t *csi) while (*(csi->ip++)); /* Find NULL */ skipto(csi, CS_END_CMD); csi->ip++; - return(0); + return 0; } break; case CS_GET_TEMPLATE: @@ -1408,34 +1408,34 @@ int sbbs_t::exec(csi_t *csi) break; } while (*(csi->ip++)); /* Find NULL */ - return(0); + return 0; } if (*csi->ip >= CS_THREE_BYTE) { switch (*(csi->ip++)) { case CS_THREE_MORE_BYTES: errormsg(WHERE, ERR_CHK, "shell instruction", *(csi->ip - 1)); - return(0); + return 0; case CS_GOTO: csi->ip = csi->cs + *((ushort *)(csi->ip)); - return(0); + return 0; case CS_CALL: if (csi->rets < MAX_RETS) { csi->ret[csi->rets++] = csi->ip + 2; csi->ip = csi->cs + *((ushort *)(csi->ip)); } - return(0); + return 0; case CS_MSWAIT: mswait(*(ushort *)csi->ip); csi->ip += 2; - return(0); + return 0; case CS_TOGGLE_NODE_MISC: if (getnodedat(cfg.node_num, &thisnode, true)) { thisnode.misc ^= *(ushort *)csi->ip; putnodedat(cfg.node_num, &thisnode); } csi->ip += 2; - return(0); + return 0; case CS_COMPARE_NODE_MISC: getnodedat(cfg.node_num, &thisnode); if ((thisnode.misc & *(ushort *)csi->ip) == *(ushort *)csi->ip) @@ -1443,7 +1443,7 @@ int sbbs_t::exec(csi_t *csi) else csi->logic = LOGIC_FALSE; csi->ip += 2; - return(0); + return 0; case CS_ADJUST_USER_CREDITS: i = *(short *)csi->ip; l = i * 1024L; @@ -1452,12 +1452,12 @@ int sbbs_t::exec(csi_t *csi) else useron.cdt = adjustuserval(&cfg, useron.number, USER_CDT, l); csi->ip += 2; - return(0); + return 0; case CS_ADJUST_USER_MINUTES: i = *(short *)csi->ip; useron.min = (uint32_t)adjustuserval(&cfg, useron.number, USER_MIN, i); csi->ip += 2; - return(0); + return 0; case CS_GETNUM: i = *(short *)csi->ip; csi->ip += 2; @@ -1470,7 +1470,7 @@ int sbbs_t::exec(csi_t *csi) snprintf(csi->str, 128, "%lu", l); csi->logic = LOGIC_TRUE; } - return(0); + return 0; case CS_TOGGLE_USER_FLAG: i = *(csi->ip++); @@ -1502,9 +1502,9 @@ int sbbs_t::exec(csi_t *csi) break; default: errormsg(WHERE, ERR_CHK, "user flag type", *(csi->ip - 2)); - return(0); + return 0; } - return(0); + return 0; case CS_REVERT_TEXT: i = *(ushort *)csi->ip; csi->ip += 2; @@ -1514,20 +1514,20 @@ int sbbs_t::exec(csi_t *csi) free(text[i]); text[i] = text_sav[i]; } - return(0); + return 0; } i--; if (i >= TOTAL_TEXT) { errormsg(WHERE, ERR_CHK, "revert text #", i); - return(0); + return 0; } if (text[i] != text_sav[i] && text[i] != nulstr) free(text[i]); text[i] = text_sav[i]; - return(0); + return 0; default: errormsg(WHERE, ERR_CHK, "shell instruction", *(csi->ip - 1)); - return(0); + return 0; } } @@ -1537,46 +1537,46 @@ int sbbs_t::exec(csi_t *csi) switch (*(csi->ip++)) { case CS_USER_EVENT: user_event((user_event_t)*(csi->ip++)); - return(0); + return 0; } errormsg(WHERE, ERR_CHK, "shell instruction", *(csi->ip - 1)); - return(0); + return 0; case CS_SETLOGIC: csi->logic = *csi->ip++; - return(0); + return 0; case CS_CMDKEY: if (((*csi->ip) == CS_DIGIT && IS_DIGIT(csi->cmd)) || ((*csi->ip) == CS_EDIGIT && csi->cmd & 0x80 && IS_DIGIT(csi->cmd & 0x7f))) { csi->ip++; - return(0); + return 0; } if (csi->cmd != *csi->ip) { csi->ip++; skipto(csi, CS_END_CMD); /* skip code */ } csi->ip++; /* skip key */ - return(0); + return 0; case CS_CMDCHAR: if (csi->cmd != *csi->ip) { csi->ip++; skipto(csi, CS_END_CMD); /* skip code */ } csi->ip++; /* skip key */ - return(0); + return 0; case CS_NODE_ACTION: action = *csi->ip++; - return(0); + return 0; case CS_NODE_STATUS: if (getnodedat(cfg.node_num, &thisnode, true)) { thisnode.status = *csi->ip++; putnodedat(cfg.node_num, &thisnode); } else csi->ip++; - return(0); + return 0; case CS_MULTINODE_CHAT: multinodechat(*csi->ip++); - return(0); + return 0; case CS_GETSTR: csi->logic = LOGIC_TRUE; getstr(csi->str, *csi->ip++, 0); @@ -1588,7 +1588,7 @@ int sbbs_t::exec(csi_t *csi) csi->cmd = csi->str[1] | 0x80; else csi->cmd = csi->str[0]; - return(0); + return 0; case CS_GETLINE: getstr(csi->str, *csi->ip++, K_LINE); if (sys_status & SS_ABORT) @@ -1597,7 +1597,7 @@ int sbbs_t::exec(csi_t *csi) csi->cmd = csi->str[1] | 0x80; else csi->cmd = csi->str[0]; - return(0); + return 0; case CS_GETSTRUPR: getstr(csi->str, *csi->ip++, K_UPPER); if (sys_status & SS_ABORT) @@ -1606,12 +1606,12 @@ int sbbs_t::exec(csi_t *csi) csi->cmd = csi->str[1] | 0x80; else csi->cmd = csi->str[0]; - return(0); + return 0; case CS_GETNAME: getstr(csi->str, *csi->ip++, K_UPRLWR); if (sys_status & SS_ABORT) csi->str[0] = 0; - return(0); + return 0; case CS_SHIFT_STR: i = *(csi->ip++); j = strlen(csi->str); @@ -1619,7 +1619,7 @@ int sbbs_t::exec(csi_t *csi) i = j; if (i) memmove(csi->str, csi->str + i, j + 1); - return(0); + return 0; case CS_COMPARE_KEY: if (((*csi->ip) == CS_DIGIT && IS_DIGIT(csi->cmd)) || ((*csi->ip) == CS_EDIGIT && csi->cmd & 0x80 @@ -1633,22 +1633,22 @@ int sbbs_t::exec(csi_t *csi) else csi->logic = LOGIC_FALSE; } - return(0); + return 0; case CS_COMPARE_CHAR: if (csi->cmd == *(csi->ip++)) csi->logic = LOGIC_TRUE; else csi->logic = LOGIC_FALSE; - return(0); + return 0; case CS_SET_USER_LEVEL: useron.level = *(csi->ip++); putuserdec32(useron.number, USER_LEVEL, useron.level); - return(0); + return 0; case CS_SET_USER_STRING: csi->logic = LOGIC_FALSE; if (!csi->str[0]) { csi->ip++; - return(0); + return 0; } switch (*(csi->ip++)) { case USER_STRING_ALIAS: @@ -1762,12 +1762,12 @@ int sbbs_t::exec(csi_t *csi) break; default: errormsg(WHERE, ERR_CHK, "user string type", *(csi->ip - 1)); - return(0); + return 0; } - return(0); + return 0; default: errormsg(WHERE, ERR_CHK, "shell instruction", *(csi->ip - 1)); - return(0); + return 0; } } @@ -1781,116 +1781,116 @@ int sbbs_t::exec(csi_t *csi) switch (*(csi->ip++)) { case CS_OFFLINE: csi->misc |= CS_OFFLINE_EXEC; - return(0); + return 0; case CS_ONLINE: csi->misc &= ~CS_OFFLINE_EXEC; - return(0); + return 0; case CS_NEWUSER: if (newuser()) csi->logic = LOGIC_TRUE; else csi->logic = LOGIC_FALSE; - return(0); + return 0; case CS_LOGON: if (logon()) csi->logic = LOGIC_TRUE; else csi->logic = LOGIC_FALSE; - return(0); + return 0; case CS_LOGOUT: logout(); - return(0); + return 0; case CS_EXIT: - return(1); + return 1; case CS_LOOP_BEGIN: if (csi->loops < MAX_LOOPDEPTH) csi->loop_home[csi->loops++] = (csi->ip - 1); - return(0); + return 0; case CS_BREAK_LOOP: if (csi->loops) { skipto(csi, CS_END_LOOP); csi->ip += 2; csi->loops--; } - return(0); + return 0; case CS_END_LOOP: case CS_CONTINUE_LOOP: if (csi->loops) csi->ip = csi->loop_home[csi->loops - 1]; - return(0); + return 0; default: errormsg(WHERE, ERR_CHK, "one byte extended function" , *(csi->ip - 1)); - return(0); + return 0; } case CS_CRLF: CRLF; - return(0); + return 0; case CS_CLS: CLS; - return(0); + return 0; case CS_PAUSE: pause(); - return(0); + return 0; case CS_PAUSE_RESET: lncntr = 0; - return(0); + return 0; case CS_GETLINES: getdimensions(); - return(0); + return 0; case CS_HANGUP: hangup(); - return(0); + return 0; case CS_LOGKEY: logch(csi->cmd, 0); - return(0); + return 0; case CS_LOGKEY_COMMA: logch(csi->cmd, 1); - return(0); + return 0; case CS_LOGSTR: log(csi->str); - return(0); + return 0; case CS_CHKSYSPASS: csi->logic = !chksyspass(); - return(0); + return 0; case CS_PUT_NODE: if (getnodedat(cfg.node_num, &thisnode, true)) putnodedat(cfg.node_num, &thisnode); - return(0); + return 0; case CS_SYNC: sync(); - return(0); + return 0; case CS_ASYNC: sync(); - return(0); + return 0; case CS_GETTIMELEFT: gettimeleft(); - return(0); + return 0; case CS_RETURN: if (!csi->rets) - return(1); + return 1; csi->ip = csi->ret[--csi->rets]; - return(0); + return 0; case CS_GETKEY: csi->cmd = getkey(K_UPPER); - return(0); + return 0; case CS_GETCHAR: csi->cmd = getkey(0); - return(0); + return 0; case CS_INKEY: csi->cmd = toupper(inkey(K_NONE, 1)); if (csi->cmd) csi->logic = LOGIC_TRUE; else csi->logic = LOGIC_FALSE; - return(0); + return 0; case CS_INCHAR: csi->cmd = inkey(K_NONE, 1); if (csi->cmd) csi->logic = LOGIC_TRUE; else csi->logic = LOGIC_FALSE; - return(0); + return 0; case CS_GETKEYE: csi->cmd = getkey(K_UPPER); if (csi->cmd == '/') { @@ -1898,22 +1898,22 @@ int sbbs_t::exec(csi_t *csi) csi->cmd = getkey(K_UPPER); csi->cmd |= 0x80; } - return(0); + return 0; case CS_GETFILESPEC: if (getfilespec(csi->str)) csi->logic = LOGIC_TRUE; else csi->logic = LOGIC_FALSE; - return(0); + return 0; case CS_SAVELINE: saveline(); - return(0); + return 0; case CS_RESTORELINE: restoreline(); - return(0); + return 0; case CS_SELECT_SHELL: csi->logic = select_shell() ? LOGIC_TRUE:LOGIC_FALSE; - return(0); + return 0; case CS_SET_SHELL: csi->logic = LOGIC_TRUE; for (i = 0; i < cfg.total_shells; i++) @@ -1926,11 +1926,11 @@ int sbbs_t::exec(csi_t *csi) } else csi->logic = LOGIC_FALSE; - return(0); + return 0; case CS_SELECT_EDITOR: csi->logic = select_editor() ? LOGIC_TRUE:LOGIC_FALSE; - return(0); + return 0; case CS_SET_EDITOR: csi->logic = LOGIC_TRUE; for (i = 0; i < cfg.total_xedits; i++) @@ -1943,11 +1943,11 @@ int sbbs_t::exec(csi_t *csi) } else csi->logic = LOGIC_FALSE; - return(0); + return 0; case CS_CLEAR_ABORT: sys_status &= ~SS_ABORT; - return(0); + return 0; case CS_FINDUSER: i = finduser(csi->str); if (i) { @@ -1956,88 +1956,88 @@ int sbbs_t::exec(csi_t *csi) } else csi->logic = LOGIC_FALSE; - return(0); + return 0; case CS_UNGETKEY: ungetkey(csi->cmd & 0x7f, /* insert: */ true); - return(0); + return 0; case CS_UNGETSTR: j = strlen(csi->str); for (i = 0; i < j; i++) ungetkey(csi->str[i]); - return(0); + return 0; case CS_PRINTKEY: if ((csi->cmd & 0x7f) >= ' ') outchar(csi->cmd & 0x7f); - return(0); + return 0; case CS_PRINTSTR: putmsg(csi->str, P_SAVEATR | P_NOABORT | P_NOATCODES); - return(0); + return 0; case CS_CMD_HOME: if (csi->cmdrets < MAX_CMDRETS) csi->cmdret[csi->cmdrets++] = (csi->ip - 1); - return(0); + return 0; case CS_END_CMD: if (csi->cmdrets) csi->ip = csi->cmdret[--csi->cmdrets]; - return(0); + return 0; case CS_CMD_POP: if (csi->cmdrets) csi->cmdrets--; - return(0); + return 0; case CS_IF_TRUE: if (csi->logic != LOGIC_TRUE) { skipto(csi, CS_ELSEORENDIF); csi->ip++; } - return(0); + return 0; case CS_IF_GREATER: if (csi->logic != LOGIC_GREATER) { skipto(csi, CS_ELSEORENDIF); csi->ip++; } - return(0); + return 0; case CS_IF_GREATER_OR_EQUAL: if (csi->logic != LOGIC_GREATER && csi->logic != LOGIC_EQUAL) { skipto(csi, CS_ELSEORENDIF); csi->ip++; } - return(0); + return 0; case CS_IF_LESS: if (csi->logic != LOGIC_LESS) { skipto(csi, CS_ELSEORENDIF); csi->ip++; } - return(0); + return 0; case CS_IF_LESS_OR_EQUAL: if (csi->logic != LOGIC_LESS && csi->logic != LOGIC_EQUAL) { skipto(csi, CS_ELSEORENDIF); csi->ip++; } - return(0); + return 0; case CS_IF_FALSE: if (csi->logic == LOGIC_TRUE) { skipto(csi, CS_ELSEORENDIF); csi->ip++; } - return(0); + return 0; case CS_ELSE: skipto(csi, CS_ENDIF); csi->ip++; - return(0); + return 0; case CS_END_CASE: skipto(csi, CS_END_SWITCH); csi->misc &= ~CS_IN_SWITCH; csi->ip++; - return(0); + return 0; case CS_DEFAULT: case CS_END_SWITCH: csi->misc &= ~CS_IN_SWITCH; - return(0); + return 0; case CS_ENDIF: - return(0); + return 0; default: errormsg(WHERE, ERR_CHK, "shell instruction", *(csi->ip - 1)); - return(0); + return 0; } } @@ -2050,9 +2050,9 @@ bool sbbs_t::select_shell(void) if ((i = uselect(0, useron.shell, 0, 0, 0)) >= 0) { useron.shell = i; putuserstr(useron.number, USER_SHELL, cfg.shell[i]->code); - return(true); + return true; } - return(false); + return false; } bool sbbs_t::select_editor(void) @@ -2065,7 +2065,7 @@ bool sbbs_t::select_editor(void) useron.xedit = i + 1; if (useron.number > 0) putuserstr(useron.number, USER_XEDIT, cfg.xedit[i]->code); - return(true); + return true; } - return(false); + return false; } diff --git a/src/sbbs3/execfile.cpp b/src/sbbs3/execfile.cpp index d62b87ebe762a770ef1f35876407e9a075598946..5403f911cf8e3377f73bacd177ec67327be2c62d 100644 --- a/src/sbbs3/execfile.cpp +++ b/src/sbbs3/execfile.cpp @@ -34,7 +34,7 @@ int sbbs_t::exec_file(csi_t *csi) case CS_FILE_SELECT_AREA: csi->logic = LOGIC_FALSE; - if (!usrlibs) return(0); + if (!usrlibs) return 0; while (online) { j = 0; if (usrlibs > 1) { @@ -56,7 +56,7 @@ int sbbs_t::exec_file(csi_t *csi) j = getnum(usrlibs); clear_hotspots(); if ((int)j == -1) - return(0); + return 0; if (!j) j = curlib; else @@ -84,7 +84,7 @@ int sbbs_t::exec_file(csi_t *csi) clear_hotspots(); if ((int)i == -1) { if (usrlibs == 1) - return(0); + return 0; continue; } if (!i) @@ -94,9 +94,9 @@ int sbbs_t::exec_file(csi_t *csi) curlib = j; curdir[curlib] = i; csi->logic = LOGIC_TRUE; - return(0); + return 0; } - return(0); + return 0; case CS_FILE_GET_DIR_NUM: @@ -104,7 +104,7 @@ int sbbs_t::exec_file(csi_t *csi) i = atoi(csi->str); if (i && i <= usrdirs[curlib] && usrlibs) curdir[curlib] = i - 1; - return(0); + return 0; } ch = getkey(K_UPPER); @@ -115,12 +115,12 @@ int sbbs_t::exec_file(csi_t *csi) if (!IS_DIGIT(ch) && ch != CR) { ungetkey(ch); curdir[curlib] = (i / 10) - 1; - return(0); + return 0; } outchar(ch); if (ch == CR) { curdir[curlib] = (i / 10) - 1; - return(0); + return 0; } logch(ch, 0); i += ch & 0xf; @@ -130,12 +130,12 @@ int sbbs_t::exec_file(csi_t *csi) if (!IS_DIGIT(ch) && ch != CR) { ungetkey(ch); curdir[curlib] = (i / 10) - 1; - return(0); + return 0; } outchar(ch); if (ch == CR) { curdir[curlib] = (i / 10) - 1; - return(0); + return 0; } logch(ch, 0); i += ch & 0xf; @@ -144,11 +144,11 @@ int sbbs_t::exec_file(csi_t *csi) curdir[curlib] = i - 1; if (keybuf_level() && (ch = getkey(K_UPPER)) != '\r') ungetkey(ch, /* insert: */ true); - return(0); + return 0; } if ((ch & 0xf) <= (int)usrdirs[curlib] && (ch & 0xf) && usrlibs) curdir[curlib] = (ch & 0xf) - 1; - return(0); + return 0; case CS_FILE_GET_LIB_NUM: @@ -156,7 +156,7 @@ int sbbs_t::exec_file(csi_t *csi) i = atoi(csi->str); if (i && i <= usrlibs) curlib = i - 1; - return(0); + return 0; } ch = getkey(K_UPPER); @@ -167,12 +167,12 @@ int sbbs_t::exec_file(csi_t *csi) if (!IS_DIGIT(ch) && ch != CR) { ungetkey(ch); curlib = (i / 10) - 1; - return(0); + return 0; } outchar(ch); if (ch == CR) { curlib = (i / 10) - 1; - return(0); + return 0; } logch(ch, 0); i += ch & 0xf; @@ -180,18 +180,18 @@ int sbbs_t::exec_file(csi_t *csi) curlib = i - 1; if (keybuf_level() && (ch = getkey(K_UPPER)) != '\r') ungetkey(ch, /* insert: */ true); - return(0); + return 0; } if ((ch & 0xf) <= (int)usrlibs && (ch & 0xf)) curlib = (ch & 0xf) - 1; if (keybuf_level() && (ch = getkey(K_UPPER)) != '\r') ungetkey(ch, /* insert: */ true); - return(0); + return 0; case CS_FILE_SHOW_LIBRARIES: - if (!usrlibs) return(0); + if (!usrlibs) return 0; if (menu("libs", P_NOERROR)) { - return(0); + return 0; } bputs(text[LibLstHdr]); for (i = 0; i < usrlibs && !msgabort(); i++) { @@ -203,13 +203,13 @@ int sbbs_t::exec_file(csi_t *csi) bprintf(text[LibLstFmt], i + 1 , cfg.lib[usrlib[i]]->lname, nulstr, usrdirs[i]); } - return(0); + return 0; case CS_FILE_SHOW_DIRECTORIES: - if (!usrlibs) return(0); + if (!usrlibs) return 0; snprintf(str, sizeof str, "dirs%u", usrlib[curlib] + 1); if (menu(str, P_NOERROR)) { - return(0); + return 0; } CRLF; bprintf(text[DirLstHdr], cfg.lib[usrlib[curlib]]->lname); @@ -224,30 +224,30 @@ int sbbs_t::exec_file(csi_t *csi) add_hotspot(i + 1); bputs(str); } - return(0); + return 0; case CS_FILE_LIBRARY_UP: curlib++; if (curlib >= usrlibs) curlib = 0; - return(0); + return 0; case CS_FILE_LIBRARY_DOWN: if (!curlib) curlib = usrlibs - 1; else curlib--; - return(0); + return 0; case CS_FILE_DIRECTORY_UP: - if (!usrlibs) return(0); + if (!usrlibs) return 0; curdir[curlib]++; if (curdir[curlib] >= usrdirs[curlib]) curdir[curlib] = 0; - return(0); + return 0; case CS_FILE_DIRECTORY_DOWN: - if (!usrlibs) return(0); + if (!usrlibs) return 0; if (!curdir[curlib]) curdir[curlib] = usrdirs[curlib] - 1; else curdir[curlib]--; - return(0); + return 0; case CS_FILE_SET_AREA: csi->logic = LOGIC_TRUE; for (i = 0; i < usrlibs; i++) @@ -255,10 +255,10 @@ int sbbs_t::exec_file(csi_t *csi) if (!stricmp(csi->str, cfg.dir[usrdir[i][j]]->code)) { curlib = i; curdir[i] = j; - return(0); + return 0; } csi->logic = LOGIC_FALSE; - return(0); + return 0; case CS_FILE_SET_LIBRARY: csi->logic = LOGIC_TRUE; for (i = 0; i < usrlibs; i++) @@ -268,7 +268,7 @@ int sbbs_t::exec_file(csi_t *csi) curlib = i; else csi->logic = LOGIC_FALSE; - return(0); + return 0; case CS_FILE_UPLOAD: csi->logic = LOGIC_FALSE; @@ -280,28 +280,28 @@ int sbbs_t::exec_file(csi_t *csi) } else i = cfg.upload_dir; csi->logic = upload(i) ? LOGIC_TRUE:LOGIC_FALSE; - return(0); + return 0; case CS_FILE_UPLOAD_USER: csi->logic = LOGIC_FALSE; if (cfg.user_dir == INVALID_DIR) { bputs(text[NoUserDir]); - return(0); + return 0; } csi->logic = upload(cfg.user_dir) ? LOGIC_TRUE:LOGIC_FALSE; - return(0); + return 0; case CS_FILE_UPLOAD_SYSOP: csi->logic = LOGIC_FALSE; if (cfg.sysop_dir == INVALID_DIR) { bputs(text[NoSysopDir]); - return(0); + return 0; } csi->logic = upload(cfg.sysop_dir) ? LOGIC_TRUE:LOGIC_FALSE; - return(0); + return 0; case CS_FILE_DOWNLOAD: - if (!usrlibs) return(0); + if (!usrlibs) return 0; if (useron.rest & FLAG('D')) { bputs(text[R_Download]); - return(0); + return 0; } if (!listfileinfo(usrdir[curlib][curdir[curlib]], csi->str, FI_DOWNLOAD) && strcmp(csi->str, ALLFILES) != 0) { @@ -315,7 +315,7 @@ int sbbs_t::exec_file(csi_t *csi) if (i != curdir[curlib] && (s = listfileinfo(usrdir[curlib][i], csi->str, FI_DOWNLOAD)) != 0) if (s == -1 || (!strchr(csi->str, '?') && !strchr(csi->str, '*'))) - return(0); + return 0; } bputs(text[Scanned]); bputs(text[SearchingAllLibs]); @@ -329,27 +329,27 @@ int sbbs_t::exec_file(csi_t *csi) } if ((s = listfileinfo(usrdir[i][j], csi->str, FI_DOWNLOAD)) != 0) if (s == -1 || (!strchr(csi->str, '?') && !strchr(csi->str, '*'))) - return(0); + return 0; } } bputs(text[Scanned]); } - return(0); + return 0; case CS_FILE_DOWNLOAD_USER: /* Download from user dir */ csi->logic = LOGIC_FALSE; if (cfg.user_dir == INVALID_DIR) { bputs(text[NoUserDir]); - return(0); + return 0; } if (useron.rest & FLAG('D')) { bputs(text[R_Download]); - return(0); + return 0; } if (!listfileinfo(cfg.user_dir, nulstr, FI_USERXFER)) bputs(text[NoFilesForYou]); else csi->logic = LOGIC_TRUE; - return(0); + return 0; case CS_FILE_DOWNLOAD_BATCH: if (batdn_total() > 0 && (text[DownloadBatchQ][0] == 0 || yesno(text[DownloadBatchQ]))) { @@ -358,14 +358,14 @@ int sbbs_t::exec_file(csi_t *csi) } else csi->logic = LOGIC_FALSE; - return(0); + return 0; case CS_FILE_BATCH_ADD_LIST: batch_add_list(csi->str); - return(0); + return 0; case CS_FILE_BATCH_ADD: csi->logic = LOGIC_FALSE; if (!csi->str[0]) - return(0); + return 0; for (x = y = 0; x < usrlibs; x++) { for (y = 0; y < usrdirs[x]; y++) { if (msgabort()) @@ -378,18 +378,18 @@ int sbbs_t::exec_file(csi_t *csi) } } } - return(0); + return 0; case CS_FILE_BATCH_CLEAR: csi->logic = clearbatdl() ? LOGIC_TRUE : LOGIC_FALSE; return 0; case CS_FILE_VIEW: - if (!usrlibs) return(0); + if (!usrlibs) return 0; csi->logic = LOGIC_TRUE; if (listfiles(usrdir[curlib][curdir[curlib]], csi->str, 0, FL_VIEW) || strcmp(csi->str, ALLFILES) == 0) - return(0); + return 0; bputs(text[SearchingAllDirs]); for (i = 0; i < usrdirs[curlib]; i++) { if (msgabort()) { @@ -403,7 +403,7 @@ int sbbs_t::exec_file(csi_t *csi) } bputs(text[Scanned]); if (i < usrdirs[curlib]) - return(0); + return 0; bputs(text[SearchingAllLibs]); for (i = 0; i < usrlibs; i++) { progress(text[Scanning], i, usrlibs); @@ -414,28 +414,28 @@ int sbbs_t::exec_file(csi_t *csi) return 0; } if (listfiles(usrdir[i][j], csi->str, 0, FL_VIEW)) - return(0); + return 0; } } bputs(text[Scanned]); csi->logic = LOGIC_FALSE; bputs(text[FileNotFound]); - return(0); + return 0; case CS_FILE_LIST: /* List files in current dir */ - if (!usrlibs) return(0); + if (!usrlibs) return 0; csi->logic = LOGIC_FALSE; if (!getfiles(&cfg, usrdir[curlib][curdir[curlib]])) { bputs(text[EmptyDir]); - return(0); + return 0; } s = listfiles(usrdir[curlib][curdir[curlib]], csi->str, 0, 0); if (s > 1) { bprintf(text[NFilesListed], s); } csi->logic = !s; - return(0); + return 0; case CS_FILE_LIST_EXTENDED: /* Extended Information on files */ - if (!usrlibs) return(0); + if (!usrlibs) return 0; if (!listfileinfo(usrdir[curlib][curdir[curlib]], csi->str, FI_INFO) && strcmp(csi->str, ALLFILES) != 0) { bputs(text[SearchingAllDirs]); @@ -448,7 +448,7 @@ int sbbs_t::exec_file(csi_t *csi) if (i != curdir[curlib] && (s = listfileinfo(usrdir[curlib][i] , csi->str, FI_INFO)) != 0) if (s == -1 || (!strchr(csi->str, '?') && !strchr(csi->str, '*'))) - return(0); + return 0; } bputs(text[Scanned]); bputs(text[SearchingAllLibs]); @@ -462,44 +462,44 @@ int sbbs_t::exec_file(csi_t *csi) } if ((s = listfileinfo(usrdir[i][j], csi->str, FI_INFO)) != 0) if (s == -1 || (!strchr(csi->str, '?') && !strchr(csi->str, '*'))) - return(0); + return 0; } } bputs(text[Scanned]); } - return(0); + return 0; case CS_FILE_FIND_TEXT: /* Find text in descriptions */ scandirs(FL_FIND); - return(0); + return 0; case CS_FILE_FIND_TEXT_ALL: /* Find text in descriptions */ scanalldirs(FL_FIND); - return(0); + return 0; case CS_FILE_FIND_NAME: /* Find text in descriptions */ scandirs(FL_NO_HDR); - return(0); + return 0; case CS_FILE_FIND_NAME_ALL: /* Find text in descriptions */ scanalldirs(FL_NO_HDR); - return(0); + return 0; case CS_FILE_BATCH_SECTION: batchmenu(); - return(0); + return 0; case CS_FILE_TEMP_SECTION: temp_xfer(); - return(0); + return 0; case CS_FILE_PTRS_CFG: csi->logic = !inputnstime(&ns_time); - return(0); + return 0; case CS_FILE_NEW_SCAN: scandirs(FL_ULTIME); - return(0); + return 0; case CS_FILE_NEW_SCAN_ALL: scanalldirs(FL_ULTIME); - return(0); + return 0; case CS_FILE_REMOVE: - if (!usrlibs) return(0); + if (!usrlibs) return 0; if (useron.rest & FLAG('R')) { bputs(text[R_RemoveFiles]); - return(0); + return 0; } if (!listfileinfo(usrdir[curlib][curdir[curlib]], csi->str, FI_REMOVE) && strcmp(csi->str, ALLFILES) != 0) { @@ -507,7 +507,7 @@ int sbbs_t::exec_file(csi_t *csi) && cfg.user_dir != usrdir[curlib][curdir[curlib]]) if ((s = listfileinfo(cfg.user_dir, csi->str, FI_REMOVE)) != 0) if (s == -1 || (!strchr(csi->str, '?') && !strchr(csi->str, '*'))) - return(0); + return 0; bputs(text[SearchingAllDirs]); for (i = 0; i < usrdirs[curlib]; i++) { if (msgabort()) { @@ -518,7 +518,7 @@ int sbbs_t::exec_file(csi_t *csi) if (i != curdir[curlib] && i != cfg.user_dir && (s = listfileinfo(usrdir[curlib][i], csi->str, FI_REMOVE)) != 0) if (s == -1 || (!strchr(csi->str, '?') && !strchr(csi->str, '*'))) - return(0); + return 0; } bputs(text[Scanned]); bputs(text[SearchingAllLibs]); @@ -532,14 +532,14 @@ int sbbs_t::exec_file(csi_t *csi) } if ((s = listfileinfo(usrdir[i][j], csi->str, FI_REMOVE)) != 0) if (s == -1 || (!strchr(csi->str, '?') && !strchr(csi->str, '*'))) - return(0); + return 0; } } bputs(text[Scanned]); } - return(0); + return 0; } errormsg(WHERE, ERR_CHK, "shell function", *(csi->ip - 1)); - return(0); + return 0; } diff --git a/src/sbbs3/execfunc.cpp b/src/sbbs3/execfunc.cpp index 199b7c9ea0b0f394fc093ee19df1838005f2a922..ee5a8df69854ca239232e4a5e844f1f1ee5b934c 100644 --- a/src/sbbs3/execfunc.cpp +++ b/src/sbbs3/execfunc.cpp @@ -37,48 +37,48 @@ int sbbs_t::exec_function(csi_t *csi) case CS_PRINTFILE_STR: printfile(csi->str, P_NOATCODES); - return(0); + return 0; /********************************/ /* General Main Menu Type Stuff */ /********************************/ case CS_AUTO_MESSAGE: automsg(); - return(0); + return 0; case CS_MINUTE_BANK: time_bank(); - return(0); + return 0; case CS_CHAT_SECTION: chatsection(); - return(0); + return 0; case CS_USER_DEFAULTS: maindflts(&useron); if (!(useron.rest & FLAG('G'))) /* not guest */ getuseron(WHERE); - return(0); + return 0; case CS_TEXT_FILE_SECTION: text_sec(); - return(0); + return 0; case CS_INFO_SYSTEM: /* System information */ sys_info(); - return(0); + return 0; case CS_INFO_SUBBOARD: /* Sub-board information */ - if (!usrgrps) return(0); + if (!usrgrps) return 0; subinfo(usrsub[curgrp][cursub[curgrp]]); - return(0); + return 0; case CS_INFO_DIRECTORY: /* Sub-board information */ - if (!usrlibs) return(0); + if (!usrlibs) return 0; dirinfo(usrdir[curlib][curdir[curlib]]); - return(0); + return 0; case CS_INFO_VERSION: /* Version */ ver(); - return(0); + return 0; case CS_INFO_USER: /* User's statistics */ user_info(); - return(0); + return 0; case CS_INFO_XFER_POLICY: xfer_policy(); - return(0); + return 0; case CS_XTRN_EXEC: csi->logic = LOGIC_TRUE; for (i = 0; i < cfg.total_xtrns; i++) @@ -88,10 +88,10 @@ int sbbs_t::exec_function(csi_t *csi) exec_xtrn(i); else csi->logic = LOGIC_FALSE; - return(0); + return 0; case CS_XTRN_SECTION: xtrn_sec(); - return(0); + return 0; case CS_LOGOFF: if (text[LogOffQ][0] == 0 || !noyes(text[LogOffQ])) { if (cfg.logoff_mod[0]) @@ -101,51 +101,51 @@ int sbbs_t::exec_function(csi_t *csi) sync(); hangup(); } - return(0); + return 0; case CS_LOGOFF_FAST: sync(); hangup(); - return(0); + return 0; case CS_NODELIST_ALL: nodelist(); - return(0); + return 0; case CS_NODELIST_USERS: whos_online(true); - return(0); + return 0; case CS_USERLIST_SUB: userlist(UL_SUB); - return(0); + return 0; case CS_USERLIST_DIR: userlist(UL_DIR); - return(0); + return 0; case CS_USERLIST_ALL: userlist(UL_ALL); - return(0); + return 0; case CS_USERLIST_LOGONS: logonlist(); - return(0); + return 0; case CS_PAGE_SYSOP: csi->logic = sysop_page() ? LOGIC_TRUE:LOGIC_FALSE; - return(0); + return 0; case CS_PAGE_GURU: csi->logic = guru_page() ? LOGIC_TRUE:LOGIC_FALSE; - return(0); + return 0; case CS_SPY: csi->logic = spy(atoi(csi->str)) ? LOGIC_TRUE:LOGIC_FALSE; - return(0); + return 0; case CS_PRIVATE_CHAT: privchat(); - return(0); + return 0; case CS_PRIVATE_MESSAGE: nodemsg(); - return(0); + return 0; /*******************/ /* Sysop Functions */ /*******************/ case CS_USER_EDIT: useredit(csi->str[0] ? finduser(csi->str) : 0); - return(0); + return 0; /******************/ @@ -154,13 +154,13 @@ int sbbs_t::exec_function(csi_t *csi) case CS_MAIL_READ: /* Read E-mail */ readmail(useron.number, MAIL_YOUR); - return(0); + return 0; case CS_MAIL_READ_SENT: /* Kill/read sent mail */ readmail(useron.number, MAIL_SENT); - return(0); + return 0; case CS_MAIL_READ_ALL: readmail(useron.number, MAIL_ALL); - return(0); + return 0; case CS_MAIL_SEND: /* Send E-mail */ if (strchr(csi->str, '@')) { i = 1; @@ -170,12 +170,12 @@ int sbbs_t::exec_function(csi_t *csi) || (cfg.msg_misc & MM_REALNAME && (i = finduserstr(0, USER_NAME, csi->str)) != 0)) email(i); csi->logic = !i; - return(0); + return 0; case CS_MAIL_SEND_FEEDBACK: /* Feedback */ if ((i = finduser(csi->str)) != 0) email(i, text[ReFeedback]); csi->logic = !i; - return(0); + return 0; case CS_MAIL_SEND_NETMAIL: case CS_MAIL_SEND_NETFILE: { @@ -186,7 +186,7 @@ int sbbs_t::exec_function(csi_t *csi) csi->logic = LOGIC_TRUE; } } - return(0); + return 0; } case CS_MAIL_SEND_FILE: /* Upload Attached File to E-mail */ if (strchr(csi->str, '@')) { @@ -197,7 +197,7 @@ int sbbs_t::exec_function(csi_t *csi) || (cfg.msg_misc & MM_REALNAME && (i = finduserstr(0, USER_NAME, csi->str)) != 0)) email(i, NULL, NULL, WM_FILE); csi->logic = !i; - return(0); + return 0; case CS_MAIL_SEND_BULK: if (csi->str[0]) p = arstr(NULL, csi->str, &cfg, NULL); @@ -205,46 +205,46 @@ int sbbs_t::exec_function(csi_t *csi) p = NULL; bulkmail(p); free(p); - return(0); + return 0; case CS_INC_MAIN_CMDS: main_cmds++; - return(0); + return 0; case CS_INC_FILE_CMDS: xfer_cmds++; - return(0); + return 0; case CS_SYSTEM_LOG: /* System log */ if (!chksyspass()) - return(0); + return 0; if (localtime_r(&now, &tm) == NULL) - return(0); + return 0; snprintf(str, sizeof str, "%slogs/%2.2d%2.2d%2.2d.log", cfg.logs_dir , tm.tm_mon + 1, tm.tm_mday, TM_YEAR(tm.tm_year)); printfile(str, 0); - return(0); + return 0; case CS_SYSTEM_YLOG: /* Yesterday's log */ if (!chksyspass()) - return(0); + return 0; now -= (ulong)60L * 24L * 60L; if (localtime_r(&now, &tm) == NULL) - return(0); + return 0; snprintf(str, sizeof str, "%slogs/%2.2d%2.2d%2.2d.log", cfg.logs_dir , tm.tm_mon + 1, tm.tm_mday, TM_YEAR(tm.tm_year)); printfile(str, 0); - return(0); + return 0; case CS_SYSTEM_STATS: /* System Statistics */ sys_stats(); - return(0); + return 0; case CS_NODE_STATS: /* Node Statistics */ node_stats(atoi(csi->str)); - return(0); + return 0; case CS_CHANGE_USER: /* Change to another user */ change_user(); - return(0); + return 0; case CS_SHOW_MEM: - return(0); + return 0; case CS_ERROR_LOG: snprintf(str, sizeof str, "%serror.log", cfg.logs_dir); if (fexist(str)) { @@ -271,26 +271,26 @@ int sbbs_t::exec_function(csi_t *csi) } } } - return(0); + return 0; case CS_ANSI_CAPTURE: /* Capture ANSI codes */ sys_status ^= SS_ANSCAP; bprintf(text[ANSICaptureIsNow] , sys_status & SS_ANSCAP ? text[On] : text[Off]); - return(0); + return 0; case CS_LIST_TEXT_FILE: /* View ASCII/ANSI/Ctrl-A file */ if (!chksyspass()) - return(0); + return 0; bputs(text[Filename]); if (getstr(str, 60, K_TRIM)) printfile(str, 0); - return(0); + return 0; case CS_EDIT_TEXT_FILE: /* Edit ASCII/Ctrl-A file */ if (!chksyspass()) - return(0); + return 0; bputs(text[Filename]); if (getstr(str, 60, K_TRIM)) editfile(str); - return(0); + return 0; case CS_GURU_LOG: snprintf(str, sizeof str, "%sguru.log", cfg.logs_dir); if (fexist(str)) { @@ -299,10 +299,10 @@ int sbbs_t::exec_function(csi_t *csi) if (text[DeleteGuruLogQ][0] && !noyes(text[DeleteGuruLogQ])) remove(str); } - return(0); + return 0; case CS_FILE_SET_ALT_PATH: bprintf("Alternate Upload Paths are Unsupported\r\n"); - return(0); + return 0; case CS_FILE_RESORT_DIRECTORY: lprintf(LOG_WARNING, "deprecated function: RESORT_DIRECTORY"); return 0; @@ -310,57 +310,57 @@ int sbbs_t::exec_function(csi_t *csi) case CS_FILE_GET: if (!fexist(csi->str)) { bputs(text[FileNotFound]); - return(0); + return 0; } if (!chksyspass()) - return(0); + return 0; // fall-through case CS_FILE_SEND: csi->logic = sendfile(csi->str) ? LOGIC_TRUE:LOGIC_FALSE; - return(0); + return 0; case CS_FILE_PUT: csi->logic = LOGIC_FALSE; if (!chksyspass()) - return(0); + return 0; // fall-through case CS_FILE_RECEIVE: csi->logic = recvfile(csi->str) ? LOGIC_TRUE:LOGIC_FALSE; - return(0); + return 0; case CS_FILE_UPLOAD_BULK: - if (!usrlibs) return(0); + if (!usrlibs) return 0; if (!stricmp(csi->str, "ALL")) { /* all libraries */ for (i = 0; i < usrlibs; i++) for (j = 0; j < usrdirs[i]; j++) { if (cfg.lib[i]->offline_dir == usrdir[i][j]) continue; - if (bulkupload(usrdir[i][j])) return(0); + if (bulkupload(usrdir[i][j])) return 0; } - return(0); + return 0; } if (!stricmp(csi->str, "LIB")) { /* current library */ for (i = 0; i < usrdirs[curlib]; i++) { if (cfg.lib[usrlib[curlib]]->offline_dir == usrdir[curlib][i]) continue; - if (bulkupload(usrdir[curlib][i])) return(0); + if (bulkupload(usrdir[curlib][i])) return 0; } - return(0); + return 0; } bulkupload(usrdir[curlib][curdir[curlib]]); /* current dir */ - return(0); + return 0; case CS_FILE_FIND_OLD: case CS_FILE_FIND_OPEN: case CS_FILE_FIND_OFFLINE: case CS_FILE_FIND_OLD_UPLOADS: - if (!usrlibs) return(0); + if (!usrlibs) return 0; if (!getfilespec(str)) - return(0); + return 0; k = 0; bputs("\r\nSearching "); if (!stricmp(csi->str, "ALL")) @@ -392,7 +392,7 @@ int sbbs_t::exec_function(csi_t *csi) if (cfg.lib[i]->offline_dir == usrdir[i][j]) continue; if ((s = listfileinfo(usrdir[i][j], str, (char)l)) == -1) - return(0); + return 0; else k += s; } } @@ -401,32 +401,32 @@ int sbbs_t::exec_function(csi_t *csi) if (cfg.lib[usrlib[curlib]]->offline_dir == usrdir[curlib][i]) continue; if ((s = listfileinfo(usrdir[curlib][i], str, (char)l)) == -1) - return(0); + return 0; else k += s; } } else { s = listfileinfo(usrdir[curlib][curdir[curlib]], str, (char)l); if (s == -1) - return(0); + return 0; k = s; } if (k > 1) { bprintf(text[NFilesListed], k); } - return(0); + return 0; } if (*(csi->ip - 1) >= CS_MSG_SET_AREA && *(csi->ip - 1) <= CS_MSG_UNUSED1) { csi->ip--; - return(exec_msg(csi)); + return exec_msg(csi); } if (*(csi->ip - 1) >= CS_FILE_SET_AREA && *(csi->ip - 1) <= CS_FILE_RECEIVE) { csi->ip--; - return(exec_file(csi)); + return exec_file(csi); } errormsg(WHERE, ERR_CHK, "shell function", *(csi->ip - 1)); - return(0); + return 0; } diff --git a/src/sbbs3/execmisc.cpp b/src/sbbs3/execmisc.cpp index 22819c8dbc2e21c84901174a64d43e84ae0b049e..366fc4fc19851030e66e6f5758cfc5fab9ab5b41 100644 --- a/src/sbbs3/execmisc.cpp +++ b/src/sbbs3/execmisc.cpp @@ -75,7 +75,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) putmsg(cmdstr(*pp, path, csi->str, buf) , P_SAVEATR | P_NOABORT | P_NOATCODES); csi->ip += 4; - return(0); + return 0; case VAR_PRINTF: case VAR_PRINTF_LOCAL: op = *(csi->ip - 1); @@ -86,7 +86,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) lputs(LOG_INFO, cmdstr(p, path, csi->str, buf)); } free(p); - return(0); + return 0; case SHOW_VARS: bprintf("shell str=(%p) %s\r\n" , csi->str, csi->str); @@ -110,11 +110,11 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) , i, global_int_var_name[i] , global_int_var[i] , global_int_var[i]); - return(0); + return 0; case DEFINE_STR_VAR: if (getstrvar(csi, *(int32_t *)csi->ip)) { csi->ip += 4; - return(0); + return 0; } csi->str_vars++; csi->str_var = (char **)realloc_or_free(csi->str_var @@ -140,11 +140,11 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->str_var[csi->str_vars - 1] = 0; } csi->ip += 4; /* Skip variable name */ - return(0); + return 0; case DEFINE_INT_VAR: if (getintvar(csi, *(int32_t *)csi->ip)) { csi->ip += 4; - return(0); + return 0; } csi->int_vars++; csi->int_var = (int32_t *)realloc_or_free(csi->int_var @@ -170,11 +170,11 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->int_var[csi->int_vars - 1] = 0; } csi->ip += 4; /* Skip variable name */ - return(0); + return 0; case DEFINE_GLOBAL_STR_VAR: if (getstrvar(csi, *(int32_t *)csi->ip)) { csi->ip += 4; - return(0); + return 0; } global_str_vars++; global_str_var = (char **)realloc_or_free(global_str_var @@ -201,11 +201,11 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) global_str_var[global_str_vars - 1] = 0; } csi->ip += 4; /* Skip variable name */ - return(0); + return 0; case DEFINE_GLOBAL_INT_VAR: if (getintvar(csi, *(int32_t *)csi->ip)) { csi->ip += 4; - return(0); + return 0; } global_int_vars++; global_int_var = (int32_t *)realloc_or_free(global_int_var @@ -232,7 +232,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) global_int_var[global_int_vars - 1] = 0; } csi->ip += 4; /* Skip variable name */ - return(0); + return 0; case SET_STR_VAR: pp = getstrvar(csi, *(int32_t *)csi->ip); @@ -241,14 +241,14 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) *pp = copystrvar(csi, *pp , cmdstr((char *)csi->ip, path, csi->str, buf)); while (*(csi->ip++)); /* Find NULL */ - return(0); + return 0; case SET_INT_VAR: lp = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; /* Skip variable name */ if (lp) *lp = *(int32_t *)csi->ip; csi->ip += 4; /* Skip value */ - return(0); + return 0; case COMPARE_STR_VAR: pp = getstrvar(csi, *(int32_t *)csi->ip); csi->ip += 4; /* Skip variable name */ @@ -262,7 +262,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->logic = LOGIC_FALSE; } while (*(csi->ip++)); /* Find NULL */ - return(0); + return 0; case STRSTR_VAR: pp = getstrvar(csi, *(int32_t *)csi->ip); csi->ip += 4; /* Skip variable name */ @@ -272,7 +272,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) else csi->logic = LOGIC_FALSE; while (*(csi->ip++)); /* Find NULL */ - return(0); + return 0; case STRNCMP_VAR: i = *csi->ip++; pp = getstrvar(csi, *(int32_t *)csi->ip); @@ -283,7 +283,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) else csi->logic = LOGIC_FALSE; while (*(csi->ip++)); /* Find NULL */ - return(0); + return 0; case STRNCMP_VARS: i = *csi->ip++; pp1 = getstrvar(csi, *(int32_t *)csi->ip); @@ -294,7 +294,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->logic = strnicmp(*pp1, *pp2, i); else csi->logic = LOGIC_FALSE; - return(0); + return 0; case STRSTR_VARS: pp1 = getstrvar(csi, *(int32_t *)csi->ip); csi->ip += 4; /* Skip variable name */ @@ -304,7 +304,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->logic = LOGIC_TRUE; else csi->logic = LOGIC_FALSE; - return(0); + return 0; case COMPARE_INT_VAR: lp = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; /* Skip variable name */ @@ -312,7 +312,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->ip += 4; /* Skip static value */ if (!lp) { /* Unknown variable */ csi->logic = LOGIC_FALSE; - return(0); + return 0; } if (*lp > l) csi->logic = LOGIC_GREATER; @@ -320,7 +320,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->logic = LOGIC_LESS; else csi->logic = LOGIC_EQUAL; - return(0); + return 0; case COMPARE_VARS: lp1 = lp2 = 0; pp1 = getstrvar(csi, *(int32_t *)csi->ip); @@ -338,7 +338,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->logic = LOGIC_TRUE; else csi->logic = LOGIC_FALSE; - return(0); + return 0; } if (pp1) { /* ASCII */ @@ -348,7 +348,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) } else csi->logic = stricmp(*pp1, *pp2); - return(0); + return 0; } /* Binary */ @@ -360,7 +360,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->logic = LOGIC_LESS; else csi->logic = LOGIC_EQUAL; - return(0); + return 0; } if (*lp1 > *lp2) csi->logic = LOGIC_GREATER; @@ -368,7 +368,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->logic = LOGIC_LESS; else csi->logic = LOGIC_EQUAL; - return(0); + return 0; case COPY_VAR: lp1 = lp2 = 0; pp1 = getstrvar(csi, *(int32_t *)csi->ip); @@ -383,7 +383,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) if ((!pp1 && !lp1) || ((!pp2 || !*pp2) && !lp2)) { csi->logic = LOGIC_FALSE; - return(0); + return 0; } csi->logic = LOGIC_TRUE; @@ -393,13 +393,13 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) else strcpy(tmp, *pp2); *pp1 = copystrvar(csi, *pp1, tmp); - return(0); + return 0; } if (!lp2) *lp1 = strtol(*pp2, 0, 0); else *lp1 = *lp2; - return(0); + return 0; case SWAP_VARS: lp1 = lp2 = 0; pp1 = getstrvar(csi, *(int32_t *)csi->ip); @@ -414,7 +414,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) if (((!pp1 || !*pp1) && !lp1) || ((!pp2 || !*pp2) && !lp2)) { csi->logic = LOGIC_FALSE; - return(0); + return 0; } csi->logic = LOGIC_TRUE; @@ -437,7 +437,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) *pp1 = *pp2; *pp2 = p; } - return(0); + return 0; } /* Binary */ @@ -458,7 +458,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) *lp1 = *lp2; *lp2 = l; } - return(0); + return 0; case CAT_STR_VAR: pp = getstrvar(csi, *(int32_t *)csi->ip); csi->ip += 4; /* Skip variable name */ @@ -476,7 +476,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) } if (pp && *pp) strcat(*pp, tmp); - return(0); + return 0; case CAT_STR_VARS: pp1 = getstrvar(csi, *(int32_t *)csi->ip); csi->ip += 4; /* Skip dest variable name */ @@ -488,7 +488,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) lp = getintvar(csi, *(int32_t *)(csi->ip - 4)); if (lp == NULL) { csi->logic = LOGIC_FALSE; - return(0); + return 0; } pp = pp1; tmp[0] = (uchar) * lp; @@ -505,12 +505,12 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) } if (pp && *pp) strcat(*pp, tmp); - return(0); + return 0; } if (!pp1 || !pp2 || !*pp2) { csi->logic = LOGIC_FALSE; - return(0); + return 0; } csi->logic = LOGIC_TRUE; if (*pp1) @@ -525,7 +525,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) } if (*pp1 != NULL) strcat(*pp1, *pp2); - return(0); + return 0; case FORMAT_STR_VAR: pp = getstrvar(csi, *(int32_t *)csi->ip); csi->ip += 4; /* Skip variable name */ @@ -534,7 +534,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) if (pp) *pp = copystrvar(csi, *pp, str); free(p); - return(0); + return 0; case FORMAT_TIME_STR: pp = getstrvar(csi, *(int32_t *)csi->ip); csi->ip += 4; /* Skip variable name */ @@ -550,7 +550,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) *pp = copystrvar(csi, *pp, buf); } } - return(0); + return 0; case TIME_STR: pp = getstrvar(csi, *(int32_t *)csi->ip); csi->ip += 4; /* Skip str variable name */ @@ -560,7 +560,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) strcpy(str, timestr(*lp)); *pp = copystrvar(csi, *pp, str); } - return(0); + return 0; case DATE_STR: pp = getstrvar(csi, *(int32_t *)csi->ip); csi->ip += 4; /* Skip str variable name */ @@ -569,7 +569,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) if (pp && lp) { *pp = copystrvar(csi, *pp, datestr(*lp, str)); } - return(0); + return 0; case SECOND_STR: pp = getstrvar(csi, *(int32_t *)csi->ip); csi->ip += 4; /* Skip str variable name */ @@ -579,31 +579,31 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) sectostr(*lp, str); *pp = copystrvar(csi, *pp, str); } - return(0); + return 0; case STRUPR_VAR: pp = getstrvar(csi, *(int32_t *)csi->ip); csi->ip += 4; if (pp && *pp) strupr(*pp); - return(0); + return 0; case STRLWR_VAR: pp = getstrvar(csi, *(int32_t *)csi->ip); csi->ip += 4; if (pp && *pp) strlwr(*pp); - return(0); + return 0; case TRUNCSP_STR_VAR: pp = getstrvar(csi, *(int32_t *)csi->ip); csi->ip += 4; if (pp && *pp) truncsp(*pp); - return(0); + return 0; case STRIP_CTRL_STR_VAR: pp = getstrvar(csi, *(int32_t *)csi->ip); csi->ip += 4; if (pp && *pp) strip_ctrl(*pp, *pp); - return(0); + return 0; case ADD_INT_VAR: case SUB_INT_VAR: @@ -620,7 +620,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) l = *(int32_t *)csi->ip; csi->ip += 4; if (!lp) - return(0); + return 0; switch (i) { case ADD_INT_VAR: *lp += l; @@ -650,7 +650,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) *lp ^= l; break; } - return(0); + return 0; case COMPARE_ANY_BITS: case COMPARE_ALL_BITS: i = *(csi->ip - 1); @@ -660,7 +660,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->ip += 4; csi->logic = LOGIC_FALSE; if (!lp) - return(0); + return 0; if (i == COMPARE_ANY_BITS) { if (((*lp) & l) != 0) @@ -669,7 +669,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) if (((*lp) & l) == l) csi->logic = LOGIC_TRUE; } - return(0); + return 0; case ADD_INT_VARS: case SUB_INT_VARS: case MUL_INT_VARS: @@ -686,14 +686,14 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) if (!lp2) { pp = getstrvar(csi, *(int32_t *)csi->ip); if (!pp || !*pp) - return(0); + return 0; l = strtol(*pp, 0, 0); } else l = *lp2; csi->ip += 4; if (!lp1) - return(0); + return 0; switch (i) { case ADD_INT_VARS: *lp1 += l; @@ -723,7 +723,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) *lp1 ^= l; break; } - return(0); + return 0; case RANDOM_INT_VAR: lp = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; @@ -731,13 +731,13 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->ip += 4; if (lp) *lp = sbbs_random(l); - return(0); + return 0; case TIME_INT_VAR: lp = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; if (lp) *lp = time32(NULL); - return(0); + return 0; case DATE_STR_TO_INT: lp = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; @@ -745,7 +745,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->ip += 4; if (lp && pp && *pp) *lp = (int32_t)dstrtounix(cfg.sys_date_fmt, *pp); - return(0); + return 0; case STRLEN_INT_VAR: lp = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; @@ -757,7 +757,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) else *lp = 0; } - return(0); + return 0; case CRC16_TO_INT: lp = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; @@ -769,7 +769,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) else *lp = 0; } - return(0); + return 0; case CRC32_TO_INT: lp = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; @@ -781,7 +781,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) else *lp = 0; } - return(0); + return 0; case CHKSUM_TO_INT: lp = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; @@ -795,7 +795,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) *lp += (uchar) * ((*pp) + (i++)); } } - return(0); + return 0; case FLENGTH_TO_INT: lp = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; @@ -807,7 +807,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) else *lp = 0; } - return(0); + return 0; case FTIME_TO_INT: lp = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; @@ -819,7 +819,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) else *lp = 0; } - return(0); + return 0; case CHARVAL_TO_INT: case COPY_FIRST_CHAR: // duplicate functionality - doh! lp = getintvar(csi, *(int32_t *)csi->ip); @@ -832,7 +832,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) else *lp = 0; } - return(0); + return 0; case GETSTR_VAR: case GETLINE_VAR: case GETNAME_VAR: @@ -867,12 +867,12 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) getstr(buf, i, 0); } if (sys_status & SS_ABORT) - return(0); + return 0; if (pp) { *pp = copystrvar(csi, *pp, buf); csi->logic = LOGIC_TRUE; } - return(0); + return 0; case GETNUM_VAR: pp = getstrvar(csi, *(int32_t *)csi->ip); if (!pp) @@ -883,7 +883,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->logic = LOGIC_FALSE; l = getnum(i); if (!pp && !lp) - return(0); + return 0; if (pp) { if (l <= 0) str[0] = 0; @@ -891,23 +891,23 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) ultoa(l, str, 10); *pp = copystrvar(csi, *pp, str); csi->logic = LOGIC_TRUE; - return(0); + return 0; } if (lp) { *lp = l; csi->logic = LOGIC_TRUE; } - return(0); + return 0; case SHIFT_STR_VAR: pp = getstrvar(csi, *(int32_t *)csi->ip); csi->ip += 4; i = *(csi->ip++); if (!pp || !*pp) - return(0); + return 0; if ((int)strlen(*pp) >= i) memmove(*pp, *pp + i, strlen(*pp) + 1); - return(0); + return 0; case SHIFT_TO_FIRST_CHAR: case SHIFT_TO_LAST_CHAR: @@ -917,18 +917,18 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) ch = *(csi->ip++); csi->logic = LOGIC_FALSE; if (!pp || !*pp) - return(0); + return 0; if (i == SHIFT_TO_FIRST_CHAR) p = strchr(*pp, ch); else /* _TO_LAST_CHAR */ p = strrchr(*pp, ch); if (p == NULL) - return(0); + return 0; csi->logic = LOGIC_TRUE; i = p - *pp; if (i > 0) memmove(*pp, *pp + i, strlen(p) + 1); - return(0); + return 0; case CHKFILE_VAR: pp = getstrvar(csi, *(int32_t *)csi->ip); @@ -937,7 +937,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->logic = LOGIC_TRUE; else csi->logic = LOGIC_FALSE; - return(0); + return 0; case PRINTFILE_VAR_MODE: pp = getstrvar(csi, *(int32_t *)csi->ip); csi->ip += 4; @@ -945,7 +945,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->ip += 2; if (pp && *pp) printfile(*pp, i); - return(0); + return 0; case PRINTTAIL_VAR_MODE: pp = getstrvar(csi, *(int32_t *)csi->ip); csi->ip += 4; @@ -955,7 +955,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->ip++; if (pp && *pp) printtail(*pp, j, i); - return(0); + return 0; case TELNET_GATE_VAR: l = *(uint32_t *)(csi->ip); // Mode csi->ip += 4; @@ -963,14 +963,14 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->ip += 4; if (pp && *pp) telnet_gate(*pp, l); - return(0); + return 0; case TELNET_GATE_STR: l = *(uint32_t *)(csi->ip); // Mode csi->ip += 4; strcpy(str, (char *)csi->ip); while (*(csi->ip++)); /* Find NULL */ telnet_gate(str, l); - return(0); + return 0; case COPY_CHAR: pp = getstrvar(csi, *(int32_t *)csi->ip); if (pp == NULL) @@ -983,7 +983,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) snprintf(tmp, sizeof tmp, "%c", csi->cmd); *pp = copystrvar(csi, *pp, tmp); } - return(0); + return 0; case COMPARE_FIRST_CHAR: pp = getstrvar(csi, *(int32_t *)csi->ip); csi->ip += 4; @@ -998,7 +998,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) else csi->logic = LOGIC_LESS; } - return(0); + return 0; case SEND_FILE_VIA: case RECEIVE_FILE_VIA: @@ -1012,7 +1012,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) if (protocol(cfg.prot[i], j == SEND_FILE_VIA ? XFER_DOWNLOAD : XFER_UPLOAD , str, str, true) == 0) csi->logic = LOGIC_TRUE; - return(0); + return 0; case SEND_FILE_VIA_VAR: case RECEIVE_FILE_VIA_VAR: j = *(csi->ip - 1); @@ -1022,13 +1022,13 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) i = protnum(ch, j == SEND_FILE_VIA_VAR ? XFER_DOWNLOAD : XFER_UPLOAD); csi->logic = LOGIC_FALSE; if (!pp || !(*pp)) - return(0); + return 0; if (i < cfg.total_prots) if (protocol(cfg.prot[i] , j == SEND_FILE_VIA_VAR ? XFER_DOWNLOAD : XFER_UPLOAD , *pp, *pp, true) == 0) csi->logic = LOGIC_TRUE; - return(0); + return 0; case MATCHUSER: lp = getintvar(csi, *(int32_t *)csi->ip); @@ -1041,11 +1041,11 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) else *lp = 0; } - return(0); + return 0; default: errormsg(WHERE, ERR_CHK, "var sub-instruction", *(csi->ip - 1)); - return(0); + return 0; } case CS_FIO_FUNCTION: @@ -1065,11 +1065,11 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) pp = getstrvar(csi, *(int32_t *)csi->ip); csi->ip += 4; if (!pp || !*pp) - return(0); + return 0; strcpy(str, *pp); } if (csi->files >= MAX_FOPENS) - return(0); + return 0; if (lp) { /* Access flags are not cross-platform, so convert */ i = 0; @@ -1093,7 +1093,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->logic = LOGIC_TRUE; } } - return(0); + return 0; case FIO_CLOSE: lp = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; @@ -1105,7 +1105,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) } else csi->logic = LOGIC_FALSE; - return(0); + return 0; case FIO_FLUSH: lp = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; @@ -1113,7 +1113,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->logic = fflush(csi->file[*lp]); else csi->logic = LOGIC_FALSE; - return(0); + return 0; case FIO_READ: case FIO_READ_VAR: lp1 = getintvar(csi, *(int32_t *)csi->ip); /* Handle */ @@ -1131,13 +1131,13 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) vp = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; if (!vp) - return(0); + return 0; i = *(short *)vp; } if (i > (int)sizeof(buf) - 1) i = sizeof(buf) - 1; if (!lp1 || *lp1 >= csi->files || (!pp && !lp2)) - return(0); + return 0; if (pp) { if (i < 1) { if (*pp && **pp) @@ -1160,7 +1160,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) if (fread(lp2, 1, i, csi->file[*lp1]) == (size_t)i) csi->logic = LOGIC_TRUE; } - return(0); + return 0; case FIO_READ_LINE: lp1 = getintvar(csi, *(int32_t *)csi->ip); /* Handle */ csi->ip += 4; @@ -1170,7 +1170,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->ip += 4; csi->logic = LOGIC_FALSE; if (!lp1 || *lp1 >= csi->files || feof(csi->file[*lp1]) || (!pp && !lp2)) - return(0); + return 0; csi->logic = LOGIC_TRUE; for (i = 0; i < (int)sizeof(buf) - 1; i++) { if (!fread(buf + i, 1, 1, csi->file[*lp1])) @@ -1189,7 +1189,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) *pp = copystrvar(csi, *pp, buf); else *lp2 = strtol(buf, 0, 0); - return(0); + return 0; case FIO_WRITE: case FIO_WRITE_VAR: lp1 = getintvar(csi, *(int32_t *)csi->ip); @@ -1207,13 +1207,13 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) vp = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; if (!vp) - return(0); + return 0; i = *(short *)vp; } if (i > (int)sizeof(buf) - 1) i = sizeof(buf) - 1; if (!lp1 || *lp1 >= csi->files || (!pp && !lp2) || (pp && !*pp)) - return(0); + return 0; if (pp) { j = strlen(*pp); if (i < 1) i = j; @@ -1232,7 +1232,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) if (fwrite(lp2, 1, i, csi->file[*lp1]) == (size_t)i) csi->logic = LOGIC_TRUE; } - return(0); + return 0; case FIO_GET_LENGTH: lp1 = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; @@ -1240,7 +1240,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->ip += 4; if (lp1 && *lp1 < csi->files && lp2) *lp2 = (uint32_t)filelength(fileno(csi->file[*lp1])); - return(0); + return 0; case FIO_GET_TIME: lp1 = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; @@ -1248,7 +1248,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->ip += 4; if (lp1 && *lp1 < csi->files && lp2) *lp2 = (int32_t)filetime(fileno(csi->file[*lp1])); - return(0); + return 0; case FIO_SET_TIME: lp1 = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; @@ -1260,7 +1260,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) setftime(fileno(csi->file[*lp1]), &ft); } #endif - return(0); + return 0; case FIO_EOF: lp = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; @@ -1268,7 +1268,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) if (lp && *lp < csi->files) if (ftell(csi->file[*lp]) >= filelength(fileno(csi->file[*lp]))) csi->logic = LOGIC_TRUE; - return(0); + return 0; case FIO_GET_POS: lp1 = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; @@ -1276,7 +1276,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->ip += 4; if (lp1 && *lp1 < csi->files && lp2) *lp2 = (uint32_t)ftell(csi->file[*lp1]); - return(0); + return 0; case FIO_SEEK: case FIO_SEEK_VAR: lp1 = getintvar(csi, *(int32_t *)csi->ip); @@ -1291,7 +1291,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->ip += 4; if (!lp2) { csi->ip += 2; - return(0); + return 0; } l = *lp2; } @@ -1300,7 +1300,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) if (lp1 && *lp1 < csi->files) if (fseek(csi->file[*lp1], l, i) != -1) csi->logic = LOGIC_TRUE; - return(0); + return 0; case FIO_LOCK: case FIO_LOCK_VAR: lp1 = getintvar(csi, *(int32_t *)csi->ip); @@ -1313,14 +1313,14 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) lp2 = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; if (!lp2) - return(0); + return 0; l = *lp2; } if (lp1 && *lp1 < csi->files) { fflush(csi->file[*lp1]); csi->logic = !lock(fileno(csi->file[*lp1]), ftell(csi->file[*lp1]), l); } - return(0); + return 0; case FIO_UNLOCK: case FIO_UNLOCK_VAR: lp1 = getintvar(csi, *(int32_t *)csi->ip); @@ -1333,14 +1333,14 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) lp2 = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; if (!lp2) - return(0); + return 0; l = *lp2; } if (lp1 && *lp1 < csi->files) { fflush(csi->file[*lp1]); csi->logic = !unlock(fileno(csi->file[*lp1]), ftell(csi->file[*lp1]), l); } - return(0); + return 0; case FIO_SET_LENGTH: case FIO_SET_LENGTH_VAR: lp1 = getintvar(csi, *(int32_t *)csi->ip); @@ -1353,12 +1353,12 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) lp2 = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; if (!lp2) - return(0); + return 0; l = *lp2; } if (lp1 && *lp1 < csi->files) csi->logic = chsize(fileno(csi->file[*lp1]), l); - return(0); + return 0; case FIO_PRINTF: lp1 = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; @@ -1368,10 +1368,10 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) fwrite(str, 1, strlen(str), csi->file[*lp1]); } free(p); - return(0); + return 0; case FIO_SET_ETX: csi->etx = *(csi->ip++); - return(0); + return 0; case REMOVE_FILE: pp = getstrvar(csi, *(int32_t *)csi->ip); csi->ip += 4; @@ -1379,7 +1379,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->logic = LOGIC_TRUE; else csi->logic = LOGIC_FALSE; - return(0); + return 0; case RENAME_FILE: case COPY_FILE: case MOVE_FILE: @@ -1401,7 +1401,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) } else csi->logic = LOGIC_FALSE; - return(0); + return 0; case GET_FILE_ATTRIB: case SET_FILE_ATTRIB: lp = getintvar(csi, *(int32_t *)csi->ip); @@ -1414,7 +1414,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) else *lp = CHMOD(*pp, (int)*lp); } - return(0); + return 0; case MAKE_DIR: case REMOVE_DIR: case CHANGE_DIR: @@ -1434,7 +1434,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) } else csi->logic = LOGIC_FALSE; - return(0); + return 0; case OPEN_DIR: lp = getintvar(csi, *(int32_t *)csi->ip); @@ -1443,7 +1443,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->ip += 4; csi->logic = LOGIC_FALSE; if (csi->dirs >= MAX_OPENDIRS) - return(0); + return 0; if (pp && *pp && lp) { dp = opendir((char *)*pp); if (dp != NULL) { @@ -1457,7 +1457,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->logic = LOGIC_TRUE; } } - return(0); + return 0; case READ_DIR: lp = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; @@ -1471,7 +1471,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) *pp = copystrvar(csi, *pp, de->d_name); } } - return(0); + return 0; case REWIND_DIR: lp = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; @@ -1480,7 +1480,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->logic = LOGIC_TRUE; } else csi->logic = LOGIC_FALSE; - return(0); + return 0; case CLOSE_DIR: lp = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; @@ -1491,15 +1491,15 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->dirs--; } else csi->logic = LOGIC_FALSE; - return(0); + return 0; default: errormsg(WHERE, ERR_CHK, "fio sub-instruction", *(csi->ip - 1)); - return(0); + return 0; } case CS_NET_FUNCTION: - return(exec_net(csi)); + return exec_net(csi); case CS_SWITCH: lp = getintvar(csi, *(int32_t *)csi->ip); @@ -1512,7 +1512,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) csi->misc |= CS_IN_SWITCH; csi->switch_val = *lp; } - return(0); + return 0; case CS_CASE: l = *(int32_t *)csi->ip; csi->ip += 4; @@ -1520,48 +1520,48 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) skipto(csi, CS_NEXTCASE); else csi->misc &= ~CS_IN_SWITCH; - return(0); + return 0; case CS_COMPARE_ARS: i = *(csi->ip++); /* Length of ARS stored as byte before ARS */ csi->logic = !chk_ar(csi->ip, &useron, &client); csi->ip += i; - return(0); + return 0; case CS_TOGGLE_USER_MISC: useron.misc ^= *(uint32_t *)csi->ip; putusermisc(useron.number, useron.misc); csi->ip += 4; - return(0); + return 0; case CS_COMPARE_USER_MISC: if ((useron.misc & *(uint32_t *)csi->ip) == *(uint32_t *)csi->ip) csi->logic = LOGIC_TRUE; else csi->logic = LOGIC_FALSE; csi->ip += 4; - return(0); + return 0; case CS_TOGGLE_USER_CHAT: useron.chat ^= *(uint32_t *)csi->ip; putuserchat(useron.number, useron.chat); csi->ip += 4; - return(0); + return 0; case CS_COMPARE_USER_CHAT: if ((useron.chat & *(uint32_t *)csi->ip) == *(uint32_t *)csi->ip) csi->logic = LOGIC_TRUE; else csi->logic = LOGIC_FALSE; csi->ip += 4; - return(0); + return 0; case CS_TOGGLE_USER_QWK: useron.qwk ^= *(uint32_t *)csi->ip; putuserqwk(useron.number, useron.qwk); csi->ip += 4; - return(0); + return 0; case CS_COMPARE_USER_QWK: if ((useron.qwk & *(uint32_t *)csi->ip) == *(uint32_t *)csi->ip) csi->logic = LOGIC_TRUE; else csi->logic = LOGIC_FALSE; csi->ip += 4; - return(0); + return 0; case CS_REPLACE_TEXT: i = *(ushort *)csi->ip; csi->ip += 2; @@ -1569,7 +1569,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) if (i >= TOTAL_TEXT) { errormsg(WHERE, ERR_CHK, "replace text #", i); while (*(csi->ip++)); /* Find NULL */ - return(0); + return 0; } if (text[i] != text_sav[i] && text[i] != nulstr) free(text[i]); @@ -1582,12 +1582,12 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) errormsg(WHERE, ERR_ALLOC, "replacement text", j); while (*(csi->ip++)); /* Find NULL */ text[i] = text_sav[i]; - return(0); + return 0; } if (j) strcpy(text[i], buf); while (*(csi->ip++)); /* Find NULL */ - return(0); + return 0; case CS_USE_INT_VAR: // Self-modifying code! pp = getstrvar(csi, *(int32_t *)csi->ip); if (pp && *pp) @@ -1604,7 +1604,7 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) if (i < 1 || csi->ip + 1 + i >= csi->cs + csi->length) { errormsg(WHERE, ERR_CHK, "offset", i); csi->ip++; - return(0); + return 0; } switch (*(csi->ip++)) { // Length case sizeof(char): @@ -1620,10 +1620,10 @@ int sbbs_t::exec_misc(csi_t* csi, const char *path) errormsg(WHERE, ERR_CHK, "length", *(csi->ip - 1)); break; } - return(0); + return 0; default: errormsg(WHERE, ERR_CHK, "shell instruction", *(csi->ip - 1)); - return(0); + return 0; } } diff --git a/src/sbbs3/execmsg.cpp b/src/sbbs3/execmsg.cpp index 3b2da39d1b613af53342469886c941cadefd636e..f0d436527fd0c52420702eafa86cb5ef56dc5992 100644 --- a/src/sbbs3/execmsg.cpp +++ b/src/sbbs3/execmsg.cpp @@ -31,7 +31,7 @@ int sbbs_t::exec_msg(csi_t *csi) case CS_MSG_SELECT_AREA: csi->logic = LOGIC_FALSE; - if (!usrgrps) return(0); + if (!usrgrps) return 0; while (online) { j = 0; if (usrgrps > 1) { @@ -53,7 +53,7 @@ int sbbs_t::exec_msg(csi_t *csi) j = getnum(usrgrps); clear_hotspots(); if ((int)j == -1) - return(0); + return 0; if (!j) j = curgrp; else @@ -81,7 +81,7 @@ int sbbs_t::exec_msg(csi_t *csi) clear_hotspots(); if ((int)i == -1) { if (usrgrps == 1) - return(0); + return 0; continue; } if (!i) @@ -91,9 +91,9 @@ int sbbs_t::exec_msg(csi_t *csi) curgrp = j; cursub[curgrp] = i; csi->logic = LOGIC_TRUE; - return(0); + return 0; } - return(0); + return 0; case CS_MSG_GET_SUB_NUM: @@ -101,7 +101,7 @@ int sbbs_t::exec_msg(csi_t *csi) i = atoi(csi->str); if (i && usrgrps && i <= usrsubs[curgrp]) cursub[curgrp] = i - 1; - return(0); + return 0; } ch = getkey(K_UPPER); @@ -112,12 +112,12 @@ int sbbs_t::exec_msg(csi_t *csi) if (!IS_DIGIT(ch) && ch != CR) { ungetkey(ch); cursub[curgrp] = (i / 10) - 1; - return(0); + return 0; } outchar(ch); if (ch == CR) { cursub[curgrp] = (i / 10) - 1; - return(0); + return 0; } logch(ch, 0); i += ch & 0xf; @@ -127,12 +127,12 @@ int sbbs_t::exec_msg(csi_t *csi) if (!IS_DIGIT(ch) && ch != CR) { ungetkey(ch); cursub[curgrp] = (i / 10) - 1; - return(0); + return 0; } outchar(ch); if (ch == CR) { cursub[curgrp] = (i / 10) - 1; - return(0); + return 0; } logch(ch, 0); i += ch & 0xf; @@ -141,11 +141,11 @@ int sbbs_t::exec_msg(csi_t *csi) cursub[curgrp] = i - 1; if (keybuf_level() && (ch = getkey(K_UPPER)) != '\r') ungetkey(ch, /* insert: */ true); - return(0); + return 0; } if ((ch & 0xf) <= usrsubs[curgrp] && (ch & 0xf) && usrgrps) cursub[curgrp] = (ch & 0xf) - 1; - return(0); + return 0; case CS_MSG_GET_GRP_NUM: @@ -153,7 +153,7 @@ int sbbs_t::exec_msg(csi_t *csi) i = atoi(csi->str); if (i && i <= usrgrps) curgrp = i - 1; - return(0); + return 0; } ch = getkey(K_UPPER); @@ -164,12 +164,12 @@ int sbbs_t::exec_msg(csi_t *csi) if (!IS_DIGIT(ch) && ch != CR) { ungetkey(ch); curgrp = (i / 10) - 1; - return(0); + return 0; } outchar(ch); if (ch == CR) { curgrp = (i / 10) - 1; - return(0); + return 0; } logch(ch, 0); i += ch & 0xf; @@ -177,13 +177,13 @@ int sbbs_t::exec_msg(csi_t *csi) curgrp = i - 1; if (keybuf_level() && (ch = getkey(K_UPPER)) != '\r') ungetkey(ch, /* insert: */ true); - return(0); + return 0; } if ((ch & 0xf) <= usrgrps && (ch & 0xf)) curgrp = (ch & 0xf) - 1; if (keybuf_level() && (ch = getkey(K_UPPER)) != '\r') ungetkey(ch, /* insert: */ true); - return(0); + return 0; case CS_MSG_SET_GROUP: csi->logic = LOGIC_TRUE; @@ -194,12 +194,12 @@ int sbbs_t::exec_msg(csi_t *csi) curgrp = i; else csi->logic = LOGIC_FALSE; - return(0); + return 0; case CS_MSG_SHOW_GROUPS: - if (!usrgrps) return(0); + if (!usrgrps) return 0; if (menu("grps", P_NOERROR)) { - return(0); + return 0; } bputs(text[GrpLstHdr]); for (i = 0; i < usrgrps && !msgabort(); i++) { @@ -211,13 +211,13 @@ int sbbs_t::exec_msg(csi_t *csi) bprintf(text[GrpLstFmt], i + 1 , cfg.grp[usrgrp[i]]->lname, nulstr, usrsubs[i]); } - return(0); + return 0; case CS_MSG_SHOW_SUBBOARDS: - if (!usrgrps) return(0); + if (!usrgrps) return 0; snprintf(str, sizeof str, "subs%u", usrgrp[curgrp] + 1); if (menu(str, P_NOERROR)) { - return(0); + return 0; } CRLF; bprintf(text[SubLstHdr], cfg.grp[usrgrp[curgrp]]->lname); @@ -232,30 +232,30 @@ int sbbs_t::exec_msg(csi_t *csi) add_hotspot(i + 1); bputs(str); } - return(0); + return 0; case CS_MSG_GROUP_UP: curgrp++; if (curgrp >= usrgrps) curgrp = 0; - return(0); + return 0; case CS_MSG_GROUP_DOWN: if (!curgrp) curgrp = usrgrps - 1; else curgrp--; - return(0); + return 0; case CS_MSG_SUBBOARD_UP: - if (!usrgrps) return(0); + if (!usrgrps) return 0; cursub[curgrp]++; if (cursub[curgrp] >= usrsubs[curgrp]) cursub[curgrp] = 0; - return(0); + return 0; case CS_MSG_SUBBOARD_DOWN: - if (!usrgrps) return(0); + if (!usrgrps) return 0; if (!cursub[curgrp]) cursub[curgrp] = usrsubs[curgrp] - 1; else cursub[curgrp]--; - return(0); + return 0; case CS_MSG_SET_AREA: csi->logic = LOGIC_TRUE; for (i = 0; i < usrgrps; i++) @@ -263,71 +263,71 @@ int sbbs_t::exec_msg(csi_t *csi) if (!stricmp(csi->str, cfg.sub[usrsub[i][j]]->code)) { curgrp = i; cursub[i] = j; - return(0); + return 0; } csi->logic = LOGIC_FALSE; - return(0); + return 0; case CS_MSG_READ: - if (!usrgrps) return(0); + if (!usrgrps) return 0; csi->logic = scanposts(usrsub[curgrp][cursub[curgrp]], 0, nulstr); - return(0); + return 0; case CS_MSG_POST: - if (!usrgrps) return(0); + if (!usrgrps) return 0; csi->logic = !postmsg(usrsub[curgrp][cursub[curgrp]], 0, 0); - return(0); + return 0; case CS_MSG_QWK: qwk_sec(); - return(0); + return 0; case CS_MSG_PTRS_CFG: new_scan_ptr_cfg(); - return(0); + return 0; case CS_MSG_PTRS_REINIT: reinit_msg_ptrs(); bputs(text[MsgPtrsInitialized]); - return(0); + return 0; case CS_MSG_NEW_SCAN_CFG: new_scan_cfg(SUB_CFG_NSCAN); - return(0); + return 0; case CS_MSG_NEW_SCAN: scansubs(SCAN_NEW); - return(0); + return 0; case CS_MSG_NEW_SCAN_SUB: csi->logic = scanposts(usrsub[curgrp][cursub[curgrp]], SCAN_NEW, nulstr); - return(0); + return 0; case CS_MSG_NEW_SCAN_ALL: scanallsubs(SCAN_NEW); - return(0); + return 0; case CS_MSG_CONT_SCAN: scansubs(SCAN_NEW | SCAN_CONT); - return(0); + return 0; case CS_MSG_CONT_SCAN_ALL: scanallsubs(SCAN_NEW | SCAN_CONT); - return(0); + return 0; case CS_MSG_BROWSE_SCAN: scansubs(SCAN_NEW | SCAN_BACK); - return(0); + return 0; case CS_MSG_BROWSE_SCAN_ALL: scanallsubs(SCAN_BACK | SCAN_NEW); - return(0); + return 0; case CS_MSG_FIND_TEXT: scansubs(SCAN_FIND); - return(0); + return 0; case CS_MSG_FIND_TEXT_ALL: scanallsubs(SCAN_FIND); - return(0); + return 0; case CS_MSG_YOUR_SCAN_CFG: new_scan_cfg(SUB_CFG_SSCAN); - return(0); + return 0; case CS_MSG_YOUR_SCAN: scansubs(SCAN_TOYOU); - return(0); + return 0; case CS_MSG_YOUR_SCAN_ALL: scanallsubs(SCAN_TOYOU); - return(0); + return 0; case CS_MSG_LIST: listsub(usrsub[curgrp][cursub[curgrp]], SCAN_INDEX, /* start: */ 0, /* search: */ NULL); - return(0); + return 0; } errormsg(WHERE, ERR_CHK, "shell function", *(csi->ip - 1)); - return(0); + return 0; } diff --git a/src/sbbs3/execnet.cpp b/src/sbbs3/execnet.cpp index 4009891b4d60126237c8ea6f876628cb73a6dc89..b167d4eb8a5b2bbba5b94cc590f76e77c459ff28 100644 --- a/src/sbbs3/execnet.cpp +++ b/src/sbbs3/execnet.cpp @@ -43,7 +43,7 @@ int sbbs_t::exec_net(csi_t* csi) csi->logic = LOGIC_FALSE; csi->socket_error = 0; if (csi->sockets >= MAX_SOCKETS) - return(0); + return 0; if (lp != NULL) { SOCKET sock = open_socket(PF_INET, SOCK_STREAM, NULL); @@ -58,7 +58,7 @@ int sbbs_t::exec_net(csi_t* csi) if ((i = bind(sock, (struct sockaddr *) &addr, sizeof (addr))) != 0) { csi->socket_error = SOCKET_ERRNO; close_socket(sock); - return(0); + return 0; } *lp = sock; @@ -72,7 +72,7 @@ int sbbs_t::exec_net(csi_t* csi) csi->logic = LOGIC_TRUE; } } - return(0); + return 0; case CS_SOCKET_CLOSE: lp = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; @@ -86,7 +86,7 @@ int sbbs_t::exec_net(csi_t* csi) csi->socket[i] = 0; *lp = 0; } - return(0); + return 0; case CS_SOCKET_CHECK: lp = getintvar(csi, *(int32_t *)csi->ip); csi->ip += 4; @@ -94,14 +94,14 @@ int sbbs_t::exec_net(csi_t* csi) csi->socket_error = 0; if (lp == NULL || *lp == INVALID_SOCKET) - return(0); + return 0; if (socket_check(*lp, NULL, NULL, 0) == TRUE) csi->logic = LOGIC_TRUE; else csi->socket_error = SOCKET_ERRNO; - return(0); + return 0; case CS_SOCKET_CONNECT: lp = getintvar(csi, *(int32_t *)csi->ip); /* socket */ csi->ip += 4; @@ -116,12 +116,12 @@ int sbbs_t::exec_net(csi_t* csi) csi->socket_error = 0; if (!lp || !*lp || !pp || !*pp || !w) - return(0); + return 0; ulong ip_addr; if ((ip_addr = resolve_ip(*pp)) == INADDR_NONE) - return(0); + return 0; SOCKADDR_IN addr; @@ -132,16 +132,16 @@ int sbbs_t::exec_net(csi_t* csi) if ((i = connect(*lp, (struct sockaddr *)&addr, sizeof(addr))) != 0) { csi->socket_error = SOCKET_ERRNO; - return(0); + return 0; } csi->logic = LOGIC_TRUE; - return(0); + return 0; case CS_SOCKET_ACCEPT: lp1 = getintvar(csi, *(int32_t *)csi->ip); /* socket */ csi->ip += 4; csi->socket_error = 0; /* TODO */ - return(0); + return 0; case CS_SOCKET_NREAD: lp1 = getintvar(csi, *(int32_t *)csi->ip); /* socket */ csi->ip += 4; @@ -152,13 +152,13 @@ int sbbs_t::exec_net(csi_t* csi) csi->socket_error = 0; if (!lp1 || !lp2) - return(0); + return 0; if (ioctlsocket(*lp1, FIONREAD, (ulong*)lp2) == 0) csi->logic = LOGIC_TRUE; else csi->socket_error = SOCKET_ERRNO; - return(0); + return 0; case CS_SOCKET_PEEK: case CS_SOCKET_READ: lp = getintvar(csi, *(int32_t *)csi->ip); /* socket */ @@ -172,7 +172,7 @@ int sbbs_t::exec_net(csi_t* csi) csi->socket_error = 0; if (!lp || !pp) - return(0); + return 0; if (w < 1 || w > sizeof(buf) - 1) w = sizeof(buf) - 1; @@ -189,7 +189,7 @@ int sbbs_t::exec_net(csi_t* csi) *pp = copystrvar(csi, *pp, buf); } else csi->socket_error = SOCKET_ERRNO; - return(0); + return 0; case CS_SOCKET_READLINE: lp = getintvar(csi, *(int32_t *)csi->ip); /* socket */ csi->ip += 4; @@ -202,7 +202,7 @@ int sbbs_t::exec_net(csi_t* csi) csi->socket_error = 0; if (!lp || !pp) - return(0); + return 0; if (w < 1 || w > sizeof(buf) - 1) w = sizeof(buf) - 1; @@ -211,23 +211,23 @@ int sbbs_t::exec_net(csi_t* csi) for (i = 0; i < w;) { if (!online) - return(1); + return 1; if (!socket_check(*lp, &rd, NULL, 1000)) - return(0); + return 0; if (!rd) { if (time(NULL) - start > TIMEOUT_SOCK_READLINE) { lprintf(LOG_WARNING, "!socket_readline: timeout (%d) exceeded" , TIMEOUT_SOCK_READLINE); - return(0); + return 0; } continue; } if (recv(*lp, &ch, 1, 0) != 1) { csi->socket_error = SOCKET_ERRNO; - return(0); + return 0; } if (ch == '\n' && i >= 1) @@ -246,7 +246,7 @@ int sbbs_t::exec_net(csi_t* csi) } *pp = copystrvar(csi, *pp, buf); csi->logic = LOGIC_TRUE; - return(0); + return 0; case CS_SOCKET_WRITE: lp = getintvar(csi, *(int32_t *)csi->ip); /* socket */ csi->ip += 4; @@ -257,13 +257,13 @@ int sbbs_t::exec_net(csi_t* csi) csi->socket_error = 0; if (!lp || !pp || !(*pp)) - return(0); + return 0; if (sendsocket(*lp, *pp, strlen(*pp)) > 0) csi->logic = LOGIC_TRUE; else csi->socket_error = SOCKET_ERRNO; - return(0); + return 0; /* FTP Functions */ case CS_FTP_LOGIN: @@ -278,28 +278,28 @@ int sbbs_t::exec_net(csi_t* csi) csi->socket_error = 0; if (!lp || !pp1 || !pp2) - return(0); + return 0; if (!ftp_cmd(csi, *lp, NULL, rsp)) - return(0); + return 0; if (atoi(rsp) != 220) - return(0); + return 0; snprintf(str, sizeof str, "USER %s", *pp1); if (!ftp_cmd(csi, *lp, str, rsp)) - return(0); + return 0; if (atoi(rsp) == 331) { /* Password needed */ snprintf(str, sizeof str, "PASS %s", *pp2); if (!ftp_cmd(csi, *lp, str, rsp)) - return(0); + return 0; } if (atoi(rsp) == 230) /* Login successful */ csi->logic = LOGIC_TRUE; - return(0); + return 0; case CS_FTP_LOGOUT: lp = getintvar(csi, *(int32_t *)csi->ip); /* socket */ @@ -308,14 +308,14 @@ int sbbs_t::exec_net(csi_t* csi) csi->socket_error = 0; if (!lp) - return(0); + return 0; if (!ftp_cmd(csi, *lp, "QUIT", rsp)) - return(0); + return 0; if (atoi(rsp) == 221) /* Logout successful */ csi->logic = LOGIC_TRUE; - return(0); + return 0; case CS_FTP_PWD: lp = getintvar(csi, *(int32_t *)csi->ip); /* socket */ @@ -323,14 +323,14 @@ int sbbs_t::exec_net(csi_t* csi) csi->logic = LOGIC_FALSE; csi->socket_error = 0; if (!lp) - return(0); + return 0; if (!ftp_cmd(csi, *lp, "PWD", rsp)) - return(0); + return 0; if (atoi(rsp) == 257) /* pathname */ csi->logic = LOGIC_TRUE; - return(0); + return 0; case CS_FTP_CWD: lp = getintvar(csi, *(int32_t *)csi->ip); /* socket */ @@ -341,16 +341,16 @@ int sbbs_t::exec_net(csi_t* csi) csi->logic = LOGIC_FALSE; csi->socket_error = 0; if (!lp || !pp) - return(0); + return 0; snprintf(str, sizeof str, "CWD %s", *pp); if (!ftp_cmd(csi, *lp, str, rsp)) - return(0); + return 0; if (atoi(rsp) == 250) csi->logic = LOGIC_TRUE; - return(0); + return 0; case CS_FTP_DIR: lp = getintvar(csi, *(int32_t *)csi->ip); /* socket */ @@ -362,12 +362,12 @@ int sbbs_t::exec_net(csi_t* csi) csi->socket_error = 0; if (!lp || !pp) - return(0); + return 0; if (ftp_get(csi, *lp, *pp, NULL /* unused */, true /* DIR */) == true) csi->logic = LOGIC_TRUE; - return(0); + return 0; case CS_FTP_DELETE: lp = getintvar(csi, *(int32_t *)csi->ip); /* socket */ @@ -378,16 +378,16 @@ int sbbs_t::exec_net(csi_t* csi) csi->logic = LOGIC_FALSE; csi->socket_error = 0; if (!lp || !pp) - return(0); + return 0; snprintf(str, sizeof str, "DELE %s", *pp); if (!ftp_cmd(csi, *lp, str, rsp)) - return(0); + return 0; if (atoi(rsp) == 250) csi->logic = LOGIC_TRUE; - return(0); + return 0; case CS_FTP_GET: @@ -402,12 +402,12 @@ int sbbs_t::exec_net(csi_t* csi) csi->socket_error = 0; if (!lp || !pp1 || !pp2) - return(0); + return 0; if (ftp_get(csi, *lp, *pp1, *pp2) == true) csi->logic = LOGIC_TRUE; - return(0); + return 0; case CS_FTP_PUT: lp = getintvar(csi, *(int32_t *)csi->ip); /* socket */ @@ -421,17 +421,17 @@ int sbbs_t::exec_net(csi_t* csi) csi->socket_error = 0; if (!lp || !pp1 || !pp2) - return(0); + return 0; if (ftp_put(csi, *lp, *pp1, *pp2) == true) csi->logic = LOGIC_TRUE; - return(0); + return 0; default: errormsg(WHERE, ERR_CHK, "net sub-instruction", *(csi->ip - 1)); - return(0); + return 0; } } @@ -452,7 +452,7 @@ bool sbbs_t::ftp_cmd(csi_t* csi, SOCKET sock, const char* cmdsrc, char* rsp) len = strlen(cmd); if (sendsocket(sock, cmd, len) != len) { csi->socket_error = SOCKET_ERRNO; - return(FALSE); + return FALSE; } } @@ -468,23 +468,23 @@ bool sbbs_t::ftp_cmd(csi_t* csi, SOCKET sock, const char* cmdsrc, char* rsp) while (rd < 500) { if (!online) - return(FALSE); + return FALSE; if (!socket_check(sock, &data_avail, NULL, 1000)) - return(FALSE); + return FALSE; if (!data_avail) { if (time(NULL) - start > TIMEOUT_FTP_RESPONSE) { lprintf(LOG_WARNING, "!ftp_cmd: TIMEOUT_FTP_RESPONSE (%d) exceeded" , TIMEOUT_FTP_RESPONSE); - return(FALSE); + return FALSE; } continue; } if (recv(sock, &ch, 1, 0) != 1) { csi->socket_error = SOCKET_ERRNO; - return(FALSE); + return FALSE; } if (ch == '\n' && rd >= 1) @@ -500,7 +500,7 @@ bool sbbs_t::ftp_cmd(csi_t* csi, SOCKET sock, const char* cmdsrc, char* rsp) } } - return(TRUE); + return TRUE; } SOCKET sbbs_t::ftp_data_sock(csi_t* csi, SOCKET ctrl_sock, SOCKADDR_IN* addr) @@ -527,12 +527,12 @@ SOCKET sbbs_t::ftp_data_sock(csi_t* csi, SOCKET ctrl_sock, SOCKADDR_IN* addr) strcpy(cmd, "TYPE I"); if (!ftp_cmd(csi, ctrl_sock, cmd, rsp) || atoi(rsp) != 200) { - return(INVALID_SOCKET); + return INVALID_SOCKET; } if ((data_sock = open_socket(PF_INET, SOCK_STREAM, "ftp")) == INVALID_SOCKET) { csi->socket_error = SOCKET_ERRNO; - return(INVALID_SOCKET); + return INVALID_SOCKET; } memset(addr, 0, sizeof(SOCKADDR_IN)); @@ -542,7 +542,7 @@ SOCKET sbbs_t::ftp_data_sock(csi_t* csi, SOCKET ctrl_sock, SOCKADDR_IN* addr) if (bind(data_sock, (struct sockaddr *)addr, xp_sockaddr_len(addr)) != 0) { csi->socket_error = SOCKET_ERRNO; close_socket(data_sock); - return(INVALID_SOCKET); + return INVALID_SOCKET; } if (csi->ftp_mode & CS_FTP_PASV) { @@ -551,14 +551,14 @@ SOCKET sbbs_t::ftp_data_sock(csi_t* csi, SOCKET ctrl_sock, SOCKADDR_IN* addr) || atoi(rsp) != 227 /* PASV response */) { bprintf("ftp: failure, line %d", __LINE__); close_socket(data_sock); - return(INVALID_SOCKET); + return INVALID_SOCKET; } p = strchr(rsp, '('); if (p == NULL) { bprintf("ftp: failure, line %d", __LINE__); close_socket(data_sock); - return(INVALID_SOCKET); + return INVALID_SOCKET; } p++; if (sscanf(p, "%u,%u,%u,%u,%u,%u" @@ -566,7 +566,7 @@ SOCKET sbbs_t::ftp_data_sock(csi_t* csi, SOCKET ctrl_sock, SOCKADDR_IN* addr) , &port_b[0], &port_b[1]) != 6) { bprintf("ftp: failure, line %d", __LINE__); close_socket(data_sock); - return(INVALID_SOCKET); + return INVALID_SOCKET; } ip_addr.b[0] = ip_b[0]; ip_addr.b[1] = ip_b[1]; @@ -582,7 +582,7 @@ SOCKET sbbs_t::ftp_data_sock(csi_t* csi, SOCKET ctrl_sock, SOCKADDR_IN* addr) if (getsockname(data_sock, (struct sockaddr *)addr, &addr_len) != 0) { csi->socket_error = SOCKET_ERRNO; close_socket(data_sock); - return(INVALID_SOCKET); + return INVALID_SOCKET; } SOCKADDR_IN ctrl_addr; @@ -590,13 +590,13 @@ SOCKET sbbs_t::ftp_data_sock(csi_t* csi, SOCKET ctrl_sock, SOCKADDR_IN* addr) if (getsockname(ctrl_sock, (struct sockaddr *)&ctrl_addr, &addr_len) != 0) { csi->socket_error = SOCKET_ERRNO; close_socket(data_sock); - return(INVALID_SOCKET); + return INVALID_SOCKET; } if (listen(data_sock, 1) != 0) { csi->socket_error = SOCKET_ERRNO; close_socket(data_sock); - return(INVALID_SOCKET); + return INVALID_SOCKET; } ip_addr.dw = ntohl(ctrl_addr.sin_addr.s_addr); @@ -613,12 +613,12 @@ SOCKET sbbs_t::ftp_data_sock(csi_t* csi, SOCKET ctrl_sock, SOCKADDR_IN* addr) if (!ftp_cmd(csi, ctrl_sock, cmd, rsp) || atoi(rsp) != 200 /* PORT response */) { close_socket(data_sock); - return(INVALID_SOCKET); + return INVALID_SOCKET; } } - return(data_sock); + return data_sock; } bool sbbs_t::ftp_get(csi_t* csi, SOCKET ctrl_sock, char* src, char* dest, bool dir) @@ -635,7 +635,7 @@ bool sbbs_t::ftp_get(csi_t* csi, SOCKET ctrl_sock, char* src, char* dest, bool d FILE* fp = NULL; if ((data_sock = ftp_data_sock(csi, ctrl_sock, &addr.in)) == INVALID_SOCKET) - return(false); + return false; if (csi->ftp_mode & CS_FTP_PASV) { @@ -649,7 +649,7 @@ bool sbbs_t::ftp_get(csi_t* csi, SOCKET ctrl_sock, char* src, char* dest, bool d if (connect(data_sock, &addr.addr, sizeof(SOCKADDR_IN)) != 0) { csi->socket_error = SOCKET_ERRNO; close_socket(data_sock); - return(false); + return false; } } @@ -661,14 +661,14 @@ bool sbbs_t::ftp_get(csi_t* csi, SOCKET ctrl_sock, char* src, char* dest, bool d if (!ftp_cmd(csi, ctrl_sock, cmd, rsp) || atoi(rsp) != 150 /* Open data connection */) { close_socket(data_sock); - return(false); + return false; } if (!(csi->ftp_mode & CS_FTP_PASV)) { /* Normal (Active) FTP */ if (!socket_readable(data_sock, TIMEOUT_SOCK_LISTEN * 1000)) { csi->socket_error = SOCKET_ERRNO; closesocket(data_sock); - return(false); + return false; } SOCKET accept_sock; @@ -678,7 +678,7 @@ bool sbbs_t::ftp_get(csi_t* csi, SOCKET ctrl_sock, char* src, char* dest, bool d == INVALID_SOCKET) { csi->socket_error = SOCKET_ERRNO; closesocket(data_sock); - return(false); + return false; } close_socket(data_sock); @@ -688,7 +688,7 @@ bool sbbs_t::ftp_get(csi_t* csi, SOCKET ctrl_sock, char* src, char* dest, bool d if (!dir) if ((fp = fopen(dest, "wb")) == NULL) { close_socket(data_sock); - return(false); + return false; } while (online) { @@ -728,11 +728,11 @@ bool sbbs_t::ftp_get(csi_t* csi, SOCKET ctrl_sock, char* src, char* dest, bool d if (!ftp_cmd(csi, ctrl_sock, NULL, rsp) || atoi(rsp) != 226 /* Download complete */) - return(false); + return false; bprintf("ftp: %lu bytes received.\r\n", total); - return(true); + return true; } bool sbbs_t::ftp_put(csi_t* csi, SOCKET ctrl_sock, char* src, char* dest) @@ -752,11 +752,11 @@ bool sbbs_t::ftp_put(csi_t* csi, SOCKET ctrl_sock, char* src, char* dest) SAFECOPY(path, src); if (!fexistcase(path)) - return(false); + return false; if ((data_sock = ftp_data_sock(csi, ctrl_sock, &addr.in)) == INVALID_SOCKET) { bprintf("ftp: failure, line %d", __LINE__); - return(false); + return false; } if (csi->ftp_mode & CS_FTP_PASV) { @@ -771,14 +771,14 @@ bool sbbs_t::ftp_put(csi_t* csi, SOCKET ctrl_sock, char* src, char* dest) bprintf("ftp: failure, line %d", __LINE__); csi->socket_error = SOCKET_ERRNO; close_socket(data_sock); - return(false); + return false; } } if ((fp = fopen(path, "rb")) == NULL) { bprintf("ftp: failure, line %d", __LINE__); close_socket(data_sock); - return(false); + return false; } snprintf(cmd, sizeof cmd, "STOR %s", dest); @@ -788,7 +788,7 @@ bool sbbs_t::ftp_put(csi_t* csi, SOCKET ctrl_sock, char* src, char* dest) bprintf("ftp: failure, line %d", __LINE__); close_socket(data_sock); fclose(fp); - return(false); + return false; } if (!(csi->ftp_mode & CS_FTP_PASV)) { /* Normal (Active) FTP */ @@ -796,7 +796,7 @@ bool sbbs_t::ftp_put(csi_t* csi, SOCKET ctrl_sock, char* src, char* dest) csi->socket_error = SOCKET_ERRNO; closesocket(data_sock); fclose(fp); - return(false); + return false; } SOCKET accept_sock; @@ -807,7 +807,7 @@ bool sbbs_t::ftp_put(csi_t* csi, SOCKET ctrl_sock, char* src, char* dest) csi->socket_error = SOCKET_ERRNO; closesocket(data_sock); fclose(fp); - return(false); + return false; } close_socket(data_sock); @@ -844,10 +844,10 @@ bool sbbs_t::ftp_put(csi_t* csi, SOCKET ctrl_sock, char* src, char* dest) if (!ftp_cmd(csi, ctrl_sock, NULL, rsp) || atoi(rsp) != 226 /* Upload complete */) - return(false); + return false; if (!error) bprintf("ftp: %lu bytes sent.\r\n", total); - return(!error); + return !error; } diff --git a/src/sbbs3/fido.cpp b/src/sbbs3/fido.cpp index 8aa50a1f751d9397782876a61ef9e65d126a0f46..35aff1654d2334bb689dbf6b64f5f4925d90dae3 100644 --- a/src/sbbs3/fido.cpp +++ b/src/sbbs3/fido.cpp @@ -31,12 +31,12 @@ bool sbbs_t::lookup_netuser(char *into) FILE *stream; if (into == NULL || into[0] == 0 || strchr(into, '@')) - return(false); + return false; SAFECOPY(to, into); strupr(to); snprintf(str, sizeof str, "%sqnet/users.dat", cfg.data_dir); if ((stream = fnopen(&i, str, O_RDONLY)) == NULL) - return(false); + return false; while (!feof(stream)) { if (!fgets(str, sizeof(str), stream)) break; @@ -50,11 +50,11 @@ bool sbbs_t::lookup_netuser(char *into) if (strstr(name, to) && yesno(q)) { fclose(stream); snprintf(into, 128, "%s@%s", str, str + 27); - return(true); + return true; } if (sys_status & SS_ABORT) break; } fclose(stream); - return(false); + return false; } diff --git a/src/sbbs3/file.cpp b/src/sbbs3/file.cpp index 7cb94d77d9864ba5ff2265e1dfd83a51c66ea26c..9094547058b807ff47f78743da630d5ecb30261b 100644 --- a/src/sbbs3/file.cpp +++ b/src/sbbs3/file.cpp @@ -125,7 +125,7 @@ char* sbbs_t::getfilespec(char *str) strcpy(str, ALLFILES); if (msgabort(true)) return NULL; - return(str); + return str; } /****************************************************************************/ @@ -169,7 +169,7 @@ bool sbbs_t::removefcdt(file_t* f) if ((u = matchuser(&cfg, f->from, TRUE /*sysop_alias*/)) == 0) { bprintf(text[UnknownUploader], f->from, f->name); - return(false); + return false; } cdt = 0L; if (cfg.dir[f->dir]->misc & DIR_CDTMIN && cur_cps) { @@ -208,7 +208,7 @@ bool sbbs_t::removefcdt(file_t* f) adjustuserval(&cfg, u, USER_ULB, -f->size); adjustuserval(&cfg, u, USER_ULS, -1); - return(true); + return true; } /****************************************************************************/ diff --git a/src/sbbs3/filedat.c b/src/sbbs3/filedat.c index e7e95071feeb6eb15efb269f1eccb8d155d3e61f..44fdccc5319d43a2ab10a7297e43c6db3a3ffe23 100644 --- a/src/sbbs3/filedat.c +++ b/src/sbbs3/filedat.c @@ -1188,9 +1188,9 @@ char* prep_file_desc(const char* ext, char* dest) static const char* quoted_string(const char* str, char* buf, size_t maxlen) { if (strchr(str, ' ') == NULL) - return(str); + return str; safe_snprintf(buf, maxlen, "\"%s\"", str); - return(buf); + return buf; } #define QUOTED_STRING(ch, str, buf, maxlen) \ @@ -1371,7 +1371,7 @@ char* cmdstr(scfg_t* cfg, user_t* user, const char* instr, const char* fpath } cmd[j] = 0; - return(cmd); + return cmd; } /****************************************************************************/ diff --git a/src/sbbs3/filelist.c b/src/sbbs3/filelist.c index c70b402bd448e1bc0342603ae002b731f87c3b8a..d7650d6b1dc6eec3fbc292153e785ceff0514803 100644 --- a/src/sbbs3/filelist.c +++ b/src/sbbs3/filelist.c @@ -54,7 +54,7 @@ int lprintf(int level, const char *fmat, ...) va_end(argptr); truncsp(sbuf); printf("%s\n", sbuf); - return(chcount); + return chcount; } char* byteStr(uint64_t value) @@ -454,5 +454,5 @@ int main(int argc, char **argv) fprintf(out, "TOTALS\n------\n%" PRIu64 " credits/bytes in %lu files.\n" , total_cdt, total_files); printf("\nDone.\n"); - return(0); + return 0; } diff --git a/src/sbbs3/finddupes.c b/src/sbbs3/finddupes.c index 425268eb20baf90bb2d1a514252e93c286208184..2e9d4a53ad8a29993e9daff280c1429d63be4a20 100644 --- a/src/sbbs3/finddupes.c +++ b/src/sbbs3/finddupes.c @@ -40,21 +40,21 @@ int fchksum(const char* fname, long length, if ((fp = fopen(fname, "rb")) == NULL) { perror(fname); - return(-1); + return -1; } if (length && (buf = malloc(length)) == NULL) { printf("!Error allocating %ld bytes of memory for %s\n" , length, fname); fclose(fp); - return(-1); + return -1; } if (fread(buf, sizeof(BYTE), length, fp) != length) { perror(fname); fclose(fp); FREE_AND_NULL(buf); - return(-1); + return -1; } fclose(fp); @@ -64,7 +64,7 @@ int fchksum(const char* fname, long length, *chksum = crc32(buf, length); #endif FREE_AND_NULL(buf); - return(0); + return 0; } char* timestr(void) @@ -73,7 +73,7 @@ char* timestr(void) time_t t = time(NULL); p = ctime(&t); p[19] = 0; /* chop off year and \n */ - return(p + 4); /* skip day-of-week */ + return p + 4; /* skip day-of-week */ } int searchdir(const char* path, BOOL recursive, ulong compare_bytes) @@ -86,7 +86,7 @@ int searchdir(const char* path, BOOL recursive, ulong compare_bytes) printf("%s begin searching %s\n", timestr(), path); if ((dir = opendir(path)) == NULL) { perror(path); - return(1); + return 1; } while ((ent = readdir(dir)) != NULL) { @@ -132,7 +132,7 @@ int searchdir(const char* path, BOOL recursive, ulong compare_bytes) closedir(dir); printf("%s done searching %s\n", timestr(), path); - return(0); + return 0; } int compare_files(const file_t *f1, const file_t *f2 ) @@ -141,14 +141,14 @@ int compare_files(const file_t *f1, const file_t *f2 ) /* Sort first by size (descending) */ if ((result = f2->length - f1->length) != 0) - return(result); + return result; /* Then by chksum (ascending) */ if ((result = memcmp(&f1->chksum, &f2->chksum, sizeof(f1->chksum))) != 0) - return(result); + return result; /* Then by date (descending) */ - return(f2->date - f1->date); + return f2->date - f1->date; } int main(int argc, char** argv) @@ -191,7 +191,7 @@ int main(int argc, char** argv) if (!file_count) { printf("no files.\n"); - return(0); + return 0; } printf("%s begin sorting (%lu files)\n", timestr(), file_count); @@ -227,5 +227,5 @@ int main(int argc, char** argv) printf("%s done (%lu duplicates found)\n", timestr(), dupe_count); if (del_files) printf("%lu bytes deleted in %lu files\n", del_bytes, del_files); - return(0); + return 0; } diff --git a/src/sbbs3/fixsmb.c b/src/sbbs3/fixsmb.c index 1ddc1346ec052576a1afa09e5fa261efb62d533e..7093690e20a08e21e8dd7d035d10de6190178c1d 100644 --- a/src/sbbs3/fixsmb.c +++ b/src/sbbs3/fixsmb.c @@ -40,7 +40,7 @@ char* usage = "usage: fixsmb [-renumber] [-undelete] [-fixnums] [-rehash] <smb_f int compare_index(const idxrec_t* idx1, const idxrec_t* idx2) { - return(idx1->number - idx2->number); + return idx1->number - idx2->number; } void sort_index(smb_t* smb) @@ -320,7 +320,7 @@ int fixsmb(char* sub) unlock_msgbase(); printf("Done.\n"); FREE_AND_NULL(numbers); - return(0); + return 0; } int main(int argc, char **argv) diff --git a/src/sbbs3/fmsgdump.c b/src/sbbs3/fmsgdump.c index f9fbda6578952b957ed2924322417eb190acd991..fd6f912757268a4292b8a92c01985f60e972fe95 100644 --- a/src/sbbs3/fmsgdump.c +++ b/src/sbbs3/fmsgdump.c @@ -23,7 +23,7 @@ char* freadstr(FILE* fp, char* str, size_t maxlen) str[maxlen - 1] = 0; - return(str); + return str; } const char* fmsgattr_str(uint16_t attr) @@ -64,7 +64,7 @@ int msgdump(FILE* fp, const char* fname) if (fread(&hdr, sizeof(hdr), 1, fp) != 1) { fprintf(stderr, "%s !Error reading msg hdr (%" XP_PRIsize_t "u bytes)\n" , fname, sizeof(hdr)); - return(__COUNTER__); + return __COUNTER__; } fseek(fp, -1L, SEEK_END); @@ -99,7 +99,7 @@ int msgdump(FILE* fp, const char* fname) if (end <= sizeof(hdr) + 1) { fprintf(stderr, "!No body text\n"); - return(__COUNTER__); + return __COUNTER__; } long len = end - sizeof(hdr); @@ -143,7 +143,7 @@ int msgdump(FILE* fp, const char* fname) free(body); printf("\n"); - return(0); + return 0; } char* usage = "usage: fmsgdump [-body | -ctrl] <file1.msg> [file2.msg] [...]\n"; @@ -169,7 +169,7 @@ int main(int argc, char** argv) if (sizeof(fmsghdr_t) != FIDO_STORED_MSG_HDR_LEN) { printf("sizeof(fmsghdr_t)=%" XP_PRIsize_t "u, expected: %d\n", sizeof(fmsghdr_t), FIDO_STORED_MSG_HDR_LEN); - return(-1); + return -1; } for (i = 1; i < argc; i++) { @@ -183,7 +183,7 @@ int main(int argc, char** argv) break; default: printf("%s", usage); - return(0); + return 0; } continue; } @@ -196,5 +196,5 @@ int main(int argc, char** argv) fclose(fp); } - return(0); + return 0; } diff --git a/src/sbbs3/ftpsrvr.c b/src/sbbs3/ftpsrvr.c index a99ea8e3845e7b7ff48d7e42c7ee992b31d850e4..aded7f51c9a08dac98471d483d0b8100d4f5971d 100644 --- a/src/sbbs3/ftpsrvr.c +++ b/src/sbbs3/ftpsrvr.c @@ -120,9 +120,9 @@ static const char *ftp_mon[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun" BOOL direxist(char *dir) { if (access(dir, 0) == 0) - return(TRUE); + return TRUE; else - return(FALSE); + return FALSE; } BOOL dir_op(scfg_t* cfg, user_t* user, client_t* client, uint dirnum) @@ -182,11 +182,11 @@ static BOOL winsock_startup(void) if ((status = WSAStartup(MAKEWORD(1, 1), &WSAData)) == 0) { lprintf(LOG_DEBUG, "%s %s", WSAData.szDescription, WSAData.szSystemStatus); WSAInitialized = TRUE; - return (TRUE); + return TRUE; } lprintf(LOG_CRIT, "!WinSock startup ERROR %d", status); - return (FALSE); + return FALSE; } #else /* No WINSOCK */ @@ -283,7 +283,7 @@ static SOCKET ftp_open_socket(int domain, int type) sock = socket(domain, type, IPPROTO_IP); if (sock != INVALID_SOCKET) ftp_open_socket_cb(sock, NULL); - return(sock); + return sock; } #ifdef __BORLANDC__ @@ -300,7 +300,7 @@ static int ftp_close_socket(SOCKET* sock, CRYPT_SESSION *sess, int line) if ((*sock) == INVALID_SOCKET) { lprintf(LOG_WARNING, "0000 !INVALID_SOCKET in close_socket from line %u", line); - return(-1); + return -1; } shutdown(*sock, SHUT_RDWR); /* required on Unix */ @@ -315,7 +315,7 @@ static int ftp_close_socket(SOCKET* sock, CRYPT_SESSION *sess, int line) } *sock = INVALID_SOCKET; - return(result); + return result; } #define GCES(status, sock, session, estr, action) do { \ @@ -354,13 +354,13 @@ static int sockprintf(SOCKET sock, CRYPT_SESSION sess, char *fmt, ...) if (sock == INVALID_SOCKET) { lprintf(LOG_WARNING, "!INVALID SOCKET in call to sockprintf"); - return(0); + return 0; } /* Check socket for writability */ if (!socket_writable(sock, 300000)) { lprintf(LOG_WARNING, "%04d !WARNING socket not ready for write", sock); - return(0); + return 0; } if (sess != -1) { @@ -395,12 +395,12 @@ static int sockprintf(SOCKET sock, CRYPT_SESSION sess, char *fmt, ...) lprintf(LOG_WARNING, "%04d Connection aborted by peer on send", sock); else lprintf(LOG_WARNING, "%04d !ERROR %d sending", sock, SOCKET_ERRNO); - return(0); + return 0; } lprintf(LOG_WARNING, "%04d !ERROR: short send: %u instead of %u", sock, result, len); } } - return(len); + return len; } void recverror(SOCKET socket, int rd, int line) @@ -434,7 +434,7 @@ static int sock_recvbyte(SOCKET sock, CRYPT_SESSION sess, char *buf, time_t *las if (ftp_set == NULL || terminate_server) { sockprintf(sock, sess, "421 Server downed, aborting."); lprintf(LOG_WARNING, "%04d Server downed, aborting", sock); - return(0); + return 0; } if (sess > -1) { /* Try a read with no timeout first. */ @@ -469,7 +469,7 @@ static int sock_recvbyte(SOCKET sock, CRYPT_SESSION sess, char *buf, time_t *las lprintf(LOG_WARNING, "%04d Disconnecting due to to inactivity", sock); sockprintf(sock, sess, "421 Disconnecting due to inactivity (%u seconds)." , startup->max_inactivity); - return(0); + return 0; } if (!socket_readable(sock, startup->max_inactivity * 1000)) { @@ -477,7 +477,7 @@ static int sock_recvbyte(SOCKET sock, CRYPT_SESSION sess, char *buf, time_t *las lprintf(LOG_WARNING, "%04d Disconnecting due to to inactivity", sock); sockprintf(sock, sess, "421 Disconnecting due to inactivity (%u seconds)." , startup->max_inactivity); - return(0); + return 0; } } } @@ -489,7 +489,7 @@ static int sock_recvbyte(SOCKET sock, CRYPT_SESSION sess, char *buf, time_t *las lprintf(LOG_WARNING, "%04d Disconnecting due to to inactivity", sock); sockprintf(sock, sess, "421 Disconnecting due to inactivity (%u seconds)." , startup->max_inactivity); - return(0); + return 0; } continue; } @@ -514,7 +514,7 @@ int sockreadline(SOCKET socket, CRYPT_SESSION sess, char* buf, int len, time_t* if (socket == INVALID_SOCKET) { lprintf(LOG_WARNING, "INVALID SOCKET in call to sockreadline"); - return(0); + return 0; } while (rd < len - 1) { @@ -523,7 +523,7 @@ int sockreadline(SOCKET socket, CRYPT_SESSION sess, char* buf, int len, time_t* if (i < 1) { if (sess != -1) recverror(socket, i, __LINE__); - return(i); + return i; } if (ch == '\n' /* && rd>=1 */) { /* Mar-9-2003: terminate on sole LF */ break; @@ -535,7 +535,7 @@ int sockreadline(SOCKET socket, CRYPT_SESSION sess, char* buf, int len, time_t* else buf[rd] = 0; - return(rd); + return rd; } void ftp_terminate(void) @@ -1450,7 +1450,7 @@ char* dotname(char* in, char* out) else out[i] = in[i]; out[i] = 0; - return(out); + return out; } static BOOL can_list(lib_t *lib, dir_t *dir, user_t *user, client_t *client) @@ -1579,7 +1579,7 @@ static BOOL ftpalias(char* fullalias, char* filename, user_t* user, client_t* cl fclose(fp); if (curdir != NULL) *curdir = dir; - return(result); + return result; } /* @@ -1733,21 +1733,21 @@ char* root_dir(char* path) else if (*root == '/' || *root == '\\') root[1] = 0; - return(root); + return root; } char* genvpath(int lib, int dir, char* str) { strcpy(str, "/"); if (lib < 0) - return(str); + return str; strcat(str, scfg.lib[lib]->vdir); strcat(str, "/"); if (dir < 0) - return(str); + return str; strcat(str, scfg.dir[dir]->vdir); strcat(str, "/"); - return(str); + return str; } void ftp_printfile(SOCKET sock, CRYPT_SESSION sess, const char* name, unsigned code) @@ -1818,18 +1818,18 @@ static BOOL badlogin(SOCKET sock, CRYPT_SESSION sess, ulong* login_attempts if ((*login_attempts) >= 3) { sockprintf(sock, sess, "421 Too many failed login attempts."); - return(TRUE); + return TRUE; } ftp_printfile(sock, sess, "badlogin", 530); sockprintf(sock, sess, "530 Invalid login."); - return(FALSE); + return FALSE; } static char* ftp_tmpfname(char* fname, char* ext, SOCKET sock) { safe_snprintf(fname, MAX_PATH, "%sSBBS_FTP.%x%x%x%lx.%s" , scfg.temp_dir, getpid(), sock, rand(), (ulong)clock(), ext); - return(fname); + return fname; } #if defined(__GNUC__) // Catch printf-format errors @@ -5111,7 +5111,7 @@ const char* ftp_ver(void) , GIT_BRANCH, GIT_HASH , GIT_DATE, compiler); - return(ver); + return ver; } void ftp_server(void* arg) diff --git a/src/sbbs3/getkey.cpp b/src/sbbs3/getkey.cpp index 960d3d7b48e96f6798b8b8f234d72f08357a04f0..cbf200bee77d962578d1de5a72ad9af008a77274 100644 --- a/src/sbbs3/getkey.cpp +++ b/src/sbbs3/getkey.cpp @@ -40,7 +40,7 @@ char sbbs_t::getkey(int mode) online = FALSE; if (!online) { YIELD(); // just in case someone is looping on getkey() when they shouldn't - return(0); + return 0; } sys_status &= ~SS_ABORT; if ((sys_status & SS_USERON || action == NODE_DFLT) && !(mode & (K_GETSTR | K_NOSPIN))) @@ -60,7 +60,7 @@ char sbbs_t::getkey(int mode) backspace(); #endif } - return(0); + return 0; } if (mode & K_SPIN) { @@ -74,7 +74,7 @@ char sbbs_t::getkey(int mode) } ch = inkey(mode, mode & K_SPIN ? 200:1000); if (sys_status & SS_ABORT) - return(0); + return 0; now = time(NULL); if (ch) { if (mode & K_NUMBER && IS_PRINTABLE(ch) && !IS_DIGIT(ch)) @@ -104,8 +104,8 @@ char sbbs_t::getkey(int mode) ungetkey(coldkey); } if (mode & K_UPPER) - return(toupper(ch)); - return(ch); + return toupper(ch); + return ch; } if (sys_status & SS_USERON && !(sys_status & SS_LCHAT)) gettimeleft(); else if (online && now - answertime > SEC_LOGON && !(sys_status & SS_LCHAT)) { @@ -153,7 +153,7 @@ char sbbs_t::getkey(int mode) bputs(text[CallBackWhenYoureThere]); logline(LOG_NOTICE, nulstr, "Maximum user input inactivity exceeded"); hangup(); - return(0); + return 0; } if ((sys_status & SS_USERON) && *text[AreYouThere] != '\0') { attr(LIGHTGRAY); @@ -166,7 +166,7 @@ char sbbs_t::getkey(int mode) } while (online); - return(0); + return 0; } @@ -275,7 +275,7 @@ bool sbbs_t::yesno(const char *str, int mode) if (!(mode & P_SAVEATR)) attr(LIGHTGRAY); lncntr = 0; - return(true); + return true; } if (ch == no_key()) { if (bputs(text[No], mode) && !(mode & P_NOCRLF)) @@ -283,10 +283,10 @@ bool sbbs_t::yesno(const char *str, int mode) if (!(mode & P_SAVEATR)) attr(LIGHTGRAY); lncntr = 0; - return(false); + return false; } } - return(true); + return true; } /****************************************************************************/ @@ -313,7 +313,7 @@ bool sbbs_t::noyes(const char *str, int mode) if (!(mode & P_SAVEATR)) attr(LIGHTGRAY); lncntr = 0; - return(true); + return true; } if (ch == yes_key()) { if (bputs(text[Yes], mode) && !(mode & P_NOCRLF)) @@ -321,10 +321,10 @@ bool sbbs_t::noyes(const char *str, int mode) if (!(mode & P_SAVEATR)) attr(LIGHTGRAY); lncntr = 0; - return(false); + return false; } } - return(true); + return true; } /****************************************************************************/ @@ -353,7 +353,7 @@ int sbbs_t::getkeys(const char *keys, uint max, int mode) CRLF; } lncntr = 0; - return(-1); + return -1; } if (ch && !n && ((keys == NULL && !IS_DIGIT(ch)) || (strchr(str, ch)))) { /* return character if in string */ if (ch > ' ') { @@ -369,7 +369,7 @@ int sbbs_t::getkeys(const char *keys, uint max, int mode) if (!(mode & (K_NOECHO | K_NOCRLF))) { CRLF; } - return(-1); + return -1; } if (c == BS || c == DEL) { if (!(mode & K_NOECHO)) @@ -383,7 +383,7 @@ int sbbs_t::getkeys(const char *keys, uint max, int mode) } lncntr = 0; } - return(ch); + return ch; } if (ch == CR && max) { /* return 0 if no number */ if (!(mode & (K_NOECHO | K_NOCRLF))) { @@ -392,8 +392,8 @@ int sbbs_t::getkeys(const char *keys, uint max, int mode) } lncntr = 0; if (n) - return(i | 0x80000000L); /* return number plus high bit */ - return(0); + return i | 0x80000000L; /* return number plus high bit */ + return 0; } if ((ch == BS || ch == DEL) && n) { if (!(mode & K_NOECHO)) @@ -413,11 +413,11 @@ int sbbs_t::getkeys(const char *keys, uint max, int mode) CRLF; } lncntr = 0; - return(i | 0x80000000L); + return i | 0x80000000L; } } } - return(-1); + return -1; } /****************************************************************************/ diff --git a/src/sbbs3/getmail.c b/src/sbbs3/getmail.c index 9cd232135bc6bb62cc4a7fccc60162d33265729c..d6ebe8b56e4d0dc3c3550161a1cc8546d8357c8e 100644 --- a/src/sbbs3/getmail.c +++ b/src/sbbs3/getmail.c @@ -40,13 +40,13 @@ int getmail(scfg_t* cfg, int usernumber, bool sent, int attr) SAFEPRINTF(path, "%s.sid", smb.file); l = (long)flength(path); if (l < (long)sizeof(idxrec_t)) - return(0); + return 0; if (usernumber == 0 && attr == 0) - return(l / sizeof(idxrec_t)); /* Total system e-mail */ + return l / sizeof(idxrec_t); /* Total system e-mail */ smb.subnum = INVALID_SUB; if (smb_open_fp(&smb, &smb.sid_fp, SH_DENYNO) != 0) - return(0); + return 0; while (!smb_feof(smb.sid_fp)) { if (smb_fread(&smb, &idx, sizeof(idx), smb.sid_fp) != sizeof(idx)) @@ -65,7 +65,7 @@ int getmail(scfg_t* cfg, int usernumber, bool sent, int attr) i++; } smb_close(&smb); - return(i); + return i; } @@ -118,15 +118,15 @@ mail_t* loadmail(smb_t* smb, uint32_t* msgs, uint usernumber mail_t* mail = NULL; if (msgs == NULL) - return(NULL); + return NULL; *msgs = 0; if (smb == NULL) - return(NULL); + return NULL; if (smb_locksmbhdr(smb) != 0) /* Be sure noone deletes or */ - return(NULL); /* adds while we're reading */ + return NULL; /* adds while we're reading */ smb_rewind(smb->sid_fp); while (!smb_feof(smb->sid_fp)) { @@ -150,7 +150,7 @@ mail_t* loadmail(smb_t* smb, uint32_t* msgs, uint usernumber if ((np = realloc(mail, sizeof(mail_t) * (l + 1))) == NULL) { free(mail); smb_unlocksmbhdr(smb); - return(NULL); + return NULL; } mail = np; mail[l] = idx; @@ -169,7 +169,7 @@ mail_t* loadmail(smb_t* smb, uint32_t* msgs, uint usernumber free(mail); mail = reversed; } - return(mail); + return mail; } void freemail(mail_t* mail) diff --git a/src/sbbs3/getmsg.cpp b/src/sbbs3/getmsg.cpp index 2e5442d99b47f9e3481f8bf411d35ae97f2cb98a..271d2712bc931ec39cb5ed03cdfd7d3662891202 100644 --- a/src/sbbs3/getmsg.cpp +++ b/src/sbbs3/getmsg.cpp @@ -524,7 +524,7 @@ int sbbs_t::getmsgnum(int subnum, time_t t) idxrec_t idx; if (!t) - return(0); + return 0; ZERO_VAR(smb); SAFEPRINTF2(smb.file, "%s%s", cfg.sub[subnum]->data_dir, cfg.sub[subnum]->code); @@ -557,37 +557,37 @@ time_t sbbs_t::getmsgtime(int subnum, uint ptr) smb.subnum = subnum; if ((i = smb_open(&smb)) != 0) { errormsg(WHERE, ERR_OPEN, smb.file, i, smb.last_error); - return(0); + return 0; } if (!filelength(fileno(smb.sid_fp))) { /* Empty base */ smb_close(&smb); - return(0); + return 0; } msg.idx_offset = 0; msg.hdr.number = 0; if (smb_getmsgidx(&smb, &msg)) { /* Get first message index */ smb_close(&smb); - return(0); + return 0; } if (!ptr || msg.idx.number >= ptr) { /* ptr is before first message */ smb_close(&smb); - return(msg.idx.time); /* so return time of first msg */ + return msg.idx.time; /* so return time of first msg */ } if (smb_getlastidx(&smb, &lastidx)) { /* Get last message index */ smb_close(&smb); - return(0); + return 0; } if (lastidx.number < ptr) { /* ptr is after last message */ smb_close(&smb); - return(lastidx.time); /* so return time of last msg */ + return lastidx.time; /* so return time of last msg */ } msg.idx.time = 0; msg.hdr.number = ptr; if (!smb_getmsgidx(&smb, &msg)) { smb_close(&smb); - return(msg.idx.time); + return msg.idx.time; } if (ptr - msg.idx.number < lastidx.number - ptr) { @@ -600,7 +600,7 @@ time_t sbbs_t::getmsgtime(int subnum, uint ptr) msg.idx_offset++; } smb_close(&smb); - return(msg.idx.time); + return msg.idx.time; } ptr--; @@ -611,7 +611,7 @@ time_t sbbs_t::getmsgtime(int subnum, uint ptr) ptr--; } smb_close(&smb); - return(msg.idx.time); + return msg.idx.time; } @@ -631,7 +631,7 @@ uint sbbs_t::getlastmsg(int subnum, uint32_t *ptr, time_t *t) if (t) (*t) = 0; if (!subnum_is_valid(subnum)) - return(0); + return 0; ZERO_VAR(smb); SAFEPRINTF2(smb.file, "%s%s", cfg.sub[subnum]->data_dir, cfg.sub[subnum]->code); @@ -639,22 +639,22 @@ uint sbbs_t::getlastmsg(int subnum, uint32_t *ptr, time_t *t) smb.subnum = subnum; if ((i = smb_open(&smb)) != 0) { errormsg(WHERE, ERR_OPEN, smb.file, i, smb.last_error); - return(0); + return 0; } if (!filelength(fileno(smb.sid_fp))) { /* Empty base */ smb_close(&smb); - return(0); + return 0; } if ((i = smb_locksmbhdr(&smb)) != 0) { smb_close(&smb); errormsg(WHERE, ERR_LOCK, smb.file, i, smb.last_error); - return(0); + return 0; } if ((i = smb_getlastidx(&smb, &idx)) != 0) { smb_close(&smb); errormsg(WHERE, ERR_READ, smb.file, i, smb.last_error); - return(0); + return 0; } if (cfg.sub[subnum]->misc & SUB_NOVOTING) total = (int)filelength(fileno(smb.sid_fp)) / sizeof(idxrec_t); @@ -666,6 +666,6 @@ uint sbbs_t::getlastmsg(int subnum, uint32_t *ptr, time_t *t) (*ptr) = idx.number; if (t) (*t) = idx.time; - return(total); + return total; } diff --git a/src/sbbs3/getnode.cpp b/src/sbbs3/getnode.cpp index 591b5b84781a71df1fafd7cc895f1d8a6a7274bb..841569fecd3a51f4eca960ed168f64d421c0561d 100644 --- a/src/sbbs3/getnode.cpp +++ b/src/sbbs3/getnode.cpp @@ -385,7 +385,7 @@ int sbbs_t::whos_online(bool listself) } if (!j) bputs(text[NoOtherActiveNodes]); - return(j); + return j; } void sbbs_t::nodelist(void) diff --git a/src/sbbs3/getstats.c b/src/sbbs3/getstats.c index 3879a08ceefc0fc5805b530d9da4fb1c01a86bee..471eee8df92718caa082a80633e5fbca6febbdc3 100644 --- a/src/sbbs3/getstats.c +++ b/src/sbbs3/getstats.c @@ -169,7 +169,7 @@ bool getstats(scfg_t* cfg, uint node, stats_t* stats) if (!fexistcase(path)) return true; if ((file = nopen(path, O_RDONLY)) == -1) { - return(false); + return false; } int rd = read(file, &legacy_stats, sizeof(legacy_stats)); close(file); diff --git a/src/sbbs3/getstr.cpp b/src/sbbs3/getstr.cpp index 89246440a598c6f0c38f5b6d717f3a8fa61f1d61..05918d04d27832d4816fe16970e2e343153d8291 100644 --- a/src/sbbs3/getstr.cpp +++ b/src/sbbs3/getstr.cpp @@ -137,7 +137,7 @@ size_t sbbs_t::getstr(char *strout, size_t maxlen, int mode, const str_list_t hi if (strstr(str1, "��")) { bputs("\r\n\r\nYou must set your terminal to NO PARITY, " "8 DATA BITS, and 1 STOP BIT (N-8-1).\7\r\n"); - return(0); + return 0; } } getstr_offset = i; @@ -331,7 +331,7 @@ size_t sbbs_t::getstr(char *strout, size_t maxlen, int mode, const str_list_t hi strcpy(strout, str2); l = strlen(strout); if (mode & K_NOECHO) - return(l); + return l; if (mode & K_MSG) redrwstr(strout, i, l, K_MSG); else { @@ -343,7 +343,7 @@ size_t sbbs_t::getstr(char *strout, size_t maxlen, int mode, const str_list_t hi } if (!(mode & K_NOCRLF)) CRLF; - return(l); + return l; case CTRL_N: /* Ctrl-N Next word */ if (i < l && term & (ANSI | PETSCII)) { @@ -499,7 +499,7 @@ size_t sbbs_t::getstr(char *strout, size_t maxlen, int mode, const str_list_t hi if (mode & K_LINE && !(mode & K_NOECHO)) attr(LIGHTGRAY); console |= CON_UPARROW; - return(l); + return l; #else console |= CON_UPARROW; break; @@ -534,7 +534,7 @@ size_t sbbs_t::getstr(char *strout, size_t maxlen, int mode, const str_list_t hi redrwstr(strout, i, l, K_MSG); if (!(mode & (K_NOECHO | K_NOCRLF))) CRLF; - return(i); + return i; } x = i - 1; z = 1; @@ -548,7 +548,7 @@ size_t sbbs_t::getstr(char *strout, size_t maxlen, int mode, const str_list_t hi redrwstr(strout, i, l, K_MSG); if (!(mode & (K_NOECHO | K_NOCRLF))) CRLF; - return(i); + return i; } wordwrap[z] = 0; if (!(mode & K_NOECHO)) @@ -563,7 +563,7 @@ size_t sbbs_t::getstr(char *strout, size_t maxlen, int mode, const str_list_t hi redrwstr(strout, i, x, mode); if (!(mode & (K_NOECHO | K_NOCRLF))) CRLF; - return(x); + return x; } if (i < maxlen && ch >= ' ') { if (ch == ' ' && (mode & K_TRIM) && i && str1[i - 1] == ' ') @@ -607,11 +607,11 @@ size_t sbbs_t::getstr(char *strout, size_t maxlen, int mode, const str_list_t hi if (i > l) l = i; if (mode & K_CHAT && !l) - return(0); + return 0; } getstr_offset = i; if (!online) - return(0); + return 0; if (i > l) l = i; str1[l] = 0; @@ -632,7 +632,7 @@ size_t sbbs_t::getstr(char *strout, size_t maxlen, int mode, const str_list_t hi carriage_return(); lncntr = 0; } - return(l); + return l; } /****************************************************************************/ @@ -659,19 +659,19 @@ int sbbs_t::getnum(uint max, uint dflt) } CRLF; lncntr = 0; - return(-1); + return -1; } else if (sys_status & SS_ABORT) { CRLF; lncntr = 0; - return(-1); + return -1; } else if (ch == CR) { CRLF; lncntr = 0; if (!n) - return(dflt); - return(i); + return dflt; + return i; } else if ((ch == BS || ch == DEL) && n) { backspace(); @@ -686,11 +686,11 @@ int sbbs_t::getnum(uint max, uint dflt) if (i * 10UL > max && !(useron.misc & COLDKEYS) && keybuf_level() < 1) { CRLF; lncntr = 0; - return(i); + return i; } } } - return(0); + return 0; } void sbbs_t::insert_indicator(void) diff --git a/src/sbbs3/inkey.cpp b/src/sbbs3/inkey.cpp index 55f86f247f688db4e8ab2f1bea207e454000536f..8642a5bff511783195ed4a8161ed22286c46963f 100644 --- a/src/sbbs3/inkey.cpp +++ b/src/sbbs3/inkey.cpp @@ -117,8 +117,8 @@ int sbbs_t::inkey(int mode, unsigned int timeout) /* Is this a control key */ if (!(mode & K_CTRLKEYS) && ch < ' ') { if (cfg.ctrlkey_passthru & (1 << ch)) /* flagged as passthru? */ - return(ch); /* do not handle here */ - return(handle_ctrlkey(ch, mode)); + return ch; /* do not handle here */ + return handle_ctrlkey(ch, mode); } /* Translate (not control character) input into CP437 */ @@ -149,7 +149,7 @@ int sbbs_t::inkey(int mode, unsigned int timeout) if (mode & K_UPPER) ch = toupper(ch); - return(ch); + return ch; } char sbbs_t::handle_ctrlkey(char ch, int mode) @@ -162,12 +162,12 @@ char sbbs_t::handle_ctrlkey(char ch, int mode) sys_status |= SS_ABORT; if (mode & K_SPIN) /* back space once if on spinning cursor */ backspace(); - return(0); + return 0; } if (ch == CTRL_Z && !(mode & (K_MSG | K_GETSTR)) && action != NODE_PCHT) { /* Ctrl-Z toggle raw input mode */ if (hotkey_inside & (1 << ch)) - return(0); + return 0; hotkey_inside |= (1 << ch); if (mode & K_SPIN) bputs("\b "); @@ -186,16 +186,16 @@ char sbbs_t::handle_ctrlkey(char ch, int mode) lncntr = 0; hotkey_inside &= ~(1 << ch); if (action != NODE_MAIN && action != NODE_XFER) - return(CTRL_Z); - return(0); + return CTRL_Z; + return 0; } if (console & CON_RAW_IN) /* ignore ctrl-key commands if in raw mode */ - return(ch); + return ch; #if 0 /* experimental removal to fix Tracker1's pause module problem with down-arrow */ if (ch == LF) /* ignore LF's if not in raw mode */ - return(0); + return 0; #endif /* Global hot key event */ @@ -205,7 +205,7 @@ char sbbs_t::handle_ctrlkey(char ch, int mode) break; if (i < cfg.total_hotkeys) { if (hotkey_inside & (1 << ch)) - return(0); + return 0; hotkey_inside |= (1 << ch); if (mode & K_SPIN) bputs("\b "); @@ -228,19 +228,19 @@ char sbbs_t::handle_ctrlkey(char ch, int mode) } lncntr = 0; hotkey_inside &= ~(1 << ch); - return(0); + return 0; } } switch (ch) { case CTRL_O: /* Ctrl-O toggles pause temporarily */ console ^= CON_PAUSEOFF; - return(0); + return 0; case CTRL_P: /* Ctrl-P Private node-node comm */ if (!(sys_status & SS_USERON)) break; ; if (hotkey_inside & (1 << ch)) - return(0); + return 0; hotkey_inside |= (1 << ch); if (mode & K_SPIN) bputs("\b "); @@ -258,13 +258,13 @@ char sbbs_t::handle_ctrlkey(char ch, int mode) } lncntr = 0; hotkey_inside &= ~(1 << ch); - return(0); + return 0; case CTRL_U: /* Ctrl-U Users online */ if (!(sys_status & SS_USERON)) break; if (hotkey_inside & (1 << ch)) - return(0); + return 0; hotkey_inside |= (1 << ch); if (mode & K_SPIN) bputs("\b "); @@ -281,14 +281,14 @@ char sbbs_t::handle_ctrlkey(char ch, int mode) } lncntr = 0; hotkey_inside &= ~(1 << ch); - return(0); + return 0; case CTRL_T: /* Ctrl-T Time information */ if (sys_status & SS_SPLITP) - return(ch); + return ch; if (!(sys_status & SS_USERON)) break; if (hotkey_inside & (1 << ch)) - return(0); + return 0; hotkey_inside |= (1 << ch); if (mode & K_SPIN) bputs("\b "); @@ -307,14 +307,14 @@ char sbbs_t::handle_ctrlkey(char ch, int mode) restoreline(); lncntr = 0; hotkey_inside &= ~(1 << ch); - return(0); + return 0; case CTRL_K: /* Ctrl-K Control key menu */ if (sys_status & SS_SPLITP) - return(ch); + return ch; if (!(sys_status & SS_USERON)) break; if (hotkey_inside & (1 << ch)) - return(0); + return 0; hotkey_inside |= (1 << ch); if (mode & K_SPIN) bputs("\b "); @@ -329,15 +329,15 @@ char sbbs_t::handle_ctrlkey(char ch, int mode) restoreline(); lncntr = 0; hotkey_inside &= ~(1 << ch); - return(0); + return 0; case ESC: i = kbincom((mode & K_GETSTR) ? 3000:1000); if (i == NOINP) // timed-out waiting for '[' - return(ESC); + return ESC; ch = i; if (ch != '[') { ungetkey(ch, /* insert: */ true); - return(ESC); + return ESC; } i = j = 0; autoterm |= ANSI; /* <ESC>[x means they have ANSI */ @@ -426,7 +426,7 @@ char sbbs_t::handle_ctrlkey(char ch, int mode) for (j = i; j > 0; j--) ungetkey(str[j - 1], /* insert: */ true); ungetkey('[', /* insert: */ true); - return(ESC); + return ESC; } if (button == 0x22) // Right-click return handle_ctrlkey(TERM_KEY_ABORT, mode); @@ -503,7 +503,7 @@ char sbbs_t::handle_ctrlkey(char ch, int mode) ungetkey(str[j - 1], /* insert: */ true); ungetkey('<', /* insert: */ true); ungetkey('[', /* insert: */ true); - return(ESC); + return ESC; } if (ch == 'M' && button == 2) // Right-click return handle_ctrlkey(TERM_KEY_ABORT, mode); @@ -516,34 +516,34 @@ char sbbs_t::handle_ctrlkey(char ch, int mode) str[i] = 0; switch (ch) { case 'A': - return(TERM_KEY_UP); + return TERM_KEY_UP; case 'B': - return(TERM_KEY_DOWN); + return TERM_KEY_DOWN; case 'C': - return(TERM_KEY_RIGHT); + return TERM_KEY_RIGHT; case 'D': - return(TERM_KEY_LEFT); + return TERM_KEY_LEFT; case 'H': /* ANSI: home cursor */ - return(TERM_KEY_HOME); + return TERM_KEY_HOME; case 'V': return TERM_KEY_PAGEUP; case 'U': return TERM_KEY_PAGEDN; case 'F': /* Xterm: cursor preceding line */ case 'K': /* ANSI: clear-to-end-of-line */ - return(TERM_KEY_END); + return TERM_KEY_END; case '@': /* ANSI/ECMA-048 INSERT */ - return(TERM_KEY_INSERT); + return TERM_KEY_INSERT; case '~': /* VT-220 (XP telnet.exe) */ switch (atoi(str)) { case 1: - return(TERM_KEY_HOME); + return TERM_KEY_HOME; case 2: - return(TERM_KEY_INSERT); + return TERM_KEY_INSERT; case 3: - return(TERM_KEY_DELETE); + return TERM_KEY_DELETE; case 4: - return(TERM_KEY_END); + return TERM_KEY_END; case 5: return TERM_KEY_PAGEUP; case 6: @@ -555,7 +555,7 @@ char sbbs_t::handle_ctrlkey(char ch, int mode) for (j = i; j > 0; j--) ungetkey(str[j - 1], /* insert: */ true); ungetkey('[', /* insert: */ true); - return(ESC); + return ESC; } if (ch == 'R') { /* cursor position report */ if (mode & K_ANSI_CPR && i) { /* auto-detect rows */ @@ -571,7 +571,7 @@ char sbbs_t::handle_ctrlkey(char ch, int mode) update_nodeterm(); } } - return(0); + return 0; } str[i++] = ch; } @@ -579,9 +579,9 @@ char sbbs_t::handle_ctrlkey(char ch, int mode) for (j = i; j > 0; j--) ungetkey(str[j - 1], /* insert: */ true); ungetkey('[', /* insert: */ true); - return(ESC); + return ESC; } - return(ch); + return ch; } void sbbs_t::set_mouse(int flags) diff --git a/src/sbbs3/js_bbs.cpp b/src/sbbs3/js_bbs.cpp index a22f0107b406b1ec5652b0964533fdafee037bae..5e3a7c996733a51d4fade9b258dd57d909de4aeb 100644 --- a/src/sbbs3/js_bbs.cpp +++ b/src/sbbs3/js_bbs.cpp @@ -301,7 +301,7 @@ static JSBool js_bbs_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_IdToValue(cx, id, &idval); tiny = JSVAL_TO_INT(idval); @@ -781,17 +781,17 @@ static JSBool js_bbs_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) break; default: - return(JS_TRUE); + return JS_TRUE; } if (p != NULL) { JSString* js_str = JS_NewStringCopyZ(cx, p); if (js_str == NULL) - return(JS_FALSE); + return JS_FALSE; *vp = STRING_TO_JSVAL(js_str); } else *vp = UINT_TO_JSVAL(val); - return(JS_TRUE); + return JS_TRUE; } static JSBool js_bbs_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp) @@ -804,18 +804,18 @@ static JSBool js_bbs_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, j sbbs_t* sbbs; if ((sbbs = js_GetPrivate(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_IdToValue(cx, id, &idval); tiny = JSVAL_TO_INT(idval); if (JSVAL_IS_NUMBER(*vp) || JSVAL_IS_BOOLEAN(*vp)) { if (!JS_ValueToECMAUint32(cx, *vp, &val)) - return(JS_FALSE); + return JS_FALSE; } else if (JSVAL_IS_STRING(*vp)) { if ((js_str = JS_ValueToString(cx, *vp)) == NULL) - return(JS_FALSE); + return JS_FALSE; JSSTRING_TO_MSTRING(cx, js_str, p, NULL); HANDLE_PENDING(cx, p); } @@ -981,7 +981,7 @@ static JSBool js_bbs_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, j default: if (p) free(p); - return(JS_TRUE); + return JS_TRUE; } if (p) @@ -996,7 +996,7 @@ static JSBool js_bbs_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, j else sbbs->curdirnum = INVALID_DIR; - return(JS_TRUE); + return JS_TRUE; } #define PROP_READONLY JSPROP_ENUMERATE | JSPROP_READONLY @@ -1144,7 +1144,7 @@ static uint get_subnum(JSContext* cx, sbbs_t* sbbs, jsval *argv, int argc, int p else if (sbbs->usrgrps > 0) subnum = sbbs->usrsub[sbbs->curgrp][sbbs->cursub[sbbs->curgrp]]; - return(subnum); + return subnum; } static uint get_dirnum(JSContext* cx, sbbs_t* sbbs, jsval val, bool dflt) @@ -1171,7 +1171,7 @@ static uint get_dirnum(JSContext* cx, sbbs_t* sbbs, jsval val, bool dflt) dirnum = sbbs->usrdir[sbbs->curlib][sbbs->curdir[sbbs->curlib]]; } - return(dirnum); + return dirnum; } /**************************/ @@ -1190,14 +1190,14 @@ js_menu(JSContext *cx, uintN argc, jsval *arglist) JSObject* obj = JS_GetScopeChain(cx); if (!js_argc(cx, argc, 1)) - return(JS_FALSE); + return JS_FALSE; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; str = JS_ValueToString(cx, argv[0]); if (!str) - return(JS_FALSE); + return JS_FALSE; uintN argn = 1; if (argc > argn && JSVAL_IS_NUMBER(argv[argn])) { @@ -1221,7 +1221,7 @@ js_menu(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, result ? JSVAL_TRUE : JSVAL_FALSE); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1234,14 +1234,14 @@ js_menu_exists(JSContext *cx, uintN argc, jsval *arglist) char * menu; if (!js_argc(cx, argc, 1)) - return(JS_FALSE); + return JS_FALSE; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; str = JS_ValueToString(cx, argv[0]); if (!str) - return(JS_FALSE); + return JS_FALSE; JSSTRING_TO_MSTRING(cx, str, menu, NULL); if (!menu) @@ -1253,7 +1253,7 @@ js_menu_exists(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(result)); - return(JS_TRUE); + return JS_TRUE; } @@ -1264,7 +1264,7 @@ js_hangup(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -1272,7 +1272,7 @@ js_hangup(JSContext *cx, uintN argc, jsval *arglist) sbbs->hangup(); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1284,7 +1284,7 @@ js_nodesync(JSContext *cx, uintN argc, jsval *arglist) JSBool clearline = false; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -1296,7 +1296,7 @@ js_nodesync(JSContext *cx, uintN argc, jsval *arglist) sbbs->nodesync(clearline ? true : false); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1313,13 +1313,13 @@ js_exec(JSContext *cx, uintN argc, jsval *arglist) char* cstr; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; if (!js_argc(cx, argc, 1)) - return(JS_FALSE); + return JS_FALSE; if ((cmd = JS_ValueToString(cx, argv[0])) == NULL) - return(JS_FALSE); + return JS_FALSE; for (i = 1; i < argc; i++) { if (JSVAL_IS_NUMBER(argv[i])) { @@ -1348,7 +1348,7 @@ js_exec(JSContext *cx, uintN argc, jsval *arglist) free(p_startup_dir); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1361,7 +1361,7 @@ js_exec_xtrn(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; if (!js_argc(cx, argc, 1)) return JS_FALSE; @@ -1369,7 +1369,7 @@ js_exec_xtrn(JSContext *cx, uintN argc, jsval *arglist) if (JSVAL_IS_STRING(argv[0])) { JSVALUE_TO_ASTRING(cx, argv[0], code, LEN_CODE + 2, NULL); if (code == NULL) - return(JS_FALSE); + return JS_FALSE; for (i = 0; i < sbbs->cfg.total_xtrns; i++) if (!stricmp(sbbs->cfg.xtrn[i]->code, code)) @@ -1387,7 +1387,7 @@ js_exec_xtrn(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->exec_xtrn(i))); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1399,7 +1399,7 @@ js_user_event(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc && JSVAL_IS_NUMBER(argv[0])) { if (!JS_ValueToECMAUint32(cx, argv[0], &i)) @@ -1408,7 +1408,7 @@ js_user_event(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->user_event((user_event_t)i))); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1448,7 +1448,7 @@ js_chksyspass(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc) { JSString* str = JS_ValueToString(cx, argv[0]); @@ -1458,7 +1458,7 @@ js_chksyspass(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->chksyspass(sys_pw))); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1471,10 +1471,10 @@ js_chkpass(JSContext *cx, uintN argc, jsval *arglist) bool unique = false; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; if (!js_argc(cx, argc, 1)) - return(JS_FALSE); + return JS_FALSE; if (argc > 1 && JSVAL_IS_BOOLEAN(argv[1])) unique = JSVAL_TO_BOOLEAN(argv[1]); @@ -1485,7 +1485,7 @@ js_chkpass(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->chkpass(cstr, &sbbs->useron, unique))); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } @@ -1498,7 +1498,7 @@ js_text(JSContext *cx, uintN argc, jsval *arglist) bool dflt = false; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_NULL); @@ -1522,11 +1522,11 @@ js_text(JSContext *cx, uintN argc, jsval *arglist) if (i > 0 && i <= TOTAL_TEXT) { JSString* js_str = JS_NewStringCopyZ(cx, dflt ? sbbs->text_sav[i - 1] : sbbs->text[i - 1]); if (js_str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); } - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1539,12 +1539,12 @@ js_replace_text(JSContext *cx, uintN argc, jsval *arglist) sbbs_t* sbbs; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_FALSE); if (!js_argc(cx, argc, 2)) - return(JS_FALSE); + return JS_FALSE; if (JSVAL_IS_NUMBER(argv[0])) { if (!JS_ValueToECMAUint32(cx, argv[0], &i)) @@ -1559,7 +1559,7 @@ js_replace_text(JSContext *cx, uintN argc, jsval *arglist) free(id); } if (i < 1 || i > TOTAL_TEXT) - return(JS_TRUE); + return JS_TRUE; i--; if (sbbs->text[i] != sbbs->text_sav[i] && sbbs->text[i] != nulstr) @@ -1567,7 +1567,7 @@ js_replace_text(JSContext *cx, uintN argc, jsval *arglist) JSVALUE_TO_MSTRING(cx, argv[1], p, NULL); if (p == NULL) - return(JS_FALSE); + return JS_FALSE; len = strlen(p); if (!len) { @@ -1579,7 +1579,7 @@ js_replace_text(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_TRUE); } - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1590,10 +1590,10 @@ js_revert_text(JSContext *cx, uintN argc, jsval *arglist) sbbs_t* sbbs; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; if (!js_argc(cx, argc, 1)) - return(JS_FALSE); + return JS_FALSE; if (JSVAL_IS_NUMBER(argv[0])) { if (!JS_ValueToECMAUint32(cx, argv[0], &i)) @@ -1623,7 +1623,7 @@ js_revert_text(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_TRUE); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1639,16 +1639,16 @@ js_load_text(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (!js_argc(cx, argc, 1)) - return(JS_FALSE); + return JS_FALSE; if ((js_str = JS_ValueToString(cx, argv[0])) == NULL) { JS_SET_RVAL(cx, arglist, JSVAL_FALSE); - return(JS_TRUE); + return JS_TRUE; } JSSTRING_TO_MSTRING(cx, js_str, cstr, NULL); if (!cstr) @@ -1669,7 +1669,7 @@ js_load_text(JSContext *cx, uintN argc, jsval *arglist) if ((stream = fnopen(NULL, path, O_RDONLY)) == NULL) { JS_SET_RVAL(cx, arglist, JSVAL_FALSE); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } for (i = 0; i < TOTAL_TEXT && !feof(stream); i++) { if ((sbbs->text[i] = readtext(NULL, stream, i)) == NULL) { @@ -1693,7 +1693,7 @@ js_load_text(JSContext *cx, uintN argc, jsval *arglist) fclose(stream); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1704,14 +1704,14 @@ js_load_user_text(JSContext* cx, uintN argc, jsval* arglist) bool result; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); result = sbbs->load_user_text(); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(result)); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1725,14 +1725,14 @@ js_atcode(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; if (!js_argc(cx, argc, 1)) - return(JS_FALSE); + return JS_FALSE; JSVALUE_TO_MSTRING(cx, argv[0], instr, NULL); if (instr == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); cp = sbbs->formatted_atcode(instr, str, sizeof(str)); @@ -1743,11 +1743,11 @@ js_atcode(JSContext *cx, uintN argc, jsval *arglist) else { JSString* js_str = JS_NewStringCopyZ(cx, cp); if (js_str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); } - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1803,13 +1803,13 @@ js_logkey(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((js_str = JS_ValueToString(cx, argv[0])) == NULL) { JS_SET_RVAL(cx, arglist, JSVAL_FALSE); - return(JS_TRUE); + return JS_TRUE; } if (argc > 1) @@ -1818,7 +1818,7 @@ js_logkey(JSContext *cx, uintN argc, jsval *arglist) JSSTRING_TO_MSTRING(cx, js_str, p, NULL); if (p == NULL) { JS_SET_RVAL(cx, arglist, JSVAL_FALSE); - return(JS_TRUE); + return JS_TRUE; } rc = JS_SUSPENDREQUEST(cx); @@ -1829,7 +1829,7 @@ js_logkey(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, JSVAL_TRUE); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1842,22 +1842,22 @@ js_logstr(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (!js_argc(cx, argc, 1)) - return(JS_FALSE); + return JS_FALSE; if ((js_str = JS_ValueToString(cx, argv[0])) == NULL) { JS_SET_RVAL(cx, arglist, JSVAL_FALSE); - return(JS_TRUE); + return JS_TRUE; } JSSTRING_TO_MSTRING(cx, js_str, p, NULL); if (p == NULL) { JS_SET_RVAL(cx, arglist, JSVAL_FALSE); - return(JS_TRUE); + return JS_TRUE; } rc = JS_SUSPENDREQUEST(cx); @@ -1866,7 +1866,7 @@ js_logstr(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, JSVAL_TRUE); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1879,27 +1879,27 @@ js_finduser(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; if (!js_argc(cx, argc, 1)) - return(JS_FALSE); + return JS_FALSE; if ((js_str = JS_ValueToString(cx, argv[0])) == NULL) { JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(0)); - return(JS_TRUE); + return JS_TRUE; } JSSTRING_TO_MSTRING(cx, js_str, p, NULL); if (p == NULL) { JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(0)); - return(JS_TRUE); + return JS_TRUE; } rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(sbbs->finduser(p, /* silent_failure: */ true))); free(p); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1914,32 +1914,32 @@ js_trashcan(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; if (!js_argc(cx, argc, 2)) - return(JS_FALSE); + return JS_FALSE; if ((js_can = JS_ValueToString(cx, argv[0])) == NULL) { JS_SET_RVAL(cx, arglist, JSVAL_FALSE); - return(JS_TRUE); + return JS_TRUE; } if ((js_str = JS_ValueToString(cx, argv[1])) == NULL) { JS_SET_RVAL(cx, arglist, JSVAL_FALSE); - return(JS_TRUE); + return JS_TRUE; } JSSTRING_TO_MSTRING(cx, js_can, can, NULL); if (can == NULL) { JS_SET_RVAL(cx, arglist, JSVAL_FALSE); - return(JS_TRUE); + return JS_TRUE; } JSSTRING_TO_MSTRING(cx, js_str, str, NULL); if (str == NULL) { free(can); JS_SET_RVAL(cx, arglist, JSVAL_FALSE); - return(JS_TRUE); + return JS_TRUE; } rc = JS_SUSPENDREQUEST(cx); @@ -1947,7 +1947,7 @@ js_trashcan(JSContext *cx, uintN argc, jsval *arglist) free(can); free(str); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1957,12 +1957,12 @@ js_newuser(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->newuser())); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1972,12 +1972,12 @@ js_logon(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->logon())); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1996,13 +1996,13 @@ js_login(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; if (!js_argc(cx, argc, 2)) - return(JS_FALSE); + return JS_FALSE; if ((js_name = JS_ValueToString(cx, argv[0])) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc > 1) js_pw_prompt = JS_ValueToString(cx, argv[1]); @@ -2013,7 +2013,7 @@ js_login(JSContext *cx, uintN argc, jsval *arglist) JSSTRING_TO_ASTRING(cx, js_name, name, (LEN_ALIAS > LEN_NAME) ? LEN_ALIAS + 2 : LEN_NAME + 2, NULL); if (name == NULL) - return(JS_FALSE); + return JS_FALSE; JSSTRING_TO_MSTRING(cx, js_pw_prompt, pw_prompt, NULL); JSSTRING_TO_MSTRING(cx, js_user_pw, user_pw, NULL); @@ -2025,7 +2025,7 @@ js_login(JSContext *cx, uintN argc, jsval *arglist) FREE_AND_NULL(pw_prompt); FREE_AND_NULL(user_pw); FREE_AND_NULL(sys_pw); - return(JS_TRUE); + return JS_TRUE; } @@ -2038,7 +2038,7 @@ js_logoff(JSContext *cx, uintN argc, jsval *arglist) JSBool prompt = JS_TRUE; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_FALSE); @@ -2057,7 +2057,7 @@ js_logoff(JSContext *cx, uintN argc, jsval *arglist) } JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2067,7 +2067,7 @@ js_logout(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2075,7 +2075,7 @@ js_logout(JSContext *cx, uintN argc, jsval *arglist) sbbs->logout(); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2085,7 +2085,7 @@ js_automsg(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2093,7 +2093,7 @@ js_automsg(JSContext *cx, uintN argc, jsval *arglist) sbbs->automsg(); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2103,7 +2103,7 @@ js_time_bank(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2111,7 +2111,7 @@ js_time_bank(JSContext *cx, uintN argc, jsval *arglist) sbbs->time_bank(); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2121,7 +2121,7 @@ js_text_sec(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2129,7 +2129,7 @@ js_text_sec(JSContext *cx, uintN argc, jsval *arglist) sbbs->text_sec(); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2139,7 +2139,7 @@ js_chat_sec(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2147,7 +2147,7 @@ js_chat_sec(JSContext *cx, uintN argc, jsval *arglist) sbbs->chatsection(); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2157,7 +2157,7 @@ js_qwk_sec(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2165,7 +2165,7 @@ js_qwk_sec(JSContext *cx, uintN argc, jsval *arglist) sbbs->qwk_sec(); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2177,7 +2177,7 @@ js_xtrn_sec(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc > 0) { @@ -2187,7 +2187,7 @@ js_xtrn_sec(JSContext *cx, uintN argc, jsval *arglist) sbbs->xtrn_sec(section); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2197,7 +2197,7 @@ js_xfer_policy(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2205,7 +2205,7 @@ js_xfer_policy(JSContext *cx, uintN argc, jsval *arglist) sbbs->xfer_policy(); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2215,7 +2215,7 @@ js_batchmenu(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2223,7 +2223,7 @@ js_batchmenu(JSContext *cx, uintN argc, jsval *arglist) sbbs->batchmenu(); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2233,12 +2233,12 @@ js_batchdownload(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->start_batch_download())); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2250,12 +2250,12 @@ js_batchaddlist(JSContext *cx, uintN argc, jsval *arglist) char* cstr; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (!js_argc(cx, argc, 1)) - return(JS_FALSE); + return JS_FALSE; JSVALUE_TO_MSTRING(cx, argv[0], cstr, NULL); if (cstr == NULL) @@ -2265,7 +2265,7 @@ js_batchaddlist(JSContext *cx, uintN argc, jsval *arglist) free(cstr); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2277,7 +2277,7 @@ js_batch_clear(JSContext *cx, uintN argc, jsval *arglist) enum XFER_TYPE xfer_type = XFER_BATCH_DOWNLOAD; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc > 0 && argv[0] == JSVAL_TRUE) xfer_type = XFER_BATCH_UPLOAD; @@ -2288,7 +2288,7 @@ js_batch_clear(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(result)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2300,7 +2300,7 @@ js_batch_remove(JSContext *cx, uintN argc, jsval *arglist) enum XFER_TYPE xfer_type = XFER_BATCH_DOWNLOAD; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc > 0 && argv[0] == JSVAL_TRUE) xfer_type = XFER_BATCH_UPLOAD; @@ -2321,7 +2321,7 @@ js_batch_remove(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(result)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2333,7 +2333,7 @@ js_batch_sort(JSContext *cx, uintN argc, jsval *arglist) enum XFER_TYPE xfer_type = XFER_BATCH_DOWNLOAD; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc > 0 && argv[0] == JSVAL_TRUE) xfer_type = XFER_BATCH_UPLOAD; @@ -2344,7 +2344,7 @@ js_batch_sort(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(result)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2357,7 +2357,7 @@ js_xfer_prot_menu(JSContext *cx, uintN argc, jsval *arglist) enum XFER_TYPE xfer_type = XFER_DOWNLOAD; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc > 0 && argv[0] == JSVAL_TRUE) xfer_type = XFER_UPLOAD; @@ -2414,10 +2414,10 @@ js_sendfile(JSContext *cx, uintN argc, jsval *arglist) char* cstr; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; if (!js_argc(cx, argc, 1)) - return(JS_FALSE); + return JS_FALSE; if (argc > 1) { JSVALUE_TO_ASTRING(cx, argv[1], p, 8, NULL); @@ -2446,7 +2446,7 @@ js_sendfile(JSContext *cx, uintN argc, jsval *arglist) free(desc); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2461,10 +2461,10 @@ js_recvfile(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; if (!js_argc(cx, argc, 1)) - return(JS_FALSE); + return JS_FALSE; if (argc > 1) { JSVALUE_TO_ASTRING(cx, argv[1], p, 8, NULL); @@ -2482,7 +2482,7 @@ js_recvfile(JSContext *cx, uintN argc, jsval *arglist) free(cstr); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2492,7 +2492,7 @@ js_temp_xfer(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2500,7 +2500,7 @@ js_temp_xfer(JSContext *cx, uintN argc, jsval *arglist) sbbs->temp_xfer(); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2510,7 +2510,7 @@ js_user_config(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2520,7 +2520,7 @@ js_user_config(JSContext *cx, uintN argc, jsval *arglist) sbbs->getuseron(WHERE); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2530,7 +2530,7 @@ js_user_sync(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2538,7 +2538,7 @@ js_user_sync(JSContext *cx, uintN argc, jsval *arglist) sbbs->getuseron(WHERE); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2548,7 +2548,7 @@ js_sys_info(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2556,7 +2556,7 @@ js_sys_info(JSContext *cx, uintN argc, jsval *arglist) sbbs->sys_info(); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2567,7 +2567,7 @@ js_sub_info(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2578,7 +2578,7 @@ js_sub_info(JSContext *cx, uintN argc, jsval *arglist) sbbs->subinfo(subnum); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2589,7 +2589,7 @@ js_dir_info(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2599,7 +2599,7 @@ js_dir_info(JSContext *cx, uintN argc, jsval *arglist) sbbs->dirinfo(dirnum); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2609,7 +2609,7 @@ js_user_info(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2617,7 +2617,7 @@ js_user_info(JSContext *cx, uintN argc, jsval *arglist) sbbs->user_info(); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2627,7 +2627,7 @@ js_ver(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2635,7 +2635,7 @@ js_ver(JSContext *cx, uintN argc, jsval *arglist) sbbs->ver(); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2645,7 +2645,7 @@ js_sys_stats(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2653,7 +2653,7 @@ js_sys_stats(JSContext *cx, uintN argc, jsval *arglist) sbbs->sys_stats(); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2665,7 +2665,7 @@ js_node_stats(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2678,7 +2678,7 @@ js_node_stats(JSContext *cx, uintN argc, jsval *arglist) sbbs->node_stats(node_num); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2690,7 +2690,7 @@ js_userlist(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2703,7 +2703,7 @@ js_userlist(JSContext *cx, uintN argc, jsval *arglist) sbbs->userlist(mode); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2715,7 +2715,7 @@ js_useredit(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2728,7 +2728,7 @@ js_useredit(JSContext *cx, uintN argc, jsval *arglist) sbbs->useredit(usernumber); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2738,7 +2738,7 @@ js_change_user(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2746,7 +2746,7 @@ js_change_user(JSContext *cx, uintN argc, jsval *arglist) sbbs->change_user(); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2758,7 +2758,7 @@ js_logonlist(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2769,7 +2769,7 @@ js_logonlist(JSContext *cx, uintN argc, jsval *arglist) sbbs->logonlist(args); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2779,7 +2779,7 @@ js_nodelist(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2787,7 +2787,7 @@ js_nodelist(JSContext *cx, uintN argc, jsval *arglist) sbbs->nodelist(); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2797,7 +2797,7 @@ js_whos_online(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2805,7 +2805,7 @@ js_whos_online(JSContext *cx, uintN argc, jsval *arglist) sbbs->whos_online(true); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2817,12 +2817,12 @@ js_spy(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (!js_argc(cx, argc, 1)) - return(JS_FALSE); + return JS_FALSE; if (JSVAL_IS_NUMBER(argv[0])) { if (!JS_ValueToInt32(cx, argv[0], &node_num)) @@ -2832,7 +2832,7 @@ js_spy(JSContext *cx, uintN argc, jsval *arglist) sbbs->spy(node_num); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2846,7 +2846,7 @@ js_readmail(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; usernumber = sbbs->useron.number; if (argc > 0 && JSVAL_IS_NUMBER(argv[0])) { @@ -2868,7 +2868,7 @@ js_readmail(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(result)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2890,12 +2890,12 @@ js_email(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; ZERO_VAR(msg); if (!js_argc(cx, argc, 1)) - return(JS_FALSE); + return JS_FALSE; if (JSVAL_IS_NUMBER(argv[0])) { if (!JS_ValueToECMAUint32(cx, argv[0], &usernumber)) @@ -2943,7 +2943,7 @@ js_email(JSContext *cx, uintN argc, jsval *arglist) if (subj != def) free(subj); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2964,13 +2964,13 @@ js_netmail(JSContext *cx, uintN argc, jsval *arglist) bool error = false; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; ZERO_VAR(msg); JS_SET_RVAL(cx, arglist, JSVAL_FALSE); if (!js_argc(cx, argc, 1)) - return(JS_FALSE); + return JS_FALSE; for (uintN i = 0; i < argc && !error; i++) { if (JSVAL_IS_NUMBER(argv[i])) { @@ -3035,7 +3035,7 @@ js_netmail(JSContext *cx, uintN argc, jsval *arglist) FREE_AND_NULL(subj); FREE_AND_NULL(to); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3048,14 +3048,14 @@ js_bulkmail(JSContext *cx, uintN argc, jsval *arglist) char * p; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc) { JSVALUE_TO_MSTRING(cx, argv[0], p, NULL); if (p == NULL) - return(JS_FALSE); + return JS_FALSE; ar = arstr(NULL, p, &sbbs->cfg, NULL); free(p); } @@ -3064,7 +3064,7 @@ js_bulkmail(JSContext *cx, uintN argc, jsval *arglist) free(ar); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3077,13 +3077,13 @@ js_upload_file(JSContext *cx, uintN argc, jsval *arglist) char* fname = nullptr; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; dirnum = get_dirnum(cx, sbbs, argv[0], argc == 0); if (!dirnum_is_valid(&sbbs->cfg, dirnum)) { JS_SET_RVAL(cx, arglist, JSVAL_FALSE); - return(JS_TRUE); + return JS_TRUE; } if (argc > 1 && JSVAL_IS_STRING(argv[1])) { @@ -3097,7 +3097,7 @@ js_upload_file(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->upload(dirnum, fname))); JS_RESUMEREQUEST(cx, rc); free(fname); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3107,7 +3107,7 @@ js_batch_upload(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->batch_upload())); @@ -3124,19 +3124,19 @@ js_bulkupload(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; dirnum = get_dirnum(cx, sbbs, argv[0], argc == 0); if (!dirnum_is_valid(&sbbs->cfg, dirnum)) { JS_SET_RVAL(cx, arglist, JSVAL_FALSE); - return(JS_TRUE); + return JS_TRUE; } rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->bulkupload(dirnum) == 0)); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3153,17 +3153,17 @@ js_telnet_gate(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; if (!js_argc(cx, argc, 1)) - return(JS_FALSE); + return JS_FALSE; if ((js_addr = JS_ValueToString(cx, argv[0])) == NULL) - return(JS_FALSE); + return JS_FALSE; JSSTRING_TO_MSTRING(cx, js_addr, addr, NULL); if (addr == NULL) - return(JS_FALSE); + return JS_FALSE; argn = 1; if (argc > argn && JSVAL_IS_NUMBER(argv[argn])) { @@ -3205,7 +3205,7 @@ js_telnet_gate(JSContext *cx, uintN argc, jsval *arglist) strListFree(&send_strings); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } #define TG_MODE_UNSPECIFIED ~0U @@ -3227,17 +3227,17 @@ js_rlogin_gate(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; if (!js_argc(cx, argc, 1)) - return(JS_FALSE); + return JS_FALSE; if ((js_str = JS_ValueToString(cx, argv[0])) == NULL) - return(JS_FALSE); + return JS_FALSE; JSSTRING_TO_MSTRING(cx, js_str, addr, NULL); if (addr == NULL) - return(JS_FALSE); + return JS_FALSE; /* Parse optional arguments if provided */ for (argn = 1; argn < argc; argn++) { @@ -3297,7 +3297,7 @@ js_rlogin_gate(JSContext *cx, uintN argc, jsval *arglist) FREE_AND_NULL(term_type); strListFree(&send_strings); - return(fail ? JS_FALSE : JS_TRUE); + return fail ? JS_FALSE : JS_TRUE; } static JSBool @@ -3307,12 +3307,12 @@ js_pagesysop(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->sysop_page())); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3322,12 +3322,12 @@ js_pageguru(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->guru_page())); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3339,7 +3339,7 @@ js_multinode_chat(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -3352,7 +3352,7 @@ js_multinode_chat(JSContext *cx, uintN argc, jsval *arglist) sbbs->multinodechat(channel); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3362,7 +3362,7 @@ js_private_message(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -3370,7 +3370,7 @@ js_private_message(JSContext *cx, uintN argc, jsval *arglist) sbbs->nodemsg(); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3382,7 +3382,7 @@ js_private_chat(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -3393,7 +3393,7 @@ js_private_chat(JSContext *cx, uintN argc, jsval *arglist) sbbs->privchat(local ? true:false); // <- eliminates stupid msvc6 "performance warning" JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3405,7 +3405,7 @@ js_get_node_message(JSContext *cx, uintN argc, jsval *arglist) JSBool clearline = false; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -3416,7 +3416,7 @@ js_get_node_message(JSContext *cx, uintN argc, jsval *arglist) sbbs->getnmsg(clearline ? true : false); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3433,7 +3433,7 @@ js_put_node_message(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_FALSE); @@ -3524,7 +3524,7 @@ js_put_node_message(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); free(msg); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3537,7 +3537,7 @@ js_get_telegram(JSContext *cx, uintN argc, jsval *arglist) JSBool clearline = false; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -3553,7 +3553,7 @@ js_get_telegram(JSContext *cx, uintN argc, jsval *arglist) sbbs->getsmsg(usernumber, clearline ? true : false); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3571,7 +3571,7 @@ js_put_telegram(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_FALSE); @@ -3638,7 +3638,7 @@ js_put_telegram(JSContext *cx, uintN argc, jsval *arglist) } if (msg == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); bool success = putsmsg(&sbbs->cfg, usernumber, msg) == 0; @@ -3655,7 +3655,7 @@ js_put_telegram(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3671,16 +3671,16 @@ js_cmdstr(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (!js_argc(cx, argc, 1)) - return(JS_FALSE); + return JS_FALSE; js_str = JS_ValueToString(cx, argv[0]); if (!js_str) - return(JS_FALSE); + return JS_FALSE; JSSTRING_TO_MSTRING(cx, js_str, p, NULL); if (p == NULL) @@ -3720,9 +3720,9 @@ js_cmdstr(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); if ((js_str = JS_NewStringCopyZ(cx, cmd)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3734,7 +3734,7 @@ js_getfilespec(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -3747,10 +3747,10 @@ js_getfilespec(JSContext *cx, uintN argc, jsval *arglist) else { JSString* js_str = JS_NewStringCopyZ(cx, p); if (js_str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); } - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3799,7 +3799,7 @@ js_listfiles(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -3807,7 +3807,7 @@ js_listfiles(JSContext *cx, uintN argc, jsval *arglist) if (!dirnum_is_valid(&sbbs->cfg, dirnum)) { JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(0)); - return(JS_TRUE); + return JS_TRUE; } for (uintN i = 1; i < argc; i++) { @@ -3834,7 +3834,7 @@ js_listfiles(JSContext *cx, uintN argc, jsval *arglist) if (afspec) free(afspec); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } @@ -3851,7 +3851,7 @@ js_listfileinfo(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -3859,7 +3859,7 @@ js_listfileinfo(JSContext *cx, uintN argc, jsval *arglist) if (!dirnum_is_valid(&sbbs->cfg, dirnum)) { JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(0)); - return(JS_TRUE); + return JS_TRUE; } for (uintN i = 1; i < argc; i++) { @@ -3885,7 +3885,7 @@ js_listfileinfo(JSContext *cx, uintN argc, jsval *arglist) if (fspec != def) free(fspec); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3903,14 +3903,14 @@ js_post_msg(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_FALSE); subnum = get_subnum(cx, sbbs, argv, argc, 0); if (!subnum_is_valid(&sbbs->cfg, subnum)) - return(JS_TRUE); + return JS_TRUE; ZERO_VAR(msg); @@ -3937,7 +3937,7 @@ js_post_msg(JSContext *cx, uintN argc, jsval *arglist) smb_freemsgmem(&msg); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3955,7 +3955,7 @@ js_forward_msg(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_FALSE); @@ -4009,7 +4009,7 @@ js_edit_msg(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_FALSE); @@ -4045,7 +4045,7 @@ js_show_msg(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_FALSE); @@ -4070,7 +4070,7 @@ js_show_msg(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->show_msg(smb, msg, p_mode, post))); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -4088,7 +4088,7 @@ js_show_msg_header(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -4144,7 +4144,7 @@ js_download_msg_attachments(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -4167,7 +4167,7 @@ js_download_msg_attachments(JSContext *cx, uintN argc, jsval *arglist) sbbs->download_msg_attachments(smb, msg, del); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -4180,7 +4180,7 @@ js_change_msg_attr(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -4213,7 +4213,7 @@ js_msgscan_cfg(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -4226,7 +4226,7 @@ js_msgscan_cfg(JSContext *cx, uintN argc, jsval *arglist) sbbs->new_scan_cfg(mode); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } @@ -4237,7 +4237,7 @@ js_msgscan_ptrs(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -4245,7 +4245,7 @@ js_msgscan_ptrs(JSContext *cx, uintN argc, jsval *arglist) sbbs->new_scan_ptr_cfg(); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -4292,7 +4292,7 @@ js_reload_msg_scan(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -4300,7 +4300,7 @@ js_reload_msg_scan(JSContext *cx, uintN argc, jsval *arglist) sbbs->getmsgptrs(); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -4313,7 +4313,7 @@ js_scansubs(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -4333,7 +4333,7 @@ js_scansubs(JSContext *cx, uintN argc, jsval *arglist) sbbs->scansubs(mode); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -4346,7 +4346,7 @@ js_scandirs(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -4366,7 +4366,7 @@ js_scandirs(JSContext *cx, uintN argc, jsval *arglist) sbbs->scandirs(mode); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -4381,14 +4381,14 @@ js_scanposts(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_FALSE); subnum = get_subnum(cx, sbbs, argv, argc, 0); if (!subnum_is_valid(&sbbs->cfg, subnum)) - return(JS_TRUE); + return JS_TRUE; for (uintN i = 1; i < argc; i++) { if (JSVAL_IS_NUMBER(argv[i])) { @@ -4413,7 +4413,7 @@ js_scanposts(JSContext *cx, uintN argc, jsval *arglist) if (find != def) free(find); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -4430,14 +4430,14 @@ js_listmsgs(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(0)); subnum = get_subnum(cx, sbbs, argv, argc, argn++); if (!subnum_is_valid(&sbbs->cfg, subnum)) - return(JS_TRUE); + return JS_TRUE; if (argc > argn && JSVAL_IS_NUMBER(argv[argn])) { if (!JS_ValueToECMAUint32(cx, argv[argn++], &mode)) @@ -4459,7 +4459,7 @@ js_listmsgs(JSContext *cx, uintN argc, jsval *arglist) if (find != def) free(find); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -4471,7 +4471,7 @@ js_getnstime(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_NULL); @@ -4490,7 +4490,7 @@ js_getnstime(JSContext *cx, uintN argc, jsval *arglist) else JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -4500,14 +4500,14 @@ js_select_shell(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->select_shell())); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -4517,14 +4517,14 @@ js_select_editor(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->select_editor())); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -4534,14 +4534,14 @@ js_get_time_left(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(sbbs->gettimeleft())); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -4554,7 +4554,7 @@ js_chk_ar(JSContext *cx, uintN argc, jsval *arglist) char * p; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -4584,7 +4584,7 @@ js_select_node(JSContext *cx, uintN argc, jsval *arglist) BOOL all = FALSE; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc > 0 && JSVAL_IS_BOOLEAN(argv[0])) all = JSVAL_TO_BOOLEAN(argv[0]); @@ -4603,7 +4603,7 @@ js_select_user(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = js_GetPrivate(cx, JS_THIS_OBJECT(cx, arglist))) == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(sbbs->getnodetopage(/* all: */ FALSE, /* telegram: */ TRUE))); @@ -5121,7 +5121,7 @@ static JSBool js_bbs_resolve(JSContext *cx, JSObject *obj, jsid id) static JSBool js_bbs_enumerate(JSContext *cx, JSObject *obj) { - return(js_bbs_resolve(cx, obj, JSID_VOID)); + return js_bbs_resolve(cx, obj, JSID_VOID); } JSClass js_bbs_class = { @@ -5146,12 +5146,12 @@ JSObject* js_CreateBbsObject(JSContext* cx, JSObject* parent) , JSPROP_ENUMERATE | JSPROP_READONLY); if (obj == NULL) - return(NULL); + return NULL; JS_SetPrivate(cx, obj, JS_GetContextPrivate(cx)); if ((mods = JS_DefineObject(cx, obj, "mods", NULL, NULL, JSPROP_ENUMERATE)) == NULL) - return(NULL); + return NULL; js_CreateTextProperties(cx, obj); @@ -5161,7 +5161,7 @@ JSObject* js_CreateBbsObject(JSContext* cx, JSObject* parent) js_CreateArrayOfStrings(cx, obj, "_property_desc_list", bbs_prop_desc, JSPROP_READONLY); #endif - return(obj); + return obj; } #endif /* JAVSCRIPT */ diff --git a/src/sbbs3/js_client.c b/src/sbbs3/js_client.c index 536a2f269906ab67dc241ccb1bd5425a527a34da..a7031bba894a9a90aefcedb8112428fa17352387 100644 --- a/src/sbbs3/js_client.c +++ b/src/sbbs3/js_client.c @@ -52,7 +52,7 @@ static const char* client_prop_desc[] = { static JSBool js_client_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp) { - return(JS_FALSE); + return JS_FALSE; } static JSBool js_client_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) @@ -65,7 +65,7 @@ static JSBool js_client_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) client_t* client; if ((client = (client_t*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_IdToValue(cx, id, &idval); tiny = JSVAL_TO_INT(idval); @@ -93,16 +93,16 @@ static JSBool js_client_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) val = client->usernum; break; default: - return(JS_TRUE); + return JS_TRUE; } if (p != NULL) { if ((js_str = JS_NewStringCopyZ(cx, p)) == NULL) - return(JS_FALSE); + return JS_FALSE; *vp = STRING_TO_JSVAL(js_str); } else *vp = INT_TO_JSVAL(val); - return(JS_TRUE); + return JS_TRUE; } #define CLIENT_PROP_FLAGS JSPROP_ENUMERATE | JSPROP_READONLY @@ -144,7 +144,7 @@ static JSBool js_client_resolve(JSContext *cx, JSObject *obj, jsid id) static JSBool js_client_enumerate(JSContext *cx, JSObject *obj) { - return(js_client_resolve(cx, obj, JSID_VOID)); + return js_client_resolve(cx, obj, JSID_VOID); } static JSClass js_client_class = { @@ -169,7 +169,7 @@ JSObject* js_CreateClientObject(JSContext* cx, JSObject* parent , JSPROP_ENUMERATE | JSPROP_READONLY); if (obj == NULL) - return(NULL); + return NULL; JS_SetPrivate(cx, obj, client); /* Store a pointer to client_t */ @@ -180,7 +180,7 @@ JSObject* js_CreateClientObject(JSContext* cx, JSObject* parent js_CreateSocketObject(cx, obj, "socket", sock, session); - return(obj); + return obj; } #endif /* JAVSCRIPT */ diff --git a/src/sbbs3/js_com.c b/src/sbbs3/js_com.c index 0eb4b52d5365fd921ab31218ca4ad99d65404df9..5ef06b99f7a9a4f9ed3bbe675d0d869e28b6d0e5 100644 --- a/src/sbbs3/js_com.c +++ b/src/sbbs3/js_com.c @@ -91,11 +91,11 @@ js_close(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_com_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->com == COM_HANDLE_INVALID) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); comClose(p->com); @@ -108,7 +108,7 @@ js_close(JSContext *cx, uintN argc, jsval *arglist) p->is_open = FALSE; JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -121,7 +121,7 @@ js_open(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_com_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); @@ -134,7 +134,7 @@ js_open(JSContext *cx, uintN argc, jsval *arglist) dbprintf(TRUE, p, "connect failed with error %d", p->last_error); JS_SET_RVAL(cx, arglist, JSVAL_FALSE); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } comSetBaudRate(p->com, p->baud_rate); @@ -144,7 +144,7 @@ js_open(JSContext *cx, uintN argc, jsval *arglist) dbprintf(FALSE, p, "connected to port %s", p->dev); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -160,7 +160,7 @@ js_send(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_com_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (!js_argc(cx, argc, 1)) @@ -183,7 +183,7 @@ js_send(JSContext *cx, uintN argc, jsval *arglist) free(cp); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -201,7 +201,7 @@ js_sendfile(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_com_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (!js_argc(cx, argc, 1)) @@ -213,30 +213,30 @@ js_sendfile(JSContext *cx, uintN argc, jsval *arglist) HANDLE_PENDING(cx, fname); if (fname == NULL) { JS_ReportError(cx, "Failure reading filename"); - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); if ((file = nopen(fname, O_RDONLY | O_BINARY)) == -1) { JS_RESUMEREQUEST(cx, rc); free(fname); - return(JS_TRUE); + return JS_TRUE; } free(fname); len = filelength(file); if (len < 1) { close(file); - return(JS_TRUE); + return JS_TRUE; } if ((buf = malloc((size_t)len)) == NULL) { close(file); - return(JS_TRUE); + return JS_TRUE; } if (read(file, buf, (uint)len) != len) { free(buf); close(file); - return(JS_TRUE); + return JS_TRUE; } close(file); @@ -250,7 +250,7 @@ js_sendfile(JSContext *cx, uintN argc, jsval *arglist) free(buf); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -270,7 +270,7 @@ js_sendbin(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_FALSE); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_com_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (!js_argc(cx, argc, 1)) @@ -314,7 +314,7 @@ js_sendbin(JSContext *cx, uintN argc, jsval *arglist) } JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } @@ -333,7 +333,7 @@ js_recv(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_com_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (argc) { @@ -348,7 +348,7 @@ js_recv(JSContext *cx, uintN argc, jsval *arglist) if ((buf = (char*)malloc(len + 1)) == NULL) { JS_ReportError(cx, "Error allocating %u bytes", len + 1); - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); @@ -358,21 +358,21 @@ js_recv(JSContext *cx, uintN argc, jsval *arglist) p->last_error = COM_ERROR_VALUE; free(buf); JS_SET_RVAL(cx, arglist, JSVAL_NULL); - return(JS_TRUE); + return JS_TRUE; } buf[len] = 0; str = JS_NewStringCopyN(cx, buf, len); free(buf); if (str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(str)); rc = JS_SUSPENDREQUEST(cx); dbprintf(FALSE, p, "received %u bytes", len); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -391,7 +391,7 @@ js_recvline(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_com_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (argc) { @@ -401,7 +401,7 @@ js_recvline(JSContext *cx, uintN argc, jsval *arglist) if ((buf = (char*)malloc(len + 1)) == NULL) { JS_ReportError(cx, "Error allocating %u bytes", len + 1); - return(JS_FALSE); + return JS_FALSE; } if (argc > 1) { @@ -424,7 +424,7 @@ js_recvline(JSContext *cx, uintN argc, jsval *arglist) str = JS_NewStringCopyZ(cx, buf); free(buf); if (str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(str)); rc = JS_SUSPENDREQUEST(cx); @@ -432,7 +432,7 @@ js_recvline(JSContext *cx, uintN argc, jsval *arglist) , i, COM_ERROR_VALUE); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -452,7 +452,7 @@ js_recvbin(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(-1)); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_com_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (argc) { @@ -491,7 +491,7 @@ js_recvbin(JSContext *cx, uintN argc, jsval *arglist) p->last_error = COM_ERROR_VALUE; JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } /* COM Object Properites */ @@ -540,7 +540,7 @@ static JSBool js_com_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, j if ((p = (private_t*)JS_GetPrivate(cx, obj)) == NULL) { // Prototype access - return(JS_TRUE); + return JS_TRUE; } JS_IdToValue(cx, id, &idval); @@ -591,7 +591,7 @@ static JSBool js_com_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, j } - return(JS_TRUE); + return JS_TRUE; } static JSBool js_com_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) @@ -606,7 +606,7 @@ static JSBool js_com_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) if ((p = (private_t*)JS_GetPrivate(cx, obj)) == NULL) { // Protoype access - return(JS_TRUE); + return JS_TRUE; } JS_IdToValue(cx, id, &idval); @@ -643,7 +643,7 @@ static JSBool js_com_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) case COM_PROP_DEVICE: JS_RESUMEREQUEST(cx, rc); if ((js_str = JS_NewStringCopyZ(cx, p->dev)) == NULL) - return(JS_FALSE); + return JS_FALSE; *vp = STRING_TO_JSVAL(js_str); rc = JS_SUSPENDREQUEST(cx); break; @@ -670,7 +670,7 @@ static JSBool js_com_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) } JS_RESUMEREQUEST(cx, rc); - return(TRUE); + return TRUE; } #define COM_PROP_FLAGS JSPROP_ENUMERATE | JSPROP_READONLY @@ -751,7 +751,7 @@ static JSBool js_com_resolve(JSContext *cx, JSObject *obj, jsid id) static JSBool js_com_enumerate(JSContext *cx, JSObject *obj) { - return(js_com_resolve(cx, obj, JSID_VOID)); + return js_com_resolve(cx, obj, JSID_VOID); } JSClass js_com_class = { @@ -785,13 +785,13 @@ js_com_constructor(JSContext *cx, uintN argc, jsval *arglist) } if (argc == 0 || fname == NULL) { JS_ReportError(cx, "Failure reading port name"); - return(JS_FALSE); + return JS_FALSE; } if ((p = (private_t*)malloc(sizeof(private_t))) == NULL) { JS_ReportError(cx, "malloc failed"); free(fname); - return(JS_FALSE); + return JS_FALSE; } memset(p, 0, sizeof(private_t)); @@ -802,7 +802,7 @@ js_com_constructor(JSContext *cx, uintN argc, jsval *arglist) if (!JS_SetPrivate(cx, obj, p)) { JS_ReportError(cx, "JS_SetPrivate failed"); - return(JS_FALSE); + return JS_FALSE; } #ifdef BUILD_JSDOCS @@ -815,7 +815,7 @@ js_com_constructor(JSContext *cx, uintN argc, jsval *arglist) #endif dbprintf(FALSE, p, "object constructed"); - return(JS_TRUE); + return JS_TRUE; } JSObject* js_CreateCOMClass(JSContext* cx, JSObject* parent) @@ -830,7 +830,7 @@ JSObject* js_CreateCOMClass(JSContext* cx, JSObject* parent) , NULL /* funcs, specified in constructor */ , NULL, NULL); - return(comobj); + return comobj; } JSObject* js_CreateCOMObject(JSContext* cx, JSObject* parent, const char *name, COM_HANDLE com) @@ -842,10 +842,10 @@ JSObject* js_CreateCOMObject(JSContext* cx, JSObject* parent, const char *name, , JSPROP_ENUMERATE | JSPROP_READONLY); if (obj == NULL) - return(NULL); + return NULL; if ((p = (private_t*)malloc(sizeof(private_t))) == NULL) - return(NULL); + return NULL; memset(p, 0, sizeof(private_t)); p->com = com; @@ -854,12 +854,12 @@ JSObject* js_CreateCOMObject(JSContext* cx, JSObject* parent, const char *name, if (!JS_SetPrivate(cx, obj, p)) { dbprintf(TRUE, p, "JS_SetPrivate failed"); - return(NULL); + return NULL; } dbprintf(FALSE, p, "object created"); - return(obj); + return obj; } #endif /* JAVSCRIPT */ diff --git a/src/sbbs3/js_conio.c b/src/sbbs3/js_conio.c index 7b41e121ec81e07a9fbeaa8b9be4dcf97f065de2..0cc56b948f2421989c9de5d484036a7a8fe53950 100644 --- a/src/sbbs3/js_conio.c +++ b/src/sbbs3/js_conio.c @@ -141,7 +141,7 @@ static JSBool js_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) } JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool js_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp) @@ -251,7 +251,7 @@ static JSBool js_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval break; } - return(JS_TRUE); + return JS_TRUE; } static jsSyncPropertySpec js_properties[] = { @@ -329,12 +329,12 @@ js_conio_init(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); if (initciolib(ciolib_mode)) { JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } JS_SET_RVAL(cx, arglist, JSVAL_TRUE); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -346,7 +346,7 @@ js_conio_suspend(JSContext *cx, uintN argc, jsval *arglist) suspendciolib(); JS_SET_RVAL(cx, arglist, JSVAL_TRUE); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -358,7 +358,7 @@ js_conio_clreol(JSContext *cx, uintN argc, jsval *arglist) clreol(); JS_SET_RVAL(cx, arglist, JSVAL_TRUE); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -370,7 +370,7 @@ js_conio_clrscr(JSContext *cx, uintN argc, jsval *arglist) clrscr(); JS_SET_RVAL(cx, arglist, JSVAL_TRUE); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -382,7 +382,7 @@ js_conio_wscroll(JSContext *cx, uintN argc, jsval *arglist) wscroll(); JS_SET_RVAL(cx, arglist, JSVAL_TRUE); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -394,7 +394,7 @@ js_conio_delline(JSContext *cx, uintN argc, jsval *arglist) delline(); JS_SET_RVAL(cx, arglist, JSVAL_TRUE); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -406,7 +406,7 @@ js_conio_insline(JSContext *cx, uintN argc, jsval *arglist) insline(); JS_SET_RVAL(cx, arglist, JSVAL_TRUE); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -418,7 +418,7 @@ js_conio_normvideo(JSContext *cx, uintN argc, jsval *arglist) normvideo(); JS_SET_RVAL(cx, arglist, JSVAL_TRUE); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -429,7 +429,7 @@ js_conio_getch(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(getch())); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -440,7 +440,7 @@ js_conio_getche(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(getche())); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -452,7 +452,7 @@ js_conio_beep(JSContext *cx, uintN argc, jsval *arglist) beep(); JS_SET_RVAL(cx, arglist, JSVAL_TRUE); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -466,10 +466,10 @@ js_conio_getfont(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(getfont(fnum))); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } - return(JS_FALSE); + return JS_FALSE; } static JSBool @@ -480,7 +480,7 @@ js_conio_hidemouse(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(hidemouse())); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -491,7 +491,7 @@ js_conio_showmouse(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(showmouse())); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -506,10 +506,10 @@ js_conio_setcursortype(JSContext *cx, uintN argc, jsval *arglist) _setcursortype(type); JS_SET_RVAL(cx, arglist, JSVAL_TRUE); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } - return(JS_FALSE); + return JS_FALSE; } static JSBool @@ -525,11 +525,11 @@ js_conio_gotoxy(JSContext *cx, uintN argc, jsval *arglist) gotoxy(x, y); JS_SET_RVAL(cx, arglist, JSVAL_TRUE); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } JS_ReportError(cx, "Insufficient Arguments"); - return(JS_FALSE); + return JS_FALSE; } static JSBool @@ -543,10 +543,10 @@ js_conio_putch(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(putch(ch))); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } - return(JS_FALSE); + return JS_FALSE; } static JSBool @@ -560,10 +560,10 @@ js_conio_ungetch(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(ungetch(ch))); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } - return(JS_FALSE); + return JS_FALSE; } static JSBool @@ -581,11 +581,11 @@ js_conio_loadfont(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(loadfont(str))); free(str); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } } - return(JS_FALSE); + return JS_FALSE; } static JSBool @@ -604,11 +604,11 @@ js_conio_settitle(JSContext *cx, uintN argc, jsval *arglist) free(str); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, JSVAL_TRUE); - return(JS_TRUE); + return JS_TRUE; } } - return(JS_FALSE); + return JS_FALSE; } static JSBool @@ -627,11 +627,11 @@ js_conio_setname(JSContext *cx, uintN argc, jsval *arglist) free(str); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, JSVAL_TRUE); - return(JS_TRUE); + return JS_TRUE; } } - return(JS_FALSE); + return JS_FALSE; } static JSBool @@ -649,11 +649,11 @@ js_conio_cputs(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(cputs(str))); free(str); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } } - return(JS_FALSE); + return JS_FALSE; } static JSBool @@ -669,28 +669,28 @@ js_conio_setfont(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc > 2) - return(JS_FALSE); + return JS_FALSE; if (argc > 0 && JSVAL_IS_NUMBER(argv[arg]) && JS_ValueToInt32(cx, argv[arg], &font)) { for (arg = 1; arg < argc; arg++) { if (JSVAL_IS_NUMBER(argv[arg])) { if (!JS_ValueToInt32(cx, argv[arg], &fnum)) - return(JS_FALSE); + return JS_FALSE; } else if (JSVAL_IS_BOOLEAN(argv[arg])) { if (!JS_ValueToBoolean(cx, argv[1], &force)) - return(JS_FALSE); + return JS_FALSE; } else - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(setfont(font, force, fnum))); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } - return(JS_FALSE); + return JS_FALSE; } static JSBool @@ -710,11 +710,11 @@ js_conio_getpass(JSContext *cx, uintN argc, jsval *arglist) free(str); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(JS_NewStringCopyZ(cx, pwd))); - return(JS_TRUE); + return JS_TRUE; } } - return(JS_FALSE); + return JS_FALSE; } static JSBool @@ -730,31 +730,31 @@ js_conio_window(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc > 4) - return(JS_FALSE); + return JS_FALSE; if (argc > 0) { if (!JSVAL_IS_NUMBER(argv[0])) - return(JS_FALSE); + return JS_FALSE; if (!JS_ValueToInt32(cx, argv[0], &left)) - return(JS_FALSE); + return JS_FALSE; } if (argc > 1) { if (!JSVAL_IS_NUMBER(argv[1])) - return(JS_FALSE); + return JS_FALSE; if (!JS_ValueToInt32(cx, argv[1], &top)) - return(JS_FALSE); + return JS_FALSE; } if (argc > 2) { if (!JSVAL_IS_NUMBER(argv[2])) - return(JS_FALSE); + return JS_FALSE; if (!JS_ValueToInt32(cx, argv[2], &right)) - return(JS_FALSE); + return JS_FALSE; } if (argc > 3) { if (!JSVAL_IS_NUMBER(argv[3])) - return(JS_FALSE); + return JS_FALSE; if (!JS_ValueToInt32(cx, argv[3], &bottom)) - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); @@ -769,7 +769,7 @@ js_conio_window(JSContext *cx, uintN argc, jsval *arglist) else { JS_SET_RVAL(cx, arglist, JSVAL_FALSE); } - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -784,14 +784,14 @@ js_conio_cgets(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc > 1) - return(JS_FALSE); + return JS_FALSE; if (argc > 0) { if (!JSVAL_IS_NUMBER(argv[0])) - return(JS_FALSE); + return JS_FALSE; if (!JS_ValueToInt32(cx, argv[0], &maxlen)) - return(JS_FALSE); + return JS_FALSE; if (maxlen > 255) - return(JS_FALSE); + return JS_FALSE; } buf[0] = (char)maxlen; rc = JS_SUSPENDREQUEST(cx); @@ -804,7 +804,7 @@ js_conio_cgets(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(JS_NewStringCopyZ(cx, ret))); } - return(JS_TRUE); + return JS_TRUE; } /* TODO: cprintf() not really needed since we have cputs() and format() */ @@ -838,17 +838,17 @@ js_conio_movetext(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc != 6) - return(JS_FALSE); + return JS_FALSE; for (i = 0; i < 6; i++) { if (!JSVAL_IS_NUMBER(argv[i])) - return(JS_FALSE); + return JS_FALSE; if (!JS_ValueToInt32(cx, argv[i], &args[i])) - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(movetext(args[0], args[1], args[2], args[3], args[4], args[5]))); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -873,41 +873,41 @@ js_conio_puttext(JSContext *cx, uintN argc, jsval *arglist) args[3] = cio_textinfo.screenheight; if (argc != 5) - return(JS_FALSE); + return JS_FALSE; for (i = 0; i < 4; i++) { if (!JSVAL_IS_NUMBER(argv[i])) - return(JS_FALSE); + return JS_FALSE; if (!JS_ValueToInt32(cx, argv[i], &args[i])) - return(JS_FALSE); + return JS_FALSE; } if (args[0] < 1 || args[1] < 1 || args[2] < 1 || args[3] < 1 || args[0] > args[2] || args[1] > args[3] || args[2] > cio_textinfo.screenwidth || args[3] > cio_textinfo.screenheight) { JS_SET_RVAL(cx, arglist, JSVAL_FALSE); - return(JS_TRUE); + return JS_TRUE; } if (!JSVAL_IS_OBJECT(argv[4])) - return(JS_FALSE); + return JS_FALSE; array = JSVAL_TO_OBJECT(argv[4]); if (array == NULL || !JS_GetArrayLength(cx, array, &size)) - return(JS_FALSE); + return JS_FALSE; buffer = (unsigned char *)malloc(size); if (buffer == NULL) - return(JS_FALSE); + return JS_FALSE; for (i = 0; i < size; i++) { if (!JS_GetElement(cx, array, i, &val)) { free(buffer); - return(JS_FALSE); + return JS_FALSE; } if (!JSVAL_IS_NUMBER(val)) { free(buffer); - return(JS_FALSE); + return JS_FALSE; } if (!JS_ValueToInt32(cx, val, &j)) { free(buffer); - return(JS_FALSE); + return JS_FALSE; } buffer[i] = (unsigned char)j; } @@ -916,7 +916,7 @@ js_conio_puttext(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(puttext(args[0], args[1], args[2], args[3], buffer))); free(buffer); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -940,23 +940,23 @@ js_conio_gettext(JSContext *cx, uintN argc, jsval *arglist) args[3] = cio_textinfo.screenheight; if (argc > 4) - return(JS_FALSE); + return JS_FALSE; for (i = 0; i < (int)argc; i++) { if (!JSVAL_IS_NUMBER(argv[i])) - return(JS_FALSE); + return JS_FALSE; if (!JS_ValueToInt32(cx, argv[i], &args[i])) - return(JS_FALSE); + return JS_FALSE; } if (args[0] < 1 || args[1] < 1 || args[2] < 1 || args[3] < 1 || args[0] > args[2] || args[1] > args[3] || args[2] > cio_textinfo.screenwidth || args[3] > cio_textinfo.screenheight) { JS_SET_RVAL(cx, arglist, JSVAL_FALSE); - return(JS_TRUE); + return JS_TRUE; } size = (args[2] - args[0] + 1) * (args[3] - args[1] + 1) * 2; result = (unsigned char *)malloc(size); if (result == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); @@ -967,7 +967,7 @@ js_conio_gettext(JSContext *cx, uintN argc, jsval *arglist) val = UINT_TO_JSVAL(result[i]); if (!JS_SetElement(cx, array, i, &val)) { free(result); - return(JS_FALSE); + return JS_FALSE; } } JS_SET_RVAL(cx, arglist, OBJECT_TO_JSVAL(array)); @@ -977,7 +977,7 @@ js_conio_gettext(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_NULL); } free(result); - return(JS_TRUE); + return JS_TRUE; } /* TODO: seticon() */ @@ -1151,7 +1151,7 @@ static JSBool js_conio_resolve(JSContext *cx, JSObject *obj, jsid id) static JSBool js_conio_enumerate(JSContext *cx, JSObject *obj) { - return(js_conio_resolve(cx, obj, JSID_VOID)); + return js_conio_resolve(cx, obj, JSID_VOID); } static JSClass js_conio_class = { @@ -1203,12 +1203,12 @@ JSObject* js_CreateConioObject(JSContext* cx, JSObject* parent) if ((obj = JS_DefineObject(cx, parent, "conio", &js_conio_class, NULL , JSPROP_ENUMERATE | JSPROP_READONLY)) == NULL) - return(NULL); + return NULL; #ifdef BUILD_JSDOCS js_DescribeSyncObject(cx, obj, "Console Input/Output Object (DOS conio library functionality for jsexec)", 315); js_CreateArrayOfStrings(cx, obj, "_property_desc_list", conio_prop_desc, JSPROP_READONLY); #endif - return(obj); + return obj; } diff --git a/src/sbbs3/js_console.cpp b/src/sbbs3/js_console.cpp index 933585e766873de5c9059be84d20ba3e8eadf48f..ad46ca51699287af6d37002ce19c37a5e50da198 100644 --- a/src/sbbs3/js_console.cpp +++ b/src/sbbs3/js_console.cpp @@ -85,7 +85,7 @@ static JSBool js_console_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) sbbs_t* sbbs; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, obj, &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_IdToValue(cx, id, &idval); tiny = JSVAL_TO_INT(idval); @@ -132,15 +132,15 @@ static JSBool js_console_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) break; case CON_PROP_TERMINAL: if ((js_str = JS_NewStringCopyZ(cx, sbbs->terminal)) == NULL) - return(JS_FALSE); + return JS_FALSE; break; case CON_PROP_TERM_TYPE: if ((js_str = JS_NewStringCopyZ(cx, sbbs->term_type())) == NULL) - return(JS_FALSE); + return JS_FALSE; break; case CON_PROP_CHARSET: if ((js_str = JS_NewStringCopyZ(cx, sbbs->term_charset())) == NULL) - return(JS_FALSE); + return JS_FALSE; break; case CON_PROP_UNICODE_ZEROWIDTH: val = sbbs->unicode_zerowidth; @@ -162,10 +162,10 @@ static JSBool js_console_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) break; case CON_PROP_ABORTED: *vp = BOOLEAN_TO_JSVAL(INT_TO_BOOL(sbbs->sys_status & SS_ABORT)); - return(JS_TRUE); + return JS_TRUE; case CON_PROP_ABORTABLE: *vp = BOOLEAN_TO_JSVAL(INT_TO_BOOL(sbbs->rio_abortable)); - return(JS_TRUE); + return JS_TRUE; case CON_PROP_TELNET_MODE: val = sbbs->telnet_mode; break; @@ -174,11 +174,11 @@ static JSBool js_console_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) break; case CON_PROP_WORDWRAP: if ((js_str = JS_NewStringCopyZ(cx, sbbs->wordwrap)) == NULL) - return(JS_FALSE); + return JS_FALSE; break; case CON_PROP_QUESTION: if ((js_str = JS_NewStringCopyZ(cx, sbbs->question)) == NULL) - return(JS_FALSE); + return JS_FALSE; break; case CON_PROP_CTRLKEY_PASSTHRU: val = sbbs->cfg.ctrlkey_passthru; @@ -235,7 +235,7 @@ static JSBool js_console_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) break; default: - return(JS_TRUE); + return JS_TRUE; } if (js_str != NULL) @@ -243,7 +243,7 @@ static JSBool js_console_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) else *vp = INT_TO_JSVAL(val); - return(JS_TRUE); + return JS_TRUE; } static JSBool js_console_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp) @@ -257,7 +257,7 @@ static JSBool js_console_set(JSContext *cx, JSObject *obj, jsid id, JSBool stric char * sval; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, obj, &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_IdToValue(cx, id, &idval); tiny = JSVAL_TO_INT(idval); @@ -385,10 +385,10 @@ static JSBool js_console_set(JSContext *cx, JSObject *obj, jsid id, JSBool stric break; default: - return(JS_TRUE); + return JS_TRUE; } - return(JS_TRUE); + return JS_TRUE; } #define CON_PROP_FLAGS JSPROP_ENUMERATE @@ -520,7 +520,7 @@ js_inkey(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_NULL); @@ -538,11 +538,11 @@ js_inkey(JSContext *cx, uintN argc, jsval *arglist) key[0] = ch; key[1] = 0; if ((js_str = JS_NewStringCopyZ(cx, key)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); } JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -556,7 +556,7 @@ js_getkey(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -570,10 +570,10 @@ js_getkey(JSContext *cx, uintN argc, jsval *arglist) key[1] = 0; if ((js_str = JS_NewStringCopyZ(cx, key)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -718,7 +718,7 @@ js_handle_ctrlkey(JSContext *cx, uintN argc, jsval *arglist) char * keystr; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_FALSE); @@ -727,7 +727,7 @@ js_handle_ctrlkey(JSContext *cx, uintN argc, jsval *arglist) else { JSVALUE_TO_ASTRING(cx, argv[0], keystr, 8, NULL); if (keystr == NULL) - return(JS_FALSE); + return JS_FALSE; key = keystr[0]; } @@ -739,7 +739,7 @@ js_handle_ctrlkey(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->handle_ctrlkey(key, mode) == 0)); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -756,7 +756,7 @@ js_getstr(JSContext *cx, uintN argc, jsval *arglist) str_list_t history = NULL; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -774,7 +774,7 @@ js_getstr(JSContext *cx, uintN argc, jsval *arglist) else if (JSVAL_IS_STRING(argv[i])) { js_str = JS_ValueToString(cx, argv[i]); if (!js_str) - return(JS_FALSE); + return JS_FALSE; } else if (JSVAL_IS_OBJECT(argv[i])) { JSObject* array = JSVAL_TO_OBJECT(argv[i]); @@ -802,7 +802,7 @@ js_getstr(JSContext *cx, uintN argc, jsval *arglist) if (!maxlen) maxlen = 128; if ((p = (char *)calloc(1, maxlen + 1)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (js_str != NULL) { JSSTRING_TO_MSTRING(cx, js_str, p2, NULL); @@ -823,10 +823,10 @@ js_getstr(JSContext *cx, uintN argc, jsval *arglist) free(p); if (js_str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -839,7 +839,7 @@ js_getnum(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -855,7 +855,7 @@ js_getnum(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(sbbs->getnum(maxnum, dflt))); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -874,7 +874,7 @@ js_getkeys(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -914,11 +914,11 @@ js_getkeys(JSContext *cx, uintN argc, jsval *arglist) key[0] = (uchar)val; key[1] = 0; if ((js_str = JS_NewStringCopyZ(cx, key)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); } - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -935,7 +935,7 @@ js_gettemplate(JSContext *cx, uintN argc, jsval *arglist) char* cstr; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -952,7 +952,7 @@ js_gettemplate(JSContext *cx, uintN argc, jsval *arglist) } if (js_fmt == NULL) - return(JS_FALSE); + return JS_FALSE; if (js_str == NULL) str[0] = 0; @@ -969,10 +969,10 @@ js_gettemplate(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); if ((js_str = JS_NewStringCopyZ(cx, str)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1012,10 +1012,10 @@ js_ungetstr(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; if ((js_str = JS_ValueToString(cx, argv[0])) == NULL) - return(JS_FALSE); + return JS_FALSE; JSSTRING_TO_MSTRING(cx, js_str, op, NULL); if (op == NULL) @@ -1027,7 +1027,7 @@ js_ungetstr(JSContext *cx, uintN argc, jsval *arglist) free(op); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(wrote == len)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1041,12 +1041,12 @@ js_yesno(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((js_str = JS_ValueToString(cx, argv[0])) == NULL) - return(JS_FALSE); + return JS_FALSE; JSSTRING_TO_MSTRING(cx, js_str, cstr, NULL); if (cstr == NULL) @@ -1061,7 +1061,7 @@ js_yesno(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->yesno(cstr, mode))); free(cstr); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1075,12 +1075,12 @@ js_noyes(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((js_str = JS_ValueToString(cx, argv[0])) == NULL) - return(JS_FALSE); + return JS_FALSE; JSSTRING_TO_MSTRING(cx, js_str, cstr, NULL); if (cstr == NULL) @@ -1095,7 +1095,7 @@ js_noyes(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->noyes(cstr, mode))); free(cstr); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1108,12 +1108,12 @@ js_mnemonics(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((js_str = JS_ValueToString(cx, argv[0])) == NULL) - return(JS_FALSE); + return JS_FALSE; JSSTRING_TO_MSTRING(cx, js_str, cstr, NULL); if (cstr == NULL) @@ -1122,7 +1122,7 @@ js_mnemonics(JSContext *cx, uintN argc, jsval *arglist) sbbs->mnemonics(cstr); free(cstr); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1159,7 +1159,7 @@ js_clear(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -1179,7 +1179,7 @@ js_clear(JSContext *cx, uintN argc, jsval *arglist) else sbbs->clearscreen(sbbs->term_supports()); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1190,7 +1190,7 @@ js_clearline(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -1202,7 +1202,7 @@ js_clearline(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); sbbs->clearline(); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1213,7 +1213,7 @@ js_cleartoeol(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -1225,7 +1225,7 @@ js_cleartoeol(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); sbbs->cleartoeol(); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1237,7 +1237,7 @@ js_newline(JSContext *cx, uintN argc, jsval *arglist) int32 count = 1; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -1249,7 +1249,7 @@ js_newline(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); sbbs->newline(count); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1313,7 +1313,7 @@ js_pause(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; uintN argn = 0; if (argc > argn && JSVAL_IS_BOOLEAN(argv[argn])) { @@ -1324,7 +1324,7 @@ js_pause(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->pause(set_abort))); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1337,7 +1337,7 @@ js_beep(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -1350,7 +1350,7 @@ js_beep(JSContext *cx, uintN argc, jsval *arglist) sbbs->outchar('\a'); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1365,14 +1365,14 @@ js_print(JSContext *cx, uintN argc, jsval *arglist) int32 pmode = 0; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 2 && JSVAL_IS_STRING(argv[0]) && JSVAL_IS_NUMBER(argv[1])) { JSVALUE_TO_RASTRING(cx, argv[0], cstr, &cstr_sz, NULL); if (cstr == NULL) - return(JS_FALSE); + return JS_FALSE; if (!JS_ValueToInt32(cx, argv[1], &pmode)) { free(cstr); return JS_FALSE; @@ -1385,14 +1385,14 @@ js_print(JSContext *cx, uintN argc, jsval *arglist) JSVALUE_TO_RASTRING(cx, argv[i], cstr, &cstr_sz, NULL); if (cstr == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); sbbs->bputs(cstr); JS_RESUMEREQUEST(cx, rc); } free(cstr); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1406,12 +1406,12 @@ js_strlen(JSContext *cx, uintN argc, jsval *arglist) int32 pmode = 0; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((str = JS_ValueToString(cx, argv[0])) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc > 1) (void)JS_ValueToInt32(cx, argv[1], &pmode); @@ -1423,7 +1423,7 @@ js_strlen(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(sbbs->bstrlen(cstr, pmode))); free(cstr); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1438,7 +1438,7 @@ js_write(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -1452,7 +1452,7 @@ js_write(JSContext *cx, uintN argc, jsval *arglist) } free(str); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1461,16 +1461,16 @@ js_writeln(JSContext *cx, uintN argc, jsval *arglist) sbbs_t* sbbs; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc) { if (!js_write(cx, argc, arglist)) - return(JS_FALSE); + return JS_FALSE; } sbbs->rputs("\r\n"); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1487,13 +1487,13 @@ js_putmsg(JSContext *cx, uintN argc, jsval *arglist) JSObject* obj = JS_GetScopeChain(cx); if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); str = JS_ValueToString(cx, argv[0]); if (!str) - return(JS_FALSE); + return JS_FALSE; argn = 1; if (argc > argn && JSVAL_IS_NUMBER(argv[argn])) { @@ -1519,7 +1519,7 @@ js_putmsg(JSContext *cx, uintN argc, jsval *arglist) sbbs->putmsg(cstr, mode, columns, obj); free(cstr); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1535,7 +1535,7 @@ js_printfile(JSContext *cx, uintN argc, jsval *arglist) JSObject* obj = JS_GetScopeChain(cx); if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (JSVAL_NULL_OR_VOID(argv[0])) { JS_ReportError(cx, "No filename specified"); @@ -1544,7 +1544,7 @@ js_printfile(JSContext *cx, uintN argc, jsval *arglist) str = JS_ValueToString(cx, argv[0]); if (!str) - return(JS_FALSE); + return JS_FALSE; uintN argn = 1; if (argc > argn && JSVAL_IS_NUMBER(argv[argn])) { @@ -1573,7 +1573,7 @@ js_printfile(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(result)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1591,7 +1591,7 @@ js_printtail(JSContext *cx, uintN argc, jsval *arglist) JSObject* obj = JS_GetScopeChain(cx); if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; for (i = 0; i < argc; i++) { if (JSVAL_IS_NUMBER(argv[i])) { @@ -1633,7 +1633,7 @@ js_printtail(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(result)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1653,7 +1653,7 @@ js_editfile(JSContext *cx, uintN argc, jsval *arglist) JSBool result = JS_TRUE; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_FALSE); @@ -1725,7 +1725,7 @@ js_uselect(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -1741,7 +1741,7 @@ js_uselect(JSContext *cx, uintN argc, jsval *arglist) if ((js_str = JS_ValueToString(cx, argv[i])) == NULL) { FREE_AND_NULL(title); FREE_AND_NULL(item); - return(JS_FALSE); + return JS_FALSE; } if (title == NULL) { JSSTRING_TO_MSTRING(cx, js_str, title, NULL) // Magicsemicolon @@ -1779,7 +1779,7 @@ js_uselect(JSContext *cx, uintN argc, jsval *arglist) free(item); free(ar); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1793,13 +1793,13 @@ js_center(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); str = JS_ValueToString(cx, argv[0]); if (!str) - return(JS_FALSE); + return JS_FALSE; if (argc > 1) { if (!JS_ValueToInt32(cx, argv[1], &cols)) @@ -1813,7 +1813,7 @@ js_center(JSContext *cx, uintN argc, jsval *arglist) sbbs->center(cstr, cols); free(cstr); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1826,13 +1826,13 @@ js_wide(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); str = JS_ValueToString(cx, argv[0]); if (str == NULL) - return(JS_FALSE); + return JS_FALSE; JSSTRING_TO_MSTRING(cx, str, cstr, NULL); if (cstr == NULL) @@ -1841,7 +1841,7 @@ js_wide(JSContext *cx, uintN argc, jsval *arglist) sbbs->wide(cstr); free(cstr); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1850,10 +1850,10 @@ js_saveline(JSContext *cx, uintN argc, jsval *arglist) sbbs_t* sbbs; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->saveline())); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1863,12 +1863,12 @@ js_restoreline(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->restoreline())); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1880,7 +1880,7 @@ js_ansi(JSContext *cx, uintN argc, jsval *arglist) sbbs_t* sbbs; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -1895,14 +1895,14 @@ js_ansi(JSContext *cx, uintN argc, jsval *arglist) if (!JS_ValueToInt32(cx, argv[1], &curattr)) return JS_FALSE; if ((js_str = JS_NewStringCopyZ(cx, sbbs->ansi(attr, curattr, buf))) == NULL) - return(JS_FALSE); + return JS_FALSE; } else { if ((js_str = JS_NewStringCopyZ(cx, sbbs->ansi(attr))) == NULL) - return(JS_FALSE); + return JS_FALSE; } JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1912,12 +1912,12 @@ js_pushxy(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->ansi_save())); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1927,12 +1927,12 @@ js_popxy(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->ansi_restore())); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1945,7 +1945,7 @@ js_gotoxy(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -1970,7 +1970,7 @@ js_gotoxy(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->cursor_xy(x, y))); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } @@ -1984,7 +1984,7 @@ js_getxy(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, obj, &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_FALSE); @@ -1994,7 +1994,7 @@ js_getxy(JSContext *cx, uintN argc, jsval *arglist) if (result == true) { if ((screen = JS_NewObject(cx, NULL, NULL, obj)) == NULL) - return(JS_TRUE); + return JS_TRUE; JS_DefineProperty(cx, screen, "x", INT_TO_JSVAL(x) , NULL, NULL, JSPROP_ENUMERATE); @@ -2003,7 +2003,7 @@ js_getxy(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, OBJECT_TO_JSVAL(screen)); } - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2013,14 +2013,14 @@ js_cursor_home(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); rc = JS_SUSPENDREQUEST(cx); sbbs->cursor_home(); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2032,7 +2032,7 @@ js_cursor_up(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2043,7 +2043,7 @@ js_cursor_up(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); sbbs->cursor_up(val); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2055,7 +2055,7 @@ js_cursor_down(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2066,7 +2066,7 @@ js_cursor_down(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); sbbs->cursor_down(val); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2078,7 +2078,7 @@ js_cursor_right(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2089,7 +2089,7 @@ js_cursor_right(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); sbbs->cursor_right(val); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2101,7 +2101,7 @@ js_cursor_left(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2112,7 +2112,7 @@ js_cursor_left(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); sbbs->cursor_left(val); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2124,7 +2124,7 @@ js_backspace(JSContext *cx, uintN argc, jsval *arglist) int32 val = 1; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc) { @@ -2134,7 +2134,7 @@ js_backspace(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); sbbs->backspace(val); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2146,7 +2146,7 @@ js_creturn(JSContext *cx, uintN argc, jsval *arglist) int32 val = 1; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc) { @@ -2156,7 +2156,7 @@ js_creturn(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); sbbs->carriage_return(val); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2168,7 +2168,7 @@ js_linefeed(JSContext *cx, uintN argc, jsval *arglist) int32 val = 1; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc) { @@ -2178,7 +2178,7 @@ js_linefeed(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); sbbs->line_feed(val); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2187,13 +2187,13 @@ js_clearkeybuf(JSContext *cx, uintN argc, jsval *arglist) sbbs_t* sbbs; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); sbbs->keybufbot = sbbs->keybuftop = 0; RingBufReInit(&sbbs->inbuf); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2203,12 +2203,12 @@ js_ansi_getdims(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->ansi_getdims())); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2218,14 +2218,14 @@ js_getdims(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); rc = JS_SUSPENDREQUEST(cx); sbbs->getdimensions(); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } void @@ -2252,7 +2252,7 @@ js_lock_input(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2267,7 +2267,7 @@ js_lock_input(JSContext *cx, uintN argc, jsval *arglist) } JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2280,7 +2280,7 @@ js_telnet_cmd(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); @@ -2306,7 +2306,7 @@ js_telnet_cmd(JSContext *cx, uintN argc, jsval *arglist) sbbs->send_telnet_cmd((uchar)cmd, (uchar)opt); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2318,13 +2318,13 @@ js_term_supports(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc) { if (!JS_ValueToInt32(cx, argv[0], &flags)) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->term_supports(flags))); JS_RESUMEREQUEST(cx, rc); @@ -2335,7 +2335,7 @@ js_term_supports(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(flags)); } - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2379,7 +2379,7 @@ js_install_event(JSContext *cx, uintN argc, jsval *arglist, BOOL once) sbbs_t * sbbs; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc != 2) { JS_ReportError(cx, "console.on() and console.once() require exactly two parameters"); @@ -2442,7 +2442,7 @@ js_clear_console_event(JSContext *cx, uintN argc, jsval *arglist, BOOL once) sbbs_t * sbbs; if ((sbbs = (sbbs_t*)js_GetClassPrivate(cx, JS_THIS_OBJECT(cx, arglist), &js_console_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc != 2) { JS_ReportError(cx, "console.clearOn() and console.clearOnce() require exactly two parameters"); @@ -2885,7 +2885,7 @@ static JSBool js_console_resolve(JSContext *cx, JSObject *obj, jsid id) static JSBool js_console_enumerate(JSContext *cx, JSObject *obj) { - return(js_console_resolve(cx, obj, JSID_VOID)); + return js_console_resolve(cx, obj, JSID_VOID); } JSClass js_console_class = { @@ -2907,11 +2907,11 @@ JSObject* js_CreateConsoleObject(JSContext* cx, JSObject* parent) sbbs_t* sbbs; if ((sbbs = (sbbs_t*)JS_GetContextPrivate(cx)) == NULL) - return(NULL); + return NULL; if ((obj = JS_DefineObject(cx, parent, "console", &js_console_class, NULL , JSPROP_ENUMERATE | JSPROP_READONLY)) == NULL) - return(NULL); + return NULL; JS_SetPrivate(cx, obj, sbbs); @@ -2920,17 +2920,17 @@ JSObject* js_CreateConsoleObject(JSContext* cx, JSObject* parent) JSObject* color_list; if ((color_list = JS_NewArrayObject(cx, 0, NULL)) == NULL) - return(NULL); + return NULL; if (!JS_DefineProperty(cx, obj, "color_list", OBJECT_TO_JSVAL(color_list) , NULL, NULL, 0)) - return(NULL); + return NULL; for (uint i = 0; i < NUM_COLORS; i++) { jsval val = INT_TO_JSVAL(sbbs->cfg.color[i]); if (!JS_SetElement(cx, color_list, i, &val)) - return(NULL); + return NULL; } #ifdef BUILD_JSDOCS @@ -2938,7 +2938,7 @@ JSObject* js_CreateConsoleObject(JSContext* cx, JSObject* parent) js_CreateArrayOfStrings(cx, obj, "_property_desc_list", con_prop_desc, JSPROP_READONLY); #endif - return(obj); + return obj; } #endif /* JAVSCRIPT */ diff --git a/src/sbbs3/js_cryptcert.c b/src/sbbs3/js_cryptcert.c index dda7b9bd784b470bb1c2109b40d3a3778ef5bbbb..df3b17025fd442f29006dc911dd5ba2df22c73ac 100644 --- a/src/sbbs3/js_cryptcert.c +++ b/src/sbbs3/js_cryptcert.c @@ -311,7 +311,7 @@ js_get_attribute_string(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); if ((js_str = JS_NewStringCopyN(cx, val, len)) == NULL) { free(val); - return(JS_FALSE); + return JS_FALSE; } free(val); @@ -370,7 +370,7 @@ js_get_attribute_time(JSContext *cx, uintN argc, jsval *arglist) msec *= 1000; dobj = JS_NewDateObjectMsec(cx, msec); if (dobj == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, OBJECT_TO_JSVAL(dobj)); return JS_TRUE; } @@ -604,7 +604,7 @@ js_cryptcert_attrstr_get(JSContext *cx, jsval *vp, CRYPT_CERTIFICATE cert, CRYPT } if ((js_str = JS_NewStringCopyN(cx, val, len)) == NULL) { free(val); - return(JS_FALSE); + return JS_FALSE; } free(val); *vp = STRING_TO_JSVAL(js_str); @@ -639,7 +639,7 @@ js_cryptcert_attrtime_get(JSContext *cx, jsval *vp, CRYPT_CERTIFICATE cert, CRYP msec *= 1000; dobj = JS_NewDateObjectMsec(cx, msec); if (dobj == NULL) - return(JS_FALSE); + return JS_FALSE; *vp = OBJECT_TO_JSVAL(dobj); return JS_TRUE; @@ -3023,7 +3023,7 @@ static JSBool js_cryptcert_resolve(JSContext *cx, JSObject *obj, jsid id) static JSBool js_cryptcert_enumerate(JSContext *cx, JSObject *obj) { - return(js_cryptcert_resolve(cx, obj, JSID_VOID)); + return js_cryptcert_resolve(cx, obj, JSID_VOID); } JSClass js_cryptcert_class = { @@ -3086,13 +3086,13 @@ js_cryptcert_constructor(JSContext *cx, uintN argc, jsval *arglist) if ((p = (struct js_cryptcert_private_data *)malloc(sizeof(struct js_cryptcert_private_data))) == NULL) { JS_ReportError(cx, "malloc failed"); - return(JS_FALSE); + return JS_FALSE; } memset(p, 0, sizeof(struct js_cryptcert_private_data)); if (!JS_SetPrivate(cx, obj, p)) { JS_ReportError(cx, "JS_SetPrivate failed"); - return(JS_FALSE); + return JS_FALSE; } if (JSVAL_IS_STRING(argv[0])) { @@ -3131,7 +3131,7 @@ js_cryptcert_constructor(JSContext *cx, uintN argc, jsval *arglist) ); #endif - return(JS_TRUE); + return JS_TRUE; } #ifdef BUILD_JSDOCS @@ -3916,5 +3916,5 @@ JSObject* js_CreateCryptCertClass(JSContext* cx, JSObject* parent) } } - return(cksobj); + return cksobj; } diff --git a/src/sbbs3/js_cryptcon.c b/src/sbbs3/js_cryptcon.c index 4ab32e3ddd827672978b7ea5fd9204db1620bcff..d0a43bb86be41644f050fe33a120e00b88b3ebcd 100644 --- a/src/sbbs3/js_cryptcon.c +++ b/src/sbbs3/js_cryptcon.c @@ -553,7 +553,7 @@ js_do_encrption(JSContext *cx, uintN argc, jsval *arglist, int encrypt) str = JS_NewStringCopyN(cx, cipherText, len); free(cipherText); if (str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(str)); return JS_TRUE; } @@ -627,7 +627,7 @@ js_create_signature(JSContext *cx, uintN argc, jsval *arglist) str = JS_NewStringCopyN(cx, signature, len); free(signature); if (str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(str)); return JS_TRUE; } @@ -793,7 +793,7 @@ js_cryptcon_attrstr_get(JSContext *cx, jsval *vp, CRYPT_CONTEXT ctx, CRYPT_ATTRI } if ((js_str = JS_NewStringCopyN(cx, val, len)) == NULL) { free(val); - return(JS_FALSE); + return JS_FALSE; } free(val); *vp = STRING_TO_JSVAL(js_str); @@ -910,7 +910,7 @@ static JSBool js_cryptcon_resolve(JSContext *cx, JSObject *obj, jsid id) static JSBool js_cryptcon_enumerate(JSContext *cx, JSObject *obj) { - return(js_cryptcon_resolve(cx, obj, JSID_VOID)); + return js_cryptcon_resolve(cx, obj, JSID_VOID); } JSClass js_cryptcon_class = { @@ -973,13 +973,13 @@ js_cryptcon_constructor(JSContext *cx, uintN argc, jsval *arglist) if ((p = (struct js_cryptcon_private_data *)malloc(sizeof(struct js_cryptcon_private_data))) == NULL) { JS_ReportError(cx, "malloc failed"); - return(JS_FALSE); + return JS_FALSE; } memset(p, 0, sizeof(struct js_cryptcon_private_data)); if (!JS_SetPrivate(cx, obj, p)) { JS_ReportError(cx, "JS_SetPrivate failed"); - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); @@ -999,7 +999,7 @@ js_cryptcon_constructor(JSContext *cx, uintN argc, jsval *arglist) js_CreateArrayOfStrings(cx, obj, "_property_desc_list", cryptcon_prop_desc, JSPROP_READONLY); #endif - return(JS_TRUE); + return JS_TRUE; } #ifdef BUILD_JSDOCS @@ -1156,5 +1156,5 @@ JSObject* js_CreateCryptContextClass(JSContext* cx, JSObject* parent) } } - return(ccobj); + return ccobj; } diff --git a/src/sbbs3/js_cryptkeyset.c b/src/sbbs3/js_cryptkeyset.c index d011430e6590c7daccee65b0e07e3b52d06c0551..2029ccbe62b0116aff0e5ad588f09a1a70b2db0d 100644 --- a/src/sbbs3/js_cryptkeyset.c +++ b/src/sbbs3/js_cryptkeyset.c @@ -418,7 +418,7 @@ static JSBool js_cryptkeyset_resolve(JSContext *cx, JSObject *obj, jsid id) static JSBool js_cryptkeyset_enumerate(JSContext *cx, JSObject *obj) { - return(js_cryptkeyset_resolve(cx, obj, JSID_VOID)); + return js_cryptkeyset_resolve(cx, obj, JSID_VOID); } static JSClass js_cryptkeyset_class = { @@ -463,7 +463,7 @@ js_cryptkeyset_constructor(JSContext *cx, uintN argc, jsval *arglist) if ((p = (struct private_data *)malloc(sizeof(struct private_data))) == NULL) { JS_ReportError(cx, "malloc failed"); - return(JS_FALSE); + return JS_FALSE; } memset(p, 0, sizeof(struct private_data)); @@ -484,7 +484,7 @@ js_cryptkeyset_constructor(JSContext *cx, uintN argc, jsval *arglist) if (!JS_SetPrivate(cx, obj, p)) { JS_ReportError(cx, "JS_SetPrivate failed"); - return(JS_FALSE); + return JS_FALSE; } #ifdef BUILD_JSDOCS @@ -497,7 +497,7 @@ js_cryptkeyset_constructor(JSContext *cx, uintN argc, jsval *arglist) js_CreateArrayOfStrings(cx, obj, "_property_desc_list", cryptkeyset_prop_desc, JSPROP_READONLY); #endif - return(JS_TRUE); + return JS_TRUE; } #ifdef BUILD_JSDOCS @@ -543,5 +543,5 @@ JSObject* js_CreateCryptKeysetClass(JSContext* cx, JSObject* parent) } } - return(cksobj); + return cksobj; } diff --git a/src/sbbs3/js_file.c b/src/sbbs3/js_file.c index b6bf8dd807e64a735d3acca16c5d10a2729f5076..cfe98e029cba29009cd329a8af57bb1c5bf29f0f 100644 --- a/src/sbbs3/js_file.c +++ b/src/sbbs3/js_file.c @@ -87,7 +87,7 @@ static int fopenflags(char *mode) flags |= O_RDWR; else flags |= O_WRONLY; - return(flags); + return flags; } if (strchr(mode, 'a')) { @@ -96,7 +96,7 @@ static int fopenflags(char *mode) flags |= O_RDWR; else flags |= O_WRONLY; - return(flags); + return flags; } if (strchr(mode, 'r')) { @@ -106,7 +106,7 @@ static int fopenflags(char *mode) flags |= O_RDONLY; } - return(flags); + return flags; } /* File Object Methods */ @@ -126,20 +126,20 @@ js_open(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } JS_SET_RVAL(cx, arglist, JSVAL_FALSE); if (p->fp != NULL) - return(JS_TRUE); + return JS_TRUE; SAFECOPY(p->mode, "w+"); /* default mode */ for (i = 0; i < argc; i++) { if (JSVAL_IS_STRING(argv[i])) { /* mode */ if ((str = JS_ValueToString(cx, argv[i])) == NULL) { JS_ReportError(cx, "Invalid mode specified: %s", str); - return(JS_TRUE); + return JS_TRUE; } JSSTRING_TO_STRBUF(cx, str, p->mode, sizeof(p->mode), NULL); } @@ -147,7 +147,7 @@ js_open(JSContext *cx, uintN argc, jsval *arglist) shareable = JSVAL_TO_BOOLEAN(argv[i]); else if (JSVAL_IS_NUMBER(argv[i])) { /* bufsize */ if (!JS_ValueToInt32(cx, argv[i], &bufsize)) - return(JS_FALSE); + return JS_FALSE; } } @@ -191,7 +191,7 @@ js_open(JSContext *cx, uintN argc, jsval *arglist) close(file); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -209,24 +209,24 @@ js_popen(JSContext *cx, uintN argc, jsval *arglist) if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->fp != NULL) - return(JS_TRUE); + return JS_TRUE; SAFECOPY(p->mode, "r+"); /* default mode */ for (i = 0; i < argc; i++) { if (JSVAL_IS_STRING(argv[i])) { /* mode */ if ((str = JS_ValueToString(cx, argv[i])) == NULL) { JS_ReportError(cx, "Invalid mode specified: %s", str); - return(JS_TRUE); + return JS_TRUE; } JSSTRING_TO_STRBUF(cx, str, p->mode, sizeof(p->mode), NULL); } else if (JSVAL_IS_NUMBER(argv[i])) { /* bufsize */ if (!JS_ValueToInt32(cx, argv[i], &bufsize)) - return(JS_FALSE); + return JS_FALSE; } } @@ -243,7 +243,7 @@ js_popen(JSContext *cx, uintN argc, jsval *arglist) } JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -254,13 +254,13 @@ js_close(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (p->fp == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); #ifdef __unix__ @@ -275,7 +275,7 @@ js_close(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -288,15 +288,15 @@ js_raw_pollin(JSContext *cx, uintN argc, jsval *arglist) int32 timeout = -1; if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->fp == NULL) - return(JS_TRUE); + return JS_TRUE; if (argc && !JSVAL_NULL_OR_VOID(argv[0])) { if (!JS_ValueToInt32(cx, argv[0], &timeout)) - return(JS_FALSE); + return JS_FALSE; } JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(FALSE)); @@ -355,22 +355,22 @@ js_raw_read(JSContext *cx, uintN argc, jsval *arglist) if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->fp == NULL) - return(JS_TRUE); + return JS_TRUE; if (argc && !JSVAL_NULL_OR_VOID(argv[0])) { if (!JS_ValueToInt32(cx, argv[0], &len)) - return(JS_FALSE); + return JS_FALSE; } else len = 1; if (len < 0) len = 1; if ((buf = malloc(len)) == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); // https://pubs.opengroup.org/onlinepubs/009695399/functions/xsh_chap02_05.html#tag_02_05_01 @@ -423,11 +423,11 @@ js_raw_read(JSContext *cx, uintN argc, jsval *arglist) free(buf); if (str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(str)); - return(JS_TRUE); + return JS_TRUE; } @@ -449,15 +449,15 @@ js_read(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_NULL); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->fp == NULL) - return(JS_TRUE); + return JS_TRUE; if (argc && !JSVAL_NULL_OR_VOID(argv[0])) { if (!JS_ValueToInt32(cx, argv[0], &len)) - return(JS_FALSE); + return JS_FALSE; } else { rc = JS_SUSPENDREQUEST(cx); len = (long)filelength(fileno(p->fp)); @@ -470,7 +470,7 @@ js_read(JSContext *cx, uintN argc, jsval *arglist) len = 512; if ((buf = malloc(len + 1)) == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); len = fread(buf, 1, len, p->fp); @@ -493,7 +493,7 @@ js_read(JSContext *cx, uintN argc, jsval *arglist) if ((uubuf = malloc(uulen)) == NULL) { free(buf); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } if (p->uuencoded) uulen = uuencode(uubuf, uulen, buf, len); @@ -515,11 +515,11 @@ js_read(JSContext *cx, uintN argc, jsval *arglist) free(buf); if (str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -537,19 +537,19 @@ js_readln(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_NULL); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->fp == NULL) - return(JS_TRUE); + return JS_TRUE; if (argc && !JSVAL_NULL_OR_VOID(argv[0])) { if (!JS_ValueToInt32(cx, argv[0], &len)) - return(JS_FALSE); + return JS_FALSE; } if ((buf = malloc(len + 1)) == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); if (fgets(buf, len + 1, p->fp) != NULL) { @@ -571,7 +571,7 @@ js_readln(JSContext *cx, uintN argc, jsval *arglist) } free(buf); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -596,18 +596,18 @@ js_readbin(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(-1)); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->fp == NULL) - return(JS_TRUE); + return JS_TRUE; if (argc && !JSVAL_NULL_OR_VOID(argv[0])) { if (!JS_ValueToInt32(cx, argv[0], &size)) - return(JS_FALSE); + return JS_FALSE; if (argc > 1 && !JSVAL_NULL_OR_VOID(argv[1])) { if (!JS_ValueToInt32(cx, argv[1], &count)) - return(JS_FALSE); + return JS_FALSE; } } @@ -616,14 +616,14 @@ js_readbin(JSContext *cx, uintN argc, jsval *arglist) /* unknown size */ dbprintf(TRUE, p, "unsupported binary read size: %d", size); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } buffer = malloc(size * count); if (buffer == NULL) { dbprintf(TRUE, p, "malloc failure of %u bytes", size * count); JS_RESUMEREQUEST(cx, rc); - return(JS_FALSE); + return JS_FALSE; } b = buffer; w = buffer; @@ -702,7 +702,7 @@ js_readbin(JSContext *cx, uintN argc, jsval *arglist) end: free(buffer); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -716,11 +716,11 @@ js_readall(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_NULL); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->fp == NULL) - return(JS_TRUE); + return JS_TRUE; array = JS_NewArrayObject(cx, 0, NULL); @@ -733,7 +733,7 @@ js_readall(JSContext *cx, uintN argc, jsval *arglist) } JS_SET_RVAL(cx, arglist, OBJECT_TO_JSVAL(array)); - return(JS_TRUE); + return JS_TRUE; } static jsval get_value(JSContext *cx, char* value, bool blanks) @@ -743,7 +743,7 @@ static jsval get_value(JSContext *cx, char* value, bool blanks) jsval val; if (value == NULL || (*value == 0 && !blanks)) - return(JSVAL_VOID); + return JSVAL_VOID; /* integer or float? */ for (p = value; *p; p++) { @@ -757,7 +757,7 @@ static jsval get_value(JSContext *cx, char* value, bool blanks) val = DOUBLE_TO_JSVAL(atof(value)); else val = UINT_TO_JSVAL(strtoul(value, NULL, 10)); - return(val); + return val; } /* hexadecimal number? */ if (!strncmp(value, "0x", 2)) { @@ -766,17 +766,17 @@ static jsval get_value(JSContext *cx, char* value, bool blanks) break; if (*p == 0) { val = UINT_TO_JSVAL(strtoul(value, NULL, 0)); - return(val); + return val; } } /* Boolean? */ if (!stricmp(value, "true")) - return(JSVAL_TRUE); + return JSVAL_TRUE; if (!stricmp(value, "false")) - return(JSVAL_FALSE); + return JSVAL_FALSE; /* String */ - return(STRING_TO_JSVAL(JS_NewStringCopyZ(cx, value))); + return STRING_TO_JSVAL(JS_NewStringCopyZ(cx, value)); } static double js_DateGetMsecSinceEpoch(JSContext *cx, JSObject *obj) @@ -814,7 +814,7 @@ js_iniGetValue(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (argc && argv[0] != JSVAL_VOID && argv[0] != JSVAL_NULL) @@ -844,7 +844,7 @@ js_iniGetValue(JSContext *cx, uintN argc, jsval *arglist) strListFree(&ini); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, get_value(cx, cstr, /* blanks */ false)); - return(JS_TRUE); + return JS_TRUE; } if (JSVAL_IS_BOOLEAN(dflt)) { @@ -900,7 +900,7 @@ js_iniGetValue(JSContext *cx, uintN argc, jsval *arglist) FREE_AND_NULL(section); FREE_AND_NULL(key); strListFree(&ini); - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); i = iniGetInteger(ini, section, key, i); @@ -926,7 +926,7 @@ js_iniGetValue(JSContext *cx, uintN argc, jsval *arglist) FREE_AND_NULL(key); strListFree(&ini); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -944,11 +944,11 @@ js_iniSetValue_internal(JSContext *cx, JSObject *obj, uintN argc, jsval* argv, s time_t tt; if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->fp == NULL) - return(JS_TRUE); + return JS_TRUE; if (argc && argv[0] != JSVAL_VOID && argv[0] != JSVAL_NULL) JSVALUE_TO_MSTRING(cx, argv[0], section, NULL); @@ -1003,7 +1003,7 @@ js_iniSetValue_internal(JSContext *cx, JSObject *obj, uintN argc, jsval* argv, s FREE_AND_NULL(section); FREE_AND_NULL(key); - return(result != NULL); + return result != NULL; } static JSBool @@ -1017,11 +1017,11 @@ js_iniSetValue(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->fp == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); if ((list = iniReadFile(p->fp)) != NULL) { @@ -1049,11 +1049,11 @@ js_iniRemoveKey(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_FALSE); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->fp == NULL) - return(JS_TRUE); + return JS_TRUE; if (argc && argv[0] != JSVAL_VOID && argv[0] != JSVAL_NULL) { JSVALUE_TO_MSTRING(cx, argv[0], section, NULL); @@ -1077,7 +1077,7 @@ js_iniRemoveKey(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); FREE_AND_NULL(section); FREE_AND_NULL(key); - return(JS_TRUE); + return JS_TRUE; } if (iniRemoveKey(&list, section, key)) @@ -1089,7 +1089,7 @@ js_iniRemoveKey(JSContext *cx, uintN argc, jsval *arglist) strListFree(&list); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1105,11 +1105,11 @@ js_iniRemoveSection(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_FALSE); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->fp == NULL) - return(JS_TRUE); + return JS_TRUE; if (argc && argv[0] != JSVAL_VOID && argv[0] != JSVAL_NULL) { JSVALUE_TO_MSTRING(cx, argv[0], section, NULL); @@ -1120,7 +1120,7 @@ js_iniRemoveSection(JSContext *cx, uintN argc, jsval *arglist) if ((list = iniReadFile(p->fp)) == NULL) { JS_RESUMEREQUEST(cx, rc); FREE_AND_NULL(section); - return(JS_TRUE); + return JS_TRUE; } if (iniRemoveSection(&list, section)) @@ -1130,7 +1130,7 @@ js_iniRemoveSection(JSContext *cx, uintN argc, jsval *arglist) strListFree(&list); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1190,11 +1190,11 @@ js_iniGetSections(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_NULL); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->fp == NULL) - return(JS_TRUE); + return JS_TRUE; if (argc) { JSVALUE_TO_MSTRING(cx, argv[0], prefix, NULL); @@ -1218,7 +1218,7 @@ js_iniGetSections(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, OBJECT_TO_JSVAL(array)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1237,11 +1237,11 @@ js_iniGetKeys(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_NULL); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->fp == NULL) - return(JS_TRUE); + return JS_TRUE; if (argc && argv[0] != JSVAL_VOID && argv[0] != JSVAL_NULL) { JSVALUE_TO_MSTRING(cx, argv[0], section, NULL); @@ -1266,7 +1266,7 @@ js_iniGetKeys(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, OBJECT_TO_JSVAL(array)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1286,11 +1286,11 @@ js_iniGetObject(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_NULL); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->fp == NULL) - return(JS_TRUE); + return JS_TRUE; uintN argn = 0; if (argc > argn && !JSVAL_IS_BOOLEAN(argv[argn]) && !JSVAL_NULL_OR_VOID(argv[argn])) { @@ -1315,7 +1315,7 @@ js_iniGetObject(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); if (list == NULL) - return(JS_TRUE); + return JS_TRUE; object = JS_NewObject(cx, NULL, NULL, obj); @@ -1333,7 +1333,7 @@ js_iniGetObject(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, OBJECT_TO_JSVAL(object)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1354,21 +1354,21 @@ js_iniSetObject(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_FALSE); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->fp == NULL) - return(JS_TRUE); + return JS_TRUE; set_argv[0] = argv[0]; /* section */ if (!JSVAL_IS_OBJECT(argv[1]) || argv[1] == JSVAL_NULL) - return(JS_TRUE); + return JS_TRUE; object = JSVAL_TO_OBJECT(argv[1]); if (object == NULL || (id_array = JS_Enumerate(cx, object)) == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); if ((list = iniReadFile(p->fp)) == NULL) { @@ -1413,7 +1413,7 @@ js_iniSetObject(JSContext *cx, uintN argc, jsval *arglist) JS_DestroyIdArray(cx, id_array); - return(JS_TRUE); + return JS_TRUE; } @@ -1441,11 +1441,11 @@ js_iniGetAllObjects(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_NULL); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->fp == NULL) - return(JS_TRUE); + return JS_TRUE; uintN argn = 0; if (argc > argn && JSVAL_IS_STRING(argv[argn])) { @@ -1522,7 +1522,7 @@ js_iniGetAllObjects(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, OBJECT_TO_JSVAL(array)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1549,15 +1549,15 @@ js_iniSetAllObjects(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_FALSE); if (JSVAL_IS_NULL(argv[0]) || !JSVAL_IS_OBJECT(argv[0])) - return(JS_TRUE); + return JS_TRUE; array = JSVAL_TO_OBJECT(argv[0]); if (array == NULL || !JS_IsArrayObject(cx, array)) - return(JS_TRUE); + return JS_TRUE; if (!JS_GetArrayLength(cx, array, &count)) - return(JS_TRUE); + return JS_TRUE; if (argc > 1) { JSVALUE_TO_MSTRING(cx, argv[1], name, NULL); @@ -1570,13 +1570,13 @@ js_iniSetAllObjects(JSContext *cx, uintN argc, jsval *arglist) if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { if (name != name_def) free(name); - return(JS_FALSE); + return JS_FALSE; } if (p->fp == NULL) { if (name != name_def) free(name); - return(JS_TRUE); + return JS_TRUE; } rc = JS_SUSPENDREQUEST(cx); @@ -1601,7 +1601,7 @@ js_iniSetAllObjects(JSContext *cx, uintN argc, jsval *arglist) if ((id_array = JS_Enumerate(cx, object)) == NULL) { if (name != name_def) free(name); - return(JS_TRUE); + return JS_TRUE; } for (j = 0; j < id_array->length; j++) { @@ -1646,7 +1646,7 @@ js_iniSetAllObjects(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, rval); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1681,7 +1681,7 @@ js_iniReadAll(JSContext *cx, uintN argc, jsval *arglist) strListFree(&list); JS_SET_RVAL(cx, arglist, OBJECT_TO_JSVAL(array)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1698,14 +1698,14 @@ js_raw_write(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_FALSE); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->fp == NULL) - return(JS_TRUE); + return JS_TRUE; if ((str = JS_ValueToString(cx, argv[0])) == NULL) - return(JS_FALSE); + return JS_FALSE; JSSTRING_TO_MSTRING(cx, str, cp, &len); HANDLE_PENDING(cx, cp); @@ -1724,7 +1724,7 @@ js_raw_write(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1745,14 +1745,14 @@ js_write(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_FALSE); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->fp == NULL) - return(JS_TRUE); + return JS_TRUE; if ((str = JS_ValueToString(cx, argv[0])) == NULL) - return(JS_FALSE); + return JS_FALSE; JSSTRING_TO_MSTRING(cx, str, cp, &len); HANDLE_PENDING(cx, cp); @@ -1772,7 +1772,7 @@ js_write(JSContext *cx, uintN argc, jsval *arglist) free(uubuf); free(cp); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } free(cp); cp = uubuf; @@ -1787,7 +1787,7 @@ js_write(JSContext *cx, uintN argc, jsval *arglist) if (argc > 1 && !JSVAL_NULL_OR_VOID(argv[1])) { if (!JS_ValueToInt32(cx, argv[1], &i)) { free(cp); - return(JS_FALSE); + return JS_FALSE; } tlen = i; if (len > tlen) @@ -1802,7 +1802,7 @@ js_write(JSContext *cx, uintN argc, jsval *arglist) if ((cp = malloc(len)) == NULL) { JS_RESUMEREQUEST(cx, rc); JS_ReportError(cx, "malloc failure of %u bytes", len); - return(JS_FALSE); + return JS_FALSE; } memset(cp, p->etx, len); if (fwrite(cp, 1, len, p->fp) < len) { @@ -1821,7 +1821,7 @@ js_write(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1836,16 +1836,16 @@ js_writeln_internal(JSContext *cx, JSObject *obj, jsval *arg, jsval *rval) *rval = JSVAL_FALSE; if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->fp == NULL) - return(JS_TRUE); + return JS_TRUE; if (arg) { if ((str = JS_ValueToString(cx, *arg)) == NULL) { JS_ReportError(cx, "JS_ValueToString failed"); - return(JS_FALSE); + return JS_FALSE; } JSSTRING_TO_MSTRING(cx, str, cp, NULL); HANDLE_PENDING(cx, cp); @@ -1863,7 +1863,7 @@ js_writeln_internal(JSContext *cx, JSObject *obj, jsval *arg, jsval *rval) free(cp); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1882,7 +1882,7 @@ js_writeln(JSContext *cx, uintN argc, jsval *arglist) } JS_SET_RVAL(cx, arglist, rval); - return(ret); + return ret; } static JSBool @@ -1913,41 +1913,41 @@ js_writebin(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_FALSE); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->fp == NULL) - return(JS_TRUE); + return JS_TRUE; if (JSVAL_IS_OBJECT(argv[0]) && !JSVAL_IS_NULL(argv[0])) { array = JSVAL_TO_OBJECT(argv[0]); if (array != NULL && JS_IsArrayObject(cx, array)) { if (!JS_GetArrayLength(cx, array, &count)) - return(JS_TRUE); + return JS_TRUE; } else array = NULL; } if (array == NULL) { if (!JS_ValueToNumber(cx, argv[0], &val)) - return(JS_FALSE); + return JS_FALSE; } if (argc > 1 && !JSVAL_NULL_OR_VOID(argv[1])) { if (!JS_ValueToInt32(cx, argv[1], &size)) - return(JS_FALSE); + return JS_FALSE; } if (size != sizeof(BYTE) && size != sizeof(WORD) && size != sizeof(DWORD) && size != sizeof(uint64_t)) { rc = JS_SUSPENDREQUEST(cx); dbprintf(TRUE, p, "unsupported binary write size: %d", size); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } buffer = calloc(size, count); if (buffer == NULL) { rc = JS_SUSPENDREQUEST(cx); dbprintf(TRUE, p, "malloc failure of %u bytes", size * count); JS_RESUMEREQUEST(cx, rc); - return(JS_FALSE); + return JS_FALSE; } o.b = buffer; if (array == NULL) { @@ -2048,7 +2048,7 @@ js_writebin(JSContext *cx, uintN argc, jsval *arglist) end: free(buffer); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2065,22 +2065,22 @@ js_writeall(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_FALSE); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->fp == NULL) - return(JS_TRUE); + return JS_TRUE; if (JSVAL_IS_NULL(argv[0]) || !JSVAL_IS_OBJECT(argv[0])) - return(JS_TRUE); + return JS_TRUE; array = JSVAL_TO_OBJECT(argv[0]); if (array == NULL || !JS_IsArrayObject(cx, array)) - return(JS_TRUE); + return JS_TRUE; if (!JS_GetArrayLength(cx, array, &limit)) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, JSVAL_TRUE); @@ -2095,7 +2095,7 @@ js_writeall(JSContext *cx, uintN argc, jsval *arglist) break; } - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2112,23 +2112,23 @@ js_lock(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_FALSE); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->fp == NULL) - return(JS_TRUE); + return JS_TRUE; /* offset */ if (argc) { if (!JS_ValueToNumber(cx, argv[0], &val)) - return(JS_FALSE); + return JS_FALSE; offset = (off_t)val; } /* length */ if (argc > 1) { if (!JS_ValueToNumber(cx, argv[1], &val)) - return(JS_FALSE); + return JS_FALSE; len = (off_t)val; } @@ -2140,7 +2140,7 @@ js_lock(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_TRUE); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2157,23 +2157,23 @@ js_unlock(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_FALSE); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->fp == NULL) - return(JS_TRUE); + return JS_TRUE; /* offset */ if (argc) { if (!JS_ValueToNumber(cx, argv[0], &val)) - return(JS_FALSE); + return JS_FALSE; offset = (off_t)val; } /* length */ if (argc > 1) { if (!JS_ValueToNumber(cx, argv[1], &val)) - return(JS_FALSE); + return JS_FALSE; len = (off_t)val; } @@ -2185,7 +2185,7 @@ js_unlock(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_TRUE); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2198,7 +2198,7 @@ js_delete(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->fp != NULL) { /* close it if it's open */ @@ -2210,7 +2210,7 @@ js_delete(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(remove(p->name) == 0)); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2223,7 +2223,7 @@ js_flush(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); @@ -2233,7 +2233,7 @@ js_flush(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(fflush(p->fp) == 0)); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2246,7 +2246,7 @@ js_rewind(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); @@ -2258,7 +2258,7 @@ js_rewind(JSContext *cx, uintN argc, jsval *arglist) } JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2273,12 +2273,12 @@ js_truncate(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (argc && !JSVAL_NULL_OR_VOID(argv[0])) { if (!JS_ValueToInt32(cx, argv[0], &len)) - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); @@ -2289,7 +2289,7 @@ js_truncate(JSContext *cx, uintN argc, jsval *arglist) } JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2302,7 +2302,7 @@ js_clear_error(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); @@ -2314,7 +2314,7 @@ js_clear_error(JSContext *cx, uintN argc, jsval *arglist) } JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2329,15 +2329,15 @@ js_fprintf(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_FALSE); if ((p = (private_t*)js_GetClassPrivate(cx, obj, &js_file_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->fp == NULL) - return(JS_TRUE); + return JS_TRUE; if ((cp = js_sprintf(cx, 0, argc, argv)) == NULL) { JS_ReportError(cx, "js_sprintf failed"); - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); @@ -2345,7 +2345,7 @@ js_fprintf(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); js_sprintf_free(cp); - return(JS_TRUE); + return JS_TRUE; } @@ -2398,7 +2398,7 @@ static JSBool js_file_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, char* str = NULL; if ((p = (private_t*)JS_GetInstancePrivate(cx, obj, &js_file_class, NULL)) == NULL) { - return(JS_TRUE); + return JS_TRUE; } JS_IdToValue(cx, id, &idval); @@ -2430,7 +2430,7 @@ static JSBool js_file_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, case FILE_PROP_POSITION: if (p->fp != NULL) { if (!JS_ValueToECMAUint32(cx, *vp, &u)) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); fseek(p->fp, u, SEEK_SET); JS_RESUMEREQUEST(cx, rc); @@ -2438,7 +2438,7 @@ static JSBool js_file_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, break; case FILE_PROP_DATE: if (!JS_ValueToECMAUint32(cx, *vp, &u)) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); setfdate(p->name, u); JS_RESUMEREQUEST(cx, rc); @@ -2446,7 +2446,7 @@ static JSBool js_file_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, case FILE_PROP_LENGTH: if (p->fp != NULL) { if (!JS_ValueToECMAUint32(cx, *vp, &u)) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); result = chsize(fileno(p->fp), u); JS_RESUMEREQUEST(cx, rc); @@ -2458,19 +2458,19 @@ static JSBool js_file_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, break; case FILE_PROP_ATTRIBUTES: if (!JS_ValueToInt32(cx, *vp, &i)) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); (void)CHMOD(p->name, i); JS_RESUMEREQUEST(cx, rc); break; case FILE_PROP_ETX: if (!JS_ValueToInt32(cx, *vp, &i)) - return(JS_FALSE); + return JS_FALSE; p->etx = (uchar)i; break; case FILE_INI_KEY_LEN: if (!JS_ValueToInt32(cx, *vp, &i)) - return(JS_FALSE); + return JS_FALSE; p->ini_style.key_len = i; break; case FILE_INI_KEY_PREFIX: @@ -2515,7 +2515,7 @@ static JSBool js_file_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, break; } - return(JS_TRUE); + return JS_TRUE; } static JSBool js_file_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) @@ -2542,7 +2542,7 @@ static JSBool js_file_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) int in; if ((p = (private_t*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_TRUE); + return JS_TRUE; JS_IdToValue(cx, id, &idval); tiny = JSVAL_TO_INT(idval); @@ -2773,7 +2773,7 @@ static JSBool js_file_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) *vp = STRING_TO_JSVAL(js_str); } - return(JS_TRUE); + return JS_TRUE; } #define FILE_PROP_FLAGS JSPROP_ENUMERATE | JSPROP_READONLY @@ -3082,7 +3082,7 @@ static JSBool js_file_resolve(JSContext *cx, JSObject *obj, jsid id) static JSBool js_file_enumerate(JSContext *cx, JSObject *obj) { - return(js_file_resolve(cx, obj, JSID_VOID)); + return js_file_resolve(cx, obj, JSID_VOID); } JSClass js_file_class = { @@ -3112,19 +3112,19 @@ js_file_constructor(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, OBJECT_TO_JSVAL(obj)); if (argc < 1 || (str = JS_ValueToString(cx, argv[0])) == NULL) { JS_ReportError(cx, "No filename specified"); - return(JS_FALSE); + return JS_FALSE; } if ((p = (private_t*)calloc(1, sizeof(private_t))) == NULL) { JS_ReportError(cx, "calloc failed"); - return(JS_FALSE); + return JS_FALSE; } JSSTRING_TO_STRBUF(cx, str, p->name, sizeof(p->name), NULL); if (!JS_SetPrivate(cx, obj, p)) { dbprintf(TRUE, p, "JS_SetPrivate failed"); - return(JS_FALSE); + return JS_FALSE; } #ifdef BUILD_JSDOCS @@ -3158,7 +3158,7 @@ js_file_constructor(JSContext *cx, uintN argc, jsval *arglist) #endif dbprintf(FALSE, p, "object constructed"); - return(JS_TRUE); + return JS_TRUE; } JSObject* js_CreateFileClass(JSContext* cx, JSObject* parent) @@ -3173,7 +3173,7 @@ JSObject* js_CreateFileClass(JSContext* cx, JSObject* parent) , NULL /* funcs, set in constructor */ , NULL, NULL); - return(obj); + return obj; } JSObject* js_CreateFileObject(JSContext* cx, JSObject* parent, char *name, int fd, const char* mode) @@ -3197,12 +3197,12 @@ JSObject* js_CreateFileObject(JSContext* cx, JSObject* parent, char *name, int f if (obj == NULL) { fclose(fp); - return(NULL); + return NULL; } if ((p = (private_t*)calloc(1, sizeof(private_t))) == NULL) { fclose(fp); - return(NULL); + return NULL; } p->fp = fp; @@ -3211,11 +3211,11 @@ JSObject* js_CreateFileObject(JSContext* cx, JSObject* parent, char *name, int f if (!JS_SetPrivate(cx, obj, p)) { fclose(fp); dbprintf(TRUE, p, "JS_SetPrivate failed"); - return(NULL); + return NULL; } dbprintf(FALSE, p, "object created"); - return(obj); + return obj; } diff --git a/src/sbbs3/js_file_area.c b/src/sbbs3/js_file_area.c index b05c75a4a1e4cb440aa3a95040aa22dbb9bf0f23..46dc272b99da59f2c6da65e151d56d1770cb61b6 100644 --- a/src/sbbs3/js_file_area.c +++ b/src/sbbs3/js_file_area.c @@ -221,7 +221,7 @@ JSBool js_file_area_resolve(JSContext* cx, JSObject* areaobj, jsid id) val = DOUBLE_TO_JSVAL((jsdouble)p->cfg->min_dspace); JS_DefineProperty(cx, areaobj, "min_diskspace", val, NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY); if (name) - return(JS_TRUE); + return JS_TRUE; } if (name == NULL || strcmp(name, "max_filename_length") == 0) { @@ -230,7 +230,7 @@ JSBool js_file_area_resolve(JSContext* cx, JSObject* areaobj, jsid id) val = UINT_TO_JSVAL(p->cfg->filename_maxlen); JS_DefineProperty(cx, areaobj, "max_filename_length", val, NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY); if (name) - return(JS_TRUE); + return JS_TRUE; } if (name == NULL || strcmp(name, "settings") == 0) { @@ -239,7 +239,7 @@ JSBool js_file_area_resolve(JSContext* cx, JSObject* areaobj, jsid id) val = UINT_TO_JSVAL(p->cfg->file_misc); JS_DefineProperty(cx, areaobj, "settings", val, NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY); if (name) - return(JS_TRUE); + return JS_TRUE; } if (name == NULL || strcmp(name, "web_vpath_prefix") == 0) { @@ -254,7 +254,7 @@ JSBool js_file_area_resolve(JSContext* cx, JSObject* areaobj, jsid id) } JS_DefineProperty(cx, areaobj, "web_vpath_prefix", val, NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY); if (name) - return(JS_TRUE); + return JS_TRUE; } #ifdef BUILD_JSDOCS @@ -603,7 +603,7 @@ JSBool js_file_area_resolve(JSContext* cx, JSObject* areaobj, jsid id) static JSBool js_file_area_enumerate(JSContext *cx, JSObject *obj) { - return(js_file_area_resolve(cx, obj, JSID_VOID)); + return js_file_area_resolve(cx, obj, JSID_VOID); } static JSClass js_file_area_class = { @@ -628,7 +628,7 @@ DLLEXPORT JSObject* js_CreateFileAreaObject(JSContext* cx, JSObject* parent, scf , JSPROP_ENUMERATE | JSPROP_READONLY); if (obj == NULL) - return(NULL); + return NULL; p = (struct js_file_area_priv *)malloc(sizeof(struct js_file_area_priv)); if (p == NULL) @@ -642,7 +642,7 @@ DLLEXPORT JSObject* js_CreateFileAreaObject(JSContext* cx, JSObject* parent, scf if (!JS_SetPrivate(cx, obj, p)) { free(p); - return(NULL); + return NULL; } #ifdef BUILD_JSDOCS @@ -650,7 +650,7 @@ DLLEXPORT JSObject* js_CreateFileAreaObject(JSContext* cx, JSObject* parent, scf js_file_area_enumerate(cx, obj); #endif - return(obj); + return obj; } #endif /* JAVSCRIPT */ diff --git a/src/sbbs3/js_filebase.c b/src/sbbs3/js_filebase.c index f74a5187c1fba6aae1e076f8ac5d9755acaec83e..0c83c3488c6e8f5acee51fac96dd07c98043f129 100644 --- a/src/sbbs3/js_filebase.c +++ b/src/sbbs3/js_filebase.c @@ -1773,7 +1773,7 @@ static JSBool js_filebase_resolve(JSContext *cx, JSObject *obj, jsid id) static JSBool js_filebase_enumerate(JSContext *cx, JSObject *obj) { - return(js_filebase_resolve(cx, obj, JSID_VOID)); + return js_filebase_resolve(cx, obj, JSID_VOID); } JSClass js_filebase_class = { diff --git a/src/sbbs3/js_global.c b/src/sbbs3/js_global.c index 488d11d6ad4adb75f5aef599ea55f5c9f66ad7d6..bf49852ecaa01d17000945238a1e4d37bfd9835c 100644 --- a/src/sbbs3/js_global.c +++ b/src/sbbs3/js_global.c @@ -73,7 +73,7 @@ static JSBool js_system_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) break; case GLOB_PROP_SOCKET_ERRNO_STR: if ((js_str = JS_NewStringCopyZ(cx, SOCKET_STRERROR(err, sizeof(err)))) == NULL) - return(JS_FALSE); + return JS_FALSE; *vp = STRING_TO_JSVAL(js_str); break; case GLOB_PROP_ERRNO: @@ -81,11 +81,11 @@ static JSBool js_system_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) break; case GLOB_PROP_ERRNO_STR: if ((js_str = JS_NewStringCopyZ(cx, strerror(errno))) == NULL) - return(JS_FALSE); + return JS_FALSE; *vp = STRING_TO_JSVAL(js_str); break; } - return(JS_TRUE); + return JS_TRUE; } #define GLOBOBJ_FLAGS JSPROP_ENUMERATE | JSPROP_READONLY | JSPROP_SHARED @@ -175,12 +175,12 @@ js_OperationCallback(JSContext *cx) if ((bg = (background_data_t*)JS_GetContextPrivate(cx)) == NULL) { JS_SetOperationCallback(cx, js_OperationCallback); - return(JS_FALSE); + return JS_FALSE; } if (bg->parent_cx != NULL && !JS_IsRunning(bg->parent_cx)) { /* die when parent dies */ JS_SetOperationCallback(cx, js_OperationCallback); - return(JS_FALSE); + return JS_FALSE; } ret = js_CommonOperationCallback(cx, &bg->cb); @@ -266,7 +266,7 @@ js_load(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (global_private_t*)js_GetClassPrivate(cx, obj, &js_global_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; exec_obj = scope; @@ -278,7 +278,7 @@ js_load(JSContext *cx, uintN argc, jsval *arglist) if ((bg = (background_data_t*)malloc(sizeof(background_data_t))) == NULL) { JS_RESUMEREQUEST(cx, rc); - return(JS_FALSE); + return JS_FALSE; } memset(bg, 0, sizeof(background_data_t)); @@ -311,14 +311,14 @@ js_load(JSContext *cx, uintN argc, jsval *arglist) if ((bg->runtime = jsrt_GetNew(JAVASCRIPT_MAX_BYTES, 1000, __FILE__, __LINE__)) == NULL) { free(bg); JS_RESUMEREQUEST(cx, rc); - return(JS_FALSE); + return JS_FALSE; } if ((bg->cx = JS_NewContext(bg->runtime, JAVASCRIPT_CONTEXT_STACK)) == NULL) { jsrt_Release(bg->runtime); free(bg); JS_RESUMEREQUEST(cx, rc); - return(JS_FALSE); + return JS_FALSE; } JS_SetOptions(bg->cx, p->startup->options); JS_BEGINREQUEST(bg->cx); @@ -344,7 +344,7 @@ js_load(JSContext *cx, uintN argc, jsval *arglist) jsrt_Release(bg->runtime); free(bg); JS_RESUMEREQUEST(cx, rc); - return(JS_FALSE); + return JS_FALSE; } if ((bg->logobj = JS_NewObjectWithGivenProto(bg->cx, NULL, NULL, bg->obj)) == NULL) { @@ -354,7 +354,7 @@ js_load(JSContext *cx, uintN argc, jsval *arglist) jsrt_Release(bg->runtime); free(bg); JS_RESUMEREQUEST(cx, rc); - return(JS_FALSE); + return JS_FALSE; } JS_AddObjectRoot(bg->cx, &bg->logobj); @@ -428,7 +428,7 @@ js_load(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); free(bg); } - return(JS_FALSE); + return JS_FALSE; } JSVALUE_TO_MSTRING(cx, argv[argn], filename, NULL); argn++; @@ -443,7 +443,7 @@ js_load(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); free(bg); } - return(JS_FALSE); + return JS_FALSE; } if (argc > argn || background) { @@ -469,7 +469,7 @@ js_load(JSContext *cx, uintN argc, jsval *arglist) free(bg); } free(filename); - return(JS_FALSE); + return JS_FALSE; } JS_DefineProperty(exec_cx, exec_obj, "argv", OBJECT_TO_JSVAL(js_argv) @@ -631,7 +631,7 @@ js_load(JSContext *cx, uintN argc, jsval *arglist) } JS_RemoveValueRoot(exec_cx, &old_js_argv); JS_RemoveValueRoot(exec_cx, &old_js_argc); - return(JS_FALSE); + return JS_FALSE; } if (background) { @@ -674,7 +674,7 @@ js_load(JSContext *cx, uintN argc, jsval *arglist) } } - return(success); + return success; } /* @@ -700,7 +700,7 @@ js_require(JSContext *cx, uintN argc, jsval *arglist) exec_obj = JS_GetScopeChain(cx); if (JSVAL_IS_BOOLEAN(argv[argn])) { JS_ReportError(cx, "cannot require() background processes"); - return(JS_FALSE); + return JS_FALSE; } if (JSVAL_IS_OBJECT(argv[argn])) { @@ -714,7 +714,7 @@ js_require(JSContext *cx, uintN argc, jsval *arglist) if (argn == argc) { JS_ReportError(cx, "no symbol name specified"); - return(JS_FALSE); + return JS_FALSE; } JSVALUE_TO_MSTRING(cx, argv[argn], property, NULL); @@ -739,7 +739,7 @@ js_require(JSContext *cx, uintN argc, jsval *arglist) } free(filename); free(property); - return(JS_FALSE); + return JS_FALSE; } } free(property); @@ -757,17 +757,17 @@ js_format(JSContext *cx, uintN argc, jsval *arglist) if ((p = js_sprintf(cx, 0, argc, argv)) == NULL) { JS_ReportError(cx, "js_sprintf failed"); - return(JS_FALSE); + return JS_FALSE; } str = JS_NewStringCopyZ(cx, p); js_sprintf_free(p); if (str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -789,7 +789,7 @@ js_yield(JSContext *cx, uintN argc, jsval *arglist) } JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -810,7 +810,7 @@ js_mswait(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, DOUBLE_TO_JSVAL((xp_timer() - start) * 1000)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -825,14 +825,14 @@ js_random(JSContext *cx, uintN argc, jsval *arglist) } JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(sbbs_random(val))); - return(JS_TRUE); + return JS_TRUE; } static JSBool js_time(JSContext *cx, uintN argc, jsval *arglist) { JS_SET_RVAL(cx, arglist, UINT_TO_JSVAL((uint32_t)time(NULL))); - return(JS_TRUE); + return JS_TRUE; } @@ -858,7 +858,7 @@ js_beep(JSContext *cx, uintN argc, jsval *arglist) rc = JS_SUSPENDREQUEST(cx); sbbs_beep(freq, dur); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -885,7 +885,7 @@ js_exit(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); - return(JS_FALSE); + return JS_FALSE; } static JSBool @@ -900,19 +900,19 @@ js_crc16(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], p, &len); HANDLE_PENDING(cx, p); if (p == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); cs = crc16(p, len); free(p); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(cs)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -927,19 +927,19 @@ js_crc32(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], p, &len); HANDLE_PENDING(cx, p); if (p == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); cs = crc32(p, len); free(p); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, UINT_TO_JSVAL(cs)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -955,12 +955,12 @@ js_chksum(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], p, &len); HANDLE_PENDING(cx, p); if (p == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); /* 3.8 seconds on Deuce's computer when len==UINT_MAX/8 */ sp = p; @@ -969,7 +969,7 @@ js_chksum(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, DOUBLE_TO_JSVAL((double)sum)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -984,7 +984,7 @@ js_ascii(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; if (JSVAL_IS_STRING(argv[0])) { /* string to ascii-int */ p = JS_GetStringCharsZ(cx, JSVAL_TO_STRING(argv[0])); @@ -992,7 +992,7 @@ js_ascii(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(0)); else JS_SET_RVAL(cx, arglist, INT_TO_JSVAL((uchar) * p)); - return(JS_TRUE); + return JS_TRUE; } /* ascii-int to str */ @@ -1002,10 +1002,10 @@ js_ascii(JSContext *cx, uintN argc, jsval *arglist) str[1] = 0; if ((js_str = JS_NewStringCopyN(cx, str, 1)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1021,13 +1021,13 @@ js_ctrl(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; if (JSVAL_IS_STRING(argv[0])) { p = JS_GetStringCharsZ(cx, JSVAL_TO_STRING(argv[0])); if (p == NULL) { JS_ReportError(cx, "Invalid NULL string"); - return(JS_FALSE); + return JS_FALSE; } ch = (uchar) * p; } else { @@ -1040,10 +1040,10 @@ js_ctrl(JSContext *cx, uintN argc, jsval *arglist) str[1] = 0; if ((js_str = JS_NewStringCopyZ(cx, str)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1071,10 +1071,10 @@ js_ascii_str(JSContext *cx, uintN argc, jsval *arglist) str = JS_NewStringCopyZ(cx, buf); free(buf); if (str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(str)); - return(JS_TRUE); + return JS_TRUE; } @@ -1089,12 +1089,12 @@ js_strip_ctrl(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], buf, NULL); HANDLE_PENDING(cx, buf); if (buf == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); strip_ctrl(buf, buf); @@ -1103,10 +1103,10 @@ js_strip_ctrl(JSContext *cx, uintN argc, jsval *arglist) js_str = JS_NewStringCopyZ(cx, buf); free(buf); if (js_str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1185,12 +1185,12 @@ js_strip_exascii(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], buf, NULL) HANDLE_PENDING(cx, buf); if (buf == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); strip_exascii(buf, buf); @@ -1199,10 +1199,10 @@ js_strip_exascii(JSContext *cx, uintN argc, jsval *arglist) js_str = JS_NewStringCopyZ(cx, buf); free(buf); if (js_str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1218,17 +1218,17 @@ js_lfexpand(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], inbuf, NULL); HANDLE_PENDING(cx, inbuf); if (inbuf == NULL) - return(JS_TRUE); + return JS_TRUE; if ((outbuf = (char*)malloc((strlen(inbuf) * 2) + 1)) == NULL) { JS_ReportError(cx, "Error allocating %lu bytes at %s:%d", (strlen(inbuf) * 2) + 1, getfname(__FILE__), __LINE__); free(inbuf); - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); @@ -1244,10 +1244,10 @@ js_lfexpand(JSContext *cx, uintN argc, jsval *arglist) str = JS_NewStringCopyZ(cx, outbuf); free(outbuf); if (str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1266,12 +1266,12 @@ js_word_wrap(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], inbuf, NULL); HANDLE_PENDING(cx, inbuf); if (inbuf == NULL) - return(JS_TRUE); + return JS_TRUE; if (argc > 1) { if (!JS_ValueToInt32(cx, argv[1], &len)) { @@ -1301,14 +1301,14 @@ js_word_wrap(JSContext *cx, uintN argc, jsval *arglist) if (outbuf == NULL) { JS_ReportError(cx, "Allocation error in wordwrap()"); - return(JS_FALSE); + return JS_FALSE; } js_str = JS_NewStringCopyZ(cx, outbuf); free(outbuf); if (js_str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1330,12 +1330,12 @@ js_quote_msg(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], inbuf, NULL); HANDLE_PENDING(cx, inbuf); if (inbuf == NULL) - return(JS_TRUE); + return JS_TRUE; if (argc > 1) { if (!JS_ValueToInt32(cx, argv[1], &len)) { @@ -1359,7 +1359,7 @@ js_quote_msg(JSContext *cx, uintN argc, jsval *arglist) free(inbuf); if (prefix != prefix_def) free(prefix); - return(JS_FALSE); + return JS_FALSE; } len -= strlen(prefix); @@ -1368,7 +1368,7 @@ js_quote_msg(JSContext *cx, uintN argc, jsval *arglist) free(inbuf); if (prefix != prefix_def) free(prefix); - return(JS_TRUE); + return JS_TRUE; } linebuf_sz = (len * 3) + 2; @@ -1378,7 +1378,7 @@ js_quote_msg(JSContext *cx, uintN argc, jsval *arglist) if (prefix != prefix_def) free(prefix); JS_ReportError(cx, "Error allocating %lu bytes at %s:%d", linebuf_sz, getfname(__FILE__), __LINE__); - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); @@ -1429,10 +1429,10 @@ js_quote_msg(JSContext *cx, uintN argc, jsval *arglist) js_str = JS_NewStringCopyZ(cx, outbuf); free(outbuf); if (js_str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1444,17 +1444,17 @@ js_netaddr_type(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(NET_NONE)); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], str, NULL); HANDLE_PENDING(cx, str); if (str == NULL) - return(JS_TRUE); + return JS_TRUE; JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(smb_netaddr_type(str))); free(str); - return(JS_TRUE); + return JS_TRUE; } /* This table is used to convert between IBM ex-ASCII and HTML character entities */ @@ -1685,15 +1685,15 @@ js_html_encode(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; if ((p = (global_private_t*)js_GetClassPrivate(cx, obj, &js_global_class)) == NULL) - return(JS_FALSE); + return JS_FALSE; JSVALUE_TO_MSTRING(cx, argv[0], inbuf, NULL); HANDLE_PENDING(cx, inbuf); if (inbuf == NULL) - return(JS_TRUE); + return JS_TRUE; if (argc > 1 && JSVAL_IS_BOOLEAN(argv[1])) exascii = JSVAL_TO_BOOLEAN(argv[1]); @@ -1779,7 +1779,7 @@ js_html_encode(JSContext *cx, uintN argc, jsval *arglist) if ((tmpbuf = (char*)malloc(tmpbuf_sz)) == NULL) { free(inbuf); JS_ReportError(cx, "Error allocating %lu bytes at %s:%d", tmpbuf_sz, getfname(__FILE__), __LINE__); - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); @@ -1876,7 +1876,7 @@ js_html_encode(JSContext *cx, uintN argc, jsval *arglist) free(tmpbuf); JS_RESUMEREQUEST(cx, rc); JS_ReportError(cx, "Error allocating %lu bytes at %s:%d", obsize, getfname(__FILE__), __LINE__); - return(JS_FALSE); + return JS_FALSE; } j = sprintf(outbuf, "<span style=\"%s\">", htmlansi[7]); clear_screen = j; @@ -1890,7 +1890,7 @@ js_html_encode(JSContext *cx, uintN argc, jsval *arglist) free(outbuf); JS_RESUMEREQUEST(cx, rc); JS_ReportError(cx, "Error allocating %lu bytes at %s:%d", obsize, getfname(__FILE__), __LINE__); - return(JS_FALSE); + return JS_FALSE; } outbuf = param; } @@ -2375,7 +2375,7 @@ js_html_encode(JSContext *cx, uintN argc, jsval *arglist) free(tmpbuf); /* assertion here, Feb-20-2006 */ if (js_str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); @@ -2402,7 +2402,7 @@ js_html_encode(JSContext *cx, uintN argc, jsval *arglist) , NULL, NULL, JSPROP_ENUMERATE); } - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2422,16 +2422,16 @@ js_html_decode(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], inbuf, NULL); HANDLE_PENDING(cx, inbuf); if (inbuf == NULL) - return(JS_TRUE); + return JS_TRUE; if ((outbuf = (char*)malloc(strlen(inbuf) + 1)) == NULL) { free(inbuf); - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); @@ -2543,10 +2543,10 @@ js_html_decode(JSContext *cx, uintN argc, jsval *arglist) js_str = JS_NewStringCopyZ(cx, outbuf); free(outbuf); if (js_str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2564,19 +2564,19 @@ js_b64_encode(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_NULL); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], inbuf, &inbuf_len); HANDLE_PENDING(cx, inbuf); if (inbuf == NULL) - return(JS_TRUE); + return JS_TRUE; len = (inbuf_len * 4 / 3) + 4; if ((outbuf = (char*)malloc(len)) == NULL) { free(inbuf); JS_ReportError(cx, "Error allocating %lu bytes at %s:%d", len, getfname(__FILE__), __LINE__); - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); @@ -2586,16 +2586,16 @@ js_b64_encode(JSContext *cx, uintN argc, jsval *arglist) if (res < 1) { free(outbuf); - return(JS_TRUE); + return JS_TRUE; } js_str = JS_NewStringCopyZ(cx, outbuf); free(outbuf); if (js_str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2612,19 +2612,19 @@ js_b64_decode(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_NULL); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], inbuf, NULL); HANDLE_PENDING(cx, inbuf); if (inbuf == NULL) - return(JS_TRUE); + return JS_TRUE; len = strlen(inbuf) + 1; if ((outbuf = (char*)malloc(len)) == NULL) { JS_ReportError(cx, "Error allocating %lu bytes at %s:%d", len, getfname(__FILE__), __LINE__); free(inbuf); - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); @@ -2634,16 +2634,16 @@ js_b64_decode(JSContext *cx, uintN argc, jsval *arglist) if (res < 1) { free(outbuf); - return(JS_TRUE); + return JS_TRUE; } js_str = JS_NewStringCopyN(cx, outbuf, res); free(outbuf); if (js_str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2661,12 +2661,12 @@ js_md5_calc(JSContext* cx, uintN argc, jsval* arglist) JS_SET_RVAL(cx, arglist, JSVAL_NULL); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], inbuf, &inbuf_len); HANDLE_PENDING(cx, inbuf); if (inbuf == NULL) - return(JS_TRUE); + return JS_TRUE; if (argc > 1 && JSVAL_IS_BOOLEAN(argv[1])) hex = JSVAL_TO_BOOLEAN(argv[1]); @@ -2683,10 +2683,10 @@ js_md5_calc(JSContext* cx, uintN argc, jsval* arglist) js_str = JS_NewStringCopyZ(cx, outbuf); if (js_str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2704,12 +2704,12 @@ js_sha1_calc(JSContext* cx, uintN argc, jsval* arglist) JS_SET_RVAL(cx, arglist, JSVAL_NULL); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], inbuf, &inbuf_len); HANDLE_PENDING(cx, inbuf); if (inbuf == NULL) - return(JS_TRUE); + return JS_TRUE; if (argc > 1 && JSVAL_IS_BOOLEAN(argv[1])) hex = JSVAL_TO_BOOLEAN(argv[1]); @@ -2726,10 +2726,10 @@ js_sha1_calc(JSContext* cx, uintN argc, jsval* arglist) js_str = JS_NewStringCopyZ(cx, outbuf); if (js_str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2743,12 +2743,12 @@ js_internal_charfunc(JSContext *cx, uintN argc, jsval *arglist, char *(*func)(ch JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], str, &strlen); HANDLE_PENDING(cx, str); if (str == NULL) - return(JS_TRUE); + return JS_TRUE; if (extra_bytes) { rastr = realloc(str, strlen + extra_bytes + 1 /* for terminator */); if (rastr == NULL) @@ -2765,7 +2765,7 @@ js_internal_charfunc(JSContext *cx, uintN argc, jsval *arglist, char *(*func)(ch } free(str); - return(JS_TRUE); + return JS_TRUE; error: free(str); @@ -2798,7 +2798,7 @@ js_backslash(JSContext *cx, uintN argc, jsval *arglist) static char *nonconst_getfname(char *c) { - return(getfname(c)); + return getfname(c); } static JSBool @@ -2809,7 +2809,7 @@ js_getfname(JSContext *cx, uintN argc, jsval *arglist) static char *nonconst_getfext(char *c) { - return(getfext(c)); + return getfext(c); } static JSBool @@ -2829,12 +2829,12 @@ js_truncstr(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], str, NULL); HANDLE_PENDING(cx, str); if (str == NULL) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[1], set, NULL); if (JS_IsExceptionPending(cx)) { @@ -2844,7 +2844,7 @@ js_truncstr(JSContext *cx, uintN argc, jsval *arglist) } if (set == NULL) { free(str); - return(JS_TRUE); + return JS_TRUE; } truncstr(str, set); @@ -2853,10 +2853,10 @@ js_truncstr(JSContext *cx, uintN argc, jsval *arglist) js_str = JS_NewStringCopyZ(cx, str); free(str); if (js_str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2871,12 +2871,12 @@ js_fullpath(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], str, NULL); HANDLE_PENDING(cx, str); if (str == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); _fullpath(path, str, sizeof(path)); @@ -2884,10 +2884,10 @@ js_fullpath(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); if ((js_str = JS_NewStringCopyZ(cx, path)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } @@ -2902,7 +2902,7 @@ js_getfcase(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_STRBUF(cx, argv[0], path, sizeof(path), NULL); @@ -2911,13 +2911,13 @@ js_getfcase(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); js_str = JS_NewStringCopyZ(cx, path); if (js_str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); } else JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2934,14 +2934,14 @@ js_dosfname(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; #if defined(_WIN32) JSVALUE_TO_MSTRING(cx, argv[0], str, NULL); HANDLE_PENDING(cx, str); if (str == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); if (GetShortPathName(str, path, sizeof(path))) { @@ -2949,7 +2949,7 @@ js_dosfname(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); js_str = JS_NewStringCopyZ(cx, path); if (js_str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); } @@ -2964,7 +2964,7 @@ js_dosfname(JSContext *cx, uintN argc, jsval *arglist) #endif - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2980,17 +2980,17 @@ js_cfgfname(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc < 2 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], path, NULL); HANDLE_PENDING(cx, path); if (path == NULL) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[1], fname, NULL); if (fname == NULL) { free(path); - return(JS_TRUE); + return JS_TRUE; } rc = JS_SUSPENDREQUEST(cx); @@ -3000,7 +3000,7 @@ js_cfgfname(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(JS_NewStringCopyZ(cx, cstr))); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3014,19 +3014,19 @@ js_fexist(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], p, NULL) HANDLE_PENDING(cx, p); if (p == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); fe = fexist(p); free(p); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(fe)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3040,19 +3040,19 @@ js_removecase(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], p, NULL) HANDLE_PENDING(cx, p); if (p == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); ret = removecase(p) == 0; free(p); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(ret)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3066,19 +3066,19 @@ js_remove(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], p, NULL) HANDLE_PENDING(cx, p); if (p == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); ret = remove(p) == 0; free(p); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(ret)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3093,13 +3093,13 @@ js_rename(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(JS_FALSE)); JSVALUE_TO_MSTRING(cx, argv[0], oldname, NULL); HANDLE_PENDING(cx, oldname); if (oldname == NULL) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[1], newname, NULL); if (JS_IsExceptionPending(cx)) { free(oldname); @@ -3109,7 +3109,7 @@ js_rename(JSContext *cx, uintN argc, jsval *arglist) } if (newname == NULL) { free(oldname); - return(JS_TRUE); + return JS_TRUE; } rc = JS_SUSPENDREQUEST(cx); @@ -3118,7 +3118,7 @@ js_rename(JSContext *cx, uintN argc, jsval *arglist) free(newname); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(ret)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3133,13 +3133,13 @@ js_fcopy(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(JS_FALSE)); JSVALUE_TO_MSTRING(cx, argv[0], src, NULL); HANDLE_PENDING(cx, src); if (src == NULL) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[1], dest, NULL); if (JS_IsExceptionPending(cx)) { free(src); @@ -3148,7 +3148,7 @@ js_fcopy(JSContext *cx, uintN argc, jsval *arglist) } if (dest == NULL) { free(src); - return(JS_TRUE); + return JS_TRUE; } rc = JS_SUSPENDREQUEST(cx); @@ -3157,7 +3157,7 @@ js_fcopy(JSContext *cx, uintN argc, jsval *arglist) free(dest); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(ret)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3172,13 +3172,13 @@ js_fcompare(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(JS_FALSE)); JSVALUE_TO_MSTRING(cx, argv[0], fn1, NULL); HANDLE_PENDING(cx, fn1); if (fn1 == NULL) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[1], fn2, NULL); if (JS_IsExceptionPending(cx)) { FREE_AND_NULL(fn1); @@ -3188,7 +3188,7 @@ js_fcompare(JSContext *cx, uintN argc, jsval *arglist) if (fn2 == NULL) { FREE_AND_NULL(fn1); FREE_AND_NULL(fn2); - return(JS_TRUE); + return JS_TRUE; } rc = JS_SUSPENDREQUEST(cx); @@ -3197,7 +3197,7 @@ js_fcompare(JSContext *cx, uintN argc, jsval *arglist) free(fn2); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(ret)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3213,13 +3213,13 @@ js_backup(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(JS_FALSE)); JSVALUE_TO_MSTRING(cx, argv[0], fname, NULL); HANDLE_PENDING(cx, fname); if (fname == NULL) - return(JS_TRUE); + return JS_TRUE; if (argc > 1) { if (!JS_ValueToInt32(cx, argv[1], &level)) { @@ -3239,7 +3239,7 @@ js_backup(JSContext *cx, uintN argc, jsval *arglist) free(fname); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(ret)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3253,19 +3253,19 @@ js_isdir(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], p, NULL) HANDLE_PENDING(cx, p); if (p == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); ret = isdir(p); free(p); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(ret)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3279,19 +3279,19 @@ js_fattr(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], p, NULL) HANDLE_PENDING(cx, p); if (p == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); attr = getfattr(p); free(p); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(attr)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3364,19 +3364,19 @@ js_fdate(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], p, NULL) HANDLE_PENDING(cx, p); if (p == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); fd = fdate(p); free(p); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, DOUBLE_TO_JSVAL((double)fd)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3390,19 +3390,19 @@ js_fcdate(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], p, NULL) HANDLE_PENDING(cx, p); if (p == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); fd = fcdate(p); free(p); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, DOUBLE_TO_JSVAL((double)fd)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3420,14 +3420,14 @@ js_utime(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JS_SET_RVAL(cx, arglist, JSVAL_FALSE); JSVALUE_TO_MSTRING(cx, argv[0], fname, NULL); HANDLE_PENDING(cx, fname); if (fname == NULL) - return(JS_TRUE); + return JS_TRUE; if (argc > 1) { actime = modtime = time32(NULL); @@ -3452,7 +3452,7 @@ js_utime(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(ret)); - return(JS_TRUE); + return JS_TRUE; } @@ -3467,19 +3467,19 @@ js_flength(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], p, NULL) HANDLE_PENDING(cx, p); if (p == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); fl = flength(p); free(p); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, DOUBLE_TO_JSVAL((double)fl)); - return(JS_TRUE); + return JS_TRUE; } @@ -3494,19 +3494,19 @@ js_ftouch(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], fname, NULL); HANDLE_PENDING(cx, fname); if (fname == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); ret = ftouch(fname); free(fname); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(ret)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3523,13 +3523,13 @@ js_fmutex(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[argn], fname, NULL); argn++; HANDLE_PENDING(cx, fname); if (fname == NULL) - return(JS_TRUE); + return JS_TRUE; if (argc > argn && JSVAL_IS_STRING(argv[argn])) { JSVALUE_TO_MSTRING(cx, argv[argn], text, NULL); argn++; @@ -3554,7 +3554,7 @@ js_fmutex(JSContext *cx, uintN argc, jsval *arglist) free(text); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(ret)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3570,16 +3570,16 @@ js_sound(JSContext *cx, uintN argc, jsval *arglist) PlaySound(NULL, NULL, 0); #endif JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(JS_TRUE)); - return(JS_TRUE); + return JS_TRUE; } if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], p, NULL) HANDLE_PENDING(cx, p); if (p == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); #ifdef _WIN32 @@ -3589,7 +3589,7 @@ js_sound(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(ret)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3609,14 +3609,14 @@ js_directory(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JS_SET_RVAL(cx, arglist, JSVAL_NULL); JSVALUE_TO_MSTRING(cx, argv[0], p, NULL) HANDLE_PENDING(cx, p); if (p == NULL) - return(JS_TRUE); + return JS_TRUE; if (argc > 1) { if (!JS_ValueToInt32(cx, argv[1], &flags)) { @@ -3627,7 +3627,7 @@ js_directory(JSContext *cx, uintN argc, jsval *arglist) if ((array = JS_NewArrayObject(cx, 0, NULL)) == NULL) { free(p); - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); @@ -3647,7 +3647,7 @@ js_directory(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, OBJECT_TO_JSVAL(array)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3671,7 +3671,7 @@ js_wildmatch(JSContext *cx, uintN argc, jsval *arglist) argn++; HANDLE_PENDING(cx, fname); if (fname == NULL) - return(JS_TRUE); + return JS_TRUE; if (argn < argc && argv[argn] != JSVAL_VOID) { JSVALUE_TO_MSTRING(cx, argv[argn], spec, NULL); @@ -3684,7 +3684,7 @@ js_wildmatch(JSContext *cx, uintN argc, jsval *arglist) } if (spec == NULL) { free(fname); - return(JS_TRUE); + return JS_TRUE; } } @@ -3698,7 +3698,7 @@ js_wildmatch(JSContext *cx, uintN argc, jsval *arglist) free(spec); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } @@ -3714,12 +3714,12 @@ js_freediskspace(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], p, NULL) HANDLE_PENDING(cx, p); if (p == NULL) - return(JS_TRUE); + return JS_TRUE; if (argc > 1) { if (!JS_ValueToInt32(cx, argv[1], &unit)) { @@ -3734,7 +3734,7 @@ js_freediskspace(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, DOUBLE_TO_JSVAL((double)fd)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3749,12 +3749,12 @@ js_disksize(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], p, NULL) HANDLE_PENDING(cx, p); if (p == NULL) - return(JS_TRUE); + return JS_TRUE; if (argc > 1) { if (!JS_ValueToInt32(cx, argv[1], &unit)) { @@ -3769,7 +3769,7 @@ js_disksize(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, DOUBLE_TO_JSVAL((double)ds)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -3822,10 +3822,10 @@ js_socket_select(JSContext *cx, uintN argc, jsval *arglist) } if (inarray_cnt == 0) - return(JS_TRUE); /* This not a fatal error */ + return JS_TRUE; /* This not a fatal error */ for (i = 0; i < inarray_cnt; i++) { if (!JS_IsArrayObject(cx, inarray[i])) - return(JS_TRUE); /* This not a fatal error */ + return JS_TRUE; /* This not a fatal error */ if (JS_GetArrayLength(cx, inarray[i], &limit[i]) != 0) all_zero = FALSE; } @@ -3833,12 +3833,12 @@ js_socket_select(JSContext *cx, uintN argc, jsval *arglist) inarray_cnt = 3; if (all_zero) - return(JS_TRUE); + return JS_TRUE; if (inarray_cnt == 1) { /* Return array */ if ((robj = JS_NewArrayObject(cx, 0, NULL)) == NULL) - return(JS_FALSE); + return JS_FALSE; #ifdef PREFER_POLL // First, count the number of sockets... nfds = 0; @@ -3926,12 +3926,12 @@ js_socket_select(JSContext *cx, uintN argc, jsval *arglist) #endif JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } else { /* Return object */ if ((robj = JS_NewObject(cx, NULL, NULL, NULL)) == NULL) - return(JS_FALSE); + return JS_FALSE; #ifdef PREFER_POLL /* * So, we need to collapse all the FDs into a list with flags set... @@ -4017,7 +4017,7 @@ js_socket_select(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); if ((rarray = JS_NewArrayObject(cx, 0, NULL)) == NULL) { free(fds); - return(JS_FALSE); + return JS_FALSE; } val = OBJECT_TO_JSVAL(rarray); if (!JS_SetProperty(cx, robj, props[j], &val)) { @@ -4075,7 +4075,7 @@ js_socket_select(JSContext *cx, uintN argc, jsval *arglist) len = 0; JS_RESUMEREQUEST(cx, rc); if ((rarray = JS_NewArrayObject(cx, 0, NULL)) == NULL) - return(JS_FALSE); + return JS_FALSE; val = OBJECT_TO_JSVAL(rarray); if (!JS_SetProperty(cx, robj, props[j], &val)) return JS_FALSE; @@ -4104,7 +4104,7 @@ js_socket_select(JSContext *cx, uintN argc, jsval *arglist) #endif JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } } @@ -4159,19 +4159,19 @@ js_mkdir(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], p, NULL) HANDLE_PENDING(cx, p); if (p == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); ret = MKDIR(p) == 0; free(p); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(ret)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -4185,19 +4185,19 @@ js_mkpath(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], p, NULL) HANDLE_PENDING(cx, p); if (p == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); ret = mkpath(p) == 0; free(p); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(ret)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -4211,19 +4211,19 @@ js_rmdir(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], p, NULL) HANDLE_PENDING(cx, p); if (p == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); ret = rmdir(p) == 0; free(p); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(ret)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -4288,12 +4288,12 @@ js_strftime(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], fmt, NULL); HANDLE_PENDING(cx, fmt); if (fmt == NULL) - return(JS_TRUE); + return JS_TRUE; if (argc > 1) { if (!JS_ValueToNumber(cx, argv[1], &jst)) { @@ -4311,10 +4311,10 @@ js_strftime(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); if ((js_str = JS_NewStringCopyZ(cx, str)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } /* TODO: IPv6 */ @@ -4337,7 +4337,7 @@ js_resolve_ip(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_NULL); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; for (argn = 0; argn < argc; argn++) { if (JSVAL_IS_BOOLEAN(argv[argn])) @@ -4350,7 +4350,7 @@ js_resolve_ip(JSContext *cx, uintN argc, jsval *arglist) } } if (p == NULL) - return(JS_TRUE); + return JS_TRUE; memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_ADDRCONFIG; @@ -4367,14 +4367,14 @@ js_resolve_ip(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); if ((rarray = JS_NewArrayObject(cx, 0, NULL)) == NULL) { freeaddrinfo(res); - return(JS_FALSE); + return JS_FALSE; } JS_SET_RVAL(cx, arglist, OBJECT_TO_JSVAL(rarray)); for (cur = res; cur; cur = cur->ai_next) { inet_addrtop((void *)cur->ai_addr, ip_str, sizeof(ip_str)); if ((str = JS_NewStringCopyZ(cx, ip_str)) == NULL) { freeaddrinfo(res); - return(JS_FALSE); + return JS_FALSE; } val = STRING_TO_JSVAL(str); if (!JS_SetElement(cx, rarray, alen++, &val)) @@ -4388,11 +4388,11 @@ js_resolve_ip(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); if ((str = JS_NewStringCopyZ(cx, ip_str)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(str)); } - return(JS_TRUE); + return JS_TRUE; } @@ -4408,12 +4408,12 @@ js_resolve_host(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_NULL); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[0], p, NULL) HANDLE_PENDING(cx, p); if (p == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); memset(&hints, 0, sizeof(hints)); @@ -4421,7 +4421,7 @@ js_resolve_host(JSContext *cx, uintN argc, jsval *arglist) if (getaddrinfo(p, NULL, NULL, &res) != 0) { free(p); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } free(p); @@ -4430,14 +4430,14 @@ js_resolve_host(JSContext *cx, uintN argc, jsval *arglist) if (getnameinfo(res->ai_addr, res->ai_addrlen, host_name, sizeof(host_name), NULL, 0, NI_NAMEREQD) != 0) { JS_RESUMEREQUEST(cx, rc); freeaddrinfo(res); - return(JS_TRUE); + return JS_TRUE; } JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(JS_NewStringCopyZ(cx, host_name))); freeaddrinfo(res); - return(JS_TRUE); + return JS_TRUE; } @@ -4456,7 +4456,7 @@ js_list_named_queues(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((array = JS_NewArrayObject(cx, 0, NULL)) == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); listLock(&named_queues); @@ -4476,7 +4476,7 @@ js_list_named_queues(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, OBJECT_TO_JSVAL(array)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -4491,28 +4491,28 @@ js_flags_str(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_NULL_OR_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; if (JSVAL_IS_STRING(argv[0])) { /* string to long */ JSSTRING_TO_MSTRING(cx, JSVAL_TO_STRING(argv[0]), p, NULL); HANDLE_PENDING(cx, p); if (p == NULL) - return(JS_TRUE); + return JS_TRUE; JS_SET_RVAL(cx, arglist, DOUBLE_TO_JSVAL((double)aftou32(p))); free(p); - return(JS_TRUE); + return JS_TRUE; } /* number to string */ if (JS_ValueToNumber(cx, argv[0], &d)) { if ((js_str = JS_NewStringCopyZ(cx, u32toaf((uint32_t)d, str))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); } - return(JS_TRUE); + return JS_TRUE; } static bool @@ -4806,15 +4806,15 @@ js_qwknet_route(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc == 0 || JSVAL_IS_VOID(argv[0])) - return(JS_TRUE); + return JS_TRUE; if ((p = (global_private_t*)JS_GetPrivate(cx, obj)) == NULL) /* Will this work? Ask DM */ - return(JS_FALSE); + return JS_FALSE; JSVALUE_TO_MSTRING(cx, argv[0], str, NULL); HANDLE_PENDING(cx); if (str == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); qwk_route(&p->cfg, str, path, sizeof(path)); @@ -4822,10 +4822,10 @@ js_qwknet_route(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); if ((js_str = JS_NewStringCopyZ(cx, path)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } #endif @@ -5257,7 +5257,7 @@ static JSBool js_global_resolve(JSContext *cx, JSObject *obj, jsid id) JSBool ret = JS_TRUE; if ((p = (global_private_t*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (id != JSID_VOID && id != JSID_EMPTY && id != JS_DEFAULT_XML_NAMESPACE_ID) { jsval idval; @@ -5281,12 +5281,12 @@ static JSBool js_global_resolve(JSContext *cx, JSObject *obj, jsid id) ret = JS_FALSE; if (name) free(name); - return(ret); + return ret; } static JSBool js_global_enumerate(JSContext *cx, JSObject *obj) { - return(js_global_resolve(cx, obj, JSID_VOID)); + return js_global_resolve(cx, obj, JSID_VOID); } JSClass js_global_class = { @@ -5311,7 +5311,7 @@ bool js_CreateGlobalObject(JSContext* cx, scfg_t* cfg, jsSyncMethodSpec* methods JS_SetRuntimePrivate(rt, cfg); if ((p = (global_private_t*)malloc(sizeof(global_private_t))) == NULL) - return(FALSE); + return FALSE; p->cfg = cfg; p->methods = methods; @@ -5321,43 +5321,43 @@ bool js_CreateGlobalObject(JSContext* cx, scfg_t* cfg, jsSyncMethodSpec* methods if ((*glob = JS_NewCompartmentAndGlobalObject(cx, &js_global_class, NULL)) == NULL) { free(p); - return(FALSE); + return FALSE; } if (!JS_AddObjectRoot(cx, glob)) { free(p); - return(FALSE); + return FALSE; } if (!JS_SetPrivate(cx, *glob, p)) { /* Store a pointer to scfg_t and the new methods */ JS_RemoveObjectRoot(cx, glob); free(p); - return(FALSE); + return FALSE; } if (!JS_InitStandardClasses(cx, *glob)) { JS_RemoveObjectRoot(cx, glob); free(p); - return(FALSE); + return FALSE; } p->bg_count = 0; if (sem_init(&p->bg_sem, 0, 0) == -1) { JS_RemoveObjectRoot(cx, glob); free(p); - return(FALSE); + return FALSE; } // TODO: Deuce, what purpose does this ReservedSlot serve? // Removing this had no observable negative impact <shrug> if (!JS_SetReservedSlot(cx, *glob, 0, INT_TO_JSVAL(0))) { JS_RemoveObjectRoot(cx, glob); free(p); - return(FALSE); + return FALSE; } #ifdef BUILD_JSDOCS js_DescribeSyncObject(cx, *glob , "Top-level functions and properties (common to all servers, services, and <i>JSexec</i>)", 310); #endif - return(TRUE); + return TRUE; } #endif /* JAVSCRIPT */ diff --git a/src/sbbs3/js_internal.c b/src/sbbs3/js_internal.c index 9f4f287ef2ec735d6fa8fb2d02dfa5b1fa68399f..62cd6b7481d35492b60765b1604108df13425967 100644 --- a/src/sbbs3/js_internal.c +++ b/src/sbbs3/js_internal.c @@ -69,7 +69,7 @@ static JSBool js_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) js_callback_t* top_cb; if ((cb = (js_callback_t*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_IdToValue(cx, id, &idval); tiny = JSVAL_TO_INT(idval); @@ -136,7 +136,7 @@ static JSBool js_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) break; } - return(JS_TRUE); + return JS_TRUE; } static JSBool js_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp) @@ -146,7 +146,7 @@ static JSBool js_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval js_callback_t* cb; if ((cb = (js_callback_t*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_IdToValue(cx, id, &idval); tiny = JSVAL_TO_INT(idval); @@ -187,7 +187,7 @@ static JSBool js_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval break; } - return(JS_TRUE); + return JS_TRUE; } #define PROP_FLAGS JSPROP_ENUMERATE | JSPROP_READONLY @@ -268,7 +268,7 @@ js_CommonOperationCallback(JSContext *cx, js_callback_t* cb) if (top_cb->terminated != NULL && *top_cb->terminated) { JS_ReportWarning(cx, "Terminated"); cb->counter = 0; - return(JS_FALSE); + return JS_FALSE; } } } @@ -277,7 +277,7 @@ js_CommonOperationCallback(JSContext *cx, js_callback_t* cb) if (cb->limit && cb->counter > cb->limit) { JS_ReportError(cx, "Infinite loop (%lu operation callbacks) detected", cb->counter); cb->counter = 0; - return(JS_FALSE); + return JS_FALSE; } /* Give up timeslices every once in a while */ @@ -296,7 +296,7 @@ js_CommonOperationCallback(JSContext *cx, js_callback_t* cb) if (cb->gc_interval && (cb->counter % cb->gc_interval) == 0) JS_MaybeGC(cx), cb->gc_attempts++; - return(JS_TRUE); + return JS_TRUE; } // This is kind of halfway between js_execfile() in exec.cpp and js_load @@ -324,20 +324,20 @@ js_execfile(JSContext *cx, uintN argc, jsval *arglist) if (argc < 1) { JS_ReportError(cx, "No filename passed"); - return(JS_FALSE); + return JS_FALSE; } jsval *argv = JS_ARGV(cx, arglist); if (!JSVAL_IS_STRING(argv[arg])) { JS_ReportError(cx, "Invalid script name"); - return(JS_FALSE); + return JS_FALSE; } JSVALUE_TO_MSTRING(cx, argv[arg++], cmd, NULL); HANDLE_PENDING(cx, cmd); if (cmd == NULL) { JS_ReportError(cx, "Invalid NULL string"); - return(JS_FALSE); + return JS_FALSE; } if (argc > arg) { @@ -347,7 +347,7 @@ js_execfile(JSContext *cx, uintN argc, jsval *arglist) if (startup_dir == NULL) { free(cmd); JS_ReportError(cx, "Invalid NULL string"); - return(JS_FALSE); + return JS_FALSE; } } } @@ -358,14 +358,14 @@ js_execfile(JSContext *cx, uintN argc, jsval *arglist) free(cmd); free(startup_dir); JS_ReportError(cx, "Invalid Scope"); - return(JS_FALSE); + return JS_FALSE; } } if (js_scope == NULL) { free(cmd); free(startup_dir); JS_ReportError(cx, "Invalid Scope"); - return(JS_FALSE); + return JS_FALSE; } pscope = scope; @@ -481,7 +481,7 @@ js_execfile(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, rval); } JS_ClearPendingException(cx); - return(JS_TRUE); + return JS_TRUE; } JS_ExecuteScript(cx, js_scope, js_script, &rval); @@ -528,18 +528,18 @@ js_eval(JSContext *parent_cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc < 1) - return(JS_TRUE); + return JS_TRUE; if ((str = JS_ValueToString(parent_cx, argv[0])) == NULL) - return(JS_FALSE); + return JS_FALSE; JSSTRING_TO_MSTRING(parent_cx, str, buf, &buflen); HANDLE_PENDING(parent_cx, buf); if (buf == NULL) - return(JS_TRUE); + return JS_TRUE; if ((cx = JS_NewContext(JS_GetRuntime(parent_cx), JAVASCRIPT_CONTEXT_STACK)) == NULL) { free(buf); - return(JS_FALSE); + return JS_FALSE; } /* Use the error reporter from the parent context */ @@ -555,7 +555,7 @@ js_eval(JSContext *parent_cx, uintN argc, jsval *arglist) || !JS_InitStandardClasses(cx, obj)) { JS_DestroyContext(cx); free(buf); - return(JS_FALSE); + return JS_FALSE; } if ((script = JS_CompileScript(cx, obj, buf, buflen, NULL, 0)) != NULL) { @@ -568,7 +568,7 @@ js_eval(JSContext *parent_cx, uintN argc, jsval *arglist) JS_DestroyContext(cx); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -582,7 +582,7 @@ js_gc(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((cb = (js_callback_t*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc) JS_ValueToBoolean(cx, argv[0], &forced); @@ -594,7 +594,7 @@ js_gc(JSContext *cx, uintN argc, jsval *arglist) cb->gc_attempts++; - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -615,9 +615,9 @@ js_report_error(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (argc > 1 && argv[1] == JSVAL_TRUE) - return(JS_FALSE); /* fatal */ + return JS_FALSE; /* fatal */ - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -635,7 +635,7 @@ js_on_exit(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((pd = (global_private_t*)JS_GetPrivate(cx, glob)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (glob == scope) { if (pd->exit_func == NULL) pd->exit_func = strListInit(); @@ -677,7 +677,7 @@ js_on_exit(JSContext *cx, uintN argc, jsval *arglist) else oes->onexit = list; } - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -692,7 +692,7 @@ js_get_parent(JSContext *cx, uintN argc, jsval *arglist) && (parent = JS_GetParent(cx, child)) != NULL) JS_SET_RVAL(cx, arglist, OBJECT_TO_JSVAL(parent)); - return(JS_TRUE); + return JS_TRUE; } static JSBool js_getsize(JSContext *cx, uintN argc, jsval *arglist) @@ -702,13 +702,13 @@ static JSBool js_getsize(JSContext *cx, uintN argc, jsval *arglist) if (!JSVAL_IS_OBJECT(argv[0])) { JS_ReportError(cx, "Parameter is not an object."); - return(JS_FALSE); + return JS_FALSE; } tmp_obj = JSVAL_TO_OBJECT(argv[0]); if (!tmp_obj) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, DOUBLE_TO_JSVAL(JS_GetObjectTotalSize(cx, tmp_obj))); - return(JS_TRUE); + return JS_TRUE; } static JSBool js_flatten(JSContext *cx, uintN argc, jsval *arglist) @@ -717,11 +717,11 @@ static JSBool js_flatten(JSContext *cx, uintN argc, jsval *arglist) if (!JSVAL_IS_STRING(argv[0])) { JS_ReportError(cx, "Parameter is not a string."); - return(JS_FALSE); + return JS_FALSE; } JS_FlattenString(cx, JSVAL_TO_STRING(argv[0])); JS_SET_RVAL(cx, arglist, JSVAL_VOID); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -736,7 +736,7 @@ js_setTimeout(JSContext *cx, uintN argc, jsval *arglist) jsdouble timeout; if ((cb = (js_callback_t*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (!cb->events_supported) { JS_ReportError(cx, "events not supported"); @@ -825,7 +825,7 @@ js_internal_clear_event(JSContext *cx, uintN argc, jsval *arglist, enum js_event return JS_FALSE; } if ((cb = (js_callback_t*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; return js_clear_event(cx, arglist, cb, et, 0); } @@ -854,7 +854,7 @@ js_setInterval(JSContext *cx, uintN argc, jsval *arglist) jsdouble period; if ((cb = (js_callback_t*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (!cb->events_supported) { JS_ReportError(cx, "events not supported"); @@ -908,7 +908,7 @@ js_setImmediate(JSContext *cx, uintN argc, jsval *arglist) struct js_runq_entry *rqe; if ((cb = (js_callback_t*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc < 1) { JS_ReportError(cx, "js.setImmediate() requires a callback"); @@ -955,7 +955,7 @@ js_addEventListener(JSContext *cx, uintN argc, jsval *arglist) js_callback_t * cb; if ((cb = (js_callback_t*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc < 2) { JS_ReportError(cx, "js.addEventListener() requires exactly two parameters"); @@ -999,7 +999,7 @@ js_removeEventListener(JSContext *cx, uintN argc, jsval *arglist) js_callback_t * cb; if ((cb = (js_callback_t*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc < 1) { JS_ReportError(cx, "js.removeEventListener() requires exactly one parameter"); @@ -1049,7 +1049,7 @@ js_dispatchEvent(JSContext *cx, uintN argc, jsval *arglist) js_callback_t * cb; if ((cb = (js_callback_t*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc < 1) { JS_ReportError(cx, "js.dispatchEvent() requires a event name"); @@ -1532,12 +1532,12 @@ static JSBool js_internal_resolve(JSContext *cx, JSObject *obj, jsid id) ret = js_SyncResolve(cx, obj, name, js_properties, js_functions, NULL, 0); if (name) free(name); - return(ret); + return ret; } static JSBool js_internal_enumerate(JSContext *cx, JSObject *obj) { - return(js_internal_resolve(cx, obj, JSID_VOID)); + return js_internal_resolve(cx, obj, JSID_VOID); } static JSClass js_internal_class = { @@ -1624,10 +1624,10 @@ JSObject* js_CreateInternalJsObject(JSContext* cx, JSObject* parent, js_callback if ((obj = JS_DefineObject(cx, parent, "js", &js_internal_class, NULL , JSPROP_ENUMERATE | JSPROP_READONLY)) == NULL) - return(NULL); + return NULL; if (!JS_SetPrivate(cx, obj, cb)) /* Store a pointer to js_callback_t */ - return(NULL); + return NULL; if (startup != NULL) { JSObject* load_path_list; @@ -1635,10 +1635,10 @@ JSObject* js_CreateInternalJsObject(JSContext* cx, JSObject* parent, js_callback str_list_t load_path; if ((load_path_list = JS_NewArrayObject(cx, 0, NULL)) == NULL) - return(NULL); + return NULL; val = OBJECT_TO_JSVAL(load_path_list); if (!JS_SetProperty(cx, obj, JAVASCRIPT_LOAD_PATH_LIST, &val)) - return(NULL); + return NULL; if ((load_path = strListSplitCopy(NULL, startup->load_path, ",")) != NULL) { JSString* js_str; @@ -1660,7 +1660,7 @@ JSObject* js_CreateInternalJsObject(JSContext* cx, JSObject* parent, js_callback js_CreateArrayOfStrings(cx, obj, "_property_desc_list", prop_desc, JSPROP_READONLY); #endif - return(obj); + return obj; } #if defined(_MSC_VER) @@ -1726,14 +1726,14 @@ js_CreateArrayOfStrings(JSContext* cx, JSObject* parent, const char* name, const array = JSVAL_TO_OBJECT(val); else if ((array = JS_NewArrayObject(cx, 0, NULL)) == NULL) /* Assertion here, in _heap_alloc_dbg, June-21-2004 */ - return(JS_FALSE); /* Caused by nntpservice.js? */ + return JS_FALSE; /* Caused by nntpservice.js? */ if (!JS_DefineProperty(cx, parent, name, OBJECT_TO_JSVAL(array) , NULL, NULL, flags)) - return(JS_FALSE); + return JS_FALSE; if (array == NULL || !JS_GetArrayLength(cx, array, &len)) - return(JS_FALSE); + return JS_FALSE; for (i = 0; str[i] != NULL; i++) { if ((js_str = JS_NewStringCopyZ(cx, str[i])) == NULL) @@ -1743,6 +1743,6 @@ js_CreateArrayOfStrings(JSContext* cx, JSObject* parent, const char* name, const break; } - return(JS_TRUE); + return JS_TRUE; } diff --git a/src/sbbs3/js_msg_area.c b/src/sbbs3/js_msg_area.c index 099e5f02258aff748fac783746b08fae5c2284b7..11efee6c89188cb513ead5ca4ff1cc453a453b3a 100644 --- a/src/sbbs3/js_msg_area.c +++ b/src/sbbs3/js_msg_area.c @@ -103,95 +103,95 @@ bool js_CreateMsgAreaProperties(JSContext* cx, scfg_t* cfg, JSObject* subobj, in sub_t* sub; if (!subnum_is_valid(cfg, subnum)) - return(false); + return false; sub = cfg->sub[subnum]; if (!JS_DefineProperty(cx, subobj, "number", INT_TO_JSVAL(subnum) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(false); + return false; if (!JS_DefineProperty(cx, subobj, "grp_number", INT_TO_JSVAL(sub->grp) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(false); + return false; if ((js_str = JS_NewStringCopyZ(cx, cfg->grp[sub->grp]->sname)) == NULL) - return(false); + return false; if (!JS_DefineProperty(cx, subobj, "grp_name", STRING_TO_JSVAL(js_str) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(false); + return false; if ((js_str = JS_NewStringCopyZ(cx, sub->code)) == NULL) - return(false); + return false; if (!JS_DefineProperty(cx, subobj, "code", STRING_TO_JSVAL(js_str) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(false); + return false; if ((js_str = JS_NewStringCopyZ(cx, sub->sname)) == NULL) - return(false); + return false; if (!JS_DefineProperty(cx, subobj, "name", STRING_TO_JSVAL(js_str) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(false); + return false; if ((js_str = JS_NewStringCopyZ(cx, sub->lname)) == NULL) - return(false); + return false; if (!JS_DefineProperty(cx, subobj, "description", STRING_TO_JSVAL(js_str) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(false); + return false; if ((js_str = JS_NewStringCopyZ(cx, sub->qwkname)) == NULL) - return(false); + return false; if (!JS_DefineProperty(cx, subobj, "qwk_name", STRING_TO_JSVAL(js_str) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(false); + return false; if ((js_str = JS_NewStringCopyZ(cx, sub_area_tag(cfg, sub, str, sizeof(str)))) == NULL) - return(false); + return false; if (!JS_DefineProperty(cx, subobj, "area_tag", STRING_TO_JSVAL(js_str) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(false); + return false; if ((js_str = JS_NewStringCopyZ(cx, sub_newsgroup_name(cfg, sub, str, sizeof(str)))) == NULL) - return(false); + return false; if (!JS_DefineProperty(cx, subobj, "newsgroup", STRING_TO_JSVAL(js_str) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(false); + return false; if ((js_str = JS_NewStringCopyZ(cx, sub->arstr)) == NULL) - return(false); + return false; if (!JS_DefineProperty(cx, subobj, "ars", STRING_TO_JSVAL(js_str) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(false); + return false; if ((js_str = JS_NewStringCopyZ(cx, sub->read_arstr)) == NULL) - return(false); + return false; if (!JS_DefineProperty(cx, subobj, "read_ars", STRING_TO_JSVAL(js_str) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(false); + return false; if ((js_str = JS_NewStringCopyZ(cx, sub->post_arstr)) == NULL) - return(false); + return false; if (!JS_DefineProperty(cx, subobj, "post_ars", STRING_TO_JSVAL(js_str) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(false); + return false; if ((js_str = JS_NewStringCopyZ(cx, sub->op_arstr)) == NULL) - return(false); + return false; if (!JS_DefineProperty(cx, subobj, "operator_ars", STRING_TO_JSVAL(js_str) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(false); + return false; if ((js_str = JS_NewStringCopyZ(cx, sub->mod_arstr)) == NULL) - return(false); + return false; if (!JS_DefineProperty(cx, subobj, "moderated_ars", STRING_TO_JSVAL(js_str) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(false); + return false; if ((js_str = JS_NewStringCopyZ(cx, sub->data_dir)) == NULL) - return(false); + return false; if (!JS_DefineProperty(cx, subobj, "data_dir", STRING_TO_JSVAL(js_str) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(false); + return false; if ((js_str = JS_NewStringCopyZ(cx, smb_faddrtoa(&sub->faddr, str))) == NULL) return false; @@ -200,56 +200,56 @@ bool js_CreateMsgAreaProperties(JSContext* cx, scfg_t* cfg, JSObject* subobj, in return false; if ((js_str = JS_NewStringCopyZ(cx, sub->origline)) == NULL) - return(false); + return false; if (!JS_DefineProperty(cx, subobj, "fidonet_origin", STRING_TO_JSVAL(js_str) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(false); + return false; if ((js_str = JS_NewStringCopyZ(cx, sub->tagline)) == NULL) - return(false); + return false; if (!JS_DefineProperty(cx, subobj, "qwknet_tagline", STRING_TO_JSVAL(js_str) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(false); + return false; val = UINT_TO_JSVAL(sub->misc); if (!JS_DefineProperty(cx, subobj, "settings", val , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(false); + return false; if (!JS_DefineProperty(cx, subobj, "ptridx", INT_TO_JSVAL(sub->ptridx) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(false); + return false; if (!JS_DefineProperty(cx, subobj, "qwk_conf", INT_TO_JSVAL(sub->qwkconf) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(false); + return false; if (!JS_DefineProperty(cx, subobj, "max_crcs", INT_TO_JSVAL(sub->maxcrcs) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(false); + return false; if (!JS_DefineProperty(cx, subobj, "max_msgs", INT_TO_JSVAL(sub->maxmsgs) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(false); + return false; if (!JS_DefineProperty(cx, subobj, "max_age", INT_TO_JSVAL(sub->maxage) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(false); + return false; if (!JS_DefineProperty(cx, subobj, "print_mode", INT_TO_JSVAL(sub->pmode) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(false); + return false; if (!JS_DefineProperty(cx, subobj, "print_mode_neg", INT_TO_JSVAL(sub->n_pmode) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(false); + return false; #ifdef BUILD_JSDOCS js_CreateArrayOfStrings(cx, subobj, "_property_desc_list", msg_sub_prop_desc, JSPROP_READONLY); #endif - return(true); + return true; } /***************************************/ @@ -315,7 +315,7 @@ static JSBool js_sub_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) break; } - return(JS_TRUE); + return JS_TRUE; } static JSBool js_sub_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp) @@ -351,7 +351,7 @@ static JSBool js_sub_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, j break; } - return(JS_TRUE); + return JS_TRUE; } static struct JSPropertySpec js_sub_properties[] = { @@ -637,7 +637,7 @@ JSBool js_msg_area_resolve(JSContext* cx, JSObject* areaobj, jsid id) static JSBool js_msg_area_enumerate(JSContext *cx, JSObject *obj) { - return(js_msg_area_resolve(cx, obj, JSID_VOID)); + return js_msg_area_resolve(cx, obj, JSID_VOID); } static JSClass js_msg_area_class = { @@ -663,7 +663,7 @@ JSObject* js_CreateMsgAreaObject(JSContext* cx, JSObject* parent, scfg_t* cfg , JSPROP_ENUMERATE | JSPROP_READONLY); if (obj == NULL) - return(NULL); + return NULL; p = (struct js_msg_area_priv *)malloc(sizeof(struct js_msg_area_priv)); if (p == NULL) @@ -677,7 +677,7 @@ JSObject* js_CreateMsgAreaObject(JSContext* cx, JSObject* parent, scfg_t* cfg if (!JS_SetPrivate(cx, obj, p)) { free(p); - return(NULL); + return NULL; } #ifdef BUILD_JSDOCS @@ -685,7 +685,7 @@ JSObject* js_CreateMsgAreaObject(JSContext* cx, JSObject* parent, scfg_t* cfg js_msg_area_enumerate(cx, obj); #endif - return(obj); + return obj; } #endif /* JAVSCRIPT */ diff --git a/src/sbbs3/js_msgbase.c b/src/sbbs3/js_msgbase.c index 57e81761cda153c72dab8799c4a8ae6525a8ce4e..10c879420e29e216a1530520528852081d29d131 100644 --- a/src/sbbs3/js_msgbase.c +++ b/src/sbbs3/js_msgbase.c @@ -147,12 +147,12 @@ static bool parse_recipient_object(JSContext* cx, private_t* p, JSObject* hdr, s HANDLE_PENDING(cx, cp); if (cp == NULL) { JS_ReportError(cx, "Invalid \"to\" string in recipient object"); - return(false); + return false; } } else { if ((p != NULL) && (p->smb.status.attr & SMB_EMAIL)) { /* e-mail */ JS_ReportError(cx, "\"to\" property not included in email recipient object"); - return(false); /* "to" property required */ + return false; /* "to" property required */ } cp = strdup("All"); } @@ -173,7 +173,7 @@ static bool parse_recipient_object(JSContext* cx, private_t* p, JSObject* hdr, s HANDLE_PENDING(cx, cp); if (cp == NULL) { JS_ReportError(cx, "Invalid \"to_list\" string in recipient object"); - return(false); + return false; } if ((smb_result = smb_hfield_str(msg, RECIPIENTLIST, cp)) != SMB_SUCCESS) { free(cp); @@ -187,7 +187,7 @@ static bool parse_recipient_object(JSContext* cx, private_t* p, JSObject* hdr, s HANDLE_PENDING(cx, cp); if (cp == NULL) { JS_ReportError(cx, "Invalid \"cc_list\" string in recipient object"); - return(false); + return false; } if ((smb_result = smb_hfield_str(msg, SMB_CARBONCOPY, cp)) != SMB_SUCCESS) { free(cp); @@ -201,7 +201,7 @@ static bool parse_recipient_object(JSContext* cx, private_t* p, JSObject* hdr, s HANDLE_PENDING(cx, cp); if (cp == NULL) { JS_ReportError(cx, "Invalid \"to_ext\" string in recipient object"); - return(false); + return false; } if ((smb_result = smb_hfield_str(msg, RECIPIENTEXT, cp)) != SMB_SUCCESS) { free(cp); @@ -217,7 +217,7 @@ static bool parse_recipient_object(JSContext* cx, private_t* p, JSObject* hdr, s HANDLE_PENDING(cx, cp); if (cp == NULL) { JS_ReportError(cx, "Invalid \"to_org\" string in recipient object"); - return(false); + return false; } if ((smb_result = smb_hfield_str(msg, RECIPIENTORG, cp)) != SMB_SUCCESS) { free(cp); @@ -229,7 +229,7 @@ static bool parse_recipient_object(JSContext* cx, private_t* p, JSObject* hdr, s if (JS_GetProperty(cx, hdr, "to_net_type", &val) && !JSVAL_NULL_OR_VOID(val)) { if (!JS_ValueToInt32(cx, val, &i32)) { free(cp); - return(false); + return false; } nettype = (ushort)i32; } @@ -239,7 +239,7 @@ static bool parse_recipient_object(JSContext* cx, private_t* p, JSObject* hdr, s HANDLE_PENDING(cx, cp); if (cp == NULL) { JS_ReportError(cx, "Invalid \"to_net_addr\" string in recipient object"); - return(false); + return false; } if ((smb_result = smb_hfield_netaddr(msg, RECIPIENTNETADDR, cp, &nettype)) != SMB_SUCCESS) { free(cp); @@ -257,7 +257,7 @@ static bool parse_recipient_object(JSContext* cx, private_t* p, JSObject* hdr, s if (fulladdr[0] == 0) { JS_ReportError(cx, "Unroutable QWKnet \"to_net_addr\" (%s) in recipient object" , msg->to_net.addr); - return(false); + return false; } if ((smb_result = smb_hfield_str(msg, RECIPIENTNETADDR, fulladdr)) != SMB_SUCCESS) { JS_ReportError(cx, "Error %d adding RECIPIENTADDR field to message header" @@ -292,12 +292,12 @@ static bool parse_recipient_object(JSContext* cx, private_t* p, JSObject* hdr, s } } - return(true); + return true; err: if (smb_result != SMB_SUCCESS && p != NULL) p->smb_result = smb_result; - return(false); + return false; } @@ -993,14 +993,14 @@ static bool parse_header_object(JSContext* cx, private_t* p, JSObject* hdr, smbm if (cp) free(cp); - return(true); + return true; err: if (smb_result != SMB_SUCCESS && p != NULL) p->smb_result = smb_result; if (cp) free(cp); - return(false); + return false; } /* obj *may* have been previously returned from get_msg_header() */ @@ -1012,10 +1012,10 @@ bool js_ParseMsgHeaderObject(JSContext* cx, JSObject* obj, smbmsg_t* msg) if (!parse_header_object(cx, p == NULL ? NULL : p->p, obj, msg, /* recipient */ true)) { smb_freemsgmem(msg); - return(false); + return false; } - return(true); + return true; } /* obj must've been previously returned from get_msg_header() */ @@ -1044,10 +1044,10 @@ static bool msg_offset_by_id(private_t* p, char* id, int32_t* offset) smbmsg_t msg; if ((p->smb_result = smb_getmsgidx_by_msgid(&(p->smb), &msg, id)) != SMB_SUCCESS) - return(false); + return false; *offset = msg.idx_offset; - return(true); + return true; } static bool set_msg_idx_properties(JSContext* cx, JSObject* obj, idxrec_t* idx, int32_t offset) @@ -2186,7 +2186,7 @@ js_put_msg_header(JSContext *cx, uintN argc, jsval *arglist) smb_freemsgmem(&msg); JS_RESUMEREQUEST(cx, rc); - return(ret); + return ret; } static JSBool @@ -2274,18 +2274,18 @@ static char* get_msg_text(private_t* p, smbmsg_t* msg, bool strip_ctrl_a, bool d if (existing) { if ((p->smb_result = smb_lockmsghdr(&(p->smb), msg)) != SMB_SUCCESS) - return(NULL); + return NULL; } else { if ((p->smb_result = smb_getmsgidx(&(p->smb), msg)) != SMB_SUCCESS) - return(NULL); + return NULL; if ((p->smb_result = smb_lockmsghdr(&(p->smb), msg)) != SMB_SUCCESS) - return(NULL); + return NULL; if ((p->smb_result = smb_getmsghdr(&(p->smb), msg)) != SMB_SUCCESS) { smb_unlockmsghdr(&(p->smb), msg); - return(NULL); + return NULL; } } @@ -2293,7 +2293,7 @@ static char* get_msg_text(private_t* p, smbmsg_t* msg, bool strip_ctrl_a, bool d smb_unlockmsghdr(&(p->smb), msg); if (!existing) smb_freemsgmem(msg); - return(NULL); + return NULL; } smb_unlockmsghdr(&(p->smb), msg); @@ -2318,7 +2318,7 @@ static char* get_msg_text(private_t* p, smbmsg_t* msg, bool strip_ctrl_a, bool d } } - return(buf); + return buf; } static JSBool @@ -2701,7 +2701,7 @@ js_save_msg(JSContext *cx, uintN argc, jsval *arglist) smb_freemsgmem(&msg); - return(ret); + return ret; } static JSBool @@ -3312,7 +3312,7 @@ static JSBool js_msgbase_resolve(JSContext *cx, JSObject *obj, jsid id) static JSBool js_msgbase_enumerate(JSContext *cx, JSObject *obj) { - return(js_msgbase_resolve(cx, obj, JSID_VOID)); + return js_msgbase_resolve(cx, obj, JSID_VOID); } JSClass js_msgbase_class = { @@ -3465,7 +3465,7 @@ JSObject* js_CreateMsgBaseClass(JSContext* cx, JSObject* parent) (void)pobj; } - return(obj); + return obj; } diff --git a/src/sbbs3/js_queue.c b/src/sbbs3/js_queue.c index e58ba7a7e1f16da7b8fd262d1f2d6a649ccbd68e..c5d55f229a10d5ac184f65f68be3a020872c1d92 100644 --- a/src/sbbs3/js_queue.c +++ b/src/sbbs3/js_queue.c @@ -78,7 +78,7 @@ js_poll(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((q = (msg_queue_t*)js_GetClassPrivate(cx, obj, &js_queue_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (argc && JSVAL_IS_NUMBER(argv[0])) { /* timeout specified */ @@ -96,7 +96,7 @@ js_poll(JSContext *cx, uintN argc, jsval *arglist) else JS_SET_RVAL(cx, arglist, JSVAL_TRUE); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -113,7 +113,7 @@ js_read(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((q = (msg_queue_t*)js_GetClassPrivate(cx, obj, &js_queue_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (argc && JSVAL_IS_STRING(argv[0])) { /* value named specified */ @@ -141,7 +141,7 @@ js_read(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, rval); } - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -157,7 +157,7 @@ js_peek(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((q = (msg_queue_t*)js_GetClassPrivate(cx, obj, &js_queue_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (argc && JSVAL_IS_NUMBER(argv[0])) { /* timeout specified */ @@ -174,7 +174,7 @@ js_peek(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, rval); } - return(JS_TRUE); + return JS_TRUE; } static queued_value_t* js_encode_value(JSContext *cx, jsval val, char* name) @@ -183,7 +183,7 @@ static queued_value_t* js_encode_value(JSContext *cx, jsval val, char* name) uint64 * serialized; if ((v = malloc(sizeof(queued_value_t))) == NULL) - return(NULL); + return NULL; memset(v, 0, sizeof(queued_value_t)); if (name != NULL) @@ -201,7 +201,7 @@ static queued_value_t* js_encode_value(JSContext *cx, jsval val, char* name) memcpy(v->value, serialized, v->size); JS_free(cx, serialized); - return(v); + return v; } bool js_enqueue_value(JSContext *cx, msg_queue_t* q, jsval val, char* name) @@ -211,13 +211,13 @@ bool js_enqueue_value(JSContext *cx, msg_queue_t* q, jsval val, char* name) jsrefcount rc; if ((v = js_encode_value(cx, val, name)) == NULL) - return(false); + return false; rc = JS_SUSPENDREQUEST(cx); result = msgQueueWrite(q, v, sizeof(queued_value_t)); free(v); JS_RESUMEREQUEST(cx, rc); - return(result); + return result; } static JSBool @@ -233,7 +233,7 @@ js_write(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((q = (msg_queue_t*)js_GetClassPrivate(cx, obj, &js_queue_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } val = argv[argn++]; @@ -248,7 +248,7 @@ js_write(JSContext *cx, uintN argc, jsval *arglist) if (name) free(name); - return(JS_TRUE); + return JS_TRUE; } /* Queue Object Properites */ @@ -317,7 +317,7 @@ static JSBool js_queue_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) JS_RESUMEREQUEST(cx, rc); break; } - return(JS_TRUE); + return JS_TRUE; } #define QUEUE_PROP_FLAGS JSPROP_ENUMERATE | JSPROP_READONLY @@ -378,7 +378,7 @@ static JSBool js_queue_resolve(JSContext *cx, JSObject *obj, jsid id) static JSBool js_queue_enumerate(JSContext *cx, JSObject *obj) { - return(js_queue_resolve(cx, obj, JSID_VOID)); + return js_queue_resolve(cx, obj, JSID_VOID); } JSClass js_queue_class = { @@ -414,7 +414,7 @@ js_queue_constructor(JSContext *cx, uintN argc, jsval *arglist) #if 0 /* This doesn't appear to be doing anything but leaking memory */ if ((q = (msg_queue_t*)malloc(sizeof(msg_queue_t))) == NULL) { JS_ReportError(cx, "malloc failed"); - return(JS_FALSE); + return JS_FALSE; } memset(q, 0, sizeof(msg_queue_t)); #endif @@ -451,7 +451,7 @@ js_queue_constructor(JSContext *cx, uintN argc, jsval *arglist) if (!JS_SetPrivate(cx, obj, q)) { JS_ReportError(cx, "JS_SetPrivate failed"); - return(JS_FALSE); + return JS_FALSE; } #ifdef BUILD_JSDOCS @@ -462,7 +462,7 @@ js_queue_constructor(JSContext *cx, uintN argc, jsval *arglist) js_CreateArrayOfStrings(cx, obj, "_property_desc_list", queue_prop_desc, JSPROP_READONLY); #endif - return(JS_TRUE); + return JS_TRUE; } JSObject* js_CreateQueueClass(JSContext* cx, JSObject* parent) @@ -478,7 +478,7 @@ JSObject* js_CreateQueueClass(JSContext* cx, JSObject* parent) , NULL , NULL); - return(obj); + return obj; } JSObject* js_CreateQueueObject(JSContext* cx, JSObject* parent, char *name, msg_queue_t* q) @@ -492,12 +492,12 @@ JSObject* js_CreateQueueObject(JSContext* cx, JSObject* parent, char *name, msg_ , JSPROP_ENUMERATE | JSPROP_READONLY); if (obj == NULL) - return(NULL); + return NULL; if (!JS_SetPrivate(cx, obj, q)) - return(NULL); + return NULL; - return(obj); + return obj; } diff --git a/src/sbbs3/js_request.c b/src/sbbs3/js_request.c index 0c59768668d0bef0fc61d0cae64e883b5c376b86..11e2ce0d5bc159087a124fcdf4f8e01c55265b37 100644 --- a/src/sbbs3/js_request.c +++ b/src/sbbs3/js_request.c @@ -64,7 +64,7 @@ static struct request_log *match_request(JSContext *cx) for (ent = first_request; ent != NULL; ent = ent->next) { if (ent->cx == cx) - return(ent); + return ent; } ent = malloc(sizeof(struct request_log)); @@ -78,9 +78,9 @@ static struct request_log *match_request(JSContext *cx) first_request->prev = ent; } first_request = ent; - return(ent); + return ent; } - return(NULL); + return NULL; } static void initialize_request(void) @@ -251,7 +251,7 @@ jsrefcount js_debug_suspendrequest(JSContext *cx, const char *file, unsigned lon req->line = line; ret = JS_SuspendRequest(cx); pthread_mutex_unlock(&req_mutex); - return(ret); + return ret; } void js_debug_resumerequest(JSContext *cx, jsrefcount rc, const char *file, unsigned long line) diff --git a/src/sbbs3/js_server.c b/src/sbbs3/js_server.c index 8c5a0277adbf146eb8fb3d1edc9bf4764a436f5f..a7f833e692519ed728ff3c30f2ba35c94591f100 100644 --- a/src/sbbs3/js_server.c +++ b/src/sbbs3/js_server.c @@ -40,7 +40,7 @@ static JSBool js_server_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) char * colon; if ((p = (js_server_props_t*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_IdToValue(cx, id, &idval); tiny = JSVAL_TO_INT(idval); @@ -76,7 +76,7 @@ static JSBool js_server_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) break; } - return(JS_TRUE); + return JS_TRUE; } static JSBool js_server_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp) @@ -86,7 +86,7 @@ static JSBool js_server_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict js_server_props_t* p; if ((p = (js_server_props_t*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_IdToValue(cx, id, &idval); tiny = JSVAL_TO_INT(idval); @@ -100,7 +100,7 @@ static JSBool js_server_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict break; } - return(TRUE); + return TRUE; } @@ -186,17 +186,17 @@ static JSBool js_server_resolve(JSContext *cx, JSObject *obj, jsid id) if (name) free(name); if ((props = (js_server_props_t*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; if ((newobj = JS_NewArrayObject(cx, 0, NULL)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (!JS_SetParent(cx, newobj, obj)) - return(JS_FALSE); + return JS_FALSE; if (!JS_DefineProperty(cx, obj, "interface_ip_addr_list", OBJECT_TO_JSVAL(newobj) , NULL, NULL, JSPROP_ENUMERATE)) - return(JS_FALSE); + return JS_FALSE; for (i = 0; (*props->interfaces)[i]; i++) { str = strdup((*props->interfaces)[i]); @@ -208,7 +208,7 @@ static JSBool js_server_resolve(JSContext *cx, JSObject *obj, jsid id) JS_SetElement(cx, newobj, i, &val); } JS_DeepFreezeObject(cx, newobj); - if (name) return(JS_TRUE); + if (name) return JS_TRUE; } ret = js_SyncResolve(cx, obj, name, js_server_properties, NULL, NULL, 0); @@ -219,7 +219,7 @@ static JSBool js_server_resolve(JSContext *cx, JSObject *obj, jsid id) static JSBool js_server_enumerate(JSContext *cx, JSObject *obj) { - return(js_server_resolve(cx, obj, JSID_VOID)); + return js_server_resolve(cx, obj, JSID_VOID); } static JSClass js_server_class = { @@ -242,16 +242,16 @@ JSObject* js_CreateServerObject(JSContext* cx, JSObject* parent if ((obj = JS_DefineObject(cx, parent, "server", &js_server_class, NULL , JSPROP_ENUMERATE | JSPROP_READONLY)) == NULL) - return(NULL); + return NULL; if (!JS_SetPrivate(cx, obj, props)) - return(NULL); + return NULL; #ifdef BUILD_JSDOCS js_DescribeSyncObject(cx, obj, "Server-specific properties", 310); js_CreateArrayOfStrings(cx, obj, "_property_desc_list", server_prop_desc, JSPROP_READONLY); #endif - return(obj); + return obj; } diff --git a/src/sbbs3/js_socket.c b/src/sbbs3/js_socket.c index 441584b3a0ab2f8648f37b4d2f9cacb06360b8b1..d34198678c74c6219b2453dc9aae1eeeee3714f8 100644 --- a/src/sbbs3/js_socket.c +++ b/src/sbbs3/js_socket.c @@ -403,7 +403,7 @@ static off_t js_socket_sendfilesocket(js_socket_private_t *p, int file) if (rd < 0) { if (p->session != -1) do_CryptFlush(p); - return (-1); + return -1; } if (rd == 0) break; @@ -420,20 +420,20 @@ static off_t js_socket_sendfilesocket(js_socket_private_t *p, int file) else { if (p->session != -1) do_CryptFlush(p); - return (wr); + return wr; } } if (sent != rd) { if (p->session != -1) do_CryptFlush(p); - return (-1); + return -1; } total += rd; } if (p->session != -1) do_CryptFlush(p); - return (total); + return total; } static void dbprintf(bool error, js_socket_private_t* p, char* fmt, ...) @@ -484,7 +484,7 @@ js_close(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (js_socket_private_t*)js_GetClassPrivate(cx, obj, &js_socket_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); @@ -492,7 +492,7 @@ js_close(JSContext *cx, uintN argc, jsval *arglist) dbprintf(false, p, "closed"); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static ushort js_port(JSContext* cx, jsval val, int type) @@ -505,22 +505,22 @@ static ushort js_port(JSContext* cx, jsval val, int type) if (JSVAL_IS_NUMBER(val)) { JS_ValueToInt32(cx, val, &i); - return((ushort)i); + return (ushort)i; } if (JSVAL_IS_STRING(val)) { str = JS_ValueToString(cx, val); JSSTRING_TO_ASTRING(cx, str, cp, 16, NULL); if (cp != NULL) { if (IS_DIGIT(*cp)) - return((ushort)strtol(cp, NULL, 0)); + return (ushort)strtol(cp, NULL, 0); rc = JS_SUSPENDREQUEST(cx); serv = getservbyname(cp, type == SOCK_STREAM ? "tcp":"udp"); JS_RESUMEREQUEST(cx, rc); if (serv != NULL) - return(htons(serv->s_port)); + return htons(serv->s_port); } } - return(0); + return 0; } SOCKET js_socket(JSContext *cx, jsval val) @@ -539,7 +539,7 @@ SOCKET js_socket(JSContext *cx, jsval val) sock = i; } - return(sock); + return sock; } #ifdef PREFER_POLL @@ -739,7 +739,7 @@ js_bind(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_FALSE); if ((p = (js_socket_private_t*)js_GetClassPrivate(cx, obj, &js_socket_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } memset(&addr, 0, sizeof(addr)); @@ -762,7 +762,7 @@ js_bind(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); dbprintf(TRUE, p, "getaddrinfo(%s, %s) failed with error %d", cstr, portstr, ret); store_socket_error(p, ret, gai_strerror(ret)); - return(JS_TRUE); + return JS_TRUE; } for (tres = res; tres; tres = tres->ai_next) { if (bind(p->sock, tres->ai_addr, tres->ai_addrlen) != 0) { @@ -771,7 +771,7 @@ js_bind(JSContext *cx, uintN argc, jsval *arglist) dbprintf(TRUE, p, "bind failed with error %d", SOCKET_ERRNO); freeaddrinfo(res); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } } else @@ -782,7 +782,7 @@ js_bind(JSContext *cx, uintN argc, jsval *arglist) dbprintf(false, p, "bound to port %u", port); JS_SET_RVAL(cx, arglist, JSVAL_TRUE); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -797,7 +797,7 @@ js_listen(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (js_socket_private_t*)js_GetClassPrivate(cx, obj, &js_socket_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (argc && argv[0] != JSVAL_VOID) @@ -809,13 +809,13 @@ js_listen(JSContext *cx, uintN argc, jsval *arglist) dbprintf(TRUE, p, "listen failed with error %d", SOCKET_ERRNO); JS_SET_RVAL(cx, arglist, JSVAL_FALSE); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } dbprintf(false, p, "listening, backlog=%d", backlog); JS_SET_RVAL(cx, arglist, JSVAL_TRUE); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -832,7 +832,7 @@ js_accept(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (js_socket_private_t*)js_GetClassPrivate(cx, obj, &js_socket_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } addrlen = sizeof(p->remote_addr); @@ -843,7 +843,7 @@ js_accept(JSContext *cx, uintN argc, jsval *arglist) store_socket_error(p, SOCKET_ERRNO, NULL); dbprintf(TRUE, p, "accept failed with error %d", SOCKET_ERRNO); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } call_socket_open_callback(TRUE); } @@ -852,7 +852,7 @@ js_accept(JSContext *cx, uintN argc, jsval *arglist) store_socket_error(p, SOCKET_ERRNO, NULL); dbprintf(TRUE, p, "accept failed with error %d", SOCKET_ERRNO); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } } @@ -860,11 +860,11 @@ js_accept(JSContext *cx, uintN argc, jsval *arglist) closesocket(new_socket); JS_RESUMEREQUEST(cx, rc); JS_ReportError(cx, "Error creating new socket object"); - return(JS_TRUE); + return JS_TRUE; } if ((new_p = (js_socket_private_t*)JS_GetPrivate(cx, sockobj)) == NULL) { JS_RESUMEREQUEST(cx, rc); - return(JS_FALSE); + return JS_FALSE; } new_p->type = p->type; @@ -876,7 +876,7 @@ js_accept(JSContext *cx, uintN argc, jsval *arglist) dbprintf(false, p, "accepted connection"); JS_SET_RVAL(cx, arglist, OBJECT_TO_JSVAL(sockobj)); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } struct js_connect_event_args { @@ -1034,7 +1034,7 @@ js_connect(JSContext *cx, uintN argc, jsval *arglist) int timeout = 10000; /* Default time-out */ if ((p = (js_socket_private_t*)js_GetClassPrivate(cx, obj, &js_socket_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } str = JS_ValueToString(cx, argv[0]); @@ -1061,7 +1061,7 @@ js_connect(JSContext *cx, uintN argc, jsval *arglist) store_socket_error(p, result, gai_strerror(result)); dbprintf(TRUE, p, "getaddrinfo(%s) failed with error %d", p->hostname, result); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } /* always set to nonblocking here */ val = 1; @@ -1103,7 +1103,7 @@ js_connect(JSContext *cx, uintN argc, jsval *arglist) dbprintf(TRUE, p, "connect failed with error %d", result); JS_SET_RVAL(cx, arglist, JSVAL_FALSE); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } memcpy(&p->remote_addr, cur->ai_addr, cur->ai_addrlen); freeaddrinfo(res); @@ -1113,7 +1113,7 @@ js_connect(JSContext *cx, uintN argc, jsval *arglist) dbprintf(false, p, "connected to %s on port %u at %s", ip_str, port, p->hostname); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1131,7 +1131,7 @@ js_send(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (js_socket_private_t*)js_GetClassPrivate(cx, obj, &js_socket_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } str = JS_ValueToString(cx, argv[0]); @@ -1152,7 +1152,7 @@ js_send(JSContext *cx, uintN argc, jsval *arglist) free(cp); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1169,7 +1169,7 @@ js_sendline(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (js_socket_private_t*)js_GetClassPrivate(cx, obj, &js_socket_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } JS_SET_RVAL(cx, arglist, JSVAL_FALSE); @@ -1191,7 +1191,7 @@ js_sendline(JSContext *cx, uintN argc, jsval *arglist) free(cp); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1213,7 +1213,7 @@ js_sendto(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (js_socket_private_t*)js_GetClassPrivate(cx, obj, &js_socket_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } JS_SET_RVAL(cx, arglist, JSVAL_FALSE); @@ -1252,7 +1252,7 @@ js_sendto(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_FALSE); free(cp); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } for (cur = res; cur; cur = cur->ai_next) { @@ -1272,7 +1272,7 @@ js_sendto(JSContext *cx, uintN argc, jsval *arglist) freeaddrinfo(res); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } @@ -1290,7 +1290,7 @@ js_sendfile(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (js_socket_private_t*)js_GetClassPrivate(cx, obj, &js_socket_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } JS_SET_RVAL(cx, arglist, JSVAL_FALSE); @@ -1299,14 +1299,14 @@ js_sendfile(JSContext *cx, uintN argc, jsval *arglist) HANDLE_PENDING(cx, fname); if (fname == NULL) { JS_ReportError(cx, "Failure reading filename"); - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); if ((file = nopen(fname, O_RDONLY | O_BINARY)) == -1) { free(fname); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } len = js_socket_sendfilesocket(p, file); @@ -1321,7 +1321,7 @@ js_sendfile(JSContext *cx, uintN argc, jsval *arglist) free(fname); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1341,7 +1341,7 @@ js_sendbin(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_FALSE); if ((p = (js_socket_private_t*)js_GetClassPrivate(cx, obj, &js_socket_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (argc && argv[0] != JSVAL_VOID) @@ -1381,7 +1381,7 @@ js_sendbin(JSContext *cx, uintN argc, jsval *arglist) } JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } @@ -1400,7 +1400,7 @@ js_recv(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (js_socket_private_t*)js_GetClassPrivate(cx, obj, &js_socket_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (argc && argv[0] != JSVAL_VOID) { @@ -1413,7 +1413,7 @@ js_recv(JSContext *cx, uintN argc, jsval *arglist) if ((buf = (char*)malloc(len + 1)) == NULL) { JS_ReportError(cx, "Error allocating %u bytes", len + 1); - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); @@ -1423,14 +1423,14 @@ js_recv(JSContext *cx, uintN argc, jsval *arglist) store_socket_error(p, SOCKET_ERRNO, NULL); JS_SET_RVAL(cx, arglist, JSVAL_NULL); free(buf); - return(JS_TRUE); + return JS_TRUE; } buf[len] = 0; str = JS_NewStringCopyN(cx, buf, len); if (str == NULL) { free(buf); - return(JS_FALSE); + return JS_FALSE; } JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(str)); @@ -1439,7 +1439,7 @@ js_recv(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); free(buf); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1468,7 +1468,7 @@ js_recvfrom(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (js_socket_private_t*)js_GetClassPrivate(cx, obj, &js_socket_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } JS_SET_RVAL(cx, arglist, JSVAL_NULL); @@ -1513,14 +1513,14 @@ js_recvfrom(JSContext *cx, uintN argc, jsval *arglist) if (rd != len) { store_socket_error(p, SOCKET_ERRNO, NULL); - return(JS_TRUE); + return JS_TRUE; } } else { /* String Data */ if ((buf = (char*)malloc(len + 1)) == NULL) { JS_ReportError(cx, "Error allocating %u bytes", len + 1); - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); @@ -1529,7 +1529,7 @@ js_recvfrom(JSContext *cx, uintN argc, jsval *arglist) if (len < 0) { store_socket_error(p, SOCKET_ERRNO, NULL); free(buf); - return(JS_TRUE); + return JS_TRUE; } buf[len] = 0; @@ -1537,7 +1537,7 @@ js_recvfrom(JSContext *cx, uintN argc, jsval *arglist) free(buf); if (str == NULL) - return(JS_FALSE); + return JS_FALSE; data_val = STRING_TO_JSVAL(str); } @@ -1545,7 +1545,7 @@ js_recvfrom(JSContext *cx, uintN argc, jsval *arglist) if ((retobj = JS_NewObject(cx, NULL, NULL, obj)) == NULL) { JS_ReportError(cx, "JS_NewObject failed"); - return(JS_FALSE); + return JS_FALSE; } JS_DefineProperty(cx, retobj, "data" @@ -1554,14 +1554,14 @@ js_recvfrom(JSContext *cx, uintN argc, jsval *arglist) sprintf(port, "%u", inet_addrport(&addr)); if ((str = JS_NewStringCopyZ(cx, port)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_DefineProperty(cx, retobj, "port" , STRING_TO_JSVAL(str) , NULL, NULL, JSPROP_ENUMERATE); inet_addrtop(&addr, ip_addr, sizeof(ip_addr)); if ((str = JS_NewStringCopyZ(cx, ip_addr)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_DefineProperty(cx, retobj, "ip_address" , STRING_TO_JSVAL(str) , NULL, NULL, JSPROP_ENUMERATE); @@ -1572,7 +1572,7 @@ js_recvfrom(JSContext *cx, uintN argc, jsval *arglist) dbprintf(false, p, "received %u bytes from %s:%s", len, ip_addr, port); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } @@ -1590,7 +1590,7 @@ js_peek(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (js_socket_private_t*)js_GetClassPrivate(cx, obj, &js_socket_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (argc && argv[0] != JSVAL_VOID) @@ -1598,7 +1598,7 @@ js_peek(JSContext *cx, uintN argc, jsval *arglist) if ((buf = (char*)malloc(len + 1)) == NULL) { JS_ReportError(cx, "Error allocating %u bytes", len + 1); - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); if (p->session == -1) @@ -1610,14 +1610,14 @@ js_peek(JSContext *cx, uintN argc, jsval *arglist) store_socket_error(p, SOCKET_ERRNO, NULL); JS_SET_RVAL(cx, arglist, JSVAL_NULL); free(buf); - return(JS_TRUE); + return JS_TRUE; } buf[len] = 0; str = JS_NewStringCopyN(cx, buf, len); free(buf); if (str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(str)); rc = JS_SUSPENDREQUEST(cx); @@ -1625,7 +1625,7 @@ js_peek(JSContext *cx, uintN argc, jsval *arglist) , len, SOCKET_ERRNO); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } /* Returns 0 if there is rx data waiting */ @@ -1671,7 +1671,7 @@ js_recvline(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_NULL); if ((p = (js_socket_private_t*)js_GetClassPrivate(cx, obj, &js_socket_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (argc && argv[0] != JSVAL_VOID) @@ -1679,7 +1679,7 @@ js_recvline(JSContext *cx, uintN argc, jsval *arglist) if ((buf = (char*)malloc(len + 1)) == NULL) { JS_ReportError(cx, "Error allocating %u bytes", len + 1); - return(JS_FALSE); + return JS_FALSE; } if (argc > 1 && argv[1] != JSVAL_VOID) @@ -1711,7 +1711,7 @@ js_recvline(JSContext *cx, uintN argc, jsval *arglist) if (i == 0) { // no data received JS_RESUMEREQUEST(cx, rc); free(buf); // so return null (not an empty string) - return(JS_TRUE); + return JS_TRUE; } break; } @@ -1730,7 +1730,7 @@ js_recvline(JSContext *cx, uintN argc, jsval *arglist) str = JS_NewStringCopyZ(cx, buf); free(buf); if (str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(str)); rc = JS_SUSPENDREQUEST(cx); @@ -1738,7 +1738,7 @@ js_recvline(JSContext *cx, uintN argc, jsval *arglist) , i, SOCKET_ERRNO); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1757,7 +1757,7 @@ js_recvbin(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(-1)); if ((p = (js_socket_private_t*)js_GetClassPrivate(cx, obj, &js_socket_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (argc && argv[0] != JSVAL_VOID) @@ -1789,7 +1789,7 @@ js_recvbin(JSContext *cx, uintN argc, jsval *arglist) store_socket_error(p, SOCKET_ERRNO, NULL); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } @@ -1811,14 +1811,14 @@ js_getsockopt(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(-1)); if ((p = (js_socket_private_t*)js_GetClassPrivate(cx, obj, &js_socket_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); JSVALUE_TO_ASTRING(cx, argv[0], cstr, 64, NULL); if ((opt = getSocketOptionByName(cstr, &level)) == -1) { JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } if (opt == SO_LINGER) { @@ -1840,7 +1840,7 @@ js_getsockopt(JSContext *cx, uintN argc, jsval *arglist) } JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } @@ -1862,7 +1862,7 @@ js_setsockopt(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (js_socket_private_t*)js_GetClassPrivate(cx, obj, &js_socket_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->sock == INVALID_SOCKET) return JS_TRUE; @@ -1892,7 +1892,7 @@ js_setsockopt(JSContext *cx, uintN argc, jsval *arglist) store_socket_error(p, SOCKET_ERRNO, NULL); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1908,7 +1908,7 @@ js_ioctlsocket(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (js_socket_private_t*)js_GetClassPrivate(cx, obj, &js_socket_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (argc && argv[0] != JSVAL_VOID) @@ -1928,7 +1928,7 @@ js_ioctlsocket(JSContext *cx, uintN argc, jsval *arglist) store_socket_error(p, SOCKET_ERRNO, NULL); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1958,13 +1958,13 @@ js_poll(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (js_socket_private_t*)js_GetClassPrivate(cx, obj, &js_socket_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } if (p->sock == INVALID_SOCKET && p->set == NULL) { dbprintf(TRUE, p, "INVALID SOCKET in call to poll"); JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(-1)); - return(JS_TRUE); + return JS_TRUE; } for (argn = 0; argn < argc; argn++) { @@ -2029,7 +2029,7 @@ js_poll(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(result)); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static js_callback_t * @@ -2092,7 +2092,7 @@ js_install_event(JSContext *cx, uintN argc, jsval *arglist, bool once) size_t slen; if ((p = (js_socket_private_t*)js_GetClassPrivate(cx, obj, &js_socket_class)) == NULL) { - return(JS_FALSE); + return JS_FALSE; } /* @@ -2284,7 +2284,7 @@ static JSBool js_socket_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict if ((p = (js_socket_private_t*)JS_GetPrivate(cx, obj)) == NULL) { // Prototype access - return(JS_TRUE); + return JS_TRUE; } JS_IdToValue(cx, id, &idval); @@ -2414,7 +2414,7 @@ static JSBool js_socket_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict break; } - return(JS_TRUE); + return JS_TRUE; } static JSBool js_socket_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) @@ -2433,7 +2433,7 @@ static JSBool js_socket_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) if ((p = (js_socket_private_t*)JS_GetPrivate(cx, obj)) == NULL) { // Protoype access - return(JS_TRUE); + return JS_TRUE; } JS_IdToValue(cx, id, &idval); @@ -2509,11 +2509,11 @@ static JSBool js_socket_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) case SOCK_PROP_LOCAL_IP: if (p->sock != INVALID_SOCKET) { if (getsockname(p->sock, (struct sockaddr *)&addr, &len) != 0) - return(JS_FALSE); + return JS_FALSE; JS_RESUMEREQUEST(cx, rc); inet_addrtop(&addr, str, sizeof(str)); if ((js_str = JS_NewStringCopyZ(cx, str)) == NULL) - return(JS_FALSE); + return JS_FALSE; *vp = STRING_TO_JSVAL(js_str); rc = JS_SUSPENDREQUEST(cx); } @@ -2525,7 +2525,7 @@ static JSBool js_socket_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) *vp = INT_TO_JSVAL(p->local_port); } else if (p->sock != INVALID_SOCKET) { if (getsockname(p->sock, &addr.addr, &len) != 0) - return(JS_FALSE); + return JS_FALSE; JS_RESUMEREQUEST(cx, rc); *vp = INT_TO_JSVAL(inet_addrport(&addr)); rc = JS_SUSPENDREQUEST(cx); @@ -2538,7 +2538,7 @@ static JSBool js_socket_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) JS_RESUMEREQUEST(cx, rc); inet_addrtop(&p->remote_addr, str, sizeof(str)); if ((js_str = JS_NewStringCopyZ(cx, str)) == NULL) - return(JS_FALSE); + return JS_FALSE; *vp = STRING_TO_JSVAL(js_str); rc = JS_SUSPENDREQUEST(cx); } @@ -2558,7 +2558,7 @@ static JSBool js_socket_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) if (p->sock != INVALID_SOCKET) { JS_RESUMEREQUEST(cx, rc); if (getsockname(p->sock, &addr.addr, &len) != 0) - return(JS_FALSE); + return JS_FALSE; *vp = INT_TO_JSVAL(addr.addr.sa_family); rc = JS_SUSPENDREQUEST(cx); } @@ -2580,7 +2580,7 @@ static JSBool js_socket_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) } JS_RESUMEREQUEST(cx, rc); - return(TRUE); + return TRUE; } #define SOCK_PROP_FLAGS JSPROP_ENUMERATE | JSPROP_READONLY @@ -2725,7 +2725,7 @@ static JSBool js_socket_resolve(JSContext *cx, JSObject *obj, jsid id) static JSBool js_socket_enumerate(JSContext *cx, JSObject *obj) { - return(js_socket_resolve(cx, obj, JSID_VOID)); + return js_socket_resolve(cx, obj, JSID_VOID); } JSClass js_socket_class = { @@ -2776,14 +2776,14 @@ static bool js_DefineSocketOptionsArray(JSContext *cx, JSObject *obj, int type) socket_option_t* options; if ((options = getSocketOptionList()) == NULL) - return(false); + return false; if ((array = JS_NewArrayObject(cx, 0, NULL)) == NULL) - return(false); + return false; if (!JS_DefineProperty(cx, obj, "option_list", OBJECT_TO_JSVAL(array) , NULL, NULL, JSPROP_ENUMERATE)) - return(false); + return false; for (i = 0; options[i].name != NULL; i++) { if (options[i].type && options[i].type != type) @@ -2791,7 +2791,7 @@ static bool js_DefineSocketOptionsArray(JSContext *cx, JSObject *obj, int type) val = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, options[i].name)); JS_SetElement(cx, array, count++, &val); } - return(TRUE); + return TRUE; } /* Socket Constructor (creates socket descriptor) */ @@ -2806,16 +2806,16 @@ JSObject* js_CreateSocketObjectWithoutParent(JSContext* cx, SOCKET sock, CRYPT_C obj = JS_NewObject(cx, &js_socket_class, NULL, NULL); if (obj == NULL) - return(NULL); + return NULL; len = sizeof(type); getsockopt(sock, SOL_SOCKET, SO_TYPE, (void*)&type, &len); if (!js_DefineSocketOptionsArray(cx, obj, type)) - return(NULL); + return NULL; if ((p = (js_socket_private_t*)malloc(sizeof(js_socket_private_t))) == NULL) - return(NULL); + return NULL; memset(p, 0, sizeof(js_socket_private_t)); p->sock = sock; @@ -2833,12 +2833,12 @@ JSObject* js_CreateSocketObjectWithoutParent(JSContext* cx, SOCKET sock, CRYPT_C if (!JS_SetPrivate(cx, obj, p)) { dbprintf(TRUE, p, "JS_SetPrivate failed"); - return(NULL); + return NULL; } dbprintf(false, p, "object created"); - return(obj); + return obj; } static bool @@ -3187,7 +3187,7 @@ connected: if (!JS_SetPrivate(cx, obj, p)) { JS_ReportError(cx, "JS_SetPrivate failed"); free(p); - return(JS_FALSE); + return JS_FALSE; } #ifdef BUILD_JSDOCS @@ -3206,10 +3206,10 @@ connected: #endif if (!js_DefineSocketOptionsArray(cx, obj, type)) - return(JS_FALSE); + return JS_FALSE; dbprintf(false, p, "object constructed"); - return(JS_TRUE); + return JS_TRUE; fail: if (p) @@ -3364,7 +3364,7 @@ js_listening_socket_constructor(JSContext *cx, uintN argc, jsval *arglist) JS_ReportError(cx, "malloc failed"); free(protocol); free(set); - return(JS_FALSE); + return JS_FALSE; } memset(p, 0, sizeof(js_socket_private_t)); p->type = type; @@ -3381,13 +3381,13 @@ js_listening_socket_constructor(JSContext *cx, uintN argc, jsval *arglist) JS_ReportError(cx, "JS_SetPrivate failed"); free(p); free(set); - return(JS_FALSE); + return JS_FALSE; } if (!js_DefineSocketOptionsArray(cx, obj, type)) { free(p); free(set); - return(JS_FALSE); + return JS_FALSE; } #ifdef BUILD_JSDOCS @@ -3408,7 +3408,7 @@ js_listening_socket_constructor(JSContext *cx, uintN argc, jsval *arglist) dbprintf(false, p, "object constructed"); - return(JS_TRUE); + return JS_TRUE; fail: free(protocol); @@ -3472,7 +3472,7 @@ js_socket_constructor(JSContext *cx, uintN argc, jsval *arglist) JS_ReportError(cx, "malloc failed"); if (protocol) free(protocol); - return(JS_FALSE); + return JS_FALSE; } memset(p, 0, sizeof(js_socket_private_t)); @@ -3481,7 +3481,7 @@ js_socket_constructor(JSContext *cx, uintN argc, jsval *arglist) if (protocol) free(protocol); free(p); - return(JS_FALSE); + return JS_FALSE; } if (protocol) free(protocol); @@ -3494,7 +3494,7 @@ js_socket_constructor(JSContext *cx, uintN argc, jsval *arglist) if (!JS_SetPrivate(cx, obj, p)) { JS_ReportError(cx, "JS_SetPrivate failed"); free(p); - return(JS_FALSE); + return JS_FALSE; } #ifdef BUILD_JSDOCS @@ -3511,10 +3511,10 @@ js_socket_constructor(JSContext *cx, uintN argc, jsval *arglist) #endif if (!js_DefineSocketOptionsArray(cx, obj, type)) - return(JS_FALSE); + return JS_FALSE; dbprintf(false, p, "object constructed"); - return(JS_TRUE); + return JS_TRUE; } JSObject* js_CreateSocketClass(JSContext* cx, JSObject* parent) @@ -3564,7 +3564,7 @@ JSObject* js_CreateSocketClass(JSContext* cx, JSObject* parent) , NULL, NULL); (void)lsockobj; - return(sockobj); + return sockobj; } JSObject* js_CreateSocketObject(JSContext* cx, JSObject* parent, char *name, SOCKET sock, CRYPT_CONTEXT session) @@ -3573,10 +3573,10 @@ JSObject* js_CreateSocketObject(JSContext* cx, JSObject* parent, char *name, SOC obj = js_CreateSocketObjectWithoutParent(cx, sock, session); if (obj == NULL) - return(NULL); + return NULL; JS_DefineProperty(cx, parent, name, OBJECT_TO_JSVAL(obj), NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY); - return(obj); + return obj; } JSObject* js_CreateSocketObjectFromSet(JSContext* cx, JSObject* parent, char *name, struct xpms_set *set) @@ -3590,7 +3590,7 @@ JSObject* js_CreateSocketObjectFromSet(JSContext* cx, JSObject* parent, char *na , JSPROP_ENUMERATE | JSPROP_READONLY); if (obj == NULL) - return(NULL); + return NULL; if (set->sock_count < 1) return NULL; @@ -3599,10 +3599,10 @@ JSObject* js_CreateSocketObjectFromSet(JSContext* cx, JSObject* parent, char *na getsockopt(set->socks[0].sock, SOL_SOCKET, SO_TYPE, (void*)&type, &len); if (!js_DefineSocketOptionsArray(cx, obj, type)) - return(NULL); + return NULL; if ((p = (js_socket_private_t*)malloc(sizeof(js_socket_private_t))) == NULL) - return(NULL); + return NULL; memset(p, 0, sizeof(js_socket_private_t)); p->set = set; @@ -3615,12 +3615,12 @@ JSObject* js_CreateSocketObjectFromSet(JSContext* cx, JSObject* parent, char *na if (!JS_SetPrivate(cx, obj, p)) { dbprintf(TRUE, p, "JS_SetPrivate failed"); - return(NULL); + return NULL; } dbprintf(false, p, "object created"); - return(obj); + return obj; } #endif /* JAVSCRIPT */ diff --git a/src/sbbs3/js_sprintf.c b/src/sbbs3/js_sprintf.c index 058e0e1b1fd160df111be8fb7488bea14a538850..dff931d69d2463a5e573c47cfaf21e1cb567d2d1 100644 --- a/src/sbbs3/js_sprintf.c +++ b/src/sbbs3/js_sprintf.c @@ -35,7 +35,7 @@ js_sprintf(JSContext *cx, uint argn, uintN argc, jsval *argv) if (JS_IsExceptionPending(cx)) JS_ClearPendingException(cx); if (op == NULL) - return(NULL); + return NULL; p = op; p = xp_asprintf_start(p); diff --git a/src/sbbs3/js_system.c b/src/sbbs3/js_system.c index 4e2ab119f0140e087f8ab1fbbb26fe09d7fb1904..b5b683145f2b3a47b4aa206f2b2ea505e98097fd 100644 --- a/src/sbbs3/js_system.c +++ b/src/sbbs3/js_system.c @@ -365,11 +365,11 @@ static JSBool js_system_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) if (p != NULL) { /* string property */ if ((js_str = JS_NewStringCopyZ(cx, p)) == NULL) - return(JS_FALSE); + return JS_FALSE; *vp = STRING_TO_JSVAL(js_str); } - return(JS_TRUE); + return JS_TRUE; } static JSBool js_system_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp) @@ -720,7 +720,7 @@ static JSBool js_sysstats_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) break; } - return(TRUE); + return TRUE; } #define SYSSTAT_FLAGS JSPROP_ENUMERATE | JSPROP_READONLY @@ -795,7 +795,7 @@ static JSBool js_sysstats_resolve(JSContext *cx, JSObject *obj, jsid id) static JSBool js_sysstats_enumerate(JSContext *cx, JSObject *obj) { - return(js_sysstats_resolve(cx, obj, JSID_VOID)); + return js_sysstats_resolve(cx, obj, JSID_VOID); } static JSClass js_sysstats_class = { @@ -829,13 +829,13 @@ js_alias(JSContext *cx, uintN argc, jsval *arglist) if ((js_str = JS_ValueToString(cx, argv[0])) == NULL) { JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(0)); - return(JS_TRUE); + return JS_TRUE; } JSSTRING_TO_ASTRING(cx, js_str, p, 128, NULL); if (p == NULL) { JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(0)); - return(JS_TRUE); + return JS_TRUE; } rc = JS_SUSPENDREQUEST(cx); @@ -843,10 +843,10 @@ js_alias(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); if ((js_str = JS_NewStringCopyZ(cx, p)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -873,10 +873,10 @@ js_username(JSContext *cx, uintN argc, jsval *arglist) cstr = username(sys->cfg, val, buf); JS_RESUMEREQUEST(cx, rc); if ((js_str = JS_NewStringCopyZ(cx, cstr)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -897,7 +897,7 @@ js_matchuser(JSContext *cx, uintN argc, jsval *arglist) if ((js_str = JS_ValueToString(cx, argv[0])) == NULL) { JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(0)); - return(JS_TRUE); + return JS_TRUE; } if (argc > 1) @@ -906,13 +906,13 @@ js_matchuser(JSContext *cx, uintN argc, jsval *arglist) JSSTRING_TO_ASTRING(cx, js_str, p, (LEN_ALIAS > LEN_NAME) ? LEN_ALIAS + 2:LEN_NAME + 2, NULL); if (p == NULL) { JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(0)); - return(JS_TRUE); + return JS_TRUE; } rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(matchuser(sys->cfg, p, sysop_alias))); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -942,12 +942,12 @@ js_matchuserdata(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); if (len < 1) { JS_ReportError(cx, "Invalid user field: %d", field); - return(JS_FALSE); + return JS_FALSE; } if ((js_str = JS_ValueToString(cx, argv[1])) == NULL) { JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(0)); - return(JS_TRUE); + return JS_TRUE; } if (JSVAL_IS_BOOLEAN(argv[argnum])) @@ -960,13 +960,13 @@ js_matchuserdata(JSContext *cx, uintN argc, jsval *arglist) JSSTRING_TO_ASTRING(cx, js_str, p, 128, NULL); if (p == NULL) { JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(0)); - return(JS_TRUE); + return JS_TRUE; } rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(finduserstr(sys->cfg, usernumber, field, p, match_del, match_next, NULL, NULL))); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -986,19 +986,19 @@ js_find_login_id(JSContext *cx, uintN argc, jsval *arglist) if ((js_str = JS_ValueToString(cx, argv[0])) == NULL) { JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(0)); - return(JS_TRUE); + return JS_TRUE; } JSSTRING_TO_ASTRING(cx, js_str, p, (LEN_ALIAS > LEN_NAME) ? LEN_ALIAS + 2:LEN_NAME + 2, NULL); if (p == NULL) { JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(0)); - return(JS_TRUE); + return JS_TRUE; } rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(find_login_id(sys->cfg, p))); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } #endif @@ -1023,19 +1023,19 @@ js_trashcan(JSContext *cx, uintN argc, jsval *arglist) if ((js_can = JS_ValueToString(cx, argv[0])) == NULL) { JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(JS_FALSE)); - return(JS_TRUE); + return JS_TRUE; } if ((js_str = JS_ValueToString(cx, argv[1])) == NULL) { JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(JS_FALSE)); - return(JS_TRUE); + return JS_TRUE; } JSSTRING_TO_MSTRING(cx, js_can, can, NULL); HANDLE_PENDING(cx, can); if (can == NULL) { JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(JS_FALSE)); - return(JS_TRUE); + return JS_TRUE; } JSSTRING_TO_MSTRING(cx, js_str, str, NULL); @@ -1047,7 +1047,7 @@ js_trashcan(JSContext *cx, uintN argc, jsval *arglist) if (str == NULL) { free(can); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(JS_FALSE)); - return(JS_TRUE); + return JS_TRUE; } rc = JS_SUSPENDREQUEST(cx); @@ -1056,7 +1056,7 @@ js_trashcan(JSContext *cx, uintN argc, jsval *arglist) free(str); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(ret)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1074,10 +1074,10 @@ js_findstr(JSContext *cx, uintN argc, jsval *arglist) if (JSVAL_IS_OBJECT(argv[0]) && !JSVAL_IS_NULL(argv[0])) { JSObject* array = JSVAL_TO_OBJECT(argv[0]); if (array == NULL || !JS_IsArrayObject(cx, array)) - return(JS_TRUE); + return JS_TRUE; jsuint count; if (!JS_GetArrayLength(cx, array, &count)) - return(JS_TRUE); + return JS_TRUE; char* tmp = NULL; size_t tmplen = 0; for (jsuint i = 0; i < count; i++) { @@ -1095,19 +1095,19 @@ js_findstr(JSContext *cx, uintN argc, jsval *arglist) else { if ((js_fname = JS_ValueToString(cx, argv[0])) == NULL) { JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(JS_FALSE)); - return(JS_TRUE); + return JS_TRUE; } JSSTRING_TO_MSTRING(cx, js_fname, fname, NULL); HANDLE_PENDING(cx, fname); if (fname == NULL) { JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(JS_FALSE)); - return(JS_TRUE); + return JS_TRUE; } } if ((js_str = JS_ValueToString(cx, argv[1])) == NULL) { JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(JS_FALSE)); free(fname); - return(JS_TRUE); + return JS_TRUE; } JSSTRING_TO_MSTRING(cx, js_str, str, NULL); if (JS_IsExceptionPending(cx)) { @@ -1118,7 +1118,7 @@ js_findstr(JSContext *cx, uintN argc, jsval *arglist) if (str == NULL) { free(fname); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(JS_FALSE)); - return(JS_TRUE); + return JS_TRUE; } rc = JS_SUSPENDREQUEST(cx); @@ -1131,7 +1131,7 @@ js_findstr(JSContext *cx, uintN argc, jsval *arglist) strListFree(&list); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(ret)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1162,10 +1162,10 @@ js_zonestr(JSContext *cx, uintN argc, jsval *arglist) cstr = smb_zonestr(zone, NULL); JS_RESUMEREQUEST(cx, rc); if ((js_str = JS_NewStringCopyZ(cx, cstr)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } /* Returns a ctime()-like string in the system-preferred time format */ @@ -1194,10 +1194,10 @@ js_timestr(JSContext *cx, uintN argc, jsval *arglist) timestr(sys->cfg, (time32_t)ti, str); JS_RESUMEREQUEST(cx, rc); if ((js_str = JS_NewStringCopyZ(cx, str)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } /* Convert between string and time_t representations of date */ @@ -1226,15 +1226,15 @@ js_datestr(JSContext *cx, uintN argc, jsval *arglist) if (JSVAL_IS_STRING(argv[0])) { /* convert from string to time_t? */ JSVALUE_TO_ASTRING(cx, argv[0], p, 10, NULL); JS_SET_RVAL(cx, arglist, DOUBLE_TO_JSVAL((double)dstrtounix(fmt, p))); - return(JS_TRUE); + return JS_TRUE; } JS_ValueToECMAUint32(cx, argv[0], (uint32_t*)&t); } if ((js_str = JS_NewStringCopyZ(cx, datestr(sys->cfg, t, str))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1257,10 +1257,10 @@ js_secondstr(JSContext *cx, uintN argc, jsval *arglist) JS_ValueToECMAUint32(cx, argv[0], &t); sectostr(t, str); if ((js_str = JS_NewStringCopyZ(cx, str)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } #ifndef JSDOOR @@ -1327,7 +1327,7 @@ js_spamlog(JSContext *cx, uintN argc, jsval *arglist) free(from); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(ret)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1391,7 +1391,7 @@ js_hacklog(JSContext *cx, uintN argc, jsval *arglist) free(host); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(ret)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1457,7 +1457,7 @@ js_filter_ip(JSContext *cx, uintN argc, jsval *arglist) free(fname); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(ret)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1540,15 +1540,15 @@ js_get_node_message(JSContext *cx, uintN argc, jsval *arglist) buf = getnmsg(sys->cfg, node_num); JS_RESUMEREQUEST(cx, rc); if (buf == NULL) - return(JS_TRUE); + return JS_TRUE; js_str = JS_NewStringCopyZ(cx, buf); free(buf); if (js_str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1573,12 +1573,12 @@ js_put_node_message(JSContext *cx, uintN argc, jsval *arglist) node = 1; if ((js_msg = JS_ValueToString(cx, argv[1])) == NULL) - return(JS_FALSE); + return JS_FALSE; JSSTRING_TO_MSTRING(cx, js_msg, msg, NULL); HANDLE_PENDING(cx, msg); if (msg == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); ret = putnmsg(sys->cfg, node, msg) == 0; @@ -1586,7 +1586,7 @@ js_put_node_message(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(ret)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1613,15 +1613,15 @@ js_get_telegram(JSContext *cx, uintN argc, jsval *arglist) buf = getsmsg(sys->cfg, usernumber); JS_RESUMEREQUEST(cx, rc); if (buf == NULL) - return(JS_TRUE); + return JS_TRUE; js_str = JS_NewStringCopyZ(cx, buf); free(buf); if (js_str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1646,12 +1646,12 @@ js_put_telegram(JSContext *cx, uintN argc, jsval *arglist) usernumber = 1; if ((js_msg = JS_ValueToString(cx, argv[1])) == NULL) - return(JS_FALSE); + return JS_FALSE; JSSTRING_TO_MSTRING(cx, js_msg, msg, NULL); HANDLE_PENDING(cx, msg); if (msg == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); ret = putsmsg(sys->cfg, usernumber, msg) == 0; @@ -1659,7 +1659,7 @@ js_put_telegram(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(ret)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1789,7 +1789,7 @@ js_new_user(JSContext *cx, uintN argc, jsval *arglist) } else JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(i)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1806,7 +1806,7 @@ js_del_user(JSContext *cx, uintN argc, jsval *arglist) return JS_FALSE; if (!JS_ValueToInt32(cx, argv[0], &n)) - return(JS_FALSE); + return JS_FALSE; user.number = n; rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, JSVAL_FALSE); /* fail, by default */ @@ -1816,7 +1816,7 @@ js_del_user(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_TRUE); /* success */ JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } #endif @@ -1845,7 +1845,7 @@ js_sys_exec(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(ret)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1871,7 +1871,7 @@ js_popen(JSContext *cx, uintN argc, jsval *arglist) return JS_FALSE; } if ((array = JS_NewArrayObject(cx, 0, NULL)) == NULL) - return(JS_FALSE); + return JS_FALSE; JSVALUE_TO_MSTRING(cx, argv[0], cmd, NULL); HANDLE_PENDING(cx, cmd); @@ -1883,7 +1883,7 @@ js_popen(JSContext *cx, uintN argc, jsval *arglist) if ((fp = popen(cmd, "r")) == NULL) { free(cmd); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } free(cmd); while (!feof(fp)) { @@ -1906,7 +1906,7 @@ js_popen(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, OBJECT_TO_JSVAL(array)); - return(JS_TRUE); + return JS_TRUE; } #ifndef JSDOOR @@ -1926,7 +1926,7 @@ js_chksyspass(JSContext *cx, uintN argc, jsval *arglist) JSVALUE_TO_ASTRING(cx, argv[0], pass, LEN_PASS + 2, NULL); // +2 is so overly long passwords fail. JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(stricmp(pass, sys->cfg->sys_pass) == 0)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1949,7 +1949,7 @@ js_chkname(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(check_name(sys->cfg, str))); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2084,7 +2084,7 @@ js_chkpid(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(check_pid(pid))); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2109,7 +2109,7 @@ js_killpid(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(terminate_pid(pid))); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2333,10 +2333,10 @@ static JSBool js_node_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) tiny = JSVAL_TO_INT(idval); if ((node_list = JS_GetParent(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; if ((sysobj = JS_GetParent(cx, node_list)) == NULL) - return(JS_FALSE); + return JS_FALSE; js_system_private_t* sys; if ((sys = (js_system_private_t*)js_GetClassPrivate(cx, sysobj, &js_system_class)) == NULL) @@ -2348,7 +2348,7 @@ static JSBool js_node_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) memset(&node, 0, sizeof(node)); if (getnodedat(sys->cfg, node_num, &node, /* lockit: */ FALSE, &sys->nodefile) != 0) { JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } JS_RESUMEREQUEST(cx, rc); sys->nodegets++; @@ -2359,7 +2359,7 @@ static JSBool js_node_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) break; case NODE_PROP_VSTATUS: if ((js_str = JS_NewStringCopyZ(cx, node_vstatus(sys->cfg, &node, tmp, sizeof tmp))) == NULL) - return(JS_FALSE); + return JS_FALSE; *vp = STRING_TO_JSVAL(js_str); break; case NODE_PROP_ERRORS: @@ -2370,7 +2370,7 @@ static JSBool js_node_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) break; case NODE_PROP_ACTIVITY: if ((js_str = JS_NewStringCopyZ(cx, node_activity(sys->cfg, &node, tmp, sizeof tmp, node_num))) == NULL) - return(JS_FALSE); + return JS_FALSE; *vp = STRING_TO_JSVAL(js_str); break; case NODE_PROP_USERON: @@ -2390,11 +2390,11 @@ static JSBool js_node_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) break; case NODE_PROP_DIR: if ((js_str = JS_NewStringCopyZ(cx, sys->cfg->node_path[node_num - 1])) == NULL) - return(JS_FALSE); + return JS_FALSE; *vp = STRING_TO_JSVAL(js_str); break; } - return(JS_TRUE); + return JS_TRUE; } static JSBool js_node_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp) @@ -2409,10 +2409,10 @@ static JSBool js_node_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsrefcount rc; if ((node_list = JS_GetParent(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; if ((sysobj = JS_GetParent(cx, node_list)) == NULL) - return(JS_FALSE); + return JS_FALSE; js_system_private_t* sys; if ((sys = (js_system_private_t*)js_GetClassPrivate(cx, sysobj, &js_system_class)) == NULL) @@ -2424,7 +2424,7 @@ static JSBool js_node_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, memset(&node, 0, sizeof(node)); if (getnodedat(sys->cfg, node_num, &node, /* lockit: */ TRUE, &sys->nodefile)) { JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } JS_RESUMEREQUEST(cx, rc); @@ -2465,7 +2465,7 @@ static JSBool js_node_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, mqtt_putnodedat(sys->mqtt, node_num, &node); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static jsSyncPropertySpec js_node_properties[] = { @@ -2504,12 +2504,12 @@ static JSBool js_node_resolve(JSContext *cx, JSObject *obj, jsid id) ret = js_SyncResolve(cx, obj, name, js_node_properties, NULL, NULL, 0); if (name) free(name); - return(ret); + return ret; } static JSBool js_node_enumerate(JSContext *cx, JSObject *obj) { - return(js_node_resolve(cx, obj, JSID_VOID)); + return js_node_resolve(cx, obj, JSID_VOID); } static JSClass js_node_class = { @@ -2531,7 +2531,7 @@ static JSClass js_node_class = { JS_DefineProperty(cx, obj, (PropName), val, NULL, NULL, JSPROP_ENUMERATE); \ if (name) { \ free(name); \ - return(JS_TRUE); \ + return JS_TRUE; \ } \ } @@ -2541,12 +2541,12 @@ static JSClass js_node_class = { JS_DefineProperty(cx, obj, PropName, STRING_TO_JSVAL(js_str), NULL, NULL, JSPROP_ENUMERATE); \ if (name) { \ free(name); \ - return(JS_TRUE); \ + return JS_TRUE; \ } \ } \ else if (name) { \ free(name); \ - return(JS_TRUE); \ + return JS_TRUE; \ } \ } @@ -2557,12 +2557,12 @@ static JSClass js_node_class = { JS_DefineProperty(cx, obj, PropName, STRING_TO_JSVAL(js_str), NULL, NULL, JSPROP_ENUMERATE); \ if (name) { \ free(name); \ - return(JS_TRUE); \ + return JS_TRUE; \ } \ } \ else if (name) { \ free(name); \ - return(JS_TRUE); \ + return JS_TRUE; \ } \ } @@ -2573,12 +2573,12 @@ static JSClass js_node_class = { JS_DefineProperty(cx, obj, PropName, STRING_TO_JSVAL(js_str), NULL, NULL, JSPROP_ENUMERATE); \ if (name) { \ free(name); \ - return(JS_TRUE); \ + return JS_TRUE; \ } \ } \ else if (name) { \ free(name); \ - return(JS_TRUE); \ + return JS_TRUE; \ } \ } @@ -2621,9 +2621,9 @@ static JSBool js_system_resolve(JSContext *cx, JSObject *obj, jsid id) if ((js_str = JS_NewStringCopyZ(cx, str)) != NULL) { val = STRING_TO_JSVAL(js_str); JS_SetProperty(cx, obj, "full_version", &val); - if (name) return(JS_TRUE); + if (name) return JS_TRUE; } - else if (name) return(JS_TRUE); + else if (name) return JS_TRUE; } LAZY_STRING("version_notice", VERSION_NOTICE); @@ -2657,20 +2657,20 @@ static JSBool js_system_resolve(JSContext *cx, JSObject *obj, jsid id) return JS_FALSE; if ((newobj = JS_NewArrayObject(cx, 0, NULL)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (!JS_SetParent(cx, newobj, obj)) - return(JS_FALSE); + return JS_FALSE; if (!JS_DefineProperty(cx, obj, "fido_addr_list", OBJECT_TO_JSVAL(newobj) , NULL, NULL, JSPROP_ENUMERATE)) - return(JS_FALSE); + return JS_FALSE; for (i = 0; i < sys->cfg->total_faddrs; i++) { val = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, smb_faddrtoa(&sys->cfg->faddr[i], str))); JS_SetElement(cx, newobj, i, &val); } - if (name) return(JS_TRUE); + if (name) return JS_TRUE; } if (name == NULL || strcmp(name, "stats") == 0) { @@ -2684,7 +2684,7 @@ static JSBool js_system_resolve(JSContext *cx, JSObject *obj, jsid id) , JSPROP_ENUMERATE | JSPROP_READONLY); if (newobj == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SetPrivate(cx, newobj, sys); #ifdef BUILD_JSDOCS @@ -2703,26 +2703,26 @@ static JSBool js_system_resolve(JSContext *cx, JSObject *obj, jsid id) return JS_FALSE; if ((newobj = JS_NewArrayObject(cx, 0, NULL)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (!JS_SetParent(cx, newobj, obj)) - return(JS_FALSE); + return JS_FALSE; if (!JS_DefineProperty(cx, obj, "node_list", OBJECT_TO_JSVAL(newobj) , NULL, NULL, JSPROP_ENUMERATE)) - return(JS_FALSE); + return JS_FALSE; for (i = 0; i < sys->cfg->sys_nodes && i < sys->cfg->sys_lastnode; i++) { nodeobj = JS_NewObject(cx, &js_node_class, NULL, newobj); if (nodeobj == NULL) - return(JS_FALSE); + return JS_FALSE; /* Store node number */ /* We have to shift it to make it look like a pointer to JS. :-( */ if (!JS_SetPrivate(cx, nodeobj, (char*)(((uintptr_t)i + 1) << 1))) - return(JS_FALSE); + return JS_FALSE; #ifdef BUILD_JSDOCS if (i == 0) { @@ -2733,9 +2733,9 @@ static JSBool js_system_resolve(JSContext *cx, JSObject *obj, jsid id) val = OBJECT_TO_JSVAL(nodeobj); if (!JS_SetElement(cx, newobj, i, &val)) - return(JS_FALSE); + return JS_FALSE; } - if (name) return(JS_TRUE); + if (name) return JS_TRUE; } #endif @@ -2746,7 +2746,7 @@ static JSBool js_system_resolve(JSContext *cx, JSObject *obj, jsid id) static JSBool js_system_enumerate(JSContext *cx, JSObject *obj) { - return(js_system_resolve(cx, obj, JSID_VOID)); + return js_system_resolve(cx, obj, JSID_VOID); } static void js_system_finalize(JSContext *cx, JSObject *obj) @@ -2802,7 +2802,7 @@ JSObject* js_CreateSystemObject(JSContext* cx, JSObject* parent sysobj = JS_DefineObject(cx, parent, "system", &js_system_class, NULL , JSPROP_ENUMERATE | JSPROP_READONLY); if (sysobj == NULL) - return(NULL); + return NULL; js_system_private_t* sys; if ((sys = calloc(sizeof(*sys), 1)) == NULL) @@ -2813,29 +2813,29 @@ JSObject* js_CreateSystemObject(JSContext* cx, JSObject* parent sys->nodefile = -1; if (!JS_SetPrivate(cx, sysobj, sys)) - return(NULL); + return NULL; /****************************/ /* static string properties */ #ifndef JSDOOR if ((js_str = JS_NewStringCopyZ(cx, host_name)) == NULL) - return(NULL); + return NULL; val = STRING_TO_JSVAL(js_str); if (!JS_SetProperty(cx, sysobj, "host_name", &val)) - return(NULL); + return NULL; #endif if ((js_str = JS_NewStringCopyZ(cx, socklib_version(str, sizeof str, socklib_desc))) == NULL) - return(NULL); + return NULL; val = STRING_TO_JSVAL(js_str); if (!JS_SetProperty(cx, sysobj, "socket_lib", &val)) - return(NULL); + return NULL; /***********************/ val = DOUBLE_TO_JSVAL((double)uptime); if (!JS_SetProperty(cx, sysobj, "uptime", &val)) - return(NULL); + return NULL; js_CreateTextProperties(cx, sysobj); @@ -2844,7 +2844,7 @@ JSObject* js_CreateSystemObject(JSContext* cx, JSObject* parent js_CreateArrayOfStrings(cx, sysobj, "_property_desc_list", sys_prop_desc, JSPROP_READONLY); #endif - return(sysobj); + return sysobj; } #endif /* JAVSCRIPT */ diff --git a/src/sbbs3/js_uifc.c b/src/sbbs3/js_uifc.c index 6962a67c21c83c714e332f190c1773772824dde8..a8f9ccfe93aa0acd60e42db8f2e9030bb2ddcef8 100644 --- a/src/sbbs3/js_uifc.c +++ b/src/sbbs3/js_uifc.c @@ -59,7 +59,7 @@ static JSBool js_list_ctx_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) jsint tiny; struct list_ctx_private* p; if ((p = (struct list_ctx_private*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_IdToValue(cx, id, &idval); tiny = JSVAL_TO_INT(idval); switch (tiny) { @@ -88,7 +88,7 @@ static JSBool js_list_ctx_set(JSContext *cx, JSObject *obj, jsid id, JSBool stri int32 i = 0; struct list_ctx_private* p; if ((p = (struct list_ctx_private*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_IdToValue(cx, id, &idval); tiny = JSVAL_TO_INT(idval); if (!JS_ValueToInt32(cx, *vp, &i)) @@ -118,7 +118,7 @@ static JSBool js_showbuf_ctx_get(JSContext *cx, JSObject *obj, jsid id, jsval *v jsint tiny; struct showbuf_ctx_private* p; if ((p = (struct showbuf_ctx_private*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_IdToValue(cx, id, &idval); tiny = JSVAL_TO_INT(idval); switch (tiny) { @@ -150,7 +150,7 @@ static JSBool js_showbuf_ctx_set(JSContext *cx, JSObject *obj, jsid id, JSBool s int32 i = 0; struct showbuf_ctx_private* p; if ((p = (struct showbuf_ctx_private*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_IdToValue(cx, id, &idval); tiny = JSVAL_TO_INT(idval); if (!JS_ValueToInt32(cx, *vp, &i)) @@ -183,7 +183,7 @@ static JSBool js_getstrxy_ctx_get(JSContext *cx, JSObject *obj, jsid id, jsval * jsint tiny; struct getstrxy_ctx_private* p; if ((p = (struct getstrxy_ctx_private*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_IdToValue(cx, id, &idval); tiny = JSVAL_TO_INT(idval); switch (tiny) { @@ -200,7 +200,7 @@ static JSBool js_getstrxy_ctx_set(JSContext *cx, JSObject *obj, jsid id, JSBool int32 i = 0; struct getstrxy_ctx_private* p; if ((p = (struct getstrxy_ctx_private*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_IdToValue(cx, id, &idval); tiny = JSVAL_TO_INT(idval); if (!JS_ValueToInt32(cx, *vp, &i)) @@ -429,7 +429,7 @@ static JSBool js_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) jsint tiny; uifcapi_t* uifc; if ((uifc = (uifcapi_t*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_IdToValue(cx, id, &idval); tiny = JSVAL_TO_INT(idval); switch (tiny) { @@ -476,7 +476,7 @@ static JSBool js_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) *vp = INT_TO_JSVAL(uifc->list_height); break; } - return(JS_TRUE); + return JS_TRUE; } static JSBool js_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp) { @@ -485,7 +485,7 @@ static JSBool js_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval int32 i = 0; uifcapi_t* uifc; if ((uifc = (uifcapi_t*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_IdToValue(cx, id, &idval); tiny = JSVAL_TO_INT(idval); if (tiny == PROP_CHANGES) @@ -537,7 +537,7 @@ static JSBool js_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval uifc->lbclr = (char)i; break; } - return(JS_TRUE); + return JS_TRUE; } static jsSyncPropertySpec js_properties[] = { /* name, tinyid, flags, ver */ @@ -581,12 +581,12 @@ static uifcapi_t* get_uifc(JSContext *cx, JSObject *obj) { uifcapi_t* uifc; if ((uifc = (uifcapi_t*)JS_GetPrivate(cx, obj)) == NULL) - return(NULL); + return NULL; if (!uifc->initialized) { JS_ReportError(cx, "UIFC not initialized"); - return(NULL); + return NULL; } - return(uifc); + return uifc; } /* Methods */ static JSBool @@ -602,12 +602,12 @@ js_uifc_init(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; JS_SET_RVAL(cx, arglist, JSVAL_FALSE); if ((uifc = (uifcapi_t*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc) { JSVALUE_TO_MSTRING(cx, argv[0], title, NULL); HANDLE_PENDING(cx, title); if (title == NULL) - return(JS_TRUE); + return JS_TRUE; } if (argc > 1) { JSVALUE_TO_ASTRING(cx, argv[1], mode, 16, NULL); @@ -638,20 +638,20 @@ js_uifc_init(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); if (title != title_def) free(title); - return(JS_TRUE); + return JS_TRUE; } } else { if (initciolib(ciolib_mode)) { JS_RESUMEREQUEST(cx, rc); if (title != title_def) free(title); - return(JS_TRUE); + return JS_TRUE; } if (uifcini32(uifc)) { JS_RESUMEREQUEST(cx, rc); if (title != title_def) free(title); - return(JS_TRUE); + return JS_TRUE; } } JS_SET_RVAL(cx, arglist, JSVAL_TRUE); @@ -659,7 +659,7 @@ js_uifc_init(JSContext *cx, uintN argc, jsval *arglist) if (title != title_def) free(title); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool js_uifc_bail(JSContext *cx, uintN argc, jsval *arglist) @@ -669,11 +669,11 @@ js_uifc_bail(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((uifc = get_uifc(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); uifc->bail(); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool js_uifc_showhelp(JSContext *cx, uintN argc, jsval *arglist) @@ -683,11 +683,11 @@ js_uifc_showhelp(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((uifc = get_uifc(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); uifc->showhelp(); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool js_uifc_msg(JSContext *cx, uintN argc, jsval *arglist) @@ -699,16 +699,16 @@ js_uifc_msg(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((uifc = get_uifc(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; JSVALUE_TO_MSTRING(cx, argv[0], str, NULL); HANDLE_PENDING(cx, str); if (str == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); uifc->msg(str); free(str); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool js_uifc_pop(JSContext *cx, uintN argc, jsval *arglist) @@ -720,7 +720,7 @@ js_uifc_pop(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((uifc = get_uifc(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc) { JSVALUE_TO_MSTRING(cx, argv[0], str, NULL); HANDLE_PENDING(cx, str); @@ -730,7 +730,7 @@ js_uifc_pop(JSContext *cx, uintN argc, jsval *arglist) if (str) free(str); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool js_uifc_input(JSContext *cx, uintN argc, jsval *arglist) @@ -750,22 +750,22 @@ js_uifc_input(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((uifc = get_uifc(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argn < argc && JSVAL_IS_NUMBER(argv[argn]) && !JS_ValueToInt32(cx, argv[argn++], &mode)) - return(JS_FALSE); + return JS_FALSE; if (argn < argc && JSVAL_IS_NUMBER(argv[argn]) && !JS_ValueToInt32(cx, argv[argn++], &left)) - return(JS_FALSE); + return JS_FALSE; if (argn < argc && JSVAL_IS_NUMBER(argv[argn]) && !JS_ValueToInt32(cx, argv[argn++], &top)) - return(JS_FALSE); + return JS_FALSE; if (argn < argc && JSVAL_IS_STRING(argv[argn])) { JSVALUE_TO_MSTRING(cx, argv[argn], prompt, NULL); argn++; HANDLE_PENDING(cx, prompt); if (prompt == NULL) - return(JS_TRUE); + return JS_TRUE; } if (argn < argc && JSVAL_IS_STRING(argv[argn])) { JSVALUE_TO_MSTRING(cx, argv[argn], org, NULL); @@ -778,7 +778,7 @@ js_uifc_input(JSContext *cx, uintN argc, jsval *arglist) if (org == NULL) { if (prompt) free(prompt); - return(JS_TRUE); + return JS_TRUE; } } if (argn < argc && JSVAL_IS_NUMBER(argv[argn]) @@ -787,7 +787,7 @@ js_uifc_input(JSContext *cx, uintN argc, jsval *arglist) free(prompt); if (org) free(org); - return(JS_FALSE); + return JS_FALSE; } if (argn < argc && JSVAL_IS_NUMBER(argv[argn]) && !JS_ValueToInt32(cx, argv[argn++], &kmode)) { @@ -795,7 +795,7 @@ js_uifc_input(JSContext *cx, uintN argc, jsval *arglist) free(prompt); if (org) free(org); - return(JS_FALSE); + return JS_FALSE; } if (!maxlen) maxlen = 40; @@ -804,7 +804,7 @@ js_uifc_input(JSContext *cx, uintN argc, jsval *arglist) free(prompt); if (org) free(org); - return(JS_FALSE); + return JS_FALSE; } memset(str, 0, maxlen + 1); if (org) { @@ -818,7 +818,7 @@ js_uifc_input(JSContext *cx, uintN argc, jsval *arglist) free(prompt); if (str) free(str); - return(JS_TRUE); + return JS_TRUE; } if (prompt) free(prompt); @@ -826,7 +826,7 @@ js_uifc_input(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(JS_NewStringCopyZ(cx, str))); if (str) free(str); - return(JS_TRUE); + return JS_TRUE; } static JSBool js_uifc_list(JSContext *cx, uintN argc, jsval *arglist) @@ -855,10 +855,10 @@ js_uifc_list(JSContext *cx, uintN argc, jsval *arglist) struct list_ctx_private *p; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((uifc = get_uifc(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argn < argc && JSVAL_IS_NUMBER(argv[argn]) && !JS_ValueToInt32(cx, argv[argn++], &mode)) - return(JS_FALSE); + return JS_FALSE; for (; argn < argc; argn++) { if (JSVAL_IS_STRING(argv[argn])) { free(title); @@ -870,12 +870,12 @@ js_uifc_list(JSContext *cx, uintN argc, jsval *arglist) continue; if ((objarg = JSVAL_TO_OBJECT(argv[argn])) == NULL) { free(title); - return(JS_FALSE); + return JS_FALSE; } if (JS_IsArrayObject(cx, objarg)) { if (!JS_GetArrayLength(cx, objarg, &numopts)) { free(title); - return(JS_TRUE); + return JS_TRUE; } if (opts == NULL) opts = strListInit(); @@ -912,7 +912,7 @@ js_uifc_list(JSContext *cx, uintN argc, jsval *arglist) strListFree(&opts); if (title != NULL) free(title); - return(JS_TRUE); + return JS_TRUE; } static JSBool js_uifc_scrn(JSContext *cx, uintN argc, jsval *arglist) @@ -924,16 +924,16 @@ js_uifc_scrn(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((uifc = get_uifc(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; JSVALUE_TO_MSTRING(cx, argv[0], str, NULL); HANDLE_PENDING(cx, str); if (str == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); uifc->scrn(str); free(str); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool js_uifc_timedisplay(JSContext *cx, uintN argc, jsval *arglist) @@ -945,13 +945,13 @@ js_uifc_timedisplay(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((uifc = get_uifc(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc > 0) force = JSVAL_TO_BOOLEAN(argv[0]); rc = JS_SUSPENDREQUEST(cx); uifc->timedisplay(force); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool js_uifc_bottomline(JSContext *cx, uintN argc, jsval *arglist) @@ -963,16 +963,16 @@ js_uifc_bottomline(JSContext *cx, uintN argc, jsval *arglist) jsrefcount rc; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((uifc = get_uifc(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc == 0) { JS_ReportError(cx, "No mode specified"); - return(JS_FALSE); + return JS_FALSE; } mode = JSVAL_TO_INT(argv[0]); rc = JS_SUSPENDREQUEST(cx); uifc->bottomline(mode); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool js_uifc_getstrxy(JSContext *cx, uintN argc, jsval *arglist) @@ -994,7 +994,7 @@ js_uifc_getstrxy(JSContext *cx, uintN argc, jsval *arglist) struct getstrxy_ctx_private *p; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((uifc = get_uifc(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc < 5) { JS_ReportError(cx, "getstrxy requires at least five arguments"); return JS_FALSE; @@ -1017,12 +1017,12 @@ js_uifc_getstrxy(JSContext *cx, uintN argc, jsval *arglist) return JS_FALSE; } if (org == NULL) - return(JS_TRUE); + return JS_TRUE; } if (argn < argc && JSVAL_IS_OBJECT(argv[argn])) { if ((objarg = JSVAL_TO_OBJECT(argv[argn])) == NULL) { free(org); - return(JS_FALSE); + return JS_FALSE; } if (JS_GetClass(cx, objarg) == &js_uifc_getstrxy_ctx_class) { p = JS_GetPrivate(cx, objarg); @@ -1038,7 +1038,7 @@ js_uifc_getstrxy(JSContext *cx, uintN argc, jsval *arglist) } if ((str = (char*)malloc(maxlen + 1)) == NULL) { free(org); - return(JS_FALSE); + return JS_FALSE; } memset(str, 0, maxlen + 1); if (org) { @@ -1050,13 +1050,13 @@ js_uifc_getstrxy(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); free(str); JS_SET_RVAL(cx, arglist, JSVAL_NULL); - return(JS_TRUE); + return JS_TRUE; } JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(JS_NewStringCopyZ(cx, str))); if (str) free(str); - return(JS_TRUE); + return JS_TRUE; } static JSBool js_uifc_showbuf(JSContext *cx, uintN argc, jsval *arglist) @@ -1079,7 +1079,7 @@ js_uifc_showbuf(JSContext *cx, uintN argc, jsval *arglist) struct showbuf_ctx_private *p; JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((uifc = get_uifc(cx, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc < 3) { JS_ReportError(cx, "showbuf requires at least three arguments"); return JS_FALSE; @@ -1092,7 +1092,7 @@ js_uifc_showbuf(JSContext *cx, uintN argc, jsval *arglist) return JS_FALSE; } if (title == NULL) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, argv[argn++], str, NULL); if (JS_IsExceptionPending(cx)) { free(title); @@ -1100,13 +1100,13 @@ js_uifc_showbuf(JSContext *cx, uintN argc, jsval *arglist) } if (str == NULL) { free(title); - return(JS_TRUE); + return JS_TRUE; } if (argn < argc && JSVAL_IS_OBJECT(argv[argn])) { if ((objarg = JSVAL_TO_OBJECT(argv[argn])) == NULL) { free(title); free(str); - return(JS_FALSE); + return JS_FALSE; } if (JS_GetClass(cx, objarg) == &js_uifc_showbuf_ctx_class) { p = JS_GetPrivate(cx, objarg); @@ -1125,7 +1125,7 @@ js_uifc_showbuf(JSContext *cx, uintN argc, jsval *arglist) JS_RESUMEREQUEST(cx, rc); free(title); free(str); - return(JS_TRUE); + return JS_TRUE; } /* Destructor */ static void @@ -1244,7 +1244,7 @@ static JSBool js_uifc_resolve(JSContext *cx, JSObject *obj, jsid id) } static JSBool js_uifc_enumerate(JSContext *cx, JSObject *obj) { - return(js_uifc_resolve(cx, obj, JSID_VOID)); + return js_uifc_resolve(cx, obj, JSID_VOID); } static JSClass js_uifc_class = { "UIFC" /* name */ @@ -1264,17 +1264,17 @@ JSObject* js_CreateUifcObject(JSContext* cx, JSObject* parent) uifcapi_t* api; if ((obj = JS_DefineObject(cx, parent, "uifc", &js_uifc_class, NULL , JSPROP_ENUMERATE | JSPROP_READONLY)) == NULL) - return(NULL); + return NULL; if ((api = (uifcapi_t*)malloc(sizeof(uifcapi_t))) == NULL) - return(NULL); + return NULL; memset(api, 0, sizeof(uifcapi_t)); api->size = sizeof(uifcapi_t); api->esc_delay = 25; if (!JS_SetPrivate(cx, obj, api)) /* Store a pointer to uifcapi_t */ - return(NULL); + return NULL; #ifdef BUILD_JSDOCS js_DescribeSyncObject(cx, obj, "User InterFaCe object - Text User Interface (TUI) menu system for JSexec", 314); js_CreateArrayOfStrings(cx, obj, "_property_desc_list", uifc_prop_desc, JSPROP_READONLY); #endif - return(obj); + return obj; } diff --git a/src/sbbs3/js_user.c b/src/sbbs3/js_user.c index b6a9bc70397e0f3aaf37c82b7842f4e6b53b4529..1164c413d2230e773fcbb5d90064987a3a38303b 100644 --- a/src/sbbs3/js_user.c +++ b/src/sbbs3/js_user.c @@ -152,7 +152,7 @@ static JSBool js_user_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) scfg = JS_GetRuntimePrivate(JS_GetRuntime(cx)); if ((p = (private_t*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); js_getuserdat(scfg, p); @@ -421,12 +421,12 @@ static JSBool js_user_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) case USER_PROP_CACHED: *vp = BOOLEAN_TO_JSVAL(p->cached); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); /* intentional early return */ + return JS_TRUE; /* intentional early return */ case USER_PROP_IS_SYSOP: *vp = BOOLEAN_TO_JSVAL(user_is_sysop(p->user)); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); /* intentional early return */ + return JS_TRUE; /* intentional early return */ case USER_PROP_BATUPLST: s = batch_list_name(scfg, p->user->number, XFER_BATCH_UPLOAD, tmp, sizeof tmp); @@ -438,17 +438,17 @@ static JSBool js_user_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) default: /* This must not set vp in order for child objects to work (stats and security) */ JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } JS_RESUMEREQUEST(cx, rc); if (s != NULL) { if ((js_str = JS_NewStringCopyZ(cx, s)) == NULL) - return(JS_FALSE); + return JS_FALSE; *vp = STRING_TO_JSVAL(js_str); } else *vp = DOUBLE_TO_JSVAL((double)val); - return(JS_TRUE); + return JS_TRUE; } static JSBool js_user_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp) @@ -466,12 +466,12 @@ static JSBool js_user_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, scfg = JS_GetRuntimePrivate(JS_GetRuntime(cx)); if ((p = (private_t*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_TRUE); + return JS_TRUE; JSVALUE_TO_MSTRING(cx, *vp, str, NULL); HANDLE_PENDING(cx, str); if (str == NULL) - return(JS_FALSE); + return JS_FALSE; JS_IdToValue(cx, id, &idval); tiny = JSVAL_TO_INT(idval); @@ -795,7 +795,7 @@ static JSBool js_user_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, JS_ValueToBoolean(cx, *vp, &p->cached); JS_RESUMEREQUEST(cx, rc); free(str); - return(JS_TRUE); /* intentional early return */ + return JS_TRUE; /* intentional early return */ } free(str); @@ -803,7 +803,7 @@ static JSBool js_user_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, p->cached = FALSE; JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } #define USER_PROP_FLAGS JSPROP_ENUMERATE @@ -1432,7 +1432,7 @@ static JSBool js_user_stats_resolve(JSContext *cx, JSObject *obj, jsid id) static JSBool js_user_stats_enumerate(JSContext *cx, JSObject *obj) { - return(js_user_stats_resolve(cx, obj, JSID_VOID)); + return js_user_stats_resolve(cx, obj, JSID_VOID); } static JSBool js_user_security_resolve(JSContext *cx, JSObject *obj, jsid id) @@ -1458,7 +1458,7 @@ static JSBool js_user_security_resolve(JSContext *cx, JSObject *obj, jsid id) static JSBool js_user_security_enumerate(JSContext *cx, JSObject *obj) { - return(js_user_security_resolve(cx, obj, JSID_VOID)); + return js_user_security_resolve(cx, obj, JSID_VOID); } static JSBool js_user_limits_resolve(JSContext *cx, JSObject *obj, jsid id) @@ -1484,7 +1484,7 @@ static JSBool js_user_limits_resolve(JSContext *cx, JSObject *obj, jsid id) static JSBool js_user_limits_enumerate(JSContext *cx, JSObject *obj) { - return(js_user_limits_resolve(cx, obj, JSID_VOID)); + return js_user_limits_resolve(cx, obj, JSID_VOID); } static JSClass js_user_stats_class = { @@ -1534,7 +1534,7 @@ static JSBool js_user_resolve(JSContext *cx, JSObject *obj, jsid id) JSBool ret; if ((p = (private_t*)JS_GetPrivate(cx, obj)) == NULL) - return(JS_TRUE); + return JS_TRUE; if (id != JSID_VOID && id != JSID_EMPTY) { jsval idval; @@ -1552,14 +1552,14 @@ static JSBool js_user_resolve(JSContext *cx, JSObject *obj, jsid id) /* user.stats */ if ((newobj = JS_DefineObject(cx, obj, "stats" , &js_user_stats_class, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SetPrivate(cx, newobj, p); #ifdef BUILD_JSDOCS js_DescribeSyncObject(cx, newobj, "User statistics (all <small>READ ONLY</small>)", 310); js_CreateArrayOfStrings(cx, newobj, "_property_desc_list", user_stats_prop_desc, JSPROP_READONLY); #endif if (name) - return(JS_TRUE); + return JS_TRUE; } @@ -1569,14 +1569,14 @@ static JSBool js_user_resolve(JSContext *cx, JSObject *obj, jsid id) /* user.security */ if ((newobj = JS_DefineObject(cx, obj, "security" , &js_user_security_class, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SetPrivate(cx, newobj, p); #ifdef BUILD_JSDOCS js_DescribeSyncObject(cx, newobj, "User security settings", 310); js_CreateArrayOfStrings(cx, newobj, "_property_desc_list", user_security_prop_desc, JSPROP_READONLY); #endif if (name) - return(JS_TRUE); + return JS_TRUE; } if (name == NULL || strcmp(name, "limits") == 0) { @@ -1585,14 +1585,14 @@ static JSBool js_user_resolve(JSContext *cx, JSObject *obj, jsid id) /* user.limits */ if ((newobj = JS_DefineObject(cx, obj, "limits" , &js_user_limits_class, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SetPrivate(cx, newobj, p); #ifdef BUILD_JSDOCS js_DescribeSyncObject(cx, newobj, "User limitations based on security level (all <small>READ ONLY</small>)", 311); js_CreateArrayOfStrings(cx, newobj, "_property_desc_list", user_limits_prop_desc, JSPROP_READONLY); #endif if (name) - return(JS_TRUE); + return JS_TRUE; } ret = js_SyncResolve(cx, obj, name, js_user_properties, js_user_functions, NULL, 0); @@ -1603,7 +1603,7 @@ static JSBool js_user_resolve(JSContext *cx, JSObject *obj, jsid id) static JSBool js_user_enumerate(JSContext *cx, JSObject *obj) { - return(js_user_resolve(cx, obj, JSID_VOID)); + return js_user_resolve(cx, obj, JSID_VOID); } JSClass js_user_class = { @@ -1643,11 +1643,11 @@ js_user_constructor(JSContext *cx, uintN argc, jsval *arglist) user.number = (ushort)val; if (user.number != 0 && (i = getuserdat(scfg, &user)) != 0) { JS_ReportError(cx, "Error %d reading user number %d", i, val); - return(JS_FALSE); + return JS_FALSE; } if ((p = (private_t*)malloc(sizeof(private_t))) == NULL) - return(JS_FALSE); + return JS_FALSE; memset(p, 0, sizeof(private_t)); @@ -1657,7 +1657,7 @@ js_user_constructor(JSContext *cx, uintN argc, jsval *arglist) JS_SetPrivate(cx, obj, p); - return(JS_TRUE); + return JS_TRUE; } JSObject* js_CreateUserClass(JSContext* cx, JSObject* parent) @@ -1672,7 +1672,7 @@ JSObject* js_CreateUserClass(JSContext* cx, JSObject* parent) , NULL /* funcs, defined in constructor */ , NULL, NULL); - return(userclass); + return userclass; } JSObject* js_CreateUserObject(JSContext* cx, JSObject* parent, char* name @@ -1690,11 +1690,11 @@ JSObject* js_CreateUserObject(JSContext* cx, JSObject* parent, char* name userobj = JS_DefineObject(cx, parent, name, &js_user_class , NULL, JSPROP_ENUMERATE | JSPROP_READONLY); if (userobj == NULL) - return(NULL); + return NULL; if ((p = JS_GetPrivate(cx, userobj)) == NULL) { /* Uses existing private pointer: Fix memory leak? */ if ((p = (private_t*)malloc(sizeof(private_t))) == NULL) - return(NULL); + return NULL; memset(p, 0, sizeof(private_t)); } @@ -1721,7 +1721,7 @@ JSObject* js_CreateUserObject(JSContext* cx, JSObject* parent, char* name , "_property_desc_list", user_prop_desc, JSPROP_READONLY); #endif - return(userobj); + return userobj; } /****************************************************************************/ @@ -1732,15 +1732,15 @@ js_CreateUserObjects(JSContext* cx, JSObject* parent, scfg_t* cfg, user_t* user, , const char* web_file_vpath_prefix, subscan_t* subscan, struct mqtt* mqtt) { if (js_CreateUserObject(cx, parent, "user", user, client, /* global_user */ TRUE, mqtt) == NULL) - return(JS_FALSE); + return JS_FALSE; if (js_CreateFileAreaObject(cx, parent, cfg, user, client, web_file_vpath_prefix) == NULL) - return(JS_FALSE); + return JS_FALSE; if (js_CreateMsgAreaObject(cx, parent, cfg, user, client, subscan) == NULL) - return(JS_FALSE); + return JS_FALSE; if (js_CreateXtrnAreaObject(cx, parent, cfg, user, client) == NULL) - return(JS_FALSE); + return JS_FALSE; - return(JS_TRUE); + return JS_TRUE; } #endif /* JAVSCRIPT */ diff --git a/src/sbbs3/js_xtrn_area.c b/src/sbbs3/js_xtrn_area.c index f5a3d0a94e70d4c15c1a69c8635c17c8bb7711f1..4be7ed762f7542793bc19e9ffd4d3674c5d87c85 100644 --- a/src/sbbs3/js_xtrn_area.c +++ b/src/sbbs3/js_xtrn_area.c @@ -130,76 +130,76 @@ BOOL js_CreateXtrnProgProperties(JSContext* cx, JSObject* obj, xtrn_t* xtrn) JSString* js_str; if ((js_str = JS_NewStringCopyZ(cx, xtrn->code)) == NULL) - return(FALSE); + return FALSE; if (!JS_DefineProperty(cx, obj, "code", STRING_TO_JSVAL(js_str) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(FALSE); + return FALSE; if ((js_str = JS_NewStringCopyZ(cx, xtrn->name)) == NULL) - return(FALSE); + return FALSE; if (!JS_DefineProperty(cx, obj, "name", STRING_TO_JSVAL(js_str) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(FALSE); + return FALSE; if ((js_str = JS_NewStringCopyZ(cx, xtrn->cmd)) == NULL) - return(FALSE); + return FALSE; if (!JS_DefineProperty(cx, obj, "cmd", STRING_TO_JSVAL(js_str) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(FALSE); + return FALSE; if ((js_str = JS_NewStringCopyZ(cx, xtrn->clean)) == NULL) - return(FALSE); + return FALSE; if (!JS_DefineProperty(cx, obj, "clean_cmd", STRING_TO_JSVAL(js_str) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(FALSE); + return FALSE; if ((js_str = JS_NewStringCopyZ(cx, xtrn->path)) == NULL) - return(FALSE); + return FALSE; if (!JS_DefineProperty(cx, obj, "startup_dir", STRING_TO_JSVAL(js_str) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(FALSE); + return FALSE; if ((js_str = JS_NewStringCopyZ(cx, xtrn->arstr)) == NULL) - return(FALSE); + return FALSE; if (!JS_DefineProperty(cx, obj, "ars", STRING_TO_JSVAL(js_str) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(FALSE); + return FALSE; if ((js_str = JS_NewStringCopyZ(cx, xtrn->run_arstr)) == NULL) - return(FALSE); + return FALSE; if (!JS_DefineProperty(cx, obj, "execution_ars", STRING_TO_JSVAL(js_str) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(FALSE); + return FALSE; if (!JS_DefineProperty(cx, obj, "settings", INT_TO_JSVAL(xtrn->misc) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(FALSE); + return FALSE; if (!JS_DefineProperty(cx, obj, "type", INT_TO_JSVAL(xtrn->type) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(FALSE); + return FALSE; if (!JS_DefineProperty(cx, obj, "event", INT_TO_JSVAL(xtrn->event) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(FALSE); + return FALSE; if (!JS_DefineProperty(cx, obj, "textra", INT_TO_JSVAL(xtrn->textra) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(FALSE); + return FALSE; if (!JS_DefineProperty(cx, obj, "max_time", INT_TO_JSVAL(xtrn->maxtime) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(FALSE); + return FALSE; if (!JS_DefineProperty(cx, obj, "cost", INT_TO_JSVAL(xtrn->cost) , NULL, NULL, JSPROP_ENUMERATE | JSPROP_READONLY)) - return(FALSE); + return FALSE; #ifdef BUILD_JSDOCS js_CreateArrayOfStrings(cx, obj, "_property_desc_list", xtrn_prog_prop_desc, JSPROP_READONLY); #endif - return(TRUE); + return TRUE; } static JSBool js_event_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp) @@ -586,7 +586,7 @@ JSBool js_xtrn_area_resolve(JSContext* cx, JSObject* areaobj, jsid id) static JSBool js_xtrn_area_enumerate(JSContext *cx, JSObject *obj) { - return(js_xtrn_area_resolve(cx, obj, JSID_VOID)); + return js_xtrn_area_resolve(cx, obj, JSID_VOID); } static void @@ -625,7 +625,7 @@ JSObject* js_CreateXtrnAreaObject(JSContext* cx, JSObject* parent, scfg_t* cfg , JSPROP_ENUMERATE | JSPROP_READONLY); if (obj == NULL) - return(NULL); + return NULL; p = (struct js_xtrn_area_priv *)malloc(sizeof(struct js_xtrn_area_priv)); if (p == NULL) @@ -638,7 +638,7 @@ JSObject* js_CreateXtrnAreaObject(JSContext* cx, JSObject* parent, scfg_t* cfg if (!JS_SetPrivate(cx, obj, p)) { free(p); - return(NULL); + return NULL; } #ifdef BUILD_JSDOCS @@ -646,7 +646,7 @@ JSObject* js_CreateXtrnAreaObject(JSContext* cx, JSObject* parent, scfg_t* cfg js_xtrn_area_enumerate(cx, obj); #endif - return(obj); + return obj; } #endif /* JAVSCRIPT */ diff --git a/src/sbbs3/jsdebug.c b/src/sbbs3/jsdebug.c index ba14acba2a87ea3630ecb755a13d915013286965..76b9593d28a4d60bd559e38a21f8c77ac54dbfde 100644 --- a/src/sbbs3/jsdebug.c +++ b/src/sbbs3/jsdebug.c @@ -333,7 +333,7 @@ static enum debug_action script_debug_prompt(struct debugger *dbg, JSScript *scr strncmp(line, "q\n", 2) == 0 ) { free(line); - return (DEBUG_EXIT); + return DEBUG_EXIT; } if (strncmp(line, "eval ", 5) == 0 || strncmp(line, "e ", 2) == 0 diff --git a/src/sbbs3/jsdoor.c b/src/sbbs3/jsdoor.c index af642b03ecb6b96d6e5cb141cc4d1054e0b48147..d3a54905b019c14a25ee1b006811862747622285 100644 --- a/src/sbbs3/jsdoor.c +++ b/src/sbbs3/jsdoor.c @@ -70,7 +70,7 @@ SOCKET open_socket(int domain, int type, const char* protocol) if (sock != INVALID_SOCKET && set_socket_options(&scfg, sock, protocol, error, sizeof(error))) lprintf(LOG_ERR, "%04d !ERROR %s", sock, error); - return(sock); + return sock; } SOCKET accept_socket(SOCKET s, union xp_sockaddr* addr, socklen_t* addrlen) @@ -79,7 +79,7 @@ SOCKET accept_socket(SOCKET s, union xp_sockaddr* addr, socklen_t* addrlen) sock = accept(s, &addr->addr, addrlen); - return(sock); + return sock; } int close_socket(SOCKET sock) @@ -87,13 +87,13 @@ int close_socket(SOCKET sock) int result; if (sock == INVALID_SOCKET || sock == 0) - return(0); + return 0; shutdown(sock, SHUT_RDWR); /* required on Unix */ result = closesocket(sock); if (result != 0 && ERROR_VALUE != ENOTSOCK) lprintf(LOG_WARNING, "!ERROR %d closing socket %d", ERROR_VALUE, sock); - return(result); + return result; } DLLEXPORT void DLLCALL sbbs_srand() @@ -118,7 +118,7 @@ DLLEXPORT void DLLCALL sbbs_srand() int DLLCALL sbbs_random(int n) { - return(xp_random(n)); + return xp_random(n); } JSBool @@ -130,16 +130,16 @@ DLLCALL js_DefineSyncProperties(JSContext *cx, JSObject *obj, jsSyncPropertySpec if (props[i].tinyid < 256 && props[i].tinyid > -129) { if (!JS_DefinePropertyWithTinyId(cx, obj, props[i].name, props[i].tinyid, JSVAL_VOID, NULL, NULL, props[i].flags | JSPROP_SHARED)) - return(JS_FALSE); + return JS_FALSE; } else { if (!JS_DefineProperty(cx, obj, props[i].name, JSVAL_VOID, NULL, NULL, props[i].flags | JSPROP_SHARED)) - return(JS_FALSE); + return JS_FALSE; } } - return(JS_TRUE); + return JS_TRUE; } @@ -150,8 +150,8 @@ DLLCALL js_DefineSyncMethods(JSContext* cx, JSObject* obj, jsSyncMethodSpec *fun for (i = 0; funcs[i].name; i++) if (!JS_DefineFunction(cx, obj, funcs[i].name, funcs[i].call, funcs[i].nargs, 0)) - return(JS_FALSE); - return(JS_TRUE); + return JS_FALSE; + return JS_TRUE; } JSBool @@ -166,14 +166,14 @@ DLLCALL js_SyncResolve(JSContext* cx, JSObject* obj, char *name, jsSyncPropertyS if (props[i].tinyid < 256 && props[i].tinyid > -129) { if (!JS_DefinePropertyWithTinyId(cx, obj, props[i].name, props[i].tinyid, JSVAL_VOID, NULL, NULL, props[i].flags | JSPROP_SHARED)) - return(JS_FALSE); + return JS_FALSE; } else { if (!JS_DefineProperty(cx, obj, props[i].name, JSVAL_VOID, NULL, NULL, props[i].flags | JSPROP_SHARED)) - return(JS_FALSE); + return JS_FALSE; } if (name) - return(JS_TRUE); + return JS_TRUE; } } } @@ -181,9 +181,9 @@ DLLCALL js_SyncResolve(JSContext* cx, JSObject* obj, char *name, jsSyncPropertyS for (i = 0; funcs[i].name; i++) { if (name == NULL || strcmp(name, funcs[i].name) == 0) { if (!JS_DefineFunction(cx, obj, funcs[i].name, funcs[i].call, funcs[i].nargs, 0)) - return(JS_FALSE); + return JS_FALSE; if (name) - return(JS_TRUE); + return JS_TRUE; } } } @@ -193,15 +193,15 @@ DLLCALL js_SyncResolve(JSContext* cx, JSObject* obj, char *name, jsSyncPropertyS val = INT_TO_JSVAL(consts[i].val); if (!JS_DefineProperty(cx, obj, consts[i].name, val, NULL, NULL, flags)) - return(JS_FALSE); + return JS_FALSE; if (name) - return(JS_TRUE); + return JS_TRUE; } } } - return(JS_TRUE); + return JS_TRUE; } // Needed for load() @@ -235,7 +235,7 @@ bool DLLCALL js_CreateCommonObjects(JSContext* js_cx /* Global Object */ if (!js_CreateGlobalObject(js_cx, &scfg, methods, js_startup, glob)) - return(FALSE); + return FALSE; #ifdef JS_HAS_CTYPES JS_InitCTypesClass(js_cx, *glob); #endif @@ -298,7 +298,7 @@ bool DLLCALL js_CreateCommonObjects(JSContext* js_cx if (!success) JS_RemoveObjectRoot(js_cx, glob); - return(success); + return success; } #define PROG_NAME "JSDoor" diff --git a/src/sbbs3/jsexec.c b/src/sbbs3/jsexec.c index 25aa35434c81e197ad7dd4071ca10d120954019d..1cdd9eec2eae985711899df5a5350f4ea8b9e094 100644 --- a/src/sbbs3/jsexec.c +++ b/src/sbbs3/jsexec.c @@ -235,7 +235,7 @@ int mfprintf(FILE* fp, char *fmt, ...) ret = fprintf(fp, "%s\n", sbuf); pthread_mutex_unlock(&output_mutex); - return(ret); + return ret; } /* Log printf */ @@ -246,7 +246,7 @@ int lprintf(int level, const char *fmt, ...) int ret = 0; if (level > log_level) - return(0); + return 0; va_start(argptr, fmt); ret = vsnprintf(sbuf, sizeof(sbuf), fmt, argptr); @@ -255,7 +255,7 @@ int lprintf(int level, const char *fmt, ...) #if defined(__unix__) if (daemonize) { syslog(level, "%s", sbuf); - return(ret); + return ret; } #endif @@ -271,7 +271,7 @@ int lprintf(int level, const char *fmt, ...) ret = fprintf(statfp, "%s\n", sbuf); pthread_mutex_unlock(&output_mutex); - return(ret); + return ret; } #if defined(__unix__) && defined(NEEDS_DAEMON) @@ -285,7 +285,7 @@ daemon(int nochdir, int noclose) switch (fork()) { case -1: - return (-1); + return -1; case 0: break; default: @@ -293,7 +293,7 @@ daemon(int nochdir, int noclose) } if (setsid() == -1) - return (-1); + return -1; if (!nochdir) (void)chdir("/"); @@ -305,7 +305,7 @@ daemon(int nochdir, int noclose) if (fd > 2) (void)close(fd); } - return (0); + return 0; } #endif @@ -322,11 +322,11 @@ static bool winsock_startup(void) if ((status = WSAStartup(MAKEWORD(1, 1), &WSAData)) == 0) { /* fprintf(statfp,"%s %s\n",WSAData.szDescription, WSAData.szSystemStatus); */ WSAInitialized = true; - return(true); + return true; } lprintf(LOG_CRIT, "!WinSock startup ERROR %d", status); - return(false); + return false; } #else /* No WINSOCK */ @@ -351,7 +351,7 @@ static int do_bail(int code) if (code) fprintf(statfp, "\nReturning error code: %d\n", code); - return(code); + return code; } void bail(int code) @@ -379,10 +379,10 @@ js_log(JSContext *cx, uintN argc, jsval *arglist) for (; i < argc; i++) { if ((str = JS_ValueToString(cx, argv[i])) == NULL) - return(JS_FALSE); + return JS_FALSE; JSSTRING_TO_RASTRING(cx, str, logstr, &logstr_sz, NULL); if (logstr == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); lprintf(level, "%s", logstr); JS_RESUMEREQUEST(cx, rc); @@ -394,7 +394,7 @@ js_log(JSContext *cx, uintN argc, jsval *arglist) else JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -413,7 +413,7 @@ js_read(JSContext *cx, uintN argc, jsval *arglist) return JS_FALSE; } if ((buf = malloc(len)) == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); rd = fread(buf, sizeof(char), len, stdin); @@ -423,7 +423,7 @@ js_read(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(JS_NewStringCopyN(cx, buf, rd))); free(buf); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -442,7 +442,7 @@ js_readln(JSContext *cx, uintN argc, jsval *arglist) return JS_FALSE; } if ((buf = malloc(len + 1)) == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); cooked_tty(); @@ -454,7 +454,7 @@ js_readln(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(JS_NewStringCopyZ(cx, truncnl(p)))); free(buf); - return(JS_TRUE); + return JS_TRUE; } @@ -472,10 +472,10 @@ js_write(JSContext *cx, uintN argc, jsval *arglist) for (i = 0; i < argc; i++) { if ((str = JS_ValueToString(cx, argv[i])) == NULL) - return(JS_FALSE); + return JS_FALSE; JSSTRING_TO_RASTRING(cx, str, line, &line_sz, NULL); if (line == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); fprintf(confp, "%s", line); FREE_AND_NULL(line); @@ -486,7 +486,7 @@ js_write(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); else JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -497,12 +497,12 @@ js_writeln(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if (!js_write(cx, argc, arglist)) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); fprintf(confp, "\n"); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -516,7 +516,7 @@ jse_printf(JSContext *cx, uintN argc, jsval *arglist) if ((p = js_sprintf(cx, 0, argc, argv)) == NULL) { JS_ReportError(cx, "js_sprintf failed"); - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); @@ -527,7 +527,7 @@ jse_printf(JSContext *cx, uintN argc, jsval *arglist) js_sprintf_free(p); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -541,7 +541,7 @@ js_alert(JSContext *cx, uintN argc, jsval *arglist) JSVALUE_TO_MSTRING(cx, argv[0], line, NULL); if (line == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); fprintf(confp, "!%s\n", line); @@ -550,7 +550,7 @@ js_alert(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, argv[0]); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -566,7 +566,7 @@ js_confirm(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((str = JS_ValueToString(cx, argv[0])) == NULL) - return(JS_FALSE); + return JS_FALSE; JSSTRING_TO_MSTRING(cx, str, cstr, NULL); HANDLE_PENDING(cx, cstr); @@ -584,7 +584,7 @@ js_confirm(JSContext *cx, uintN argc, jsval *arglist) SKIP_WHITESPACE(p); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(tolower(*p) != 'n')); } - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -600,7 +600,7 @@ js_deny(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((str = JS_ValueToString(cx, argv[0])) == NULL) - return(JS_FALSE); + return JS_FALSE; JSSTRING_TO_MSTRING(cx, str, cstr, NULL); HANDLE_PENDING(cx, cstr); @@ -618,7 +618,7 @@ js_deny(JSContext *cx, uintN argc, jsval *arglist) SKIP_WHITESPACE(p); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(tolower(*p) != 'y')); } - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -636,7 +636,7 @@ js_prompt(JSContext *cx, uintN argc, jsval *arglist) JSVALUE_TO_MSTRING(cx, argv[0], prstr, NULL); HANDLE_PENDING(cx, prstr); if (prstr == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); fprintf(confp, "%s: ", prstr); free(prstr); @@ -654,16 +654,16 @@ js_prompt(JSContext *cx, uintN argc, jsval *arglist) if (!fgets(instr, sizeof(instr), stdin)) { raw_tty(); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } raw_tty(); JS_RESUMEREQUEST(cx, rc); if ((str = JS_NewStringCopyZ(cx, truncnl(instr))) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -678,7 +678,7 @@ js_chdir(JSContext *cx, uintN argc, jsval *arglist) HANDLE_PENDING(cx, p); if (p == NULL) { JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(-1)); - return(JS_TRUE); + return JS_TRUE; } rc = JS_SUSPENDREQUEST(cx); @@ -686,7 +686,7 @@ js_chdir(JSContext *cx, uintN argc, jsval *arglist) free(p); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(ret)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -703,7 +703,7 @@ js_putenv(JSContext *cx, uintN argc, jsval *arglist) } if (p == NULL) { JS_SET_RVAL(cx, arglist, INT_TO_JSVAL(-1)); - return(JS_TRUE); + return JS_TRUE; } rc = JS_SUSPENDREQUEST(cx); @@ -711,7 +711,7 @@ js_putenv(JSContext *cx, uintN argc, jsval *arglist) free(p); JS_RESUMEREQUEST(cx, rc); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(ret)); - return(JS_TRUE); + return JS_TRUE; } // Forked from mozilla/js/src/shell/js.cpp: AssertEq() @@ -816,11 +816,11 @@ static bool js_CreateEnvObject(JSContext* cx, JSObject* glob, char** env) JSObject* js_env; if ((js_env = JS_NewObject(js_cx, NULL, NULL, glob)) == NULL) - return(false); + return false; if (!JS_DefineProperty(cx, glob, "env", OBJECT_TO_JSVAL(js_env) , NULL, NULL, JSPROP_READONLY | JSPROP_ENUMERATE)) - return(false); + return false; if (env) { for (i = 0; env[i] != NULL; i++) { @@ -833,11 +833,11 @@ static bool js_CreateEnvObject(JSContext* cx, JSObject* glob, char** env) val++; if (!JS_DefineProperty(cx, js_env, name, STRING_TO_JSVAL(JS_NewStringCopyZ(cx, val)) , NULL, NULL, JSPROP_READONLY | JSPROP_ENUMERATE)) - return(false); + return false; } } - return(true); + return true; } static bool js_init(char** env) @@ -846,7 +846,7 @@ static bool js_init(char** env) SAFECOPY(startup.load_path, load_path_list); if ((js_cx = JS_NewContext(js_runtime, JAVASCRIPT_CONTEXT_STACK)) == NULL) - return(false); + return false; JS_SetOptions(js_cx, js_opts); JS_BEGINREQUEST(js_cx); @@ -862,49 +862,49 @@ static bool js_init(char** env) , (struct mqtt*)NULL )) { JS_ENDREQUEST(js_cx); - return(false); + return false; } /* Environment Object (associative array) */ if (!js_CreateEnvObject(js_cx, js_glob, env)) { JS_ENDREQUEST(js_cx); - return(false); + return false; } if (js_CreateUifcObject(js_cx, js_glob) == NULL) { JS_ENDREQUEST(js_cx); - return(false); + return false; } if (js_CreateConioObject(js_cx, js_glob) == NULL) { JS_ENDREQUEST(js_cx); - return(false); + return false; } /* STDIO objects */ if (!js_CreateFileObject(js_cx, js_glob, "stdout", STDOUT_FILENO, "w")) { JS_ENDREQUEST(js_cx); - return(false); + return false; } if (!js_CreateFileObject(js_cx, js_glob, "stdin", STDIN_FILENO, "r")) { JS_ENDREQUEST(js_cx); - return(false); + return false; } if (!js_CreateFileObject(js_cx, js_glob, "stderr", STDERR_FILENO, "w")) { JS_ENDREQUEST(js_cx); - return(false); + return false; } - return(true); + return true; } static const char* js_ext(const char* fname) { if (strchr(fname, '.') == NULL) - return(".js"); - return(""); + return ".js"; + return ""; } void dbg_puts(const char *msg) @@ -978,12 +978,12 @@ long js_exec(const char *fname, const char* buf, char** args) if (!fexistcase(path)) { lprintf(LOG_ERR, "!Module file (%s) doesn't exist", path); - return(-1); + return -1; } if ((fp = fopen(path, "r")) == NULL) { lprintf(LOG_ERR, "!Error %d (%s) opening %s", errno, strerror(errno), path); - return(-1); + return -1; } } JS_ClearPendingException(js_cx); @@ -1050,7 +1050,7 @@ long js_exec(const char *fname, const char* buf, char** args) , (ulong)(js_buflen + len)); if (fp != stdin) fclose(fp); - return(-1); + return -1; } memcpy(js_buf + js_buflen, line, len); js_buflen += len; @@ -1065,7 +1065,7 @@ long js_exec(const char *fname, const char* buf, char** args) lprintf(LOG_ERR, "!Error compiling script from %s", path); if (js_buf != buf) free(js_buf); - return(-1); + return -1; } if ((diff = xp_timer() - start) > 0) mfprintf(statfp, "%s compiled in %.2Lf seconds" @@ -1112,7 +1112,7 @@ long js_exec(const char *fname, const char* buf, char** args) if (js_buf != NULL && js_buf != buf) free(js_buf); - return(result); + return result; } void break_handler(int type) @@ -1207,7 +1207,7 @@ int main(int argc, char **argv) errfp = stderr; if ((nulfp = fopen(_PATH_DEVNULL, "w+")) == NULL) { perror(_PATH_DEVNULL); - return(do_bail(-1)); + return do_bail(-1); } if (isatty(fileno(stdin))) { #ifdef __unix__ @@ -1231,7 +1231,7 @@ int main(int argc, char **argv) scfg.size = sizeof(scfg); if (!winsock_startup()) - return(do_bail(2)); + return do_bail(2); #ifndef JSDOOR SAFECOPY(scfg.ctrl_dir, get_ctrl_dir(/* warn: */ false)); @@ -1293,7 +1293,7 @@ int main(int argc, char **argv) if (argn + 1 >= argc) { fprintf(stderr, "\n!Option requires a parameter value: %s\n", argv[argn]); usage(); - return(do_bail(1)); + return do_bail(1); } p = argv[++argn]; } @@ -1309,7 +1309,7 @@ int main(int argc, char **argv) fclose(errfp); if ((errfp = fopen(p, omode)) == NULL) { perror(p); - return(do_bail(1)); + return do_bail(1); } break; case 'g': @@ -1330,7 +1330,7 @@ int main(int argc, char **argv) case 'o': if ((confp = fopen(p, omode)) == NULL) { perror(p); - return(do_bail(1)); + return do_bail(1); } break; case 't': @@ -1358,7 +1358,7 @@ int main(int argc, char **argv) } else { if ((errfp = fopen(p, omode)) == NULL) { perror(p); - return(do_bail(1)); + return do_bail(1); } statfp = errfp; confp = errfp; @@ -1393,7 +1393,7 @@ int main(int argc, char **argv) else { if ((statfp = fopen(p, omode)) == NULL) { perror(p); - return(do_bail(1)); + return do_bail(1); } } break; @@ -1412,7 +1412,7 @@ int main(int argc, char **argv) case 'v': banner(statfp); fprintf(statfp, "%s\n", (char *)JS_GetImplementationVersion()); - return(do_bail(0)); + return do_bail(0); case 'x': cb.auto_terminate = false; break; @@ -1425,7 +1425,7 @@ int main(int argc, char **argv) case '?': usage(); iniFreeStringList(ini); - return(do_bail(1)); + return do_bail(1); } continue; } @@ -1446,7 +1446,7 @@ int main(int argc, char **argv) fprintf(stderr, "\n!No JavaScript module-name or expression specified\n"); usage(); iniFreeStringList(ini); - return(do_bail(1)); + return do_bail(1); } banner(statfp); @@ -1468,7 +1468,7 @@ int main(int argc, char **argv) if (!load_cfg(&scfg, text, /* prep: */ true, require_cfg, error, sizeof(error))) { fprintf(errfp, "!ERROR loading configuration files: %s\n", error); if (require_cfg) - return(do_bail(1)); + return do_bail(1); prep_dir(scfg.ctrl_dir, scfg.exec_dir, sizeof(scfg.exec_dir)); } SAFECOPY(scfg.temp_dir, "../temp"); @@ -1535,7 +1535,7 @@ int main(int argc, char **argv) if (!js_init(environ)) { lprintf(LOG_ERR, "!JavaScript initialization failure"); - return(do_bail(1)); + return do_bail(1); } fprintf(statfp, "\n"); @@ -1557,6 +1557,6 @@ int main(int argc, char **argv) jsrt_Release(js_runtime); iniFreeStringList(ini); - return(do_bail(result)); + return do_bail(result); } diff --git a/src/sbbs3/listfile.cpp b/src/sbbs3/listfile.cpp index 186dbaca89193ab5fe1e27d3caddbc3071524919..f6fd43b0b6aea5360b9ea1e5013168d5463f67d0 100644 --- a/src/sbbs3/listfile.cpp +++ b/src/sbbs3/listfile.cpp @@ -495,14 +495,14 @@ int sbbs_t::batchflagprompt(smb_t* smb, file_t** bf, uint* row, const int total menu("batflag"); if (lncntr) pause(); - return(2); + return 2; } if (ch == quit_key() || sys_status & SS_ABORT) - return(-1); + return -1; if (ch == 'S') - return(0); + return 0; if (ch == 'P' || ch == '-') - return(3); + return 3; if (ch == 'T') { useron.misc ^= EXTDESC; putusermisc(useron.number, useron.misc); @@ -511,14 +511,14 @@ int sbbs_t::batchflagprompt(smb_t* smb, file_t** bf, uint* row, const int total if (ch == 'B' || ch == 'D') { /* Flag for batch download */ if (useron.rest & FLAG('D')) { bputs(text[R_Download]); - return(2); + return 2; } if (total == 1) { addtobatdl(bf[0]); if (ch == 'D') start_batch_download(); CRLF; - return(2); + return 2; } link_list_t saved_hotspots = mouse_hotspots; ZERO_VAR(mouse_hotspots); @@ -530,7 +530,7 @@ int sbbs_t::batchflagprompt(smb_t* smb, file_t** bf, uint* row, const int total mouse_hotspots = saved_hotspots; lncntr = 0; if (sys_status & SS_ABORT) - return(-1); + return -1; if (d > 0) { /* d is string length */ strupr(str); CRLF; @@ -564,7 +564,7 @@ int sbbs_t::batchflagprompt(smb_t* smb, file_t** bf, uint* row, const int total if (ch == 'D') start_batch_download(); CRLF; - return(2); + return 2; } clearline(); continue; @@ -573,8 +573,8 @@ int sbbs_t::batchflagprompt(smb_t* smb, file_t** bf, uint* row, const int total if (ch == 'E' || ch == 'V') { /* Extended Info */ if (total == 1) { if (!viewfile(bf[0], ch == 'E')) - return(-1); - return(2); + return -1; + return 2; } link_list_t saved_hotspots = mouse_hotspots; ZERO_VAR(mouse_hotspots); @@ -586,7 +586,7 @@ int sbbs_t::batchflagprompt(smb_t* smb, file_t** bf, uint* row, const int total mouse_hotspots = saved_hotspots; lncntr = 0; if (sys_status & SS_ABORT) - return(-1); + return -1; if (d > 0) { /* d is string length */ strupr(str); CRLF; @@ -600,7 +600,7 @@ int sbbs_t::batchflagprompt(smb_t* smb, file_t** bf, uint* row, const int total for (i = 0; i < total; i++) { if (filematch(bf[i]->name, str + c)) { if (!viewfile(bf[i], ch == 'E')) - return(-1); + return -1; } } } @@ -608,11 +608,11 @@ int sbbs_t::batchflagprompt(smb_t* smb, file_t** bf, uint* row, const int total c += strlen(str + c); else if (str[c] < 'A' + (char)total && str[c] >= 'A') { if (!viewfile(bf[str[c] - 'A'], ch == 'E')) - return(-1); + return -1; } } cond_newline(); - return(2); + return 2; } clearline(); continue; @@ -637,14 +637,14 @@ int sbbs_t::batchflagprompt(smb_t* smb, file_t** bf, uint* row, const int total } lncntr = 0; if (sys_status & SS_ABORT) - return(-1); + return -1; if (d > 0) { /* d is string length */ strupr(str); if (total > 1) newline(); if (ch == 'R') { if (noyes(text[RemoveFileQ])) - return(2); + return 2; remcdt = true; remfile = true; if (dir_op(smb->dirnum)) { @@ -659,7 +659,7 @@ int sbbs_t::batchflagprompt(smb_t* smb, file_t** bf, uint* row, const int total sync(); bprintf(text[MoveToLibPrompt], cfg.dir[smb->dirnum]->lib + 1); if ((int)(ml = getnum(usrlibs)) == -1) - return(2); + return 2; if (!ml) ml = cfg.dir[smb->dirnum]->lib; else @@ -671,7 +671,7 @@ int sbbs_t::batchflagprompt(smb_t* smb, file_t** bf, uint* row, const int total sync(); bprintf(text[MoveToDirPrompt], usrdirs[ml]); if ((int)(md = getnum(usrdirs[ml])) == -1) - return(2); + return 2; if (!md) md = usrdirs[ml] - 1; else md--; @@ -721,16 +721,16 @@ int sbbs_t::batchflagprompt(smb_t* smb, file_t** bf, uint* row, const int total } } } - return(2); + return 2; } clearline(); continue; } - return(1); + return 1; } - return(-1); + return -1; } /****************************************************************************/ @@ -1087,7 +1087,7 @@ int sbbs_t::listfileinfo(const int dirnum, const char *filespec, const int mode) } freefiles(file_list, file_count); smb_close(&smb); - return(found); + return found; } /****************************************************************************/ @@ -1118,5 +1118,5 @@ int extdesclines(char *str) lc++; last = i; } - return(lc); + return lc; } diff --git a/src/sbbs3/load_cfg.c b/src/sbbs3/load_cfg.c index ad61f198c2b322bb2bce2853fad37f8df71fe9ce..26faa4d9e0168ae53cf4ad72180e131c4d1c06b0 100644 --- a/src/sbbs3/load_cfg.c +++ b/src/sbbs3/load_cfg.c @@ -67,7 +67,7 @@ bool load_cfg(scfg_t* cfg, char* text[], bool prep, bool req_cfg, char* error, s if (cfg->size != sizeof(scfg_t)) { safe_snprintf(error, maxerrlen, "cfg->size (%" PRIu32 ") != sizeof(scfg_t) (%" XP_PRIsize_t "d)" , cfg->size, sizeof(scfg_t)); - return(false); + return false; } free_cfg(cfg); /* free allocated config parameters */ @@ -77,7 +77,7 @@ bool load_cfg(scfg_t* cfg, char* text[], bool prep, bool req_cfg, char* error, s backslash(cfg->ctrl_dir); if (read_main_cfg(cfg, error, maxerrlen) == false && req_cfg) - return(false); + return false; if (prep) for (i = 0; i < cfg->sys_nodes; i++) @@ -86,17 +86,17 @@ bool load_cfg(scfg_t* cfg, char* text[], bool prep, bool req_cfg, char* error, s SAFECOPY(cfg->node_dir, cfg->node_path[cfg->node_num - 1]); prep_dir(cfg->ctrl_dir, cfg->node_dir, sizeof(cfg->node_dir)); if (read_node_cfg(cfg, error, maxerrlen) == false && req_cfg) - return(false); + return false; if (read_msgs_cfg(cfg, error, maxerrlen) == false) - return(false); + return false; if (read_file_cfg(cfg, error, maxerrlen) == false) - return(false); + return false; if (read_xtrn_cfg(cfg, error, maxerrlen) == false) - return(false); + return false; if (read_chat_cfg(cfg, error, maxerrlen) == false) - return(false); + return false; if (read_attr_cfg(cfg, error, maxerrlen) == false) - return(false); + return false; if (text != NULL) { @@ -106,7 +106,7 @@ bool load_cfg(scfg_t* cfg, char* text[], bool prep, bool req_cfg, char* error, s SAFEPRINTF(str, "%stext.dat", cfg->ctrl_dir); if ((fp = fnopen(NULL, str, O_RDONLY)) == NULL) { safe_snprintf(error, maxerrlen, "%d opening %s", errno, str); - return(false); + return false; } for (i = 0; i < TOTAL_TEXT; i++) if ((text[i] = readtext(&line, fp, i)) == NULL) { @@ -119,7 +119,7 @@ bool load_cfg(scfg_t* cfg, char* text[], bool prep, bool req_cfg, char* error, s safe_snprintf(error, maxerrlen, "line %d: Less than TOTAL_TEXT (%u) strings defined in %s." , i , TOTAL_TEXT, str); - return(false); + return false; } SAFEPRINTF(str, "%stext.ini", cfg->ctrl_dir); @@ -159,7 +159,7 @@ bool load_cfg(scfg_t* cfg, char* text[], bool prep, bool req_cfg, char* error, s /* Auto-toggle daylight savings time in US time-zones */ sys_timezone(cfg); - return(true); + return true; } void pathify(char* str) @@ -451,7 +451,7 @@ bool read_attr_cfg(scfg_t* cfg, char* error, size_t maxerrlen) memset(cfg->rainbow, 0, sizeof cfg->rainbow); parse_attr_str_list(cfg->rainbow, LEN_RAINBOW, value); iniFreeStringList(ini); - return(true); + return true; } char* prep_dir(const char* base, char* path, size_t buflen) @@ -464,7 +464,7 @@ char* prep_dir(const char* base, char* path, size_t buflen) char ch; if (!path[0]) - return(path); + return path; if (path[0] != '\\' && path[0] != '/' && path[1] != ':') { /* Relative directory */ ch = *lastchar(base); if (ch == '\\' || ch == '/') @@ -486,7 +486,7 @@ char* prep_dir(const char* base, char* path, size_t buflen) backslash(abspath); strncpy(path, abspath, buflen); - return(path); + return path; } char* prep_path(char* path) @@ -499,7 +499,7 @@ char* prep_path(char* path) *p = '/'; #endif - return(path); + return path; } /* Prepare a string to be used as an internal code */ @@ -528,7 +528,7 @@ char* prep_code(char *str, const char* prefix) strcpy(str, tmp); } str[LEN_CODE] = 0; - return(str); + return str; } /****************************************************************************/ @@ -552,7 +552,7 @@ ushort sys_timezone(scfg_t* cfg) } } - return(cfg->sys_timezone); + return cfg->sys_timezone; } diff --git a/src/sbbs3/login.cpp b/src/sbbs3/login.cpp index 9e08b0bcef2a95be7f52f20b7d01d4694789c998..4b3d4ad78fa90501ccedb0fd0f64220cbe25eb27 100644 --- a/src/sbbs3/login.cpp +++ b/src/sbbs3/login.cpp @@ -76,12 +76,12 @@ int sbbs_t::login(const char *username, const char *pw_prompt, const char* user_ logline(LOG_NOTICE, "+!", tmp); } useron.misc = useron_misc; - return(LOGIC_FALSE); + return LOGIC_FALSE; } if (!online) { useron.number = 0; - return(LOGIC_FALSE); + return LOGIC_FALSE; } if (useron.pass[0] || REALSYSOP) { @@ -96,7 +96,7 @@ int sbbs_t::login(const char *username, const char *pw_prompt, const char* user_ } if (!online) { useron.number = 0; - return(LOGIC_FALSE); + return LOGIC_FALSE; } if (stricmp(useron.pass, str)) { badlogin(useron.alias, str); @@ -110,13 +110,13 @@ int sbbs_t::login(const char *username, const char *pw_prompt, const char* user_ logline(LOG_NOTICE, "+!", tmp); useron.number = 0; useron.misc = useron_misc; - return(LOGIC_FALSE); + return LOGIC_FALSE; } if (REALSYSOP && (cfg.sys_misc & SM_SYSPASSLOGIN) && (cfg.sys_misc & SM_R_SYSOP) && !chksyspass(sys_pw)) { bputs(text[InvalidLogon]); useron.number = 0; useron.misc = useron_misc; - return(LOGIC_FALSE); + return LOGIC_FALSE; } } @@ -125,7 +125,7 @@ int sbbs_t::login(const char *username, const char *pw_prompt, const char* user_ PlaySound(startup->sound.login, NULL, SND_ASYNC | SND_FILENAME); #endif - return(LOGIC_TRUE); + return LOGIC_TRUE; } void sbbs_t::badlogin(const char* user, const char* passwd, const char* protocol, xp_sockaddr* addr, bool delay) diff --git a/src/sbbs3/logon.cpp b/src/sbbs3/logon.cpp index 83d6c24079fe0bbcc03c027b24a3289e53727388..35450bccd6515631e8a1e06ce188e7e6ba7a5556 100644 --- a/src/sbbs3/logon.cpp +++ b/src/sbbs3/logon.cpp @@ -43,10 +43,10 @@ bool sbbs_t::logon() now = time(NULL); if (localtime_r(&now, &tm) == NULL) - return(false); + return false; if (!useron.number) - return(false); + return false; SAFECOPY(client.user, useron.alias); client.usernum = useron.number; @@ -106,7 +106,7 @@ bool sbbs_t::logon() , useron.number, useron.alias, cfg.node_arstr); logline(LOG_NOTICE, "+!", str); hangup(); - return(false); + return false; } if (!getnodedat(cfg.node_num, &thisnode, true)) { @@ -123,7 +123,7 @@ bool sbbs_t::logon() , useron.number, useron.alias); logline(LOG_NOTICE, "+!", str); hangup(); - return(false); + return false; } bool rmlock = yesno(text[RemoveNodeLockQ]); if (!getnodedat(cfg.node_num, &thisnode, true)) { @@ -331,7 +331,7 @@ bool sbbs_t::logon() , useron.number, useron.alias); logline(LOG_NOTICE, "+!", str); hangup(); - return(false); + return false; } if (useron.rest & FLAG('L') && useron.ltoday > 1) { bputs(text[R_Logons]); @@ -339,7 +339,7 @@ bool sbbs_t::logon() , useron.number, useron.alias); logline(LOG_NOTICE, "+!", str); hangup(); - return(false); + return false; } kmode = (cfg.uq & UQ_NOEXASC) | K_TRIM; if (!(cfg.uq & UQ_NOUPRLWR)) @@ -445,7 +445,7 @@ bool sbbs_t::logon() safe_snprintf(str, sizeof(str), "(%04u) %-25s Unsuccessful logon" , useron.number, useron.alias); logline(LOG_NOTICE, "+!", str); - return(false); + return false; } SAFECOPY(useron.modem, connection); SAFECOPY(useron.ipaddr, client_ipaddr); @@ -461,7 +461,7 @@ bool sbbs_t::logon() safe_snprintf(str, sizeof(str), "(%04u) %-25s QWK Network Connection" , useron.number, useron.alias); logline("++", str); - return(true); + return true; } /********************/ @@ -480,7 +480,7 @@ bool sbbs_t::logon() safe_snprintf(path, sizeof(path), "%slogon.lst", cfg.data_dir); if ((file = nopen(path, O_WRONLY | O_CREAT | O_APPEND)) == -1) { errormsg(WHERE, ERR_OPEN, path, O_RDWR | O_CREAT | O_APPEND); - return(false); + return false; } getuserstr(&cfg, useron.number, USER_NOTE, useron.note, sizeof(useron.note)); getuserstr(&cfg, useron.number, USER_LOCATION, useron.location, sizeof(useron.location)); @@ -501,7 +501,7 @@ bool sbbs_t::logon() } if (sys_status & SS_QWKLOGON) - return(true); + return true; sys_status |= SS_PAUSEON; /* always force pause on during this section */ mailw = getmail(&cfg, useron.number, /* Sent: */ FALSE, /* attr: */ 0); @@ -553,7 +553,7 @@ bool sbbs_t::logon() logline(LOG_NOTICE, "+!", str); bputs(text[UserOnTwoNodes]); hangup(); - return(false); + return false; } } } @@ -599,7 +599,7 @@ bool sbbs_t::logon() scanallsubs(SCAN_NEW); if (usrgrps && useron.misc & ASK_SSCAN && text[SScanAllGrpsQ][0] && yesno(text[SScanAllGrpsQ])) scanallsubs(SCAN_TOYOU | SCAN_UNREAD); - return(true); + return true; } /****************************************************************************/ @@ -630,9 +630,9 @@ uint sbbs_t::logonstats() if (stats.date > now + (24L * 60L * 60L)) /* More than a day in the future? */ errormsg(WHERE, ERR_CHK, "Daily stats date/time stamp", (ulong)stats.date); if (localtime_r(&stats.date, &update_tm) == NULL) - return(0); + return 0; if (localtime_r(&now, &tm) == NULL) - return(0); + return 0; if ((tm.tm_mday > update_tm.tm_mday && tm.tm_mon == update_tm.tm_mon) || tm.tm_mon > update_tm.tm_mon || tm.tm_year > update_tm.tm_year) { @@ -646,7 +646,7 @@ uint sbbs_t::logonstats() int file; if ((file = nopen(path, O_TRUNC | O_CREAT | O_WRONLY)) == -1) { errormsg(WHERE, ERR_OPEN, path, O_TRUNC | O_CREAT | O_WRONLY); - return(0L); + return 0L; } close(file); for (i = 0; i <= cfg.sys_nodes; i++) { @@ -682,19 +682,19 @@ uint sbbs_t::logonstats() } } if (cfg.node_num == 0) /* called from event_thread() */ - return(0); + return 0; if (thisnode.status == NODE_QUIET) /* Quiet users aren't counted */ - return(0); + return 0; if (REALSYSOP && !(cfg.sys_misc & SM_SYSSTAT)) - return(0); + return 0; for (i = 0; i < 2; i++) { FILE* fp = fopen_dstats(&cfg, i ? 0 : cfg.node_num, /* for_write: */ TRUE); if (fp == NULL) { errormsg(WHERE, ERR_OPEN, "dsts.ini", i); - return(0L); + return 0L; } if (!fread_dstats(fp, &stats)) { errormsg(WHERE, ERR_READ, "dsts.ini", i); @@ -707,5 +707,5 @@ uint sbbs_t::logonstats() fclose_dstats(fp); } - return(stats.logons); + return stats.logons; } diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c index e4c6bec697eb0daa00e89390eaf98e4481c17125..e37bbd5d99197c23e86158d095a1bc726a80d22f 100644 --- a/src/sbbs3/mailsrvr.c +++ b/src/sbbs3/mailsrvr.c @@ -262,11 +262,11 @@ static BOOL winsock_startup(void) if ((status = WSAStartup(MAKEWORD(1, 1), &WSAData)) == 0) { lprintf(LOG_DEBUG, "%s %s", WSAData.szDescription, WSAData.szSystemStatus); WSAInitialized = TRUE; - return (TRUE); + return TRUE; } lprintf(LOG_CRIT, "!WinSock startup ERROR %d", status); - return (FALSE); + return FALSE; } #else /* No WINSOCK */ @@ -370,7 +370,7 @@ int mail_close_socket(SOCKET *sock, int *sess) *sess = -1; } if (*sock == INVALID_SOCKET) - return(-1); + return -1; shutdown(*sock, SHUT_RDWR); /* required on Unix */ result = closesocket(*sock); @@ -388,7 +388,7 @@ int mail_close_socket(SOCKET *sock, int *sess) *sock = -1; - return(result); + return result; } int sockprintf(SOCKET sock, const char* prot, CRYPT_SESSION sess, char *fmt, ...) @@ -400,14 +400,14 @@ int sockprintf(SOCKET sock, const char* prot, CRYPT_SESSION sess, char *fmt, ... if (sock == INVALID_SOCKET) { lprintf(LOG_WARNING, "%s !INVALID SOCKET in call to sockprintf", prot); - return(0); + return 0; } /* Check socket for writability */ if (!socket_writable(sock, 300000)) { lprintf(LOG_NOTICE, "%04d %s !NOTICE socket did not become writable" , sock, prot); - return(0); + return 0; } va_start(argptr, fmt); @@ -465,13 +465,13 @@ int sockprintf(SOCKET sock, const char* prot, CRYPT_SESSION sess, char *fmt, ... else lprintf(LOG_NOTICE, "%04d %s !ERROR %d sending on socket", sock, prot, SOCKET_ERRNO); free(sbuf); - return(0); + return 0; } lprintf(LOG_WARNING, "%04d %s !ERROR: short send on socket: %d instead of %d", sock, prot, result, len); } } free(sbuf); - return(len); + return len; } static void sockerror(SOCKET socket, const char* prot, int rd, const char* action) @@ -521,7 +521,7 @@ static int sock_recvbyte(SOCKET sock, const char* prot, CRYPT_SESSION sess, char if (startup->max_inactivity && (time(NULL) - start) > startup->max_inactivity) { lprintf(LOG_WARNING, "%04d %s !TIMEOUT in sock_recvbyte (%u seconds): INACTIVE SOCKET" , sock, prot, startup->max_inactivity); - return(-1); + return -1; } } } @@ -530,7 +530,7 @@ static int sock_recvbyte(SOCKET sock, const char* prot, CRYPT_SESSION sess, char if (startup->max_inactivity && (time(NULL) - start) > startup->max_inactivity) { lprintf(LOG_WARNING, "%04d %s !TIMEOUT in sock_recvbyte (%u seconds): INACTIVE SOCKET" , sock, prot, startup->max_inactivity); - return(-1); + return -1; } return 0; } @@ -553,20 +553,20 @@ static int sockreadline(SOCKET socket, const char* prot, CRYPT_SESSION sess, cha if (socket == INVALID_SOCKET) { lprintf(LOG_WARNING, "%s !INVALID SOCKET in call to sockreadline", prot); - return(-1); + return -1; } while (rd < len - 1) { if (terminated || terminate_server) { lprintf(LOG_WARNING, "%04d %s !ABORTING sockreadline", socket, prot); - return(-1); + return -1; } i = sock_recvbyte(socket, prot, sess, &ch, start); if (i < 1) - return(-1); + return -1; if (ch == '\n' /* && rd>=1 */) { /* Mar-9-2003: terminate on sole LF */ break; @@ -577,7 +577,7 @@ static int sockreadline(SOCKET socket, const char* prot, CRYPT_SESSION sess, cha rd--; buf[rd] = 0; - return(rd); + return rd; } static BOOL sockgetrsp(SOCKET socket, const char* prot, CRYPT_SESSION sess, char* rsp, char *buf, int len) @@ -589,7 +589,7 @@ static BOOL sockgetrsp(SOCKET socket, const char* prot, CRYPT_SESSION sess, char if (rd < 1) { if (rd == 0 && rsp != NULL) lprintf(LOG_NOTICE, "%04d %s !RECEIVED BLANK RESPONSE, Expected '%s'", socket, prot, rsp); - return(FALSE); + return FALSE; } if (buf[3] == '-') { /* Multi-line response */ if (startup->options & MAIL_OPT_DEBUG_RX_RSP) @@ -598,13 +598,13 @@ static BOOL sockgetrsp(SOCKET socket, const char* prot, CRYPT_SESSION sess, char } if (rsp != NULL && strnicmp(buf, rsp, strlen(rsp))) { lprintf(LOG_NOTICE, "%04d %s !INVALID RESPONSE: '%s' Expected: '%s'", socket, prot, buf, rsp); - return(FALSE); + return FALSE; } break; } if (startup->options & MAIL_OPT_DEBUG_RX_RSP) lprintf(LOG_DEBUG, "%04d %s RX: %s", socket, prot, buf); - return(TRUE); + return TRUE; } static int sockgetrsp_opt(SOCKET socket, const char* prot, CRYPT_SESSION sess, char* rsp, char *opt, char *buf, int len) @@ -625,7 +625,7 @@ static int sockgetrsp_opt(SOCKET socket, const char* prot, CRYPT_SESSION sess, c if (rd == 0) lprintf(LOG_NOTICE, "%04d %s !RECEIVED BLANK RESPONSE, Expected '%s'", socket, prot, rsp); free(mopt); - return(-1); + return -1; } if (buf[3] == '-') { /* Multi-line response */ if (strncmp(buf, mopt, moptlen) == 0) @@ -637,7 +637,7 @@ static int sockgetrsp_opt(SOCKET socket, const char* prot, CRYPT_SESSION sess, c if (strnicmp(buf, rsp, strlen(rsp))) { lprintf(LOG_NOTICE, "%04d %s !INVALID RESPONSE: '%s' Expected: '%s'", socket, prot, buf, rsp); free(mopt); - return(-1); + return -1; } break; } @@ -647,7 +647,7 @@ static int sockgetrsp_opt(SOCKET socket, const char* prot, CRYPT_SESSION sess, c free(mopt); if (startup->options & MAIL_OPT_DEBUG_RX_RSP) lprintf(LOG_DEBUG, "%04d %s RX: %s", socket, prot, buf); - return(ret); + return ret; } /* non-standard, but documented (mostly) in draft-newman-msgheader-originfo-05 */ @@ -752,15 +752,15 @@ static ulong sockmimetext(SOCKET socket, const char* prot, CRYPT_SESSION sess, s if (msg->reverse_path != NULL) if (!sockprintf(socket, prot, sess, "Return-Path: %s", msg->reverse_path)) - return(0); + return 0; for (i = 0; i < msg->total_hfields; i++) if (msg->hfield[i].type == SMTPRECEIVED && msg->hfield_dat[i] != NULL) if (!sockprintf(socket, prot, sess, "Received: %s", (char*)msg->hfield_dat[i])) - return(0); + return 0; if (!sockprintf(socket, prot, sess, "Date: %s", msgdate(msg->hdr.when_written, date))) - return(0); + return 0; if ((p = smb_get_hfield(msg, RFC822FROM, NULL)) != NULL) s = sockprintf(socket, prot, sess, "From: %s", p); /* use original RFC822 header field */ @@ -773,21 +773,21 @@ static ulong sockmimetext(SOCKET socket, const char* prot, CRYPT_SESSION sess, s , angle_bracket(tmp, sizeof(tmp), fromaddr)); } if (!s) - return(0); + return 0; if ((p = smb_get_hfield(msg, RFC822ORG, NULL)) != NULL) { if (!sockprintf(socket, prot, sess, "Organization: %s", p)) - return(0); + return 0; } else { if (msg->from_org != NULL || msg->from_net.type == NET_NONE) if (!sockprintf(socket, prot, sess, "Organization: %s" , encode_header_field(msg->from_org == NULL ? scfg.sys_name : msg->from_org, encoded_text, sizeof encoded_text, msg))) - return(0); + return 0; } p = smb_get_hfield(msg, RFC822SUBJECT, NULL); if (!sockprintf(socket, prot, sess, "Subject: %s", p == NULL ? encode_header_field(msg->subj, encoded_text, sizeof encoded_text, msg) : p)) - return(0); + return 0; if ((p = smb_get_hfield(msg, RFC822TO, NULL)) != NULL) s = sockprintf(socket, prot, sess, "To: %s", p); /* use original RFC822 header field (MIME-Encoded) */ @@ -811,10 +811,10 @@ static ulong sockmimetext(SOCKET socket, const char* prot, CRYPT_SESSION sess, s } } if (!s) - return(0); + return 0; if ((p = smb_get_hfield(msg, RFC822CC, NULL)) != NULL || msg->cc_list != NULL) if (!sockprintf(socket, prot, sess, "Cc: %s", p == NULL ? msg->cc_list : p)) - return(0); + return 0; np = NULL; p = smb_get_hfield(msg, RFC822REPLYTO, NULL); if (p == NULL && (p = msg->replyto_list) == NULL) { @@ -829,16 +829,16 @@ static ulong sockmimetext(SOCKET socket, const char* prot, CRYPT_SESSION sess, s s = sockprintf(socket, prot, sess, "Reply-To: %s", p); } if (!s) - return(0); + return 0; if (!sockprintf(socket, prot, sess, "Message-ID: %s", get_msgid(&scfg, INVALID_SUB, msg, msgid, sizeof(msgid)))) - return(0); + return 0; if (msg->reply_id != NULL) if (!sockprintf(socket, prot, sess, "In-Reply-To: %s", msg->reply_id)) - return(0); + return 0; if (msg->hdr.priority != SMB_PRIORITY_UNSPECIFIED) if (!sockprintf(socket, prot, sess, "X-Priority: %u", (uint)msg->hdr.priority)) - return(0); + return 0; originator_info(socket, prot, sess, msg); @@ -855,14 +855,14 @@ static ulong sockmimetext(SOCKET socket, const char* prot, CRYPT_SESSION sess, s case FIDOFLAGS: case FIDOTID: if (!sockprintf(socket, prot, sess, "%s: %s", smb_hfieldtype(msg->hfield[i].type), (char*)msg->hfield_dat[i])) - return(0); + return 0; break; } } for (i = 0; i < msg->total_hfields; i++) { if (msg->hfield[i].type == RFC822HEADER) { if (!sockprintf(socket, prot, sess, "%s", (char*)msg->hfield_dat[i])) - return(0); + return 0; } } const char* charset = msg->text_charset; @@ -889,7 +889,7 @@ static ulong sockmimetext(SOCKET socket, const char* prot, CRYPT_SESSION sess, s } } if (!sockprintf(socket, prot, sess, "")) /* Header Terminator */ - return(0); + return 0; /* MESSAGE BODY */ lines = 0; @@ -941,7 +941,7 @@ static ulong sockmimetext(SOCKET socket, const char* prot, CRYPT_SESSION sess, s } } sockprintf(socket, prot, sess, "."); /* End of text */ - return(lines); + return lines; } static ulong sockmsgtxt(SOCKET socket, const char* prot, CRYPT_SESSION sess, smbmsg_t* msg, char* msgtxt, ulong maxlines) @@ -995,7 +995,7 @@ static ulong sockmsgtxt(SOCKET socket, const char* prot, CRYPT_SESSION sess, smb if (boundary != NULL) free(boundary); - return(retval); + return retval; } static in_addr_t resolve_ip(const char *inaddr) @@ -1019,7 +1019,7 @@ static in_addr_t resolve_ip(const char *inaddr) if (*p != '.' && !IS_DIGIT(*p)) break; if (!(*p)) - return(inet_addr(addr)); + return inet_addr(addr); if ((host = gethostbyname(inaddr)) == NULL) return INADDR_NONE; @@ -1902,7 +1902,7 @@ static in_addr_t rblchk(SOCKET sock, const char* prot, union xp_sockaddr *addr, lprintf(LOG_DEBUG, "%04d %s DNSBL Query: %s", sock, prot, name); if ((host = gethostbyname(name)) == NULL) - return(0); + return 0; if (host->h_addr_list[0] == NULL) return 0; @@ -1911,7 +1911,7 @@ static in_addr_t rblchk(SOCKET sock, const char* prot, union xp_sockaddr *addr, lprintf(LOG_INFO, "%04d %s DNSBL Query: %s resolved to: %s" , sock, prot, name, inet_ntoa(dnsbl_result)); - return(dnsbl_result.s_addr); + return dnsbl_result.s_addr; } static ulong dns_blacklisted(SOCKET sock, const char* prot, union xp_sockaddr *addr, char* host_name, char* list, char* dnsbl_ip) @@ -1927,11 +1927,11 @@ static ulong dns_blacklisted(SOCKET sock, const char* prot, union xp_sockaddr *a SAFEPRINTF(fname, "%sdnsbl_exempt.cfg", scfg.ctrl_dir); inet_addrtop(addr, ip, sizeof(ip)); if (find2strs(ip, host_name, fname, NULL)) - return(FALSE); + return FALSE; SAFEPRINTF(fname, "%sdns_blacklist.cfg", scfg.ctrl_dir); if ((fp = fopen(fname, "r")) == NULL) - return(FALSE); + return FALSE; while (!feof(fp) && !found) { if (fgets(str, sizeof(str), fp) == NULL) @@ -1956,7 +1956,7 @@ static ulong dns_blacklisted(SOCKET sock, const char* prot, union xp_sockaddr *a if (found) strcpy(dnsbl_ip, ip); - return(found); + return found; } static void parse_mail_address(const char* p @@ -2013,13 +2013,13 @@ static BOOL chk_email_addr(SOCKET socket, const char* prot, char* p, char* host_ struct trash trash; if (!trashcan2(&scfg, name, addr, "email", &trash)) - return(TRUE); + return TRUE; char details[128]; lprintf(LOG_NOTICE, "%04d %s [%s] !BLOCKED %s e-mail address: %s %s" , socket, prot, host_ip, source, p, trash_details(&trash, details, sizeof details)); SAFEPRINTF2(tmp, "Blocked %s e-mail address: %s", source, p); spamlog(&scfg, &mqtt, (char*)prot, "REFUSED", tmp, host_name, host_ip, to, from); - return(FALSE); + return FALSE; } static BOOL email_addr_is_exempt(const char* addr) @@ -2182,7 +2182,7 @@ static char* mailcmdstr(char* instr, char* msgpath, char* newpath, char* logpath } cmd[j] = 0; - return(cmd); + return cmd; } #ifdef JAVASCRIPT @@ -2253,7 +2253,7 @@ js_log(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (private_t*)JS_GetContextPrivate(cx)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (JSVAL_IS_NUMBER(argv[i])) { if (!JS_ValueToInt32(cx, argv[i++], &level)) @@ -2264,7 +2264,7 @@ js_log(JSContext *cx, uintN argc, jsval *arglist) JSVALUE_TO_RASTRING(cx, argv[i], lstr, &lstr_sz, NULL); HANDLE_PENDING(cx, lstr); if (lstr == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); lprintf(level, "%04d %s %s %s" , p->sock, p->log_prefix, p->proc_name, lstr); @@ -2275,7 +2275,7 @@ js_log(JSContext *cx, uintN argc, jsval *arglist) if (lstr) free(lstr); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -2289,11 +2289,11 @@ js_alert(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((p = (private_t*)JS_GetContextPrivate(cx)) == NULL) - return(JS_FALSE); + return JS_FALSE; JSVALUE_TO_MSTRING(cx, argv[0], line, NULL); if (line == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); lprintf(LOG_ERR, "%04d %s %s %s" @@ -2303,7 +2303,7 @@ js_alert(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, argv[0]); - return(JS_TRUE); + return JS_TRUE; } @@ -2500,7 +2500,7 @@ js_mailproc(SOCKET sock, client_t* client, user_t* user, struct mailproc* mailpr JS_ENDREQUEST(*js_cx); - return(success); + return success; } void js_cleanup(JSRuntime* js_runtime, JSContext* js_cx, JSObject** js_glob) @@ -2749,7 +2749,7 @@ static int chk_received_hdr(SOCKET socket, const char* prot, const char *buf, IN fromstr = strdup(buf); if (fromstr == NULL) - return(0); + return 0; strlwr(fromstr); do { p = strstr(fromstr, "from "); @@ -2798,7 +2798,7 @@ static int chk_received_hdr(SOCKET socket, const char* prot, const char *buf, IN , socket, prot, ip, dnsbl, host_name, inet_ntoa(*dnsbl_result)); } while (0); free(fromstr); - return(dnsbl_result->s_addr); + return dnsbl_result->s_addr; } static BOOL checktag(scfg_t *scfg, char *tag, uint usernum) @@ -2806,9 +2806,9 @@ static BOOL checktag(scfg_t *scfg, char *tag, uint usernum) char fname[MAX_PATH + 1]; if (tag == NULL) - return(FALSE); + return FALSE; SAFEPRINTF2(fname, "%suser/%04d.smtpblock", scfg->data_dir, usernum); - return(findstr(tag, fname)); + return findstr(tag, fname); } static BOOL smtp_splittag(char *in, char **name, char **tag) @@ -2816,14 +2816,14 @@ static BOOL smtp_splittag(char *in, char **name, char **tag) char *last; if (in == NULL) - return(FALSE); + return FALSE; *name = strtok_r(in, "#", &last); if (*name) { *tag = strtok_r(NULL, "", &last); - return(TRUE); + return TRUE; } - return(FALSE); + return FALSE; } static uint smtp_matchuser(scfg_t *scfg, char *str, BOOL aliases, BOOL datdupe) @@ -2834,7 +2834,7 @@ static uint smtp_matchuser(scfg_t *scfg, char *str, BOOL aliases, BOOL datdupe) uint usernum = 0; if (!user) - return(0); + return 0; if (!smtp_splittag(user, &name, &tag)) goto end; @@ -2852,7 +2852,7 @@ static uint smtp_matchuser(scfg_t *scfg, char *str, BOOL aliases, BOOL datdupe) end: free(user); - return(usernum); + return usernum; } #define WITH_ESMTP (1 << 0) @@ -5137,11 +5137,11 @@ BOOL bounce(SOCKET sock, smb_t* smb, smbmsg_t* msg, char* err, BOOL immediate) if ((i = smb_updatemsg(smb, msg)) != SMB_SUCCESS) { errprintf(LOG_ERR, WHERE, "%04d SEND !BOUNCE ERROR %d (%s) incrementing delivery attempt counter of message #%u" , sock, i, smb->last_error, msg->hdr.number); - return(FALSE); + return FALSE; } if (!immediate && msg->hdr.delivery_attempts < startup->max_delivery_attempts) - return(TRUE); + return TRUE; newmsg = *msg; /* Mark original message as deleted */ @@ -5156,7 +5156,7 @@ BOOL bounce(SOCKET sock, smb_t* smb, smbmsg_t* msg, char* err, BOOL immediate) if (i != SMB_SUCCESS) { errprintf(LOG_ERR, WHERE, "%04d SEND !BOUNCE ERROR %d (%s) deleting message" , sock, i, smb->last_error); - return(FALSE); + return FALSE; } if (msg->from_agent == AGENT_SMTPSYSMSG /* don't bounce 'bounce messages' */ @@ -5164,7 +5164,7 @@ BOOL bounce(SOCKET sock, smb_t* smb, smbmsg_t* msg, char* err, BOOL immediate) || (msg->idx.from == 0 && msg->from_net.type == NET_NONE) || (msg->reverse_path != NULL && *msg->reverse_path == 0)) { lprintf(LOG_NOTICE, "%04d SEND !Deleted undeliverable message from %s", sock, msg->from); - return(TRUE); + return TRUE; } newmsg.hfield = NULL; @@ -5237,7 +5237,7 @@ BOOL bounce(SOCKET sock, smb_t* smb, smbmsg_t* msg, char* err, BOOL immediate) newmsg.hdr.total_dfields = 0; smb_freemsgmem(&newmsg); - return(TRUE); + return TRUE; } static int remove_msg_intransit(smb_t* smb, smbmsg_t* msg) @@ -5247,7 +5247,7 @@ static int remove_msg_intransit(smb_t* smb, smbmsg_t* msg) if ((i = smb_lockmsghdr(smb, msg)) != SMB_SUCCESS) { lprintf(LOG_WARNING, "0000 SEND !ERROR %d (%s) locking message header #%u" , i, smb->last_error, msg->idx.number); - return(i); + return i; } msg->hdr.netattr &= ~NETMSG_INTRANSIT; i = smb_putmsghdr(smb, msg); @@ -5257,7 +5257,7 @@ static int remove_msg_intransit(smb_t* smb, smbmsg_t* msg) errprintf(LOG_ERR, WHERE, "0000 SEND !ERROR %d (%s) writing message header #%u" , i, smb->last_error, msg->idx.number); - return(i); + return i; } void get_dns_server(char* dns_server, size_t len) @@ -6053,7 +6053,7 @@ const char* mail_ver(void) , GIT_DATE, compiler ); - return(ver); + return ver; } void mail_server(void* arg) diff --git a/src/sbbs3/main.cpp b/src/sbbs3/main.cpp index c15a95fb6a5be7e06b65ccacab07e5087f9e7ec5..105de56a28dae1a4f3e2b4f10a24a57678f70a66 100644 --- a/src/sbbs3/main.cpp +++ b/src/sbbs3/main.cpp @@ -243,14 +243,14 @@ int lputs(int level, const char* str) } if (startup == NULL || startup->lputs == NULL || str == NULL || level > startup->log_level) - return(0); + return 0; #if defined(_WIN32) if (IsBadCodePtr((FARPROC)startup->lputs)) - return(0); + return 0; #endif - return(startup->lputs(startup->cbdata, level, str)); + return startup->lputs(startup->cbdata, level, str); } int eputs(int level, const char *str) @@ -269,9 +269,9 @@ int eputs(int level, const char *str) } if (startup == NULL || startup->event_lputs == NULL || level > startup->event_log_level) - return(0); + return 0; - return(startup->event_lputs(startup->event_cbdata, level, str)); + return startup->event_lputs(startup->event_cbdata, level, str); } int lprintf(int level, const char *fmt, ...) @@ -283,7 +283,7 @@ int lprintf(int level, const char *fmt, ...) vsnprintf(sbuf, sizeof(sbuf), fmt, argptr); sbuf[sizeof(sbuf) - 1] = 0; va_end(argptr); - return(lputs(level, sbuf)); + return lputs(level, sbuf); } DLLEXPORT uint repeated_error(int line, const char* function) @@ -365,7 +365,7 @@ int sbbs_t::lprintf(int level, const char *fmt, ...) vsnprintf(sbuf, sizeof(sbuf), fmt, argptr); sbuf[sizeof(sbuf) - 1] = 0; va_end(argptr); - return(lputs(level, sbuf)); + return lputs(level, sbuf); } int sbbs_t::errprintf(int level, int line, const char* function, const char* file, const char* fmt, ...) @@ -425,7 +425,7 @@ SOCKET open_socket(int domain, int type, const char* protocol) if (sock != INVALID_SOCKET && set_socket_options(&scfg, sock, protocol, error, sizeof(error))) lprintf(LOG_ERR, "%04d !ERROR %s", sock, error); - return(sock); + return sock; } // Used by sbbs_t::ftp_put() and js_accept() @@ -437,7 +437,7 @@ SOCKET accept_socket(SOCKET s, union xp_sockaddr* addr, socklen_t* addrlen) if (sock != INVALID_SOCKET) call_socket_open_callback(true); - return(sock); + return sock; } int close_socket(SOCKET sock) @@ -445,14 +445,14 @@ int close_socket(SOCKET sock) int result; if (sock == INVALID_SOCKET || sock == 0) - return(0); + return 0; shutdown(sock, SHUT_RDWR); /* required on Unix */ result = closesocket(sock); call_socket_open_callback(false); if (result != 0 && SOCKET_ERRNO != ENOTSOCK) lprintf(LOG_WARNING, "!ERROR %d closing socket %d", SOCKET_ERRNO, sock); - return(result); + return result; } /* TODO: IPv6 */ @@ -468,7 +468,7 @@ in_addr_t resolve_ip(char *addr) if (*p != '.' && !IS_DIGIT(*p)) break; if (!(*p)) - return(inet_addr(addr)); + return inet_addr(addr); if ((host = gethostbyname(addr)) == NULL) return INADDR_NONE; if (host->h_addr_list[0] == NULL) @@ -491,11 +491,11 @@ static BOOL winsock_startup(void) if ((status = WSAStartup(MAKEWORD(1, 1), &WSAData)) == 0) { lprintf(LOG_DEBUG, "%s %s", WSAData.szDescription, WSAData.szSystemStatus); WSAInitialized = true; - return(true); + return true; } lprintf(LOG_CRIT, "!WinSock startup ERROR %d", status); - return(false); + return false; } #else /* No WINSOCK */ @@ -527,7 +527,7 @@ DLLEXPORT void sbbs_srand() int sbbs_random(int n) { - return(xp_random(n)); + return xp_random(n); } #ifdef JAVASCRIPT @@ -556,15 +556,15 @@ js_DescribeSyncObject(JSContext* cx, JSObject* obj, const char* str, int ver) JSString* js_str = JS_NewStringCopyZ(cx, str); if (js_str == NULL) - return(JS_FALSE); + return JS_FALSE; if (ver < 10000) /* auto convert 313 to 31300 */ ver *= 100; - return(JS_DefineProperty(cx, obj, "_description" + return JS_DefineProperty(cx, obj, "_description" , STRING_TO_JSVAL(js_str), NULL, NULL, JSPROP_READONLY) != JS_FALSE && JS_DefineProperty(cx, obj, "_ver" - , INT_TO_JSVAL(ver), NULL, NULL, JSPROP_READONLY) != JS_FALSE); + , INT_TO_JSVAL(ver), NULL, NULL, JSPROP_READONLY) != JS_FALSE; } JSBool @@ -573,10 +573,10 @@ js_DescribeSyncConstructor(JSContext* cx, JSObject* obj, const char* str) JSString* js_str = JS_NewStringCopyZ(cx, str); if (js_str == NULL) - return(JS_FALSE); + return JS_FALSE; - return(JS_DefineProperty(cx, obj, "_constructor" - , STRING_TO_JSVAL(js_str), NULL, NULL, JSPROP_READONLY)); + return JS_DefineProperty(cx, obj, "_constructor" + , STRING_TO_JSVAL(js_str), NULL, NULL, JSPROP_READONLY); } #ifdef BUILD_JSDOCS @@ -614,17 +614,17 @@ js_DefineSyncProperties(JSContext *cx, JSObject *obj, jsSyncPropertySpec* props) JSObject* prop; if ((array = JS_NewObject(cx, NULL, NULL, obj)) == NULL) - return(JS_FALSE); + return JS_FALSE; for (i = 0; props[i].name != NULL; ++i) { if (props[i].tinyid < 256 && props[i].tinyid > -129) { if (!JS_DefinePropertyWithTinyId(cx, obj, /* Never reserve any "slots" for properties */ props[i].name, props[i].tinyid, JSVAL_VOID, NULL, NULL, props[i].flags | JSPROP_SHARED)) - return(JS_FALSE); + return JS_FALSE; } else { if (!JS_DefineProperty(cx, obj, props[i].name, JSVAL_VOID, NULL, NULL, props[i].flags | JSPROP_SHARED)) - return(JS_FALSE); + return JS_FALSE; } if (!(props[i].flags & JSPROP_ENUMERATE)) /* No need to document invisible props */ continue; @@ -669,7 +669,7 @@ js_DefineSyncMethods(JSContext* cx, JSObject* obj, jsSyncMethodSpec *funcs) method_array = JSVAL_TO_OBJECT(val); // If the first item is already in the list, don't do anything. if (method_array == NULL || !JS_GetArrayLength(cx, method_array, &len)) - return(JS_FALSE); + return JS_FALSE; for (i = 0; i < (int)len; i++) { if (JS_GetElement(cx, method_array, i, &val) != JS_TRUE || val == JSVAL_VOID) continue; @@ -678,55 +678,55 @@ js_DefineSyncMethods(JSContext* cx, JSObject* obj, jsSyncMethodSpec *funcs) if (str == NULL) continue; if (strcmp(str, funcs[0].name) == 0) - return(JS_TRUE); + return JS_TRUE; } } else { if ((method_array = JS_NewArrayObject(cx, 0, NULL)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (!JS_DefineProperty(cx, obj, method_array_name, OBJECT_TO_JSVAL(method_array) , NULL, NULL, 0)) - return(JS_FALSE); + return JS_FALSE; } for (i = 0; funcs[i].name != NULL; ++i) { if (!JS_DefineFunction(cx, obj, funcs[i].name, funcs[i].call, funcs[i].nargs, 0)) - return(JS_FALSE); + return JS_FALSE; if (funcs[i].type == JSTYPE_ALIAS) continue; method = JS_NewObject(cx, NULL, NULL, method_array); if (method == NULL) - return(JS_FALSE); + return JS_FALSE; if (funcs[i].name != NULL) { if ((js_str = JS_NewStringCopyZ(cx, funcs[i].name)) == NULL) - return(JS_FALSE); + return JS_FALSE; val = STRING_TO_JSVAL(js_str); JS_SetProperty(cx, method, "name", &val); } val = INT_TO_JSVAL(funcs[i].nargs); if (!JS_SetProperty(cx, method, "nargs", &val)) - return(JS_FALSE); + return JS_FALSE; if ((js_str = JS_NewStringCopyZ(cx, js_type_str[funcs[i].type])) == NULL) - return(JS_FALSE); + return JS_FALSE; val = STRING_TO_JSVAL(js_str); JS_SetProperty(cx, method, "type", &val); if (funcs[i].args != NULL) { if ((js_str = JS_NewStringCopyZ(cx, funcs[i].args)) == NULL) - return(JS_FALSE); + return JS_FALSE; val = STRING_TO_JSVAL(js_str); JS_SetProperty(cx, method, "args", &val); } if (funcs[i].desc != NULL) { if ((js_str = JS_NewStringCopyZ(cx, funcs[i].desc)) == NULL) - return(JS_FALSE); + return JS_FALSE; val = STRING_TO_JSVAL(js_str); JS_SetProperty(cx, method, "desc", &val); } @@ -740,10 +740,10 @@ js_DefineSyncMethods(JSContext* cx, JSObject* obj, jsSyncMethodSpec *funcs) val = OBJECT_TO_JSVAL(method); if (!JS_SetElement(cx, method_array, len + i, &val)) - return(JS_FALSE); + return JS_FALSE; } - return(JS_TRUE); + return JS_TRUE; } /* @@ -771,7 +771,7 @@ js_SyncResolve(JSContext* cx, JSObject* obj, char *name, jsSyncPropertySpec* pro ret = JS_FALSE; } - return(ret); + return ret; } #else // NON-JSDOCS @@ -789,15 +789,15 @@ js_DefineSyncProperties(JSContext *cx, JSObject *obj, jsSyncPropertySpec* props) if (props[i].tinyid < 256 && props[i].tinyid > -129) { if (!JS_DefinePropertyWithTinyId(cx, obj, props[i].name, props[i].tinyid, JSVAL_VOID, NULL, NULL, props[i].flags | JSPROP_SHARED)) - return(JS_FALSE); + return JS_FALSE; } else { if (!JS_DefineProperty(cx, obj, props[i].name, JSVAL_VOID, NULL, NULL, props[i].flags | JSPROP_SHARED)) - return(JS_FALSE); + return JS_FALSE; } } - return(JS_TRUE); + return JS_TRUE; } @@ -812,8 +812,8 @@ js_DefineSyncMethods(JSContext* cx, JSObject* obj, jsSyncMethodSpec *funcs) */ for (i = 0; funcs[i].name; i++) if (!JS_DefineFunction(cx, obj, funcs[i].name, funcs[i].call, funcs[i].nargs, 0)) - return(JS_FALSE); - return(JS_TRUE); + return JS_FALSE; + return JS_TRUE; } JSBool @@ -832,14 +832,14 @@ js_SyncResolve(JSContext* cx, JSObject* obj, char *name, jsSyncPropertySpec* pro if (props[i].tinyid < 256 && props[i].tinyid > -129) { if (!JS_DefinePropertyWithTinyId(cx, obj, props[i].name, props[i].tinyid, JSVAL_VOID, NULL, NULL, props[i].flags | JSPROP_SHARED)) - return(JS_FALSE); + return JS_FALSE; } else { if (!JS_DefineProperty(cx, obj, props[i].name, JSVAL_VOID, NULL, NULL, props[i].flags | JSPROP_SHARED)) - return(JS_FALSE); + return JS_FALSE; } if (name) - return(JS_TRUE); + return JS_TRUE; } } } @@ -847,9 +847,9 @@ js_SyncResolve(JSContext* cx, JSObject* obj, char *name, jsSyncPropertySpec* pro for (i = 0; funcs[i].name; i++) { if (name == NULL || strcmp(name, funcs[i].name) == 0) { if (!JS_DefineFunction(cx, obj, funcs[i].name, funcs[i].call, funcs[i].nargs, 0)) - return(JS_FALSE); + return JS_FALSE; if (name) - return(JS_TRUE); + return JS_TRUE; } } } @@ -859,15 +859,15 @@ js_SyncResolve(JSContext* cx, JSObject* obj, char *name, jsSyncPropertySpec* pro val = INT_TO_JSVAL(consts[i].val); if (!JS_DefineProperty(cx, obj, consts[i].name, val, NULL, NULL, flags)) - return(JS_FALSE); + return JS_FALSE; if (name) - return(JS_TRUE); + return JS_TRUE; } } } - return(JS_TRUE); + return JS_TRUE; } #endif @@ -883,10 +883,10 @@ js_DefineConstIntegers(JSContext* cx, JSObject* obj, jsConstIntSpec* ints, int f val = INT_TO_JSVAL(ints[i].val); if (!JS_DefineProperty(cx, obj, ints[i].name, val, NULL, NULL, flags)) - return(JS_FALSE); + return JS_FALSE; } - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -904,7 +904,7 @@ js_log(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((sbbs = (sbbs_t*)JS_GetContextPrivate(cx)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc > 1 && JSVAL_IS_NUMBER(argv[i])) { if (!JS_ValueToInt32(cx, argv[i++], &level)) @@ -914,11 +914,11 @@ js_log(JSContext *cx, uintN argc, jsval *arglist) for (; i < argc; i++) { if ((str = JS_ValueToString(cx, argv[i])) == NULL) { FREE_AND_NULL(line); - return(JS_FALSE); + return JS_FALSE; } JSSTRING_TO_RASTRING(cx, str, line, &line_sz, NULL); if (line == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); sbbs->lputs(level, line); JS_RESUMEREQUEST(cx, rc); @@ -930,7 +930,7 @@ js_log(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); else JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -945,7 +945,7 @@ js_read(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((sbbs = (sbbs_t*)JS_GetContextPrivate(cx)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc) { if (!JS_ValueToInt32(cx, argv[0], &len)) @@ -953,7 +953,7 @@ js_read(JSContext *cx, uintN argc, jsval *arglist) } if ((buf = (uchar*)malloc(len)) == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); len = RingBufRead(&sbbs->inbuf, buf, len); @@ -963,7 +963,7 @@ js_read(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(JS_NewStringCopyN(cx, (char*)buf, len))); free(buf); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -978,7 +978,7 @@ js_readln(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((sbbs = (sbbs_t*)JS_GetContextPrivate(cx)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc) { if (!JS_ValueToInt32(cx, argv[0], &len)) @@ -986,7 +986,7 @@ js_readln(JSContext *cx, uintN argc, jsval *arglist) } if ((buf = (char*)malloc(len)) == NULL) - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); len = sbbs->getstr(buf, len, K_NONE); @@ -996,7 +996,7 @@ js_readln(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(JS_NewStringCopyZ(cx, buf))); free(buf); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1013,16 +1013,16 @@ js_write(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((sbbs = (sbbs_t*)JS_GetContextPrivate(cx)) == NULL) - return(JS_FALSE); + return JS_FALSE; for (i = 0; i < argc; i++) { if ((str = JS_ValueToString(cx, argv[i])) == NULL) { FREE_AND_NULL(cstr); - return(JS_FALSE); + return JS_FALSE; } JSSTRING_TO_RASTRING(cx, str, cstr, &cstr_sz, NULL); if (cstr == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); if (sbbs->online != ON_REMOTE) sbbs->lputs(LOG_INFO, cstr); @@ -1036,7 +1036,7 @@ js_write(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); else JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1053,12 +1053,12 @@ js_write_raw(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((sbbs = (sbbs_t*)JS_GetContextPrivate(cx)) == NULL) - return(JS_FALSE); + return JS_FALSE; for (i = 0; i < argc; i++) { JSVALUE_TO_RASTRING(cx, argv[i], str, &str_sz, &len); if (str == NULL) - return(JS_FALSE); + return JS_FALSE; if (len < 1) continue; rc = JS_SUSPENDREQUEST(cx); @@ -1068,7 +1068,7 @@ js_write_raw(JSContext *cx, uintN argc, jsval *arglist) if (str != NULL) free(str); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1080,7 +1080,7 @@ js_writeln(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((sbbs = (sbbs_t*)JS_GetContextPrivate(cx)) == NULL) - return(JS_FALSE); + return JS_FALSE; js_write(cx, argc, arglist); rc = JS_SUSPENDREQUEST(cx); @@ -1088,7 +1088,7 @@ js_writeln(JSContext *cx, uintN argc, jsval *arglist) sbbs->bputs(crlf); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1102,11 +1102,11 @@ js_printf(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((sbbs = (sbbs_t*)JS_GetContextPrivate(cx)) == NULL) - return(JS_FALSE); + return JS_FALSE; if ((p = js_sprintf(cx, 0, argc, argv)) == NULL) { JS_ReportError(cx, "js_sprintf failed"); - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); @@ -1120,7 +1120,7 @@ js_printf(JSContext *cx, uintN argc, jsval *arglist) js_sprintf_free(p); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1134,11 +1134,11 @@ js_alert(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((sbbs = (sbbs_t*)JS_GetContextPrivate(cx)) == NULL) - return(JS_FALSE); + return JS_FALSE; JSVALUE_TO_MSTRING(cx, argv[0], cstr, NULL); if (cstr == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); if (sbbs->online != ON_REMOTE) @@ -1154,7 +1154,7 @@ js_alert(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, argv[0]); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1168,17 +1168,17 @@ js_confirm(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((sbbs = (sbbs_t*)JS_GetContextPrivate(cx)) == NULL) - return(JS_FALSE); + return JS_FALSE; JSVALUE_TO_MSTRING(cx, argv[0], cstr, NULL); if (cstr == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->yesno(cstr))); free(cstr); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -1192,17 +1192,17 @@ js_deny(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((sbbs = (sbbs_t*)JS_GetContextPrivate(cx)) == NULL) - return(JS_FALSE); + return JS_FALSE; JSVALUE_TO_MSTRING(cx, argv[0], cstr, NULL); if (cstr == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(sbbs->noyes(cstr))); free(cstr); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } @@ -1221,13 +1221,13 @@ js_prompt(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((sbbs = (sbbs_t*)JS_GetContextPrivate(cx)) == NULL) - return(JS_FALSE); + return JS_FALSE; uintN argn = 0; if (argc > argn && JSVAL_IS_STRING(argv[argn])) { JSVALUE_TO_MSTRING(cx, argv[argn], prompt, NULL); if (prompt == NULL) - return(JS_FALSE); + return JS_FALSE; argn++; } if (argc > argn && JSVAL_IS_STRING(argv[argn])) { @@ -1253,15 +1253,15 @@ js_prompt(JSContext *cx, uintN argc, jsval *arglist) if (!result) { JS_SET_RVAL(cx, arglist, JSVAL_NULL); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } JS_RESUMEREQUEST(cx, rc); if ((str = JS_NewStringCopyZ(cx, instr)) == NULL) - return(JS_FALSE); + return JS_FALSE; JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(str)); - return(JS_TRUE); + return JS_TRUE; } static jsSyncMethodSpec js_global_functions[] = { @@ -1523,7 +1523,7 @@ extern "C" bool js_CreateCommonObjects(JSContext* js_cx /* Global Object */ if (!js_CreateGlobalObject(js_cx, node_cfg, methods, js_startup, glob)) - return(false); + return false; do { /* @@ -1609,7 +1609,7 @@ extern "C" bool js_CreateCommonObjects(JSContext* js_cx if (!success) JS_RemoveObjectRoot(js_cx, glob); - return(success); + return success; } #endif /* JAVASCRIPT */ @@ -1624,7 +1624,7 @@ static BYTE* telnet_interpret(sbbs_t* sbbs, BYTE* inbuf, int inlen, outlen = 0; if (inlen < 1) { - return(inbuf); // no length? No interpretation + return inbuf; // no length? No interpretation } first_iac = (BYTE*)memchr(inbuf, TELNET_IAC, inlen); @@ -1641,7 +1641,7 @@ static BYTE* telnet_interpret(sbbs_t* sbbs, BYTE* inbuf, int inlen, if (!sbbs->telnet_cmdlen) { if (first_iac == NULL && first_cr == NULL) { outlen = inlen; - return(inbuf); // no interpretation needed + return inbuf; // no interpretation needed } if (first_iac != NULL || first_cr != NULL) { @@ -1897,7 +1897,7 @@ static BYTE* telnet_interpret(sbbs_t* sbbs, BYTE* inbuf, int inlen, } else outbuf[outlen++] = inbuf[i]; } - return(outbuf); + return outbuf; } void sbbs_t::send_telnet_cmd(uchar cmd, uchar opt) @@ -3568,7 +3568,7 @@ bool sbbs_t::init() if ((result = getsockname(client_socket, &addr.addr, &addr_len)) != 0) { errprintf(LOG_CRIT, WHERE, "%04d %s !ERROR %d (%d) getting local address/port of socket" , client_socket, client.protocol, result, SOCKET_ERRNO); - return(false); + return false; } inet_addrtop(&addr, local_addr, sizeof(local_addr)); inet_addrtop(&client_addr, client_ipaddr, sizeof(client_ipaddr)); @@ -3590,7 +3590,7 @@ bool sbbs_t::init() if ((comspec = os_cmdshell()) == NULL) { errormsg(WHERE, ERR_CHK, OS_CMD_SHELL_ENV_VAR " environment variable", 0); - return(false); + return false; } if ((i = md(cfg.temp_dir)) != 0) { @@ -3603,7 +3603,7 @@ bool sbbs_t::init() if ((nodefile = opennodedat(&cfg)) == -1) { pthread_mutex_unlock(&nodefile_mutex); errormsg(WHERE, ERR_OPEN, "nodefile", cfg.node_num); - return(false); + return false; } memset(&node, 0, sizeof(node_t)); /* write NULL to node struct */ node.status = NODE_OFFLINE; @@ -3634,7 +3634,7 @@ bool sbbs_t::init() if (i >= LOOP_NODEDAB) { errormsg(WHERE, ERR_LOCK, "nodefile", cfg.node_num); - return(false); + return false; } if (cfg.node_num) { @@ -3642,7 +3642,7 @@ bool sbbs_t::init() if ((logfile_fp = fopen(str, "a+b")) == NULL) { errormsg(WHERE, ERR_OPEN, str, 0); lprintf(LOG_NOTICE, "Perhaps this node is already running"); - return(false); + return false; } if (filelength(fileno(logfile_fp))) { @@ -3682,7 +3682,7 @@ bool sbbs_t::init() main_csi.str = (char *)malloc(1024); if (main_csi.str == NULL) { errormsg(WHERE, ERR_ALLOC, "main_csi.str", 1024); - return(false); + return false; } memset(main_csi.str, 0, 1024); /***/ @@ -3693,28 +3693,28 @@ bool sbbs_t::init() if ((cursub = (int *)malloc(sizeof(int) * usrgrp_total)) == NULL) { errormsg(WHERE, ERR_ALLOC, "cursub", sizeof(int) * usrgrp_total); - return(false); + return false; } if ((usrgrp = (int *)malloc(sizeof(int) * usrgrp_total)) == NULL) { errormsg(WHERE, ERR_ALLOC, "usrgrp", sizeof(int) * usrgrp_total); - return(false); + return false; } if ((usrsubs = (int *)malloc(sizeof(int) * usrgrp_total)) == NULL) { errormsg(WHERE, ERR_ALLOC, "usrsubs", sizeof(int) * usrgrp_total); - return(false); + return false; } if ((usrsub = (int **)calloc(usrgrp_total, sizeof(int *))) == NULL) { errormsg(WHERE, ERR_ALLOC, "usrsub", sizeof(int) * usrgrp_total); - return(false); + return false; } } if (cfg.total_subs) { if ((subscan = (subscan_t *)calloc(cfg.total_subs, sizeof(subscan_t))) == NULL) { errormsg(WHERE, ERR_ALLOC, "subscan", sizeof(subscan_t) * cfg.total_subs); - return(false); + return false; } } @@ -3728,7 +3728,7 @@ bool sbbs_t::init() for (i = 0; i < cfg.total_grps; i++) if ((usrsub[i] = (int *)malloc(sizeof(int) * l)) == NULL) { errormsg(WHERE, ERR_ALLOC, "usrsub[x]", sizeof(int) * l); - return(false); + return false; } if (cfg.total_libs) { @@ -3737,22 +3737,22 @@ bool sbbs_t::init() if ((curdir = (int *)malloc(sizeof(int) * usrlib_total)) == NULL) { errormsg(WHERE, ERR_ALLOC, "curdir", sizeof(int) * usrlib_total); - return(false); + return false; } if ((usrlib = (int *)malloc(sizeof(int) * usrlib_total)) == NULL) { errormsg(WHERE, ERR_ALLOC, "usrlib", sizeof(int) * usrlib_total); - return(false); + return false; } if ((usrdirs = (int *)malloc(sizeof(uint) * usrlib_total)) == NULL) { errormsg(WHERE, ERR_ALLOC, "usrdirs", sizeof(int) * usrlib_total); - return(false); + return false; } if ((usrdir = (int **)calloc(usrlib_total, sizeof(int *))) == NULL) { errormsg(WHERE, ERR_ALLOC, "usrdir", sizeof(int) * usrlib_total); - return(false); + return false; } } @@ -3767,7 +3767,7 @@ bool sbbs_t::init() for (i = 0; i < cfg.total_libs; i++) if ((usrdir[i] = (int *)malloc(sizeof(int) * l)) == NULL) { errormsg(WHERE, ERR_ALLOC, "usrdir[x]", sizeof(int) * l); - return(false); + return false; } } @@ -3783,7 +3783,7 @@ bool sbbs_t::init() online = ON_REMOTE; - return(true); + return true; } //**************************************************************************** @@ -3965,7 +3965,7 @@ int sbbs_t::nopen(char *str, int access) logline(LOG_WARNING, "!!", logstr); bputs("\7\r\nNOPEN: ACCESS DENIED\r\n\7"); } - return(file); + return file; } void sbbs_t::spymsg(const char* msg) @@ -4002,18 +4002,18 @@ int sbbs_t::mv(const char* path, const char* dest, bool copy) char src[MAX_PATH + 1]; if (!stricmp(path, dest)) /* source and destination are the same! */ - return(0); + return 0; SAFECOPY(src, path); if (!fexistcase(src)) { bprintf("\r\n\7MV ERROR: Source doesn't exist\r\n'%s'\r\n" , src); - return(-1); + return -1; } if (!copy && fexist(dest)) { bprintf("\r\n\7MV ERROR: Destination already exists\r\n'%s'\r\n" , dest); - return(-1); + return -1; } if (!copy && rename(src, dest) == 0) return 0; @@ -4023,9 +4023,9 @@ int sbbs_t::mv(const char* path, const char* dest, bool copy) } if (!copy && remove(src) != 0) { errormsg(WHERE, ERR_REMOVE, src, 0); - return(-1); + return -1; } - return(0); + return 0; } void sbbs_t::hangup(void) @@ -4070,16 +4070,16 @@ int sbbs_t::incom(unsigned int timeout) #if 0 /* looping version */ while (!RingBufRead(&inbuf, &ch, 1)) if (WaitForEvent(inbuf.data_event, timeout) != WAIT_OBJECT_0 || sys_status & SS_ABORT) - return(NOINP); + return NOINP; #else if (!RingBufRead(&inbuf, &ch, 1)) { if (WaitForEvent(inbuf.data_event, timeout) != WAIT_OBJECT_0) - return(NOINP); + return NOINP; if (!RingBufRead(&inbuf, &ch, 1)) - return(NOINP); + return NOINP; } #endif - return(ch); + return ch; } // Steve's original implementation (in RCIOL) did not incorporate a retry @@ -4087,10 +4087,10 @@ int sbbs_t::incom(unsigned int timeout) int sbbs_t::_outcom(uchar ch) { if (!RingBufFree(&outbuf)) - return(TXBOF); + return TXBOF; if (!RingBufWrite(&outbuf, &ch, 1)) - return(TXBOF); - return(0); + return TXBOF; + return 0; } // This outcom version retries - copied loop from sbbs_t::outchar() @@ -4139,35 +4139,35 @@ int sbbs_t::rioctl(ushort action) switch (action) { case GVERS: /* Get version */ - return(0x200); + return 0x200; case GUART: /* Get UART I/O address, not available */ - return(0xffff); + return 0xffff; case GIRQN: /* Get IRQ number, not available */ - return((int)client_socket); + return (int)client_socket; case GBAUD: /* Get current bit rate */ - return(0xffff); + return 0xffff; case RXBC: /* Get receive buffer count */ // ulong cnt; // ioctlsocket (client_socket,FIONREAD,&cnt); - return(/* cnt+ */ RingBufFull(&inbuf)); + return /* cnt+ */ RingBufFull(&inbuf); case RXBS: /* Get receive buffer size */ - return(inbuf.size); + return inbuf.size; case TXBC: /* Get transmit buffer count */ - return(RingBufFull(&outbuf)); + return RingBufFull(&outbuf); case TXBS: /* Get transmit buffer size */ - return(outbuf.size); + return outbuf.size; case TXBF: /* Get transmit buffer free space */ - return(RingBufFree(&outbuf)); + return RingBufFree(&outbuf); case IOMODE: mode = 0; if (rio_abortable) mode |= ABORT; - return(mode); + return mode; case IOSTATE: state = 0; if (sys_status & SS_ABORT) state |= ABORT; - return(state); + return state; case IOFI: /* Flush input buffer */ RingBufReInit(&inbuf); break; @@ -4181,34 +4181,34 @@ int sbbs_t::rioctl(ushort action) case LFN81: case LFE71: case FIFOCTL: - return(0); + return 0; } if ((action & 0xff) == IOSM) { /* Get/Set/Clear mode */ if (action & ABORT) rio_abortable = true; - return(0); + return 0; } if ((action & 0xff) == IOCM) { /* Get/Set/Clear mode */ if (action & ABORT) rio_abortable = false; - return(0); + return 0; } if ((action & 0xff) == IOSS) { /* Set state */ if (action & ABORT) sys_status |= SS_ABORT; - return(0); + return 0; } if ((action & 0xff) == IOCS) { /* Clear state */ if (action & ABORT) sys_status &= ~SS_ABORT; - return(0); + return 0; } - return(0); + return 0; } void sbbs_t::reset_logon_vars(void) @@ -4820,9 +4820,9 @@ void sbbs_t::daily_maint(void) const char* js_ver(void) { #ifdef JAVASCRIPT - return(JS_GetImplementationVersion()); + return JS_GetImplementationVersion(); #else - return(""); + return ""; #endif } @@ -4847,13 +4847,13 @@ const char* bbs_ver(void) , git_date, compiler ); } - return(ver); + return ver; } /* Returns binary-coded version and revision (e.g. 0x31000 == 3.10a) */ int bbs_ver_num(void) { - return(VERSION_HEX); + return VERSION_HEX; } void bbs_terminate(void) diff --git a/src/sbbs3/makeuser.c b/src/sbbs3/makeuser.c index c4e8f8f2b84401dac315c5b048a256cfa0a4f1a9..e71df09f22df85a07052bd0c21baa89ca8b484c0 100644 --- a/src/sbbs3/makeuser.c +++ b/src/sbbs3/makeuser.c @@ -41,7 +41,7 @@ int lprintf(int level, const char *fmat, ...) va_end(argptr); truncsp(sbuf); printf("%s\n", sbuf); - return(chcount); + return chcount; } char *usage = "\nusage: makeuser [ctrl_dir] name [-param value] [...]\n" @@ -84,7 +84,7 @@ int main(int argc, char **argv) if (argc < 2) { printf("%s", usage); - return(1); + return 1; } if (strcspn(argv[first_arg], "/\\") != strlen(argv[first_arg])) @@ -119,7 +119,7 @@ int main(int argc, char **argv) if (argv[i][0] == '-') { if (argv[i + 1] == NULL) { printf("%s", usage); - return(1); + return 1; } switch (toupper(argv[i++][1])) { case 'A': @@ -159,7 +159,7 @@ int main(int argc, char **argv) break; default: printf("%s", usage); - return(1); + return 1; } break; case 'G': @@ -189,7 +189,7 @@ int main(int argc, char **argv) break; default: printf("%s", usage); - return(1); + return 1; } } else @@ -198,12 +198,12 @@ int main(int argc, char **argv) if (user.alias[0] == 0) { printf("%s", usage); - return(1); + return 1; } if ((i = matchuser(&scfg, user.alias, FALSE)) != 0) { printf("!User (%s #%d) already exists\n", user.alias, i); - return(2); + return 2; } if (user.handle[0] == 0) @@ -213,11 +213,11 @@ int main(int argc, char **argv) if ((i = newuserdat(&scfg, &user)) != 0) { fprintf(stderr, "!ERROR %d adding new user record\n", i); - return(i); + return i; } printf("User record #%d (%s) created successfully.\n", user.number, user.alias); - return(0); + return 0; } diff --git a/src/sbbs3/mime.c b/src/sbbs3/mime.c index 646afd2274038e50e56e370d507cc9a0568c54d0..d9eb0768c54ab6ab3b444116074a194e76e838e4 100644 --- a/src/sbbs3/mime.c +++ b/src/sbbs3/mime.c @@ -86,20 +86,20 @@ bool base64out(SOCKET socket, const char* prot, int sess, char* pathfile) int bytesread; if ((fp = fopen(pathfile, "rb")) == NULL) - return(false); + return false; while (1) { bytesread = fread(in, 1, sizeof(in), fp); if ((b64_encode(out, sizeof(out), in, bytesread) == -1) || !sockprintf(socket, prot, sess, "%s", out)) { fclose(fp); - return(false); + return false; } if (bytesread != sizeof(in) || feof(fp)) break; } fclose(fp); sockprintf(socket, prot, sess, ""); - return(true); + return true; } bool mimeattach(SOCKET socket, const char* prot, int sess, char* boundary, char* pathfile) @@ -114,9 +114,9 @@ bool mimeattach(SOCKET socket, const char* prot, int sess, char* boundary, char* sockprintf(socket, prot, sess, " filename=\"%s\"", fname); sockprintf(socket, prot, sess, ""); if (!base64out(socket, prot, sess, pathfile)) - return(false); + return false; sockprintf(socket, prot, sess, ""); - return(true); + return true; } void endmime(SOCKET socket, const char* prot, int sess, char* boundary) diff --git a/src/sbbs3/msdirent.c b/src/sbbs3/msdirent.c index b3883ffc17a413e13a1c1ebb0d0c47b3a3be96e4..c42b761e3992305cf39518d997ab5a8c5bec7b1a 100644 --- a/src/sbbs3/msdirent.c +++ b/src/sbbs3/msdirent.c @@ -45,7 +45,7 @@ DIR* opendir(const char* dirname) if ((dir = (DIR*)calloc(1, sizeof(DIR))) == NULL) { errno = ENOMEM; - return(NULL); + return NULL; } sprintf(dir->filespec, "%.*s", sizeof(dir->filespec) - 5, dirname); if (*dir->filespec && dir->filespec[strlen(dir->filespec) - 1] != '\\') @@ -55,30 +55,30 @@ DIR* opendir(const char* dirname) if (dir->handle == -1) { errno = ENOENT; free(dir); - return(NULL); + return NULL; } - return(dir); + return dir; } struct dirent* readdir(DIR* dir) { if (dir == NULL) - return(NULL); + return NULL; if (dir->end == TRUE) - return(NULL); + return NULL; if (dir->handle == -1) - return(NULL); + return NULL; sprintf(dir->dirent.d_name, "%.*s", sizeof(struct dirent) - 1, dir->finddata.name); if (_findnext(dir->handle, &dir->finddata) != 0) dir->end = TRUE; - return(&dir->dirent); + return &dir->dirent; } int closedir (DIR* dir) { if (dir == NULL) - return(-1); + return -1; _findclose(dir->handle); free(dir); - return(0); + return 0; } void rewinddir(DIR* dir) { diff --git a/src/sbbs3/msg_id.c b/src/sbbs3/msg_id.c index c0d803af21fc6c9c8a656a722e3111d977eda62b..2b236e5ee467516393c1f921a605a5fb8b866d30 100644 --- a/src/sbbs3/msg_id.c +++ b/src/sbbs3/msg_id.c @@ -28,8 +28,8 @@ static ulong msg_number(smbmsg_t* msg) { if (msg->idx.number) - return(msg->idx.number); - return(msg->hdr.number); + return msg->idx.number; + return msg->hdr.number; } uint32_t get_new_msg_number(smb_t* smb) @@ -49,8 +49,8 @@ uint32_t get_new_msg_number(smb_t* smb) static ulong msg_time(smbmsg_t* msg) { if (msg->idx.time) - return(msg->idx.time); - return(msg->hdr.when_imported.time); + return msg->idx.time; + return msg->hdr.when_imported.time; } static ulong msgid_serialno(smbmsg_t* msg) @@ -98,7 +98,7 @@ char* get_msgid(scfg_t* cfg, int subnum, smbmsg_t* msg, char* msgid, size_t maxl if (msg->id != NULL && *msg->id != 0) { strncpy(msgid, msg->id, maxlen); - return(msg->id); + return msg->id; } /* Try *really* hard to get a hostname from the configuration data */ @@ -127,7 +127,7 @@ char* get_msgid(scfg_t* cfg, int subnum, smbmsg_t* msg, char* msgid, size_t maxl , cfg->sub[subnum]->code , host); - return(msgid); + return msgid; } /****************************************************************************/ diff --git a/src/sbbs3/msgdate.c b/src/sbbs3/msgdate.c index 8855f7f6e1335baec01f81efd7831f9fdbc671c7..ead475100ce922629291e3d0daffdc917f41bd72 100644 --- a/src/sbbs3/msgdate.c +++ b/src/sbbs3/msgdate.c @@ -54,7 +54,7 @@ char* msgdate(when_t when, char* buf) /* RFC1123: implementations SHOULD use numeric timezones instead of timezone names */ , plus, tz / 60, tz % 60 ); - return(buf); + return buf; } /****************************************************************************/ diff --git a/src/sbbs3/msgtoqwk.cpp b/src/sbbs3/msgtoqwk.cpp index 70ea2683e991023846a5d541817d6dfe901994db..c92f6bdb2d374f611d8ba27fafcbe58f82c5d174 100644 --- a/src/sbbs3/msgtoqwk.cpp +++ b/src/sbbs3/msgtoqwk.cpp @@ -574,5 +574,5 @@ int sbbs_t::msgtoqwk(smbmsg_t* msg, FILE *qwk_fp, int mode, smb_t* smb fwrite(str, QWK_BLOCK_LEN, 1, qwk_fp); (void)fseek(qwk_fp, size, SEEK_CUR); - return(size); + return size; } diff --git a/src/sbbs3/mxlookup.c b/src/sbbs3/mxlookup.c index d73981d07b8fc0d2d9616ffb5566324a8d1e8d9e..d3ae50fb05f5b03ea99888fff1e2e22c04c67021 100644 --- a/src/sbbs3/mxlookup.c +++ b/src/sbbs3/mxlookup.c @@ -115,7 +115,7 @@ size_t dns_name(char* name, size_t* namelen, size_t maxlen, BYTE* srcbuf, char* offset = ntohs(*(WORD*)p); (*p) |= 0xC0; dns_name(name, namelen, maxlen, srcbuf, (char*)srcbuf + offset); - return(len + 2); + return len + 2; } plen = (*p); if ((*namelen) + plen > maxlen) @@ -127,7 +127,7 @@ size_t dns_name(char* name, size_t* namelen, size_t maxlen, BYTE* srcbuf, char* len += plen; } name[(*namelen)++] = 0; - return(len + 1); + return len + 1; } #if defined(MX_LOOKUP_TEST) @@ -175,7 +175,7 @@ int dns_getmx(char* name, char* mx, char* mx2 sock = socket(AF_INET, use_tcp ? SOCK_STREAM : SOCK_DGRAM, IPPROTO_IP); if (sock == INVALID_SOCKET) - return(SOCKET_ERRNO); + return SOCKET_ERRNO; mail_open_socket(sock, "dns"); @@ -187,7 +187,7 @@ int dns_getmx(char* name, char* mx, char* mx2 if (result != 0) { mail_close_socket(&sock, &sess); - return(SOCKET_ERRNO); + return SOCKET_ERRNO; } memset(&addr, 0, sizeof(addr)); @@ -197,7 +197,7 @@ int dns_getmx(char* name, char* mx, char* mx2 if ((result = connect(sock, (struct sockaddr *)&addr, sizeof(addr))) != 0) { mail_close_socket(&sock, &sess); - return(SOCKET_ERRNO); + return SOCKET_ERRNO; } memset(&msghdr, 0, sizeof(msghdr)); @@ -241,7 +241,7 @@ int dns_getmx(char* name, char* mx, char* mx2 if (!socket_writable(sock, timeout * 1000)) { result = -1; mail_close_socket(&sock, &sess); - return(result); + return result; } /* send query */ @@ -256,14 +256,14 @@ int dns_getmx(char* name, char* mx, char* mx2 else result = -2; mail_close_socket(&sock, &sess); - return(result); + return result; } /* check for readability */ if (!socket_readable(sock, timeout * 1000)) { result = -1; mail_close_socket(&sock, &sess); - return(result); + return result; } /* receive response */ @@ -334,7 +334,7 @@ int dns_getmx(char* name, char* mx, char* mx2 strcpy(mx, name); } mail_close_socket(&sock, &sess); - return(0); + return 0; } #ifdef MX_LOOKUP_TEST diff --git a/src/sbbs3/netmail.cpp b/src/sbbs3/netmail.cpp index a517194c1e429cf59fedb04612783e800dde32cb..c4ccf1bbce380a760ef4ec8bf1ab948eac9d5cb0 100644 --- a/src/sbbs3/netmail.cpp +++ b/src/sbbs3/netmail.cpp @@ -164,11 +164,11 @@ bool sbbs_t::netmail(const char *into, const char *title, int mode, smb_t* resmb if (cfg.netmail_cost && !(useron.exempt & FLAG('S'))) { if (user_available_credits(&useron) < cfg.netmail_cost) { bputs(text[NotEnoughCredits]); - return(false); + return false; } snprintf(str, sizeof str, text[NetMailCostContinueQ], cfg.netmail_cost); if (noyes(str)) - return(false); + return false; } i = nearest_sysfaddr_index(&cfg, &dest_addr); @@ -199,7 +199,7 @@ bool sbbs_t::netmail(const char *into, const char *title, int mode, smb_t* resmb msg_tmp_fname(useron.xedit, msgpath, sizeof(msgpath)); if (!writemsg(msgpath, nulstr, subj, WM_NETMAIL | mode, INVALID_SUB, to, from, &editor, &charset)) { bputs(text[Aborted]); - return(false); + return false; } if (mode & WM_FILE) { @@ -213,7 +213,7 @@ bool sbbs_t::netmail(const char *into, const char *title, int mode, smb_t* resmb SAFECOPY(subj, str); if (fexistcase(str)) { bprintf(text[FileAlreadyThere], str); - return(false); + return false; } { /* Remote */ char keys[128]; @@ -223,7 +223,7 @@ bool sbbs_t::netmail(const char *into, const char *title, int mode, smb_t* resmb ch = (char)getkeys(keys, 0); if (ch == quit_key() || sys_status & SS_ABORT) { bputs(text[Aborted]); - return(false); + return false; } x = protnum(ch, XFER_UPLOAD); if (x < cfg.total_prots) /* This should be always */ @@ -237,7 +237,7 @@ bool sbbs_t::netmail(const char *into, const char *title, int mode, smb_t* resmb bprintf(text[FileNBytesReceived], fname, ultoac(l, tmp)); else { bprintf(text[FileNotReceived], fname); - return(false); + return false; } } @@ -277,7 +277,7 @@ bool sbbs_t::netmail(const char *into, const char *title, int mode, smb_t* resmb if ((file = nopen(msgpath, O_RDONLY)) == -1) { errormsg(WHERE, ERR_OPEN, msgpath, O_RDONLY); - return(false); + return false; } length = (long)filelength(file); if (length < 0) { @@ -288,7 +288,7 @@ bool sbbs_t::netmail(const char *into, const char *title, int mode, smb_t* resmb if ((buf = (char *)calloc(1, length + 1)) == NULL) { close(file); errormsg(WHERE, ERR_ALLOC, str, length); - return(false); + return false; } if (read(file, buf, length) != length) { close(file); @@ -1009,12 +1009,12 @@ bool sbbs_t::inetmail(const char *into, const char *subj, int mode, smb_t* resmb if (user_available_credits(&useron) < cfg.inetmail_cost * rcpt_count) { strListFree(&rcpt_list); bputs(text[NotEnoughCredits]); - return(false); + return false; } SAFEPRINTF(str, text[NetMailCostContinueQ], cfg.inetmail_cost * rcpt_count); if (noyes(str)) { strListFree(&rcpt_list); - return(false); + return false; } } @@ -1034,7 +1034,7 @@ bool sbbs_t::inetmail(const char *into, const char *subj, int mode, smb_t* resmb if (!writemsg(msgpath, nulstr, title, WM_NETMAIL | mode, INVALID_SUB, to_list, /* from: */ your_addr, &editor, &charset)) { strListFree(&rcpt_list); bputs(text[Aborted]); - return(false); + return false; } if (mode & WM_FILE) { @@ -1045,7 +1045,7 @@ bool sbbs_t::inetmail(const char *into, const char *subj, int mode, smb_t* resmb strListFree(&rcpt_list); bprintf(text[FileAlreadyThere], str2); (void)remove(msgpath); - return(false); + return false; } { /* Remote */ char keys[128]; @@ -1057,7 +1057,7 @@ bool sbbs_t::inetmail(const char *into, const char *subj, int mode, smb_t* resmb bputs(text[Aborted]); strListFree(&rcpt_list); (void)remove(msgpath); - return(false); + return false; } x = protnum(ch, XFER_UPLOAD); if (x < cfg.total_prots) /* This should be always */ @@ -1073,7 +1073,7 @@ bool sbbs_t::inetmail(const char *into, const char *subj, int mode, smb_t* resmb bprintf(text[FileNotReceived], title); strListFree(&rcpt_list); (void)remove(msgpath); - return(false); + return false; } } @@ -1081,14 +1081,14 @@ bool sbbs_t::inetmail(const char *into, const char *subj, int mode, smb_t* resmb if ((i = smb_open_sub(&cfg, &smb, INVALID_SUB)) != SMB_SUCCESS) { strListFree(&rcpt_list); errormsg(WHERE, ERR_OPEN, smb.file, i, smb.last_error); - return(false); + return false; } if ((instream = fnopen(&file, msgpath, O_RDONLY | O_BINARY)) == NULL) { strListFree(&rcpt_list); smb_close(&smb); errormsg(WHERE, ERR_OPEN, msgpath, O_RDONLY | O_BINARY); - return(false); + return false; } long length = (long)filelength(file); if (length < 1) { @@ -1096,7 +1096,7 @@ bool sbbs_t::inetmail(const char *into, const char *subj, int mode, smb_t* resmb fclose(instream); smb_close(&smb); errormsg(WHERE, ERR_LEN, msgpath, length); - return(false); + return false; } char* msgbuf; if ((msgbuf = (char*)malloc(length + 1)) == NULL) { @@ -1104,7 +1104,7 @@ bool sbbs_t::inetmail(const char *into, const char *subj, int mode, smb_t* resmb fclose(instream); smb_close(&smb); errormsg(WHERE, ERR_ALLOC, msgpath, length); - return(false); + return false; } if (fread(msgbuf, sizeof(char), length, instream) != (size_t)length) { strListFree(&rcpt_list); @@ -1112,7 +1112,7 @@ bool sbbs_t::inetmail(const char *into, const char *subj, int mode, smb_t* resmb free(msgbuf); smb_close(&smb); errormsg(WHERE, ERR_READ, msgpath, length); - return(false); + return false; } msgbuf[length] = 0; fclose(instream); @@ -1155,7 +1155,7 @@ bool sbbs_t::inetmail(const char *into, const char *subj, int mode, smb_t* resmb smb_freemsgmem(&msg); strListFree(&rcpt_list); errormsg(WHERE, ERR_WRITE, smb.file, i, smb.last_error); - return(false); + return false; } for (rcpt_count = 0; rcpt_list[rcpt_count] != NULL; rcpt_count++) { @@ -1241,7 +1241,7 @@ bool sbbs_t::inetmail(const char *into, const char *subj, int mode, smb_t* resmb bprintf(text[InternetMailSent], to_list); SAFEPRINTF(str, "sent Internet Mail to %s", to_list); logline("EN", str); - return(true); + return true; } bool sbbs_t::qnetmail(const char *into, const char *subj, int mode, smb_t* resmb, smbmsg_t* remsg) @@ -1261,7 +1261,7 @@ bool sbbs_t::qnetmail(const char *into, const char *subj, int mode, smb_t* resmb if (useron.etoday >= cfg.level_emailperday[useron.level] && !SYSOP && !(useron.exempt & FLAG('M'))) { bputs(text[TooManyEmailsToday]); - return(false); + return false; } if (into != NULL) @@ -1271,13 +1271,13 @@ bool sbbs_t::qnetmail(const char *into, const char *subj, int mode, smb_t* resmb if (useron.rest & FLAG('M')) { bputs(text[NoNetMailAllowed]); - return(false); + return false; } addr = strrchr(to, '@'); if (!addr) { bprintf(text[InvalidNetMailAddr], to); - return(false); + return false; } *addr = 0; addr++; @@ -1286,13 +1286,13 @@ bool sbbs_t::qnetmail(const char *into, const char *subj, int mode, smb_t* resmb touser = qwk_route(&cfg, addr, fulladdr, sizeof(fulladdr) - 1); if (!fulladdr[0]) { bprintf(text[InvalidNetMailAddr], addr); - return(false); + return false; } truncsp(to); if (!stricmp(to, "SBBS") && !SYSOP) { bprintf(text[InvalidNetMailAddr], to); - return(false); + return false; } bprintf(text[NetMailing], to, fulladdr , useron.alias, cfg.sys_id); @@ -1307,12 +1307,12 @@ bool sbbs_t::qnetmail(const char *into, const char *subj, int mode, smb_t* resmb msg_tmp_fname(useron.xedit, msgpath, sizeof(msgpath)); if (!writemsg(msgpath, nulstr, title, (mode | WM_QWKNET | WM_NETMAIL), INVALID_SUB, to, /* from: */ useron.alias, &editor, &charset)) { bputs(text[Aborted]); - return(false); + return false; } if ((i = smb_stack(&smb, SMB_STACK_PUSH)) != SMB_SUCCESS) { errormsg(WHERE, ERR_OPEN, "MAIL", i); - return(false); + return false; } snprintf(smb.file, sizeof smb.file, "%smail", cfg.data_dir); smb.retry_time = cfg.smb_retry_time; @@ -1320,7 +1320,7 @@ bool sbbs_t::qnetmail(const char *into, const char *subj, int mode, smb_t* resmb if ((i = smb_open(&smb)) != SMB_SUCCESS) { smb_stack(&smb, SMB_STACK_POP); errormsg(WHERE, ERR_OPEN, smb.file, i, smb.last_error); - return(false); + return false; } if (filelength(fileno(smb.shd_fp)) < 1) { /* Create it if it doesn't exist */ @@ -1332,7 +1332,7 @@ bool sbbs_t::qnetmail(const char *into, const char *subj, int mode, smb_t* resmb smb_close(&smb); smb_stack(&smb, SMB_STACK_POP); errormsg(WHERE, ERR_CREATE, smb.file, i, smb.last_error); - return(false); + return false; } } @@ -1340,7 +1340,7 @@ bool sbbs_t::qnetmail(const char *into, const char *subj, int mode, smb_t* resmb smb_close(&smb); smb_stack(&smb, SMB_STACK_POP); errormsg(WHERE, ERR_LOCK, smb.file, i, smb.last_error); - return(false); + return false; } length = (long)flength(msgpath) + 2; /* +2 for translation string */ @@ -1350,7 +1350,7 @@ bool sbbs_t::qnetmail(const char *into, const char *subj, int mode, smb_t* resmb smb_close(&smb); smb_stack(&smb, SMB_STACK_POP); errormsg(WHERE, ERR_LEN, msgpath, length); - return(false); + return false; } if ((i = smb_open_da(&smb)) != SMB_SUCCESS) { @@ -1358,7 +1358,7 @@ bool sbbs_t::qnetmail(const char *into, const char *subj, int mode, smb_t* resmb smb_close(&smb); smb_stack(&smb, SMB_STACK_POP); errormsg(WHERE, ERR_OPEN, smb.file, i, smb.last_error); - return(false); + return false; } if (cfg.sys_misc & SM_FASTMAIL) offset = smb_fallocdat(&smb, length, 1); @@ -1371,7 +1371,7 @@ bool sbbs_t::qnetmail(const char *into, const char *subj, int mode, smb_t* resmb smb_close(&smb); smb_stack(&smb, SMB_STACK_POP); errormsg(WHERE, ERR_ALLOC, msgpath, length); - return(false); + return false; } if ((instream = fnopen(&file, msgpath, O_RDONLY | O_BINARY)) == NULL) { @@ -1380,7 +1380,7 @@ bool sbbs_t::qnetmail(const char *into, const char *subj, int mode, smb_t* resmb smb_close(&smb); smb_stack(&smb, SMB_STACK_POP); errormsg(WHERE, ERR_OPEN, msgpath, O_RDONLY | O_BINARY); - return(false); + return false; } fseeko(smb.sdt_fp, offset, SEEK_SET); @@ -1446,7 +1446,7 @@ bool sbbs_t::qnetmail(const char *into, const char *subj, int mode, smb_t* resmb if (i != SMB_SUCCESS) { errormsg(WHERE, ERR_WRITE, smb.file, i, smb.last_error); smb_freemsgdat(&smb, offset, length, 1); - return(false); + return false; } useron.emails = (ushort)adjustuserval(&cfg, useron.number, USER_EMAILS, 1); @@ -1457,7 +1457,7 @@ bool sbbs_t::qnetmail(const char *into, const char *subj, int mode, smb_t* resmb SAFEPRINTF2(str, "sent QWK NetMail to %s (%s)" , to, fulladdr); logline("EN", str); - return(true); + return true; } extern "C" bool is_supported_netmail_addr(scfg_t* cfg, const char* addr) diff --git a/src/sbbs3/newuser.cpp b/src/sbbs3/newuser.cpp index b35f8485624864a2b540da8ddfaddc501d3bfbaf..dab9db1df028696be309ee0b2df636388a72a01e 100644 --- a/src/sbbs3/newuser.cpp +++ b/src/sbbs3/newuser.cpp @@ -44,13 +44,13 @@ bool sbbs_t::newuser() bputs(text[NodeLocked]); logline(LOG_WARNING, "N!", "New user locked node logon attempt"); hangup(); - return(false); + return false; } if (cfg.sys_misc & SM_CLOSED) { bputs(text[NoNewUsers]); hangup(); - return(false); + return false; } if (getnodedat(cfg.node_num, &thisnode, true)) { thisnode.status = NODE_NEWUSER; @@ -72,7 +72,7 @@ bool sbbs_t::newuser() if (c == 4) { menu("../nupguess", P_NOABORT | P_NOERROR); hangup(); - return(false); + return false; } } @@ -89,7 +89,7 @@ bool sbbs_t::newuser() if (!lastuser(&cfg)) { /* Automatic sysop access for first user */ bprintf("Creating sysop account... System password required.\r\n"); if (!chksyspass()) - return(false); + return false; useron.level = 99; useron.exempt = useron.flags1 = useron.flags2 = 0xffffffffUL; useron.flags3 = useron.flags4 = 0xffffffffUL; @@ -175,12 +175,12 @@ bool sbbs_t::newuser() || (!(cfg.uq & UQ_ALIASES) && !check_realname(&cfg, useron.alias))) { bputs(text[YouCantUseThatName]); if (text[ContinueQ][0] && !yesno(text[ContinueQ])) - return(false); + return false; continue; } break; } - if (!online) return(false); + if (!online) return false; if ((cfg.uq & UQ_ALIASES) && (cfg.uq & UQ_REALNAME)) { while (online && text[EnterYourRealName][0]) { bputs(text[EnterYourRealName]); @@ -193,7 +193,7 @@ bool sbbs_t::newuser() else break; if (text[ContinueQ][0] && !yesno(text[ContinueQ])) - return(false); + return false; } } else if (cfg.uq & UQ_COMPANY && text[EnterYourCompany][0]) { @@ -208,7 +208,7 @@ bool sbbs_t::newuser() SAFECOPY(useron.name, useron.alias); else if (!(cfg.uq & UQ_DUPREAL) && finduserstr(useron.number, USER_NAME, useron.name) > 0) useron.rest |= FLAG('O'); // Can't post or send netmail using real name (it's a duplicate) - if (!online) return(false); + if (!online) return false; if (!useron.handle[0]) SAFECOPY(useron.handle, useron.alias); while ((cfg.uq & UQ_HANDLE) && online && text[EnterYourHandle][0]) { @@ -223,16 +223,16 @@ bool sbbs_t::newuser() else break; if (text[ContinueQ][0] && !yesno(text[ContinueQ])) - return(false); + return false; } - if (!online) return(false); + if (!online) return false; if (cfg.uq & UQ_ADDRESS) while (online && text[EnterYourAddress][0]) { /* Get address and zip code */ bputs(text[EnterYourAddress]); if (getstr(useron.address, LEN_ADDRESS, kmode)) break; } - if (!online) return(false); + if (!online) return false; while ((cfg.uq & UQ_LOCATION) && online && text[EnterYourCityState][0]) { bputs(text[EnterYourCityState]); if (getstr(useron.location, LEN_LOCATION, kmode) < 1) @@ -250,7 +250,7 @@ bool sbbs_t::newuser() , K_UPPER | (cfg.uq & UQ_NOEXASC) | K_EDIT | K_AUTODEL | K_TRIM)) break; } - if (!online) return(false); + if (!online) return false; if ((cfg.uq & UQ_PHONE) && text[EnterYourPhoneNumber][0]) { if (text[CallingFromNorthAmericaQ][0]) usa = yesno(text[CallingFromNorthAmericaQ]); @@ -272,7 +272,7 @@ bool sbbs_t::newuser() break; } } - if (!online) return(false); + if (!online) return false; while ((cfg.uq & UQ_SEX) && text[EnterYourGender][0] && cfg.new_genders[0] != '\0' && online) { bputs(text[EnterYourGender]); long gender = getkeys(cfg.new_genders, 0); @@ -292,7 +292,7 @@ bool sbbs_t::newuser() break; } } - if (!online) return(false); + if (!online) return false; while (!(cfg.uq & UQ_NONETMAIL) && online && text[EnterNetMailAddress][0]) { bputs(text[EnterNetMailAddress]); if (getstr(useron.netmail, LEN_NETMAIL, K_EDIT | K_AUTODEL | K_LINE | K_TRIM) < 1 @@ -309,10 +309,10 @@ bool sbbs_t::newuser() if (text[UserInfoCorrectQ][0] == 0 || yesno(text[UserInfoCorrectQ])) break; } - if (!online) return(false); + if (!online) return false; SAFEPRINTF(str, "New user: %s", useron.alias); logline("N", str); - if (!online) return(false); + if (!online) return false; menu("../sbbs", P_NOABORT | P_NOERROR); menu("../system", P_NOABORT | P_NOERROR); menu("../newuser", P_NOABORT | P_NOERROR); @@ -396,7 +396,7 @@ bool sbbs_t::newuser() } } - if (!online) return(false); + if (!online) return false; if (cfg.new_magic[0] && text[MagicWordPrompt][0]) { bputs(text[MagicWordPrompt]); str[0] = 0; @@ -407,7 +407,7 @@ bool sbbs_t::newuser() logline("N!", tmp); hangup(); } - if (!online) return(false); + if (!online) return false; } bputs(text[CheckingSlots]); @@ -416,7 +416,7 @@ bool sbbs_t::newuser() SAFEPRINTF(str, "user record #%u", useron.number); errormsg(WHERE, ERR_CREATE, str, i); hangup(); - return(false); + return false; } SAFEPRINTF2(str, "Created user record #%u: %s", useron.number, useron.alias); logline(nulstr, str); @@ -457,7 +457,7 @@ bool sbbs_t::newuser() putuserstr(useron.number, USER_COMMENT, "Didn't leave feedback"); putusermisc(useron.number, useron.misc | DELETED); putusername(&cfg, useron.number, nulstr); - return(false); + return false; } } } @@ -474,5 +474,5 @@ bool sbbs_t::newuser() getuseron(WHERE); // In case event(s) modified user data logline("N+", "Successful new user logon"); - return(true); + return true; } diff --git a/src/sbbs3/node.c b/src/sbbs3/node.c index 75ddb02690f8b4efdd617379e211f26948c946a3..1480b3f52109dd3cc8927ec5ba74836d15cfede8 100644 --- a/src/sbbs3/node.c +++ b/src/sbbs3/node.c @@ -136,7 +136,7 @@ char* itoa(int val, char* str, int radix) sprintf(str, "bad radix: %d", radix); break; } - return(str); + return str; } #endif @@ -205,7 +205,7 @@ char *unpackchatpass(char *pass, node_t node) for (i = 0; i < 8; i++) if (pass[i]) pass[i] += 64; - return(pass); + return pass; } static char* node_connection_desc(ushort conn, char* str) @@ -511,7 +511,7 @@ int main(int argc, char **argv) if (sizeof(node_t) != SIZEOF_NODE_T) { printf("COMPILER ERROR: sizeof(node_t)=%" XP_PRIsize_t "u instead of %d\n" , sizeof(node_t), SIZEOF_NODE_T); - return(-1); + return -1; } if (argc < 2) { @@ -735,5 +735,5 @@ int main(int argc, char **argv) } /* for i<argc */ close(nodefile); - return(0); + return 0; } diff --git a/src/sbbs3/nopen.c b/src/sbbs3/nopen.c index 4c808e1c616a19e3ac5ffdbe12e5dc168b5c084a..c50666274570caf83168c43ff759da45e7e62925 100644 --- a/src/sbbs3/nopen.c +++ b/src/sbbs3/nopen.c @@ -53,7 +53,7 @@ int nopen(const char* str, uint access) while (((file = sopen(str, access, share, DEFFILEMODE)) == -1) && FILE_RETRY_ERRNO(errno) && count++ < LOOP_NOPEN) FILE_RETRY_DELAY(count); - return(file); + return file; } /****************************************************************************/ @@ -67,7 +67,7 @@ FILE* fnopen(int* fd, const char* str, uint access) FILE * stream; if ((file = nopen(str, access)) == -1) - return(NULL); + return NULL; if (fd != NULL) *fd = file; @@ -91,10 +91,10 @@ FILE* fnopen(int* fd, const char* str, uint access) stream = fdopen(file, mode); if (stream == NULL) { close(file); - return(NULL); + return NULL; } setvbuf(stream, NULL, _IOFBF, FNOPEN_BUF_SIZE); - return(stream); + return stream; } bool ftouch(const char* fname) @@ -245,7 +245,7 @@ bool fcompare(const char* fn1, const char* fn2) fclose(fp1); fclose(fp2); - return(success); + return success; } diff --git a/src/sbbs3/ntsvcs.c b/src/sbbs3/ntsvcs.c index 34e23f94656100094227e5ef6d7c926be022dbe3..f2e7b3a1439a43b35476bceba6995fa82337876a 100644 --- a/src/sbbs3/ntsvcs.c +++ b/src/sbbs3/ntsvcs.c @@ -225,11 +225,11 @@ static WORD event_type(int level) { switch (level) { case LOG_WARNING: - return(EVENTLOG_WARNING_TYPE); + return EVENTLOG_WARNING_TYPE; case LOG_NOTICE: case LOG_INFO: case LOG_DEBUG: - return(EVENTLOG_INFORMATION_TYPE); /* same as EVENT_LOG_SUCCESS */ + return EVENTLOG_INFORMATION_TYPE; /* same as EVENT_LOG_SUCCESS */ } /* LOG_EMERG @@ -237,7 +237,7 @@ static WORD event_type(int level) LOG_CRIT LOG_ERR */ - return(EVENTLOG_ERROR_TYPE); + return EVENTLOG_ERROR_TYPE; } /**************************************/ @@ -258,7 +258,7 @@ static int svc_lputs(void* p, int level, const char* str) OutputDebugString(debug); } if (svc == NULL) - return(0); + return 0; len = strlen(str); SAFECOPY(msg.buf, str); @@ -318,7 +318,7 @@ static int svc_lputs(void* p, int level, const char* str) NULL); /* pointer to data */ } - return(0); + return 0; } /************************************/ @@ -534,7 +534,7 @@ static bool register_event_source(char* name, char* path) if (retval != ERROR_SUCCESS) { fprintf(stderr, "!Error %d creating/opening registry key (HKLM\\%s)\n" , retval, keyname); - return(FALSE); + return FALSE; } value = "EventMessageFile"; @@ -551,7 +551,7 @@ static bool register_event_source(char* name, char* path) RegCloseKey(hKey); fprintf(stderr, "!Error %d setting registry key value (%s)\n" , retval, value); - return(FALSE); + return FALSE; } value = "TypesSupported"; @@ -570,10 +570,10 @@ static bool register_event_source(char* name, char* path) if (retval != ERROR_SUCCESS) { fprintf(stderr, "!Error %d setting registry key value (%s)\n" , retval, value); - return(FALSE); + return FALSE; } - return(TRUE); + return TRUE; } static const char* start_type_desc(DWORD start_type) @@ -581,14 +581,14 @@ static const char* start_type_desc(DWORD start_type) static char str[128]; switch (start_type) { - case SERVICE_AUTO_START: return("Startup: Automatic"); - case SERVICE_DEMAND_START: return("Startup: Manual"); - case SERVICE_DISABLED: return("Disabled"); - case SERVICE_NOT_INSTALLED: return("Not installed"); + case SERVICE_AUTO_START: return "Startup: Automatic"; + case SERVICE_DEMAND_START: return "Startup: Manual"; + case SERVICE_DISABLED: return "Disabled"; + case SERVICE_NOT_INSTALLED: return "Not installed"; } SAFEPRINTF(str, "Start_type: %d", start_type); - return(str); + return str; } static const char* state_desc(DWORD state) @@ -596,17 +596,17 @@ static const char* state_desc(DWORD state) static char str[128]; switch (state) { - case SERVICE_STOPPED: return("Stopped"); - case SERVICE_START_PENDING: return("Start Pending"); - case SERVICE_STOP_PENDING: return("Stop Pending"); - case SERVICE_RUNNING: return("Running"); - case SERVICE_CONTINUE_PENDING: return("Continue Pending"); - case SERVICE_PAUSE_PENDING: return("Pause Pending"); - case SERVICE_PAUSED: return("Paused"); + case SERVICE_STOPPED: return "Stopped"; + case SERVICE_START_PENDING: return "Start Pending"; + case SERVICE_STOP_PENDING: return "Stop Pending"; + case SERVICE_RUNNING: return "Running"; + case SERVICE_CONTINUE_PENDING: return "Continue Pending"; + case SERVICE_PAUSE_PENDING: return "Pause Pending"; + case SERVICE_PAUSED: return "Paused"; } SAFEPRINTF(str, "State: %d", state); - return(str); + return str; } static const char* control_desc(DWORD ctrl) @@ -615,22 +615,22 @@ static const char* control_desc(DWORD ctrl) switch (ctrl) { case SERVICE_CONTROL_STOP: - return("Stopping"); + return "Stopping"; case SERVICE_CONTROL_PAUSE: - return("Pausing"); + return "Pausing"; case SERVICE_CONTROL_CONTINUE: - return("Continuing"); + return "Continuing"; case SERVICE_CONTROL_INTERROGATE: - return("Interrogating"); + return "Interrogating"; case SERVICE_CONTROL_SHUTDOWN: - return("Shutting-down"); + return "Shutting-down"; /* Synchronet-specific */ case SERVICE_CONTROL_RECYCLE: - return("Recycling"); + return "Recycling"; } SAFEPRINTF(str, "Control: %d", ctrl); - return(str); + return str; } /****************************************************************************/ @@ -650,9 +650,9 @@ static DWORD get_service_info(SC_HANDLE hSCManager, char* name, DWORD* state) if ((hService = OpenService(hSCManager, name, SERVICE_ALL_ACCESS)) == NULL) { if ((err = GetLastError()) == ERROR_SERVICE_DOES_NOT_EXIST) - return(SERVICE_NOT_INSTALLED); + return SERVICE_NOT_INSTALLED; printf("\n!ERROR %d opening service: %s\n", err, name); - return(-1); + return -1; } if (QueryServiceConfig( @@ -663,7 +663,7 @@ static DWORD get_service_info(SC_HANDLE hSCManager, char* name, DWORD* state) ) || GetLastError() != ERROR_INSUFFICIENT_BUFFER) { printf("\n!Unexpected QueryServiceConfig ERROR %u\n", err = GetLastError()); CloseServiceHandle(hService); - return(-1); + return -1; } if (state != NULL && QueryServiceStatus(hService, &status)) @@ -672,7 +672,7 @@ static DWORD get_service_info(SC_HANDLE hSCManager, char* name, DWORD* state) if ((service_config = malloc(size)) == NULL) { printf("\n!ERROR allocating %u bytes of memory\n", size); CloseServiceHandle(hService); - return(-1); + return -1; } if (!QueryServiceConfig( @@ -684,7 +684,7 @@ static DWORD get_service_info(SC_HANDLE hSCManager, char* name, DWORD* state) printf("\n!QueryServiceConfig ERROR %u\n", GetLastError()); CloseServiceHandle(hService); free(service_config); - return(-1); + return -1; } CloseServiceHandle(hService); ret = service_config->dwStartType; @@ -752,7 +752,7 @@ static int install(const char* svc_name) if (GetModuleFileName(NULL, path, sizeof(path)) == 0) { fprintf(stderr, "!ERROR %d getting module file name\n", GetLastError()); - return(-1); + return -1; } hSCManager = OpenSCManager( @@ -762,7 +762,7 @@ static int install(const char* svc_name) ); if (hSCManager == NULL) { fprintf(stderr, "!ERROR %d opening SC manager\n", GetLastError()); - return(-1); + return -1; } hSCMlib = LoadLibrary("ADVAPI32.DLL"); @@ -784,7 +784,7 @@ static int install(const char* svc_name) CloseServiceHandle(hSCManager); - return(0); + return 0; } static SC_HANDLE open_service(SC_HANDLE hSCManager, char* name) @@ -797,10 +797,10 @@ static SC_HANDLE open_service(SC_HANDLE hSCManager, char* name) printf("Not installed\n"); else printf("\n!ERROR %d opening service: %s\n", err, name); - return(NULL); + return NULL; } - return(hService); + return hService; } /****************************************************************************/ @@ -908,7 +908,7 @@ static int control(const char* svc_name, DWORD ctrl) ); if (hSCManager == NULL) { fprintf(stderr, "!ERROR %d opening SC manager\n", GetLastError()); - return(-1); + return -1; } for (i = 0; ntsvc_list[i] != NULL; i++) { @@ -937,7 +937,7 @@ static int control(const char* svc_name, DWORD ctrl) CloseServiceHandle(hSCManager); - return(0); + return 0; } /****************************************************************************/ @@ -988,7 +988,7 @@ static int uninstall(const char* svc_name) ); if (hSCManager == NULL) { fprintf(stderr, "!ERROR %d opening SC manager\n", GetLastError()); - return(-1); + return -1; } for (i = 0; ntsvc_list[i] != NULL; i++) @@ -1001,7 +1001,7 @@ static int uninstall(const char* svc_name) CloseServiceHandle(hSCManager); - return(0); + return 0; } /****************************************************************************/ @@ -1054,7 +1054,7 @@ static int enable(const char* svc_name, bool enabled) ); if (hSCManager == NULL) { fprintf(stderr, "!ERROR %d opening SC manager\n", GetLastError()); - return(-1); + return -1; } for (i = 0; ntsvc_list[i] != NULL; i++) @@ -1069,7 +1069,7 @@ static int enable(const char* svc_name, bool enabled) CloseServiceHandle(hSCManager); - return(0); + return 0; } /****************************************************************************/ @@ -1089,7 +1089,7 @@ static int list(const char* svc_name) ); if (hSCManager == NULL) { fprintf(stderr, "!ERROR %d opening SC manager\n", GetLastError()); - return(-1); + return -1; } for (i = 0; ntsvc_list[i] != NULL; i++) { @@ -1106,7 +1106,7 @@ static int list(const char* svc_name) CloseServiceHandle(hSCManager); - return(0); + return 0; } /****************************************************************************/ @@ -1124,7 +1124,7 @@ static int start(const char* svc_name, int argc, char** argv) ); if (hSCManager == NULL) { fprintf(stderr, "!ERROR %d opening SC manager\n", GetLastError()); - return(-1); + return -1; } for (i = 0; ntsvc_list[i] != NULL; i++) { @@ -1140,7 +1140,7 @@ static int start(const char* svc_name, int argc, char** argv) CloseServiceHandle(hSCManager); - return(0); + return 0; } /****************************************************************************/ @@ -1304,7 +1304,7 @@ int main(int argc, char** argv) printf("This may take several seconds. Please wait.\n" ); if (StartServiceCtrlDispatcher(ServiceDispatchTable)) - return(0); + return 0; safe_snprintf(str, sizeof(str), "!ERROR %u starting service control dispatcher", GetLastError()); printf("%s\n\n", str); @@ -1335,5 +1335,5 @@ int main(int argc, char** argv) for (i = 0; ntsvc_list[i] != NULL; i++) printf("%-20s %s\n", ntsvc_list[i]->name + STRLEN_SYNCHRONET, ntsvc_list[i]->display_name); - return(0); + return 0; } diff --git a/src/sbbs3/pack_qwk.cpp b/src/sbbs3/pack_qwk.cpp index c6981011f0a3c32227ad9588fd83fc18ec1a8330..e3604726e51584e09c3344df968a8b356ff134b2 100644 --- a/src/sbbs3/pack_qwk.cpp +++ b/src/sbbs3/pack_qwk.cpp @@ -63,7 +63,7 @@ bool sbbs_t::pack_qwk(char *packet, uint *msgcnt, bool prepack) ex |= EX_OFFLINE; if (user_is_online(&cfg, useron.number)) { /* Don't pre-pack with user online */ lprintf(LOG_NOTICE, "User #%u is concurrently logged-in, QWK packet creation aborted", useron.number); - return(false); + return false; } } @@ -122,14 +122,14 @@ bool sbbs_t::pack_qwk(char *packet, uint *msgcnt, bool prepack) SAFEPRINTF(str, "%sCONTROL.DAT", cfg.temp_dir); if ((stream = fopen(str, "wb")) == NULL) { errormsg(WHERE, ERR_OPEN, str, 0); - return(false); + return false; } now = time(NULL); if (localtime_r(&now, &tm) == NULL) { fclose(stream); errormsg(WHERE, ERR_CHK, "time", (uint)now); - return(false); + return false; } fprintf(stream, "%s\r\n%s\r\n%s\r\n%s, Sysop\r\n0000,%s\r\n" @@ -168,7 +168,7 @@ bool sbbs_t::pack_qwk(char *packet, uint *msgcnt, bool prepack) SAFEPRINTF(str, "%sDOOR.ID", cfg.temp_dir); if ((stream = fopen(str, "wb")) == NULL) { errormsg(WHERE, ERR_OPEN, str, 0); - return(false); + return false; } p = "CONTROLTYPE = "; fprintf(stream, "DOOR = %.10s\r\nVERSION = %s%c\r\n" @@ -208,7 +208,7 @@ bool sbbs_t::pack_qwk(char *packet, uint *msgcnt, bool prepack) SAFEPRINTF(str, "%sNETFLAGS.DAT", cfg.temp_dir); if ((stream = fopen(str, "wb")) == NULL) { errormsg(WHERE, ERR_CREATE, str, 0); - return(false); + return false; } ch = 1; /* Net enabled */ if (usrgrps) @@ -225,7 +225,7 @@ bool sbbs_t::pack_qwk(char *packet, uint *msgcnt, bool prepack) SAFEPRINTF(str, "%sTOREADER.EXT", cfg.temp_dir); if ((stream = fopen(str, "wb")) == NULL) { errormsg(WHERE, ERR_OPEN, str, 0); - return(false); + return false; } fprintf(stream, "ALIAS %s\r\n", useron.alias); @@ -288,14 +288,14 @@ bool sbbs_t::pack_qwk(char *packet, uint *msgcnt, bool prepack) fmode = "w+b"; if ((qwk = fopen(str, fmode)) == NULL) { errormsg(WHERE, ERR_OPEN, str, 0); - return(false); + return false; } if (useron.qwk & QWK_HEADERS) { SAFEPRINTF(str, "%sHEADERS.DAT", cfg.temp_dir); if ((hdrs = fopen(str, "a")) == NULL) { fclose(qwk); errormsg(WHERE, ERR_OPEN, str, 0); - return(false); + return false; } } if (useron.qwk & QWK_VOTING) { @@ -305,7 +305,7 @@ bool sbbs_t::pack_qwk(char *packet, uint *msgcnt, bool prepack) if (hdrs != NULL) fclose(hdrs); errormsg(WHERE, ERR_OPEN, str, 0); - return(false); + return false; } } l = (int)filelength(fileno(qwk)); @@ -334,7 +334,7 @@ bool sbbs_t::pack_qwk(char *packet, uint *msgcnt, bool prepack) if (voting != NULL) fclose(voting); errormsg(WHERE, ERR_OPEN, str, 0); - return(false); + return false; } } else @@ -364,7 +364,7 @@ bool sbbs_t::pack_qwk(char *packet, uint *msgcnt, bool prepack) smb_close(&smb); errormsg(WHERE, ERR_OPEN, str, 0); free(mail); - return(false); + return false; } } else @@ -498,7 +498,7 @@ bool sbbs_t::pack_qwk(char *packet, uint *msgcnt, bool prepack) smb_close(&smb); errormsg(WHERE, ERR_OPEN, str, 0); free(post); - return(false); + return false; } } else @@ -626,7 +626,7 @@ bool sbbs_t::pack_qwk(char *packet, uint *msgcnt, bool prepack) if (!prepack && online != ON_LOCAL && ((sys_status & SS_ABORT) || !online)) { bputs(text[Aborted]); - return(false); + return false; } if (/*!prepack && */ useron.rest & FLAG('Q')) { /* If QWK Net node, check for files */ @@ -688,7 +688,7 @@ bool sbbs_t::pack_qwk(char *packet, uint *msgcnt, bool prepack) && (prepack || !preqwk)) { if (online == ON_REMOTE) bputs(text[QWKNoNewMessages]); - return(false); + return false; } if (!(useron.rest & FLAG('Q'))) { /* Don't include in network */ @@ -727,7 +727,7 @@ bool sbbs_t::pack_qwk(char *packet, uint *msgcnt, bool prepack) if (prepack) { if (user_is_online(&cfg, useron.number)) { /* Don't pre-pack with user online */ lprintf(LOG_NOTICE, "User #%u is concurrently logged-in, QWK packet creation aborted", useron.number); - return(false); + return false; } } @@ -752,7 +752,7 @@ bool sbbs_t::pack_qwk(char *packet, uint *msgcnt, bool prepack) errormsg(WHERE, ERR_EXEC, cmdstr_output, i); if (flength(packet) < 1) { bputs(text[QWKCompressionFailed]); - return(false); + return false; } } @@ -769,5 +769,5 @@ bool sbbs_t::pack_qwk(char *packet, uint *msgcnt, bool prepack) closedir(dir); } - return(true); + return true; } diff --git a/src/sbbs3/pack_rep.cpp b/src/sbbs3/pack_rep.cpp index bb5111f225c29a6f41dcd42bdf26993d855ce13c..7216a6d5c31e3d1712512a6e79337e749131468d 100644 --- a/src/sbbs3/pack_rep.cpp +++ b/src/sbbs3/pack_rep.cpp @@ -124,7 +124,7 @@ bool sbbs_t::pack_rep(uint hubnum) if (voting != NULL) fclose(voting); errormsg(WHERE, ERR_OPEN, smb.file, i, smb.last_error); - return(false); + return false; } /***********************/ @@ -278,7 +278,7 @@ bool sbbs_t::pack_rep(uint hubnum) if (!msgcnt && !netfiles && !packedmail && !voting_data) { lprintf(LOG_INFO, "%s", remove_ctrl_a(text[QWKNoNewMessages], tmp)); - return(true); // Changed from false Mar-11-2005 (needs to be true to save updated ptrs) + return true; // Changed from false Mar-11-2005 (needs to be true to save updated ptrs) } /*******************/ @@ -303,7 +303,7 @@ bool sbbs_t::pack_rep(uint hubnum) if (!fexistcase(str)) { lprintf(LOG_WARNING, "%s", remove_ctrl_a(text[QWKCompressionFailed], tmp)); lprintf(LOG_ERR, "Couldn't compress REP packet"); - return(false); + return false; } SAFEPRINTF2(str, "%sqnet/%s.out/", cfg.data_dir, hubid_lower); delfiles(str, ALLFILES); @@ -314,7 +314,7 @@ bool sbbs_t::pack_rep(uint hubnum) smb.subnum = INVALID_SUB; if ((i = smb_open(&smb)) != 0) { errormsg(WHERE, ERR_OPEN, smb.file, i, smb.last_error); - return(true); + return true; } mail = loadmail(&smb, &mailmsgs, 0, MAIL_YOUR, 0); @@ -324,7 +324,7 @@ bool sbbs_t::pack_rep(uint hubnum) free(mail); smb_close(&smb); errormsg(WHERE, ERR_LOCK, smb.file, i, smb.last_error); /* messes with the index */ - return(true); + return true; } if ((i = smb_getstatus(&smb)) != 0) { @@ -332,7 +332,7 @@ bool sbbs_t::pack_rep(uint hubnum) free(mail); smb_close(&smb); errormsg(WHERE, ERR_READ, smb.file, i, smb.last_error); - return(true); + return true; } deleted = 0; @@ -372,5 +372,5 @@ bool sbbs_t::pack_rep(uint hubnum) lprintf(LOG_INFO, "Deleted %ld sent NetMail messages", deleted); } - return(true); + return true; } diff --git a/src/sbbs3/pktdump.c b/src/sbbs3/pktdump.c index e7e746823adad45beb6acf5561c7262a61a53f3a..2c2d9b4ec972cb169966fba3408b1dc20efe4b82 100644 --- a/src/sbbs3/pktdump.c +++ b/src/sbbs3/pktdump.c @@ -18,16 +18,16 @@ char *faddrtoa(struct fidoaddr* addr, char* outstr) static char str[64]; if (addr == NULL) - return("0:0/0"); + return "0:0/0"; sprintf(str, "%hu:%hu/%hu", addr->zone, addr->net, addr->node); if (addr->point) sprintf(str + strlen(str), ".%hu", addr->point); if (addr->domain[0]) sprintf(str + strlen(str), "@%s", addr->domain); if (outstr == NULL) - return(str); + return str; strcpy(outstr, str); - return(outstr); + return outstr; } bool freadstr(FILE* fp, char* str, size_t maxlen) @@ -85,7 +85,7 @@ int pktdump(FILE* fp, const char* fname, FILE* good, FILE* bad) if (fread(&pkthdr, sizeof(pkthdr), 1, fp) != 1) { fprintf(stderr, "%s !Error reading pkthdr (%" XP_PRIsize_t "u bytes)\n" , fname, sizeof(pkthdr)); - return(-1); + return -1; } fseek(fp, -(int)(sizeof terminator), SEEK_END); @@ -281,7 +281,7 @@ int pktdump(FILE* fp, const char* fname, FILE* good, FILE* bad) fputc('\0', bad); } - return(0); + return 0; } char* usage = "usage: pktdump [-body | -ctrl] [-recover | -split] <file1.pkt> [file2.pkt] [...]\n"; @@ -309,15 +309,15 @@ int main(int argc, char** argv) if (sizeof(fpkthdr_t) != FIDO_PACKET_HDR_LEN) { printf("sizeof(fpkthdr_t)=%" XP_PRIsize_t "u, expected: %d\n", sizeof(fpkthdr_t), FIDO_PACKET_HDR_LEN); - return(-1); + return -1; } if (sizeof(fpkdmsg_t) != FIDO_PACKED_MSG_HDR_LEN) { printf("sizeof(fpkdmsg_t)=%" XP_PRIsize_t "u, expected: %d\n", sizeof(fpkdmsg_t), FIDO_PACKED_MSG_HDR_LEN); - return(-1); + return -1; } if (sizeof(fmsghdr_t) != FIDO_STORED_MSG_HDR_LEN) { printf("sizeof(fmsghdr_t)=%" XP_PRIsize_t "u, expected: %d\n", sizeof(fmsghdr_t), FIDO_STORED_MSG_HDR_LEN); - return(-1); + return -1; } for (i = 1; i < argc; i++) { @@ -337,7 +337,7 @@ int main(int argc, char** argv) break; default: printf("%s", usage); - return(0); + return 0; } continue; } @@ -390,5 +390,5 @@ int main(int argc, char** argv) fclose(fp); } - return(0); + return 0; } diff --git a/src/sbbs3/postmsg.cpp b/src/sbbs3/postmsg.cpp index 9192c15d33152edb6d48ee9c06f64bec60c1378d..4e8845dd2393b5fd829d12d8565a23af66a6ce60 100644 --- a/src/sbbs3/postmsg.cpp +++ b/src/sbbs3/postmsg.cpp @@ -129,7 +129,7 @@ bool sbbs_t::postmsg(int subnum, int wm_mode, smb_t* resmb, smbmsg_t* remsg) if (sys_status & SS_ABORT) { strListFree(&names); - return(false); + return false; } if ( @@ -154,20 +154,20 @@ bool sbbs_t::postmsg(int subnum, int wm_mode, smb_t* resmb, smbmsg_t* remsg) if (!finduserstr(useron.number, USER_NAME, touser)) { bputs(text[UnknownUser]); strListFree(&names); - return(false); + return false; } } else { if ((i = finduser(touser)) == 0) { strListFree(&names); - return(false); + return false; } username(&cfg, i, touser); } } if (sys_status & SS_ABORT) { strListFree(&names); - return(false); + return false; } } strListFree(&names); @@ -180,7 +180,7 @@ bool sbbs_t::postmsg(int subnum, int wm_mode, smb_t* resmb, smbmsg_t* remsg) if (msgattr & MSG_PRIVATE && !stricmp(touser, "ALL")) { bputs(text[NoToUser]); - return(false); + return false; } if (msgattr & MSG_PRIVATE) wm_mode |= WM_PRIVATE; @@ -210,13 +210,13 @@ bool sbbs_t::postmsg(int subnum, int wm_mode, smb_t* resmb, smbmsg_t* remsg) if ((i = smb_stack(&smb, SMB_STACK_PUSH)) != SMB_SUCCESS) { errormsg(WHERE, ERR_OPEN, cfg.sub[subnum]->code, i, smb.last_error); - return(false); + return false; } if ((i = msgbase_open(&cfg, &smb, subnum, &storage, &dupechk_hashes, &xlat)) != SMB_SUCCESS) { errormsg(WHERE, ERR_OPEN, smb.file, i, smb.last_error); smb_stack(&smb, SMB_STACK_POP); - return(false); + return false; } if (remsg != NULL && resmb != NULL && !(wm_mode & WM_QUOTE)) { @@ -231,7 +231,7 @@ bool sbbs_t::postmsg(int subnum, int wm_mode, smb_t* resmb, smbmsg_t* remsg) bputs(text[Aborted]); smb_close(&smb); smb_stack(&smb, SMB_STACK_POP); - return(false); + return false; } if ((cfg.sub[subnum]->misc & SUB_MSGTAGS) && (tags[0] || text[TagMessageQ][0] == 0 || !noyes(text[TagMessageQ]))) { @@ -245,21 +245,21 @@ bool sbbs_t::postmsg(int subnum, int wm_mode, smb_t* resmb, smbmsg_t* remsg) smb_close(&smb); errormsg(WHERE, ERR_LOCK, smb.file, i, smb.last_error); smb_stack(&smb, SMB_STACK_POP); - return(false); + return false; } if ((i = smb_getstatus(&smb)) != SMB_SUCCESS) { smb_close(&smb); errormsg(WHERE, ERR_READ, smb.file, i, smb.last_error); smb_stack(&smb, SMB_STACK_POP); - return(false); + return false; } if ((msgbuf = (char*)calloc(length + 1, sizeof(char))) == NULL) { smb_close(&smb); errormsg(WHERE, ERR_ALLOC, "msgbuf", length + 1); smb_stack(&smb, SMB_STACK_POP); - return(false); + return false; } if ((fp = fopen(str, "rb")) == NULL) { @@ -267,7 +267,7 @@ bool sbbs_t::postmsg(int subnum, int wm_mode, smb_t* resmb, smbmsg_t* remsg) smb_close(&smb); errormsg(WHERE, ERR_OPEN, str, O_RDONLY | O_BINARY); smb_stack(&smb, SMB_STACK_POP); - return(false); + return false; } i = fread(msgbuf, 1, length, fp); @@ -277,7 +277,7 @@ bool sbbs_t::postmsg(int subnum, int wm_mode, smb_t* resmb, smbmsg_t* remsg) smb_close(&smb); errormsg(WHERE, ERR_READ, str, length); smb_stack(&smb, SMB_STACK_POP); - return(false); + return false; } truncsp(msgbuf); @@ -368,7 +368,7 @@ bool sbbs_t::postmsg(int subnum, int wm_mode, smb_t* resmb, smbmsg_t* remsg) user_event(EVENT_POST); - return(true); + return true; } // When message body is UTF-8 encoded, insure header files are UTF-8 (not CP437) encoded too @@ -404,23 +404,23 @@ extern "C" int msg_client_hfields(smbmsg_t* msg, client_t* client) char date[64]; if (client == NULL) - return(-1); + return -1; if (client->usernum && (i = smb_hfield_str(msg, SENDERUSERID, client->user)) != SMB_SUCCESS) - return(i); + return i; if (client->time && (i = smb_hfield_str(msg, SENDERTIME, xpDateTime_to_isoDateTimeStr(gmtime_to_xpDateTime(client->time) , /* separators: */ "", "", "", /* precision: */ 0 , date, sizeof(date)))) != SMB_SUCCESS) - return(i); + return i; if (*client->addr && (i = smb_hfield_str(msg, SENDERIPADDR, client->addr)) != SMB_SUCCESS) - return(i); + return i; if (*client->host && (i = smb_hfield_str(msg, SENDERHOSTNAME, client->host)) != SMB_SUCCESS) - return(i); + return i; if ((i = smb_hfield_str(msg, SENDERPROTOCOL, client->protocol)) != SMB_SUCCESS) - return(i); + return i; if (client->port) { SAFEPRINTF(port, "%u", client->port); return smb_hfield_str(msg, SENDERPORT, port); @@ -439,7 +439,7 @@ extern "C" int savemsg(scfg_t* cfg, smb_t* smb, smbmsg_t* msg, client_t* client, int dupechk_hashes = SMB_HASH_SOURCE_DUPE; if (msg == NULL) - return(SMB_FAILURE); + return SMB_FAILURE; if (!SMB_IS_OPEN(smb)) { if (smb->subnum == INVALID_SUB) @@ -448,17 +448,17 @@ extern "C" int savemsg(scfg_t* cfg, smb_t* smb, smbmsg_t* msg, client_t* client, SAFEPRINTF2(smb->file, "%s%s", cfg->sub[smb->subnum]->data_dir, cfg->sub[smb->subnum]->code); smb->retry_time = cfg->smb_retry_time; if ((i = smb_open(smb)) != SMB_SUCCESS) - return(i); + return i; } /* Lock the msgbase early to preserve our message number (used in MSG-IDs) */ if (!smb->locked && smb_locksmbhdr(smb) != SMB_SUCCESS) - return(SMB_ERR_LOCK); + return SMB_ERR_LOCK; if (filelength(fileno(smb->shd_fp)) > 0 && (i = smb_getstatus(smb)) != SMB_SUCCESS) { if (smb->locked) smb_unlocksmbhdr(smb); - return(i); + return i; } if (smb->subnum == INVALID_SUB) { /* e-mail */ @@ -556,7 +556,7 @@ extern "C" int savemsg(scfg_t* cfg, smb_t* smb, smbmsg_t* msg, client_t* client, } } free(msgbuf); - return(i); + return i; } extern "C" int votemsg(scfg_t* cfg, smb_t* smb, smbmsg_t* msg, const char* smsgfmt, const char* votefmt) diff --git a/src/sbbs3/putmsg.cpp b/src/sbbs3/putmsg.cpp index f1ba775802f6acd1c2341c2d9cba0945c7db3fd3..2016e08c1c1221c07c73cb66a63bc33a7c82c7d5 100644 --- a/src/sbbs3/putmsg.cpp +++ b/src/sbbs3/putmsg.cpp @@ -72,7 +72,7 @@ char sbbs_t::putmsg(const char *buf, int mode, int org_cols, JSObject* obj) line_delay = org_line_delay; - return(ret); + return ret; } // Print a message fragment, doesn't save/restore any console states (e.g. attributes, auto-pause) diff --git a/src/sbbs3/qwk.cpp b/src/sbbs3/qwk.cpp index 559b90a84b60338d5e2b95a673bf5bab8da323c1..2151ceed1d8dfb6fbebd80c95b729235cf5a48f2 100644 --- a/src/sbbs3/qwk.cpp +++ b/src/sbbs3/qwk.cpp @@ -41,7 +41,7 @@ float ltomsbin(int32_t val) sign = t.uc[3] / 0x80; exp = ((t.ui[1] >> 7) - 0x7f + 0x81) & 0xff; t.ui[1] = (t.ui[1] & 0x7f) | (sign << 7) | (exp << 8); - return(t.f[0]); + return t.f[0]; } bool route_circ(char *via, char *id) @@ -49,7 +49,7 @@ bool route_circ(char *via, char *id) char str[256], *p, *sp; if (via == NULL || id == NULL) - return(false); + return false; SAFECOPY(str, via); p = str; @@ -58,12 +58,12 @@ bool route_circ(char *via, char *id) sp = strchr(p, '/'); if (sp) *sp = 0; if (!stricmp(p, id)) - return(true); + return true; if (!sp) break; p = sp + 1; } - return(false); + return false; } extern "C" int qwk_route(scfg_t* cfg, const char *inaddr, char *fulladdr, size_t maxlen) @@ -85,14 +85,14 @@ extern "C" int qwk_route(scfg_t* cfg, const char *inaddr, char *fulladdr, size_t break; if (i < cfg->total_qhubs) { strncpy(fulladdr, node, maxlen); - return(0); + return 0; } i = matchuser(cfg, node, FALSE); /* Check if destination is a node */ if (i) { if (getuserflags(cfg, i, USER_REST) & FLAG('Q')) { strncpy(fulladdr, node, maxlen); - return(i); + return i; } } @@ -109,14 +109,14 @@ extern "C" int qwk_route(scfg_t* cfg, const char *inaddr, char *fulladdr, size_t break; if (i < cfg->total_qhubs) { strncpy(fulladdr, inaddr, maxlen); - return(0); + return 0; } i = matchuser(cfg, node, FALSE); /* Check if next hop is a node */ if (i) { if (getuserflags(cfg, i, USER_REST) & FLAG('Q')) { strncpy(fulladdr, inaddr, maxlen); - return(i); + return i; } } } @@ -129,7 +129,7 @@ extern "C" int qwk_route(scfg_t* cfg, const char *inaddr, char *fulladdr, size_t SAFEPRINTF(path, "%sqnet/route.dat", cfg->data_dir); if ((stream = fnopen(&file, path, O_RDONLY)) == NULL) - return(0); + return 0; strcat(node, ":"); fulladdr[0] = 0; @@ -146,7 +146,7 @@ extern "C" int qwk_route(scfg_t* cfg, const char *inaddr, char *fulladdr, size_t fclose(stream); if (!fulladdr[0]) /* First hop not found in ROUTE.DAT */ - return(0); + return 0; SAFECOPY(node, fulladdr); p = strchr(node, '/'); @@ -157,15 +157,15 @@ extern "C" int qwk_route(scfg_t* cfg, const char *inaddr, char *fulladdr, size_t if (!stricmp(cfg->qhub[i]->id, node)) break; if (i < cfg->total_qhubs) - return(0); + return 0; i = matchuser(cfg, node, FALSE); /* Check if first hop is a node */ if (i) { if (getuserflags(cfg, i, USER_REST) & FLAG('Q')) - return(i); + return i; } fulladdr[0] = 0; - return(0); + return 0; } /* Via is in format: NODE/NODE/... */ diff --git a/src/sbbs3/qwknodes.c b/src/sbbs3/qwknodes.c index d214e05127ade9d015a1e73e8b8e33aa6699ef04..e56b712f089abc43bf619140216f89aab7bb62fe 100644 --- a/src/sbbs3/qwknodes.c +++ b/src/sbbs3/qwknodes.c @@ -60,7 +60,7 @@ int lputs(char* str) else tmp[k++] = str[i]; tmp[k] = 0; - return(fputs(tmp, stdout)); + return fputs(tmp, stdout); } /****************************************************************************/ /* Performs printf() through local assembly routines */ @@ -77,7 +77,7 @@ int lprintf(const char *fmat, ...) sbuf[sizeof(sbuf) - 1] = 0; va_end(argptr); lputs(sbuf); - return(chcount); + return chcount; } void bail(int code) { @@ -102,11 +102,11 @@ char *loadmsgtail(smbmsg_t* msg) continue; length = msg->dfield[i].length - 2; if ((buf = realloc_or_free(buf, l + msg->dfield[i].length + 1)) == NULL) - return(buf); + return buf; l += fread(buf + l, 1, length, smb.sdt_fp); buf[l] = 0; } - return(buf); + return buf; } @@ -194,7 +194,7 @@ int main(int argc, char **argv) break; default: puts(usage); - return(1); + return 1; } j--; break; @@ -209,12 +209,12 @@ int main(int argc, char **argv) break; default: puts(usage); - return(1); + return 1; } if (!cmd) { puts(usage); - return(1); + return 1; } if (mode & APPEND) @@ -225,19 +225,19 @@ int main(int argc, char **argv) if (cmd & NODES) if ((nodes = fnopen(&i, "nodes.dat", o_mode)) == NULL) { printf("\7\nError opening nodes.dat\n"); - return(1); + return 1; } if (cmd & USERS) if ((users = fnopen(&i, "users.dat", o_mode)) == NULL) { printf("\7\nError opening users.dat\n"); - return(1); + return 1; } if (cmd & ROUTE) if ((route = fnopen(&i, "route.dat", o_mode)) == NULL) { printf("\7\nError opening route.dat\n"); - return(1); + return 1; } cfg.size = sizeof(cfg); @@ -405,5 +405,5 @@ int main(int argc, char **argv) } fprintf(stdout, "Done.\n"); - return(0); + return 0; } diff --git a/src/sbbs3/qwktomsg.cpp b/src/sbbs3/qwktomsg.cpp index 49c78192ab8d16a182d36ba49aaee6f462b13726..2c5298f5e642186e1e3dfa4a70e4a47950f58a07 100644 --- a/src/sbbs3/qwktomsg.cpp +++ b/src/sbbs3/qwktomsg.cpp @@ -287,7 +287,7 @@ bool sbbs_t::qwk_import_msg(FILE *qwk_fp, char *hdrblk, uint blocks if ((qwkbuf = (char *)calloc(blocks, QWK_BLOCK_LEN)) == NULL) { // over-allocate for NULL termination errormsg(WHERE, ERR_ALLOC, "QWK msg buf", (blocks - 1) * QWK_BLOCK_LEN); - return(false); + return false; } if (fread(qwkbuf, QWK_BLOCK_LEN, blocks - 1, qwk_fp) != blocks - 1) { @@ -300,7 +300,7 @@ bool sbbs_t::qwk_import_msg(FILE *qwk_fp, char *hdrblk, uint blocks if ((body = (char *)malloc((blocks - 1L) * QWK_BLOCK_LEN * 2L)) == NULL) { free(qwkbuf); errormsg(WHERE, ERR_ALLOC, "QWK msg body", (blocks - 1L) * QWK_BLOCK_LEN * 2L); - return(false); + return false; } taillen = 0; @@ -308,7 +308,7 @@ bool sbbs_t::qwk_import_msg(FILE *qwk_fp, char *hdrblk, uint blocks free(qwkbuf); free(body); errormsg(WHERE, ERR_ALLOC, "QWK msg tail", (blocks - 1L) * QWK_BLOCK_LEN * 2L); - return(false); + return false; } kludges = strListInit(); @@ -406,7 +406,7 @@ bool sbbs_t::qwk_import_msg(FILE *qwk_fp, char *hdrblk, uint blocks strListFree(&kludges); free(body); free(tail); - return(false); + return false; } SAFEPRINTF2(str, "%s/%s" , fromhub ? cfg.qhub[fromhub - 1]->id : useron.alias, p); @@ -515,6 +515,6 @@ bool sbbs_t::qwk_import_msg(FILE *qwk_fp, char *hdrblk, uint blocks free(body); free(tail); - return(success); + return success; } diff --git a/src/sbbs3/readmail.cpp b/src/sbbs3/readmail.cpp index ba68777ec69a1ad806b4b351b7f90cc3735bc2c2..f72f9cbf8e7d1cc73c28ce3cba7730626a799e20 100644 --- a/src/sbbs3/readmail.cpp +++ b/src/sbbs3/readmail.cpp @@ -889,5 +889,5 @@ int sbbs_t::searchmail(mail_t *mail, int start, int msgs, int which, const char smb_freemsgmem(&msg); } - return(found); + return found; } diff --git a/src/sbbs3/readmsgs.cpp b/src/sbbs3/readmsgs.cpp index b6e7148b2fc5b1d0efa2c1b0e1a5f317d9079d77..f5703fbf05d8b2adeff2aa3cab8040dd7191f0a3 100644 --- a/src/sbbs3/readmsgs.cpp +++ b/src/sbbs3/readmsgs.cpp @@ -24,7 +24,7 @@ int sbbs_t::sub_op(int subnum) { - return(user_is_subop(&cfg, subnum, &useron, &client)); + return user_is_subop(&cfg, subnum, &useron, &client); } bool sbbs_t::can_view_deleted_msgs(int subnum) @@ -79,7 +79,7 @@ int sbbs_t::listmsgs(int subnum, int mode, post_t *post, int start, int posts, b listed++; } - return(listed); + return listed; } void sbbs_t::dump_msghdr(smbmsg_t* msg) @@ -110,20 +110,20 @@ post_t * sbbs_t::loadposts(uint32_t *posts, int subnum, uint ptr, int mode, uint post_t * post; if (posts == NULL) - return(NULL); + return NULL; (*posts) = 0; if ((i = smb_locksmbhdr(&smb)) != 0) { /* Be sure noone deletes or */ errormsg(WHERE, ERR_LOCK, smb.file, i, smb.last_error); /* adds while we're reading */ - return(NULL); + return NULL; } total = (int)filelength(fileno(smb.sid_fp)) / sizeof(idxrec_t); /* total msgs in sub */ if (!total) { /* empty */ smb_unlocksmbhdr(&smb); - return(NULL); + return NULL; } namecrc = smb_name_crc(useron.name); @@ -136,7 +136,7 @@ post_t * sbbs_t::loadposts(uint32_t *posts, int subnum, uint ptr, int mode, uint if ((post = (post_t *)malloc(alloc_len)) == NULL) { /* alloc for max */ smb_unlocksmbhdr(&smb); errormsg(WHERE, ERR_ALLOC, smb.file, alloc_len); - return(NULL); + return NULL; } memset(post, 0, alloc_len); @@ -293,7 +293,7 @@ post_t * sbbs_t::loadposts(uint32_t *posts, int subnum, uint ptr, int mode, uint if (visible != NULL) /* Total number of currently visible/readable messages to the user */ *visible = curmsg; (*posts) = l; - return(post); + return post; } int64_t sbbs_t::get_start_msgnum(smb_t* smb, int next) @@ -307,10 +307,10 @@ int64_t sbbs_t::get_start_msgnum(smb_t* smb, int next) j = 1; bprintf(text[StartWithN], j); if ((i = getnum(smb->msgs)) < 0) - return(i); + return i; if (i == 0) - return(j - 1); - return(i - 1); + return j - 1; + return i - 1; } static int score_post(post_t* post) @@ -429,7 +429,7 @@ int sbbs_t::scanposts(int subnum, int mode, const char *find) if (!chk_ar(cfg.sub[subnum]->read_ar, &useron, &client)) { bprintf(text[CantReadSub] , cfg.grp[cfg.sub[subnum]->grp]->sname, cfg.sub[subnum]->sname); - return(0); + return 0; } ZERO_VAR(msg); /* init to NULL, specify not-allocated */ if (!(mode & SCAN_CONT)) @@ -441,7 +441,7 @@ int sbbs_t::scanposts(int subnum, int mode, const char *find) else if (!(mode & SCAN_POLLS)) bprintf(text[NoMsgsOnSub] , cfg.grp[cfg.sub[subnum]->grp]->sname, cfg.sub[subnum]->sname); - return(0); + return 0; } if (mode & SCAN_NEW && subscan[subnum].ptr >= last && !(mode & SCAN_BACK)) { if (subscan[subnum].ptr > last) @@ -450,12 +450,12 @@ int sbbs_t::scanposts(int subnum, int mode, const char *find) subscan[subnum].last = last; bprintf(text[NScanStatusFmt] , cfg.grp[cfg.sub[subnum]->grp]->sname, cfg.sub[subnum]->lname, 0L, msgs); - return(0); + return 0; } if ((i = smb_stack(&smb, SMB_STACK_PUSH)) != 0) { errormsg(WHERE, ERR_OPEN, cfg.sub[subnum]->code, i); - return(0); + return 0; } SAFEPRINTF2(smb.file, "%s%s", cfg.sub[subnum]->data_dir, cfg.sub[subnum]->code); smb.retry_time = cfg.smb_retry_time; @@ -463,7 +463,7 @@ int sbbs_t::scanposts(int subnum, int mode, const char *find) if ((i = smb_open(&smb)) != 0) { errormsg(WHERE, ERR_OPEN, smb.file, i, smb.last_error); smb_stack(&smb, SMB_STACK_POP); - return(0); + return 0; } usub = getusrsub(subnum); ugrp = getusrgrp(subnum); @@ -488,7 +488,7 @@ int sbbs_t::scanposts(int subnum, int mode, const char *find) if (!smb.msgs) { /* no messages at all */ smb_close(&smb); smb_stack(&smb, SMB_STACK_POP); - return(0); + return 0; } if (smb.curmsg == smb.msgs) { /* no new messages */ if (!(mode & SCAN_BACK)) { @@ -496,7 +496,7 @@ int sbbs_t::scanposts(int subnum, int mode, const char *find) free(post); smb_close(&smb); smb_stack(&smb, SMB_STACK_POP); - return(0); + return 0; } smb.curmsg = smb.msgs - 1; } @@ -513,7 +513,7 @@ int sbbs_t::scanposts(int subnum, int mode, const char *find) , cfg.grp[cfg.sub[subnum]->grp]->sname, cfg.sub[subnum]->sname); smb_close(&smb); smb_stack(&smb, SMB_STACK_POP); - return(0); + return 0; } if (mode & SCAN_FIND) { bprintf(text[SearchSubFmt] @@ -541,13 +541,13 @@ int sbbs_t::scanposts(int subnum, int mode, const char *find) smb_close(&smb); errormsg(WHERE, ERR_LOCK, smb.file, i, smb.last_error); smb_stack(&smb, SMB_STACK_POP); - return(0); + return 0; } if ((i = smb_getstatus(&smb)) != 0) { smb_close(&smb); errormsg(WHERE, ERR_READ, smb.file, i, smb.last_error); smb_stack(&smb, SMB_STACK_POP); - return(0); + return 0; } smb_unlocksmbhdr(&smb); last = smb.status.last_msg; @@ -837,7 +837,7 @@ int sbbs_t::scanposts(int subnum, int mode, const char *find) smb_close(&smb); smb_stack(&smb, SMB_STACK_POP); current_msg = NULL; - return(0); + return 0; case 'C': /* Continuous */ mode |= SCAN_CONT; if (smb.curmsg < smb.msgs - 1) smb.curmsg++; @@ -1619,7 +1619,7 @@ int sbbs_t::scanposts(int subnum, int mode, const char *find) smb_close(&smb); smb_stack(&smb, SMB_STACK_POP); current_msg = NULL; - return(quit); + return quit; } /****************************************************************************/ @@ -1645,7 +1645,7 @@ int sbbs_t::listsub(int subnum, int mode, int start, const char* search) if ((i = smb_stack(&smb, SMB_STACK_PUSH)) != 0) { errormsg(WHERE, ERR_OPEN, cfg.sub[subnum]->code, i); - return(0); + return 0; } SAFEPRINTF2(smb.file, "%s%s", cfg.sub[subnum]->data_dir, cfg.sub[subnum]->code); smb.retry_time = cfg.smb_retry_time; @@ -1653,7 +1653,7 @@ int sbbs_t::listsub(int subnum, int mode, int start, const char* search) if ((i = smb_open(&smb)) != 0) { errormsg(WHERE, ERR_OPEN, smb.file, i, smb.last_error); smb_stack(&smb, SMB_STACK_POP); - return(0); + return 0; } if (!(mode & SCAN_TOYOU)) lp_mode |= LP_OTHERS; @@ -1680,7 +1680,7 @@ int sbbs_t::listsub(int subnum, int mode, int start, const char* search) smb_stack(&smb, SMB_STACK_POP); - return(displayed); + return displayed; } /****************************************************************************/ @@ -1724,7 +1724,7 @@ int sbbs_t::searchposts(int subnum, post_t *post, int start, int posts smb_freemsgmem(&msg); } - return(found); + return found; } /****************************************************************************/ @@ -1780,5 +1780,5 @@ int sbbs_t::showposts_toyou(int subnum, post_t *post, uint start, int posts, int if (msg.total_hfields) smb_freemsgmem(&msg); - return(found); + return found; } diff --git a/src/sbbs3/readtext.c b/src/sbbs3/readtext.c index c8eb0b7689eec4ba05ee1c0cf11cdfba92df46d9..b89f75dfb9108758914b38e8ef61e6918dae00f2 100644 --- a/src/sbbs3/readtext.c +++ b/src/sbbs3/readtext.c @@ -138,13 +138,13 @@ char *readtext(int *line, FILE *stream, int dflt) goto use_default; } strcpy(p, str); - return(p); + return p; use_default: if (dflt < TOTAL_TEXT) { p = strdup(text_defaults[dflt]); if (p == NULL) lprintf(LOG_CRIT, "Error duplicating %s text defaults", text_defaults[dflt]); - return(p); + return p; } lprintf(LOG_CRIT, "Text defaults missing %d", dflt); return NULL; diff --git a/src/sbbs3/rechocfg.c b/src/sbbs3/rechocfg.c index 7b16076d3581870eb62c350b1508bd02050a1de9..9ddf5dbde780813736e85c9b3dd5902f4e395dd8 100644 --- a/src/sbbs3/rechocfg.c +++ b/src/sbbs3/rechocfg.c @@ -50,7 +50,7 @@ faddr_t atofaddr(const char *instr) *p = 0; if (!stricmp(str, "ALL")) { addr.zone = addr.net = addr.node = addr.point = 0xffff; - return(addr); + return addr; } addr.zone = addr.net = addr.node = addr.point = 0; if ((p = strchr(str, ':')) != NULL) { @@ -89,7 +89,7 @@ faddr_t atofaddr(const char *instr) else addr.point = atoi(p); } - return(addr); + return addr; } /****************************************************************************/ @@ -125,7 +125,7 @@ const char *faddrtoa(const faddr_t* addr) } } } - return(str); + return str; } bool faddr_contains_wildcard(const faddr_t* addr) @@ -146,7 +146,7 @@ int matchnode(sbbsecho_cfg_t* cfg, faddr_t addr, int exact) if (!memcmp(&cfg->nodecfg[i].addr, &addr, sizeof(faddr_t))) break; if (exact || i < cfg->nodecfgs) - return(i); + return i; } for (i = 0; i < cfg->nodecfgs; i++) /* Look for point match */ @@ -156,7 +156,7 @@ int matchnode(sbbsecho_cfg_t* cfg, faddr_t addr, int exact) && addr.node == cfg->nodecfg[i].addr.node) break; if (i < cfg->nodecfgs) - return(i); + return i; for (i = 0; i < cfg->nodecfgs; i++) /* Look for node match */ if (cfg->nodecfg[i].addr.node == 0xffff @@ -164,19 +164,19 @@ int matchnode(sbbsecho_cfg_t* cfg, faddr_t addr, int exact) && addr.net == cfg->nodecfg[i].addr.net) break; if (i < cfg->nodecfgs) - return(i); + return i; for (i = 0; i < cfg->nodecfgs; i++) /* Look for net match */ if (cfg->nodecfg[i].addr.net == 0xffff && addr.zone == cfg->nodecfg[i].addr.zone) break; if (i < cfg->nodecfgs) - return(i); + return i; for (i = 0; i < cfg->nodecfgs; i++) /* Look for total wild */ if (cfg->nodecfg[i].addr.zone == 0xffff) break; - return(i); + return i; } nodecfg_t* findnodecfg(sbbsecho_cfg_t* cfg, faddr_t addr, int exact) diff --git a/src/sbbs3/ringbuf.c b/src/sbbs3/ringbuf.c index a9ff712908531c1654d319f03ce61cb781f0916d..55fb5470dd05a7fb8d7c8303cc6c2a0dedc23626 100644 --- a/src/sbbs3/ringbuf.c +++ b/src/sbbs3/ringbuf.c @@ -71,7 +71,7 @@ int RingBufInit( RingBuf* rb, DWORD size { memset(rb, 0, sizeof(RingBuf)); if ((rb->pStart = (BYTE *)os_malloc(size + 1)) == NULL) - return(-1); + return -1; #ifndef RINGBUF_USE_STD_RTL rb_free = os_free; rb_memcpy = os_memcpy; @@ -87,7 +87,7 @@ int RingBufInit( RingBuf* rb, DWORD size #ifdef RINGBUF_MUTEX pthread_mutex_init(&rb->mutex, NULL); #endif - return(0); + return 0; } void RingBufDispose( RingBuf* rb) @@ -132,7 +132,7 @@ DWORD RingBufFull( RingBuf* rb ) pthread_mutex_unlock(&rb->mutex); #endif - return(retval); + return retval; } DWORD RingBufFree( RingBuf* rb ) @@ -141,7 +141,7 @@ DWORD RingBufFree( RingBuf* rb ) retval = (rb->size - RingBufFull( rb )); - return(retval); + return retval; } DWORD RingBufWrite( RingBuf* rb, const BYTE* src, DWORD cnt ) @@ -149,10 +149,10 @@ DWORD RingBufWrite( RingBuf* rb, const BYTE* src, DWORD cnt ) DWORD max, first, remain, fill_level; if (cnt == 0) - return(cnt); + return cnt; if (rb->pStart == NULL) - return(0); + return 0; #ifdef RINGBUF_MUTEX pthread_mutex_lock(&rb->mutex); @@ -200,7 +200,7 @@ DWORD RingBufWrite( RingBuf* rb, const BYTE* src, DWORD cnt ) pthread_mutex_unlock(&rb->mutex); #endif - return(cnt); + return cnt; } /* Pass NULL dst to just foward pointer (after Peek) */ @@ -258,7 +258,7 @@ DWORD RingBufRead( RingBuf* rb, BYTE* dst, DWORD cnt ) pthread_mutex_unlock(&rb->mutex); #endif - return(cnt); + return cnt; } DWORD RingBufPeek( RingBuf* rb, BYTE* dst, DWORD cnt) @@ -267,7 +267,7 @@ DWORD RingBufPeek( RingBuf* rb, BYTE* dst, DWORD cnt) len = RingBufFull( rb ); if (len == 0) - return(0); + return 0; #ifdef RINGBUF_MUTEX pthread_mutex_lock(&rb->mutex); @@ -298,7 +298,7 @@ DWORD RingBufPeek( RingBuf* rb, BYTE* dst, DWORD cnt) pthread_mutex_unlock(&rb->mutex); #endif - return(cnt); + return cnt; } /* Reset head and tail pointers */ diff --git a/src/sbbs3/sbbs_ini.c b/src/sbbs3/sbbs_ini.c index 89b1b56dcf98896a4aad681a172d010cd3cd938f..5aa944b789555e58c7016cae2c14c3c2b5db1879 100644 --- a/src/sbbs3/sbbs_ini.c +++ b/src/sbbs3/sbbs_ini.c @@ -189,7 +189,7 @@ bool sbbs_set_js_settings( else failure |= iniSetString(lp, section, strJavaScriptLoadPath, js->load_path, style) == NULL; - return(!failure); + return !failure; } void sbbs_get_sound_settings(str_list_t list, const char* section, struct startup_sound_settings* sound @@ -855,7 +855,7 @@ bool sbbs_write_ini( style.bit_separator = " | "; if ((list = iniReadFile(fp)) == NULL) - return(false); + return false; if (global == NULL) { memset(&global_buf, 0, sizeof(global_buf)); @@ -1435,5 +1435,5 @@ bool sbbs_write_ini( iniFreeStringList(list); - return(result); + return result; } diff --git a/src/sbbs3/sbbscon.c b/src/sbbs3/sbbscon.c index 7666389bbca56f168a70d316effaef0e7c7b677b..b7b8722b6216f6fd966b65c7ed57b0b75e22fab8 100644 --- a/src/sbbs3/sbbscon.c +++ b/src/sbbs3/sbbscon.c @@ -265,7 +265,7 @@ static int lputs(int level, const char *str) notify_systemd(str); #endif } - return(0); + return 0; } #endif if (!mutex_initialized) { @@ -290,7 +290,7 @@ static int lputs(int level, const char *str) fflush(stdout); pthread_mutex_unlock(&mutex); - return(prompt_len); + return prompt_len; } static void errormsg(void *cbdata, int level, const char *msg) @@ -307,7 +307,7 @@ static int lprintf(int level, const char *fmt, ...) vsnprintf(sbuf, sizeof(sbuf), fmt, argptr); sbuf[sizeof(sbuf) - 1] = 0; va_end(argptr); - return(lputs(level, sbuf)); + return lputs(level, sbuf); } static void recycle_all() @@ -337,13 +337,13 @@ static bool do_seteuid(bool to_new) bool result = FALSE; if (capabilities_set) - return(TRUE); /* do nothing */ + return TRUE; /* do nothing */ if (new_uid_name[0] == 0) /* not set? */ - return(TRUE); /* do nothing */ + return TRUE; /* do nothing */ if (old_uid == new_uid && old_gid == new_gid) - return(TRUE); /* do nothing */ + return TRUE; /* do nothing */ pthread_once(&setid_mutex_once, init_setuid_mutex); pthread_mutex_lock(&setid_mutex); @@ -379,16 +379,16 @@ bool do_setuid(bool force) bool result = TRUE; #if defined(DONT_BLAME_SYNCHRONET) if (!force) - return(do_seteuid(TRUE)); + return do_seteuid(TRUE); #endif #if defined(_THREAD_SUID_BROKEN) if (thread_suid_broken && (!force)) - return(do_seteuid(TRUE)); + return do_seteuid(TRUE); #endif if (old_uid == new_uid && old_gid == new_gid) - return(TRUE); /* do nothing */ + return TRUE; /* do nothing */ pthread_once(&setid_mutex_once, init_setuid_mutex); pthread_mutex_lock(&setid_mutex); @@ -424,7 +424,7 @@ bool do_setuid(bool force) if (force && (!result)) exit(1); - return(result); + return result; } bool change_user(void) @@ -491,9 +491,9 @@ static int linux_keepcaps(void) if (errno != EINVAL) { lprintf(LOG_ERR, "linux_keepcaps FAILED with error %d (%s)", errno, strerror(errno)); } - return(-1); + return -1; } - return(0); + return 0; } static bool linux_setcaps(unsigned int caps) @@ -557,19 +557,19 @@ static bool winsock_startup(void) int status; /* Status Code */ if ((status = WSAStartup(MAKEWORD(1, 1), &WSAData)) == 0) - return(TRUE); + return TRUE; lprintf(LOG_CRIT, "!WinSock startup ERROR %d", status); - return(FALSE); + return FALSE; } static bool winsock_cleanup(void) { if (WSACleanup() == 0) - return(TRUE); + return TRUE; lprintf(LOG_ERR, "!WinSock cleanup ERROR %d", SOCKET_ERRNO); - return(FALSE); + return FALSE; } #else /* No WINSOCK */ @@ -675,18 +675,18 @@ static int bbs_lputs(void* p, int level, const char *str) struct tm tm; if (level > bbs_startup.log_level) - return(0); + return 0; #ifdef __unix__ if (is_daemon || syslog_always) { if (str == NULL) - return(0); + return 0; if (std_facilities) syslog(level | LOG_AUTH, "%s", str); else syslog(level, "term %s", str); if (is_daemon) - return(strlen(str)); + return strlen(str); } #endif @@ -702,7 +702,7 @@ static int bbs_lputs(void* p, int level, const char *str) truncsp(logline); lputs(level, logline); - return(strlen(logline) + 1); + return strlen(logline) + 1; } @@ -717,12 +717,12 @@ static int ftp_lputs(void* p, int level, const char *str) struct tm tm; if (level > ftp_startup.log_level) - return(0); + return 0; #ifdef __unix__ if (is_daemon || syslog_always) { if (str == NULL) - return(0); + return 0; if (std_facilities) #ifdef __solaris__ syslog(level | LOG_DAEMON, "%s", str); @@ -732,7 +732,7 @@ static int ftp_lputs(void* p, int level, const char *str) else syslog(level, "ftp %s", str); if (is_daemon) - return(strlen(str)); + return strlen(str); } #endif @@ -748,7 +748,7 @@ static int ftp_lputs(void* p, int level, const char *str) truncsp(logline); lputs(level, logline); - return(strlen(logline) + 1); + return strlen(logline) + 1; } /****************************************************************************/ @@ -762,18 +762,18 @@ static int mail_lputs(void* p, int level, const char *str) struct tm tm; if (level > mail_startup.log_level) - return(0); + return 0; #ifdef __unix__ if (is_daemon || syslog_always) { if (str == NULL) - return(0); + return 0; if (std_facilities) syslog(level | LOG_MAIL, "%s", str); else syslog(level, "mail %s", str); if (is_daemon) - return(strlen(str)); + return strlen(str); } #endif @@ -789,7 +789,7 @@ static int mail_lputs(void* p, int level, const char *str) truncsp(logline); lputs(level, logline); - return(strlen(logline) + 1); + return strlen(logline) + 1; } /****************************************************************************/ @@ -803,18 +803,18 @@ static int services_lputs(void* p, int level, const char *str) struct tm tm; if (level > services_startup.log_level) - return(0); + return 0; #ifdef __unix__ if (is_daemon || syslog_always) { if (str == NULL) - return(0); + return 0; if (std_facilities) syslog(level | LOG_DAEMON, "%s", str); else syslog(level, "srvc %s", str); if (is_daemon) - return(strlen(str)); + return strlen(str); } #endif @@ -830,7 +830,7 @@ static int services_lputs(void* p, int level, const char *str) truncsp(logline); lputs(level, logline); - return(strlen(logline) + 1); + return strlen(logline) + 1; } /****************************************************************************/ @@ -844,18 +844,18 @@ static int event_lputs(void* p, int level, const char *str) struct tm tm; if (level > bbs_startup.log_level) - return(0); + return 0; #ifdef __unix__ if (is_daemon || syslog_always) { if (str == NULL) - return(0); + return 0; if (std_facilities) syslog(level | LOG_CRON, "%s", str); else syslog(level, "evnt %s", str); if (is_daemon) - return(strlen(str)); + return strlen(str); } #endif @@ -871,7 +871,7 @@ static int event_lputs(void* p, int level, const char *str) truncsp(logline); lputs(level, logline); - return(strlen(logline) + 1); + return strlen(logline) + 1; } /****************************************************************************/ @@ -885,18 +885,18 @@ static int web_lputs(void* p, int level, const char *str) struct tm tm; if (level > web_startup.log_level) - return(0); + return 0; #ifdef __unix__ if (is_daemon || syslog_always) { if (str == NULL) - return(0); + return 0; if (std_facilities) syslog(level | LOG_DAEMON, "%s", str); else syslog(level, "web %s", str); if (is_daemon) - return(strlen(str)); + return strlen(str); } #endif @@ -912,7 +912,7 @@ static int web_lputs(void* p, int level, const char *str) truncsp(logline); lputs(level, logline); - return(strlen(logline) + 1); + return strlen(logline) + 1; } static void terminate(void) @@ -1217,12 +1217,12 @@ int main(int argc, char** argv) ctrl_dir = get_ctrl_dir(/* warn: */ true); if (!winsock_startup()) - return(-1); + return -1; gethostname(host_name, sizeof(host_name) - 1); if (!winsock_cleanup()) - return(-1); + return -1; sbbs_get_ini_fname(ini_file, ctrl_dir); /* Initialize BBS startup structure */ @@ -1377,7 +1377,7 @@ int main(int argc, char** argv) printf("Services options:\t0x%08" PRIX32 "\n", services_startup.options); printf("Web server port:\t%u\n", web_startup.port); printf("Web server options:\t0x%08" PRIX32 "\n", web_startup.options); - return(0); + return 0; } #ifdef __unix__ if (!stricmp(arg, "syslog")) { @@ -1430,7 +1430,7 @@ int main(int argc, char** argv) break; default: show_usage(argv[0]); - return(1); + return 1; } break; case 'R': /* RLogin */ @@ -1441,7 +1441,7 @@ int main(int argc, char** argv) break; default: show_usage(argv[0]); - return(1); + return 1; } break; case 'F': /* FTP */ @@ -1466,7 +1466,7 @@ int main(int argc, char** argv) break; default: show_usage(argv[0]); - return(1); + return 1; } break; case 'M': /* Mail */ @@ -1497,7 +1497,7 @@ int main(int argc, char** argv) break; default: show_usage(argv[0]); - return(1); + return 1; } break; case 'P': /* POP3 */ @@ -1511,7 +1511,7 @@ int main(int argc, char** argv) break; default: show_usage(argv[0]); - return(1); + return 1; } break; case 'R': /* Relay */ @@ -1531,7 +1531,7 @@ int main(int argc, char** argv) break; default: show_usage(argv[0]); - return(1); + return 1; } break; case 'S': /* Services */ @@ -1553,7 +1553,7 @@ int main(int argc, char** argv) break; default: show_usage(argv[0]); - return(1); + return 1; } break; case 'W': /* Web server */ @@ -1578,7 +1578,7 @@ int main(int argc, char** argv) break; default: show_usage(argv[0]); - return(1); + return 1; } break; case 'G': /* GET */ @@ -1592,7 +1592,7 @@ int main(int argc, char** argv) break; default: show_usage(argv[0]); - return(1); + return 1; } break; case 'H': /* Host */ @@ -1615,7 +1615,7 @@ int main(int argc, char** argv) break; default: show_usage(argv[0]); - return(1); + return 1; } break; case 'U': /* runtime UID */ @@ -1638,7 +1638,7 @@ int main(int argc, char** argv) break; default: show_usage(argv[0]); - return(1); + return 1; } break; case 'N': /* No */ @@ -1685,13 +1685,13 @@ int main(int argc, char** argv) break; default: show_usage(argv[0]); - return(1); + return 1; } break; default: show_usage(argv[0]); - return(1); + return 1; } } @@ -1707,7 +1707,7 @@ int main(int argc, char** argv) lprintf(LOG_INFO, "Loading configuration files from %s", scfg.ctrl_dir); if (!load_cfg(&scfg, /* text: */ NULL, /* prep: */ TRUE, /* node: */ FALSE, error, sizeof(error))) { lprintf(LOG_ERR, "!ERROR Loading Configuration Files: %s", error); - return(-1); + return -1; } /* Daemonize / Set uid/gid */ @@ -2206,5 +2206,5 @@ int main(int argc, char** argv) free_cfg(&scfg); sbbs_free_ini(/* global_startup: */ NULL, &bbs_startup, &ftp_startup, &web_startup, &mail_startup, &services_startup); - return(0); + return 0; } diff --git a/src/sbbs3/sbbsecho.c b/src/sbbs3/sbbsecho.c index 7b774fb0653c8a11d977c12c5c3a19a491de9b5f..b7d454bed1ac7c5b70d7d1677f0e46982e0aea93 100644 --- a/src/sbbs3/sbbsecho.c +++ b/src/sbbs3/sbbsecho.c @@ -577,7 +577,7 @@ int lprintf(int level, char *fmt, ...) fprintf(fidologfile, "%s %s\n", timestamp, sbuf); fflush(fidologfile); } - return(chcount); + return chcount; } bool delfile(const char *filename, int line) @@ -821,7 +821,7 @@ size_t fwrite_crlf(const char* buf, size_t len, FILE* fp) last_ch = ch; } - return(wr); + return wr; } bool fidoctrl_line_exists(const smbmsg_t* msg, const char* prefix) @@ -1082,12 +1082,12 @@ int create_netmail(const char *to, const smbmsg_t* msg, const char *subject, con } if (!i) { lprintf(LOG_WARNING, "Directory full: %s", scfg.netmail_dir); - return(-1); + return -1; } startmsg = i + 1; if ((fp = fnopen(NULL, fname, O_RDWR | O_CREAT)) == NULL) { lprintf(LOG_ERR, "ERROR %u (%s) line %d opening netmail: %s", errno, strerror(errno), __LINE__, fname); - return(-1); + return -1; } if (src != NULL) @@ -1557,12 +1557,12 @@ int check_elists(const char *areatag, nodecfg_t* nodecfg) fclose(stream); quit = 1; if (match) - return(match); + return match; break; } } } - return(match); + return match; } // areafile is in (new) .ini format (e.g. data/areas.ini) @@ -2394,7 +2394,7 @@ char* process_areamgr(fidoaddr_t addr, char* inbuf, const char* subj, const char , "Your node is not configured for AreaMgr, please contact your hub sysop.\r\n" , /* dest: */ addr, /* src: */ NULL); strcat(body, "This node is not configured for AreaMgr operations.\r\n"); - return(body); + return body; } if (stricmp(nodecfg->password, password)) { @@ -2405,7 +2405,7 @@ char* process_areamgr(fidoaddr_t addr, char* inbuf, const char* subj, const char , password , (nodecfg->password[0]) ? nodecfg->password : "[None Defined]"); - return(body); + return body; } m = strlen(p); @@ -2450,7 +2450,7 @@ char* process_areamgr(fidoaddr_t addr, char* inbuf, const char* subj, const char strcat(body, "No valid AreaMgr commands were detected.\r\n"); strListFree(&add_area); strListFree(&del_area); - return(body); + return body; } if (!strListIsEmpty(add_area) || !strListIsEmpty(del_area)) alter_areas(add_area, del_area, nodecfg, name, rescan); @@ -2463,7 +2463,7 @@ char* process_areamgr(fidoaddr_t addr, char* inbuf, const char* subj, const char if (query) netmail_arealist(AREALIST_CONNECTED, addr, name); - return(NULL); + return NULL; } /****************************************************************************** This function will compare the archive signatures defined in the CFG file and @@ -2513,7 +2513,7 @@ int unpack(const char *infile, const char* outdir) if (u == cfg.arcdefs) { lprintf(LOG_ERR, "ERROR determining type of archive: %s", infile); - return(1); + return 1; } return execute(cmdstr(&scfg, /* user: */ NULL, cfg.arcdef[u].unpack, infile, outdir, tmp, sizeof(tmp))); @@ -2599,19 +2599,19 @@ int attachment(const char *bundlename, fidoaddr_t dest, enum attachment_mode mod #if 1 if (bundlename == NULL && mode != ATTACHMENT_NETMAIL) { lprintf(LOG_ERR, "ERROR line %d NULL bundlename", __LINE__); - return(1); + return 1; } SAFEPRINTF(bundle_list_filename, "%sbbsecho.bundles", cfg.outbound); if ((stream = fnopen(&file, bundle_list_filename, O_RDWR | O_CREAT)) == NULL) { lprintf(LOG_ERR, "ERROR %u (%s) line %d opening %s", errno, strerror(errno), __LINE__, bundle_list_filename); - return(1); + return 1; } if (mode == ATTACHMENT_NETMAIL) { /* Create netmail attaches */ if (!filelength(file)) { fclose(stream); - return(0); + return 0; } /* Get attach names from existing MSGs */ #ifdef __unix__ @@ -2679,7 +2679,7 @@ int attachment(const char *bundlename, fidoaddr_t dest, enum attachment_mode mod delfile(bundle_list_filename, __LINE__); /* used to truncate here, August-20-2002 */ if (num_mfncrc) free(mfncrc); - return(0); + return 0; } while (!feof(stream)) { @@ -2688,7 +2688,7 @@ int attachment(const char *bundlename, fidoaddr_t dest, enum attachment_mode mod TERMINATE(attach.filename); if (stricmp(attach.filename, bundlename) == 0) { fclose(stream); - return(0); + return 0; } } @@ -2698,7 +2698,7 @@ int attachment(const char *bundlename, fidoaddr_t dest, enum attachment_mode mod (void)fwrite(&attach, sizeof(attach_t), 1, stream); fclose(stream); #endif - return(0); + return 0; } /****************************************************************************** @@ -2902,10 +2902,10 @@ bool unpack_bundle(const char* inbound) } delfile(fname, __LINE__); /* successful, so delete bundle */ bundles_unpacked++; - return(true); + return true; } - return(false); + return false; } /****************************************************************************/ @@ -2926,11 +2926,11 @@ int mv(const char *insrc, const char *indest, bool copy) SAFECOPY(src, insrc); SAFECOPY(dest, indest); if (!strcmp(src, dest)) /* source and destination are the same! */ - return(0); + return 0; // lprintf(LOG_DEBUG, "%s file from %s to %s", copy ? "Copying":"Moving", src, dest); if (!fexistcase(src)) { lprintf(LOG_WARNING, "MV ERROR: Source file doesn't exist '%s'", src); - return(-1); + return -1; } if (isdir(dest)) { backslash(dest); @@ -2938,7 +2938,7 @@ int mv(const char *insrc, const char *indest, bool copy) } if (!copy && fexistcase(dest)) { lprintf(LOG_WARNING, "MV ERROR: Destination file already exists '%s'", dest); - return(-1); + return -1; } if (!copy #ifndef __unix__ @@ -2947,29 +2947,29 @@ int mv(const char *insrc, const char *indest, bool copy) #endif ) { if (rename(src, dest) == 0) /* same drive, so move */ - return(0); + return 0; /* rename failed, so attempt copy */ } if ((ind = nopen(src, O_RDONLY)) == -1) { lprintf(LOG_ERR, "MV ERROR %u (%s) opening '%s'", errno, strerror(errno), src); - return(-1); + return -1; } if ((inp = fdopen(ind, "rb")) == NULL) { close(ind); lprintf(LOG_ERR, "MV ERROR %u (%s) fdopening '%s'", errno, strerror(errno), src); - return(-1); + return -1; } setvbuf(inp, NULL, _IOFBF, 8 * 1024); if ((outd = nopen(dest, O_WRONLY | O_CREAT | O_TRUNC)) == -1) { fclose(inp); lprintf(LOG_ERR, "MV ERROR %u (%s) opening '%s'", errno, strerror(errno), dest); - return(-1); + return -1; } if ((outp = fdopen(outd, "wb")) == NULL) { close(outd); fclose(inp); lprintf(LOG_ERR, "MV ERROR %u (%s) fdopening '%s'", errno, strerror(errno), dest); - return(-1); + return -1; } setvbuf(outp, NULL, _IOFBF, 8 * 1024); length = filelength(ind); @@ -3017,11 +3017,11 @@ long getlastmsg(uint subnum, uint32_t *ptr, /* unused: */ time_t *t) if (!filelength(fileno(smbfile.shd_fp))) { /* Empty base */ if (ptr) (*ptr) = 0; smb_close(&smbfile); - return(0); + return 0; } smb_close(&smbfile); if (ptr) (*ptr) = smbfile.status.last_msg; - return(smbfile.status.total_msgs); + return smbfile.status.total_msgs; } @@ -3033,7 +3033,7 @@ ulong loadmsgs(smb_t* smb, post_t** post, ulong ptr) if ((i = smb_locksmbhdr(smb)) != SMB_SUCCESS) { lprintf(LOG_ERR, "ERROR %d (%s) line %d locking %s", i, smb->last_error, __LINE__, smb->file); - return(0); + return 0; } /* total msgs in sub */ @@ -3041,7 +3041,7 @@ ulong loadmsgs(smb_t* smb, post_t** post, ulong ptr) if (!total) { /* empty */ smb_unlocksmbhdr(smb); - return(0); + return 0; } if (((*post) = (post_t*)malloc((size_t)(sizeof(post_t) * total))) /* alloc for max */ @@ -3049,7 +3049,7 @@ ulong loadmsgs(smb_t* smb, post_t** post, ulong ptr) smb_unlocksmbhdr(smb); lprintf(LOG_ERR, "ERROR line %d allocating %lu bytes for %s", __LINE__ , sizeof(post_t *) * total, smb->file); - return(0); + return 0; } if (fseek(smb->sid_fp, 0L, SEEK_SET) != 0) { @@ -3078,7 +3078,7 @@ ulong loadmsgs(smb_t* smb, post_t** post, ulong ptr) smb_unlocksmbhdr(smb); if (!l) FREE_AND_NULL(*post); - return(l); + return l; } const char* area_desc(const char* areatag) @@ -3307,8 +3307,8 @@ static short fmsgzone(const char* p) val += atoi(min); if (west) - return(-val); - return(val); + return -val; + return val; } char* getfmsg(FILE* stream, ulong* outlen) @@ -3334,7 +3334,7 @@ char* getfmsg(FILE* stream, ulong* outlen) if ((fbuf = malloc(length + 1)) == NULL) { lprintf(LOG_ERR, "ERROR line %d allocating %lu bytes of memory", __LINE__, length + 1); bail(1); - return(NULL); + return NULL; } (void)fseeko(stream, start, SEEK_SET); @@ -3349,7 +3349,7 @@ char* getfmsg(FILE* stream, ulong* outlen) if (outlen) *outlen = length; - return((char*)fbuf); + return (char*)fbuf; } #define MAX_TAILLEN 1024 @@ -3772,7 +3772,7 @@ int fmsgtosmsg(char* fbuf, fmsghdr_t* hdr, uint usernumber, uint subnum) smb_freemsgmem(&msg); free(sbody); - return(i); + return i; } /***********************************************************************/ @@ -4056,7 +4056,7 @@ off_t find_packet_terminator(FILE* stream) && terminator == FIDO_PACKET_TERMINATOR) offset -= sizeof(terminator); } - return(offset); + return offset; } /****************************************************************************** @@ -4217,9 +4217,9 @@ bool check_psb(const addrlist_t* addrlist, fidoaddr_t compaddr) continue; if (compaddr.point != addrlist->addr[u].point) continue; - return(true); /* match found */ + return true; /* match found */ } - return(false); /* match not found */ + return false; /* match not found */ } /****************************************************************************** @@ -4547,7 +4547,7 @@ int import_netmail(const char* path, const fmsghdr_t* inhdr, FILE* fp, const cha } else lprintf(LOG_INFO, "%s Ignored", info); - return(-1); + return -1; } if (!sysfaddr_is_valid(match) && !cfg.ignore_netmail_dest_addr) { @@ -4556,25 +4556,25 @@ int import_netmail(const char* path, const fmsghdr_t* inhdr, FILE* fp, const cha printf(" - "); pkt_to_msg(fp, &hdr, info, inbound); } - return(2); + return 2; } if (path[0]) { /* .msg file, not .pkt */ if (hdr.attr & FIDO_ORPHAN) { printf("Orphaned"); - return(1); + return 1; } if ((hdr.attr & FIDO_RECV) && !cfg.ignore_netmail_recv_attr) { printf("Already received"); - return(3); + return 3; } if ((hdr.attr & FIDO_LOCAL) && !cfg.ignore_netmail_local_attr) { printf("Created locally"); - return(4); + return 4; } if (hdr.attr & FIDO_INTRANS) { printf("In-transit"); - return(5); + return 5; } } @@ -4698,7 +4698,7 @@ int import_netmail(const char* path, const fmsghdr_t* inhdr, FILE* fp, const cha } } FREE_AND_NULL(fmsgbuf); - return(-2); + return -2; } usernumber = atoi(hdr.to); @@ -4715,7 +4715,7 @@ int import_netmail(const char* path, const fmsghdr_t* inhdr, FILE* fp, const cha printf(" - "); pkt_to_msg(fp, &hdr, info, inbound); } - return(2); + return 2; } } @@ -4746,7 +4746,7 @@ int import_netmail(const char* path, const fmsghdr_t* inhdr, FILE* fp, const cha } if (i) { FREE_AND_NULL(fmsgbuf); - return(0); + return 0; } if (usernumber) { @@ -4803,7 +4803,7 @@ int import_netmail(const char* path, const fmsghdr_t* inhdr, FILE* fp, const cha fwrite(&hdr,sizeof(fmsghdr_t),1,fp); } ***/ lprintf(LOG_INFO, "%s Imported", info); - return(0); + return 0; } static uint32_t read_export_ptr(int subnum, const char* tag) @@ -5540,7 +5540,7 @@ char* freadstr(FILE* fp, char* str, size_t maxlen) str[maxlen - 1] = 0; /* Force terminator */ truncsp(str); - return(str); + return str; } bool netmail_sent(const char* fname) @@ -7015,5 +7015,5 @@ int main(int argc, char **argv) } } bail(0); - return(0); + return 0; } diff --git a/src/sbbs3/sbbsexec.c b/src/sbbs3/sbbsexec.c index affd6bdb572002870db0aba1fb9419715f5f1f29..e8f7c0810aa318a3db9e947d2fd7f6dbf0990a66 100644 --- a/src/sbbs3/sbbsexec.c +++ b/src/sbbs3/sbbsexec.c @@ -296,7 +296,7 @@ unsigned vdd_read(BYTE* p, unsigned count) lputs(LOG_ERR, "!VDD_READ: RingBufRead read 0 (after wait)"); } - return(count); + return count; } unsigned yields = 0; @@ -341,7 +341,7 @@ static char *chr(uchar ch) sprintf(str, "^%c (%02Xh)", '@' + ch, ch); else sprintf(str, "%u (%02Xh)", ch, ch); - return(str); + return str; } VOID uart_wrport(WORD port, BYTE data) diff --git a/src/sbbs3/scfg/scfg.c b/src/sbbs3/scfg/scfg.c index 8b1b392a6b84ce48a349d4e4f9d44c3dade76640..26e5665a103b910ad648c73decaa19ac22cddc44 100644 --- a/src/sbbs3/scfg/scfg.c +++ b/src/sbbs3/scfg/scfg.c @@ -1148,10 +1148,10 @@ int save_changes(int mode) int i = 0; if (!uifc.changes) - return(2); + return 2; if (auto_save == true) { /* -y switch used, return "Yes" */ uifc.changes = 0; - return(0); + return 0; } uifc.helpbuf = "`Save Changes:`\n" @@ -1167,7 +1167,7 @@ int save_changes(int mode) } else uifc.changes = 0; - return(i); + return i; } void txt_cfg() @@ -1597,7 +1597,7 @@ int whichlogic(void) "menu and level `50`, the user must have a level `below 50`.\n" ; i = uifc.list(WIN_MID | WIN_SAV, 0, 0, 0, &i, 0, "Select Logic", opt); - return(i); + return i; } int whichcond(void) @@ -1620,7 +1620,7 @@ int whichcond(void) "or `any` of the parameter requirements must be met.\n" ; i = uifc.list(WIN_MID | WIN_SAV, 0, 0, 0, &i, 0, "Multiple Requirement Logic", opt); - return(i); + return i; } @@ -2579,7 +2579,7 @@ int lprintf(int level, char *fmt, ...) puts(sbuf); else uifc.msg(sbuf); - return(0); + return 0; } void* new_item(void* lp, size_t size, int index, int* total) diff --git a/src/sbbs3/scfg/scfgmsg.c b/src/sbbs3/scfg/scfgmsg.c index 9d9caed9729784d4aca440790d781fab93e86556..cf1da2933b74a5c6158ea36ce195774690b51984 100644 --- a/src/sbbs3/scfg/scfgmsg.c +++ b/src/sbbs3/scfg/scfgmsg.c @@ -38,7 +38,7 @@ char *utos(char *str) else out[i] = str[i]; out[i] = 0; - return(out); + return out; } static bool code_prefix_exists(const char* prefix) diff --git a/src/sbbs3/scfg/scfgnet.c b/src/sbbs3/scfg/scfgnet.c index 3ceca4fae772b06e258514023dcfdf7da17e6790..ec1b1a600471cdca2da9db797a23da523725f5f4 100644 --- a/src/sbbs3/scfg/scfgnet.c +++ b/src/sbbs3/scfg/scfgnet.c @@ -104,7 +104,7 @@ faddr_t atofaddr(char *str) } if ((p = strchr(str, '.')) != NULL) addr.point = atoi(p + 1); - return(addr); + return addr; } uint getgrp(char* title) @@ -128,7 +128,7 @@ uint getsub(void) while (1) { i = getgrp("Select Message Group"); if (i == -1) - return(-1); + return -1; for (j = k = 0; j < cfg.total_subs && k < MAX_OPTS; j++) if (cfg.sub[j]->grp == i) { snprintf(opt[k], MAX_OPLN, "%-25s", cfg.sub[j]->lname); @@ -141,7 +141,7 @@ uint getsub(void) continue; sub_dflt++; sub_bar++; - return(subnum[j]); + return subnum[j]; } } @@ -1666,9 +1666,9 @@ char *daystr(char days) days &= 0x7f; - if (days == 0) return("None"); + if (days == 0) return "None"; - if (days == 0x7f) return("All"); + if (days == 0x7f) return "All"; str[0] = 0; for (i = 0; i < 7; i++) { @@ -1677,5 +1677,5 @@ char *daystr(char days) SAFECAT(str, " "); } } - return(str); + return str; } diff --git a/src/sbbs3/scfg/scfgxfr2.c b/src/sbbs3/scfg/scfgxfr2.c index 9c562aa439943203b831cea652a1492b86885349..4a8f252ea4abd9108a00dc369013e1bcadc14ccd 100644 --- a/src/sbbs3/scfg/scfgxfr2.c +++ b/src/sbbs3/scfg/scfgxfr2.c @@ -268,22 +268,22 @@ BOOL create_raw_dir_list(char* list_file) } if (uifc.input(WIN_MID | WIN_SAV, 0, 0, "Parent Directory", path, sizeof(path) - 1 , K_EDIT) < 1) - return(FALSE); + return FALSE; k = 1; k = uifc.list(WIN_MID | WIN_SAV, 0, 0, 0, &k, 0, "Include Empty Directories", uifcYesNoOpts); if (k < 0) - return(FALSE); + return FALSE; include_empty_dirs = (k == 0); k = 0; k = uifc.list(WIN_MID | WIN_SAV, 0, 0, 0, &k, 0, "Recursive Directory Search", uifcYesNoOpts); if (k < 0) - return(FALSE); + return FALSE; if ((fp = fopen(list_file, "w")) == NULL) { strcpy(list_file, fname); if ((fp = fopen(list_file, "w")) == NULL) { SAFEPRINTF2(path, "Create Failure (%u): %s", errno, list_file); uifc.msg(path); - return(FALSE); + return FALSE; } } backslash(path); @@ -291,7 +291,7 @@ BOOL create_raw_dir_list(char* list_file) append_dir_list(path, path, fp, /* depth: */ 0, /* max_depth: */ k, include_empty_dirs); uifc.pop(NULL); fclose(fp); - return(TRUE); + return TRUE; } int dirs_in_lib(int libnum) diff --git a/src/sbbs3/scfg/scfgxtrn.c b/src/sbbs3/scfg/scfgxtrn.c index 8419d55f91157a9b2c2c7c36d73f7909712f8930..f31cf2ea062c0ff160934505d3e535144b464f3e 100644 --- a/src/sbbs3/scfg/scfgxtrn.c +++ b/src/sbbs3/scfg/scfgxtrn.c @@ -178,7 +178,7 @@ static char* monthstr(uint16_t months) static char str[256]; if (months == 0) - return("Any"); + return "Any"; str[0] = 0; for (i = 0; i < 12; i++) { @@ -189,7 +189,7 @@ static char* monthstr(uint16_t months) SAFECAT(str, mon[i]); } - return(str); + return str; } static char* mdaystr(long mdays) @@ -199,7 +199,7 @@ static char* mdaystr(long mdays) static char str[256]; if (mdays == 0 || mdays == 1) - return("Any"); + return "Any"; str[0] = 0; for (i = 1; i < 32; i++) { @@ -211,7 +211,7 @@ static char* mdaystr(long mdays) strcat(str, tmp); } - return(str); + return str; } static char* dropfile(int type, ulong misc) @@ -2174,7 +2174,7 @@ int natvpgm_cfg() , K_EDIT) > 0) SAFECOPY(cfg.natvpgm[i]->name, str); } - return(0); + return 0; } static int progs_in_sec(int sec) diff --git a/src/sbbs3/scfglib1.c b/src/sbbs3/scfglib1.c index 24654385ae20061804ebac6270403aded83ec41c..e8058b69e8edc76660d3f0d313e8a8e2337fef8f 100644 --- a/src/sbbs3/scfglib1.c +++ b/src/sbbs3/scfglib1.c @@ -32,7 +32,7 @@ bool allocerr(char* error, size_t maxerrlen, const char* fname, const char *item { safe_snprintf(error, maxerrlen, "%s: allocating %u bytes of memory for %s" , fname, (uint)size, item); - return(false); + return false; } /****************************************************************************/ @@ -471,7 +471,7 @@ bool read_msgs_cfg(scfg_t* cfg, char* error, size_t maxerrlen) safe_snprintf(error, maxerrlen, "%s: Duplicate pointer index for subs %s and %s" , fname , cfg->sub[i]->code_suffix, cfg->sub[j]->code_suffix); - return(false); + return false; } #endif diff --git a/src/sbbs3/scfglib2.c b/src/sbbs3/scfglib2.c index ca42fa0b9fbf3a2a54bb66ce70cdae828dbfb32c..0b43e2a28fa5bcb778c1ee5e0e98fd9f1eff7a4b 100644 --- a/src/sbbs3/scfglib2.c +++ b/src/sbbs3/scfglib2.c @@ -730,11 +730,11 @@ char *readline(long *offset, char *outstr, int maxlen, FILE *instream) char str[257]; if (fgets(str, 256, instream) == NULL) - return(NULL); + return NULL; sprintf(outstr, "%.*s", maxlen, str); truncsp(outstr); (*offset) += maxlen; - return(outstr); + return outstr; } /****************************************************************************/ @@ -752,7 +752,7 @@ uint32_t aftou32(const char *str) l |= FLAG(ch); c++; } - return(l); + return l; } /*****************************************************************************/ @@ -769,7 +769,7 @@ char *u32toaf(uint32_t l, char *str) c++; } str[c] = 0; - return(str); + return str; } /****************************************************************************/ @@ -849,7 +849,7 @@ uint strtoattr(const char *str, char** endptr) } if (endptr != NULL) *endptr = (char*)str + l; - return(atr); + return atr; } void parse_attr_str_list(uint* list, int max, const char* str) diff --git a/src/sbbs3/scfgsave.c b/src/sbbs3/scfgsave.c index 1b3c7dde467161e8b886827cf989236609ecc072..35152319594c1051e89e68708fddfd2e196fab26 100644 --- a/src/sbbs3/scfgsave.c +++ b/src/sbbs3/scfgsave.c @@ -36,26 +36,26 @@ bool save_cfg(scfg_t* cfg) int i; if (cfg->prepped) - return(false); + return false; if (!write_main_cfg(cfg)) - return(false); + return false; if (!write_msgs_cfg(cfg)) - return(false); + return false; if (!write_file_cfg(cfg)) - return(false); + return false; if (!write_chat_cfg(cfg)) - return(false); + return false; if (!write_xtrn_cfg(cfg)) - return(false); + return false; for (i = 0; i < cfg->sys_nodes; i++) { cfg->node_num = i + 1; if (!write_node_cfg(cfg)) - return(false); + return false; } - return(true); + return true; } /****************************************************************************/ @@ -570,7 +570,7 @@ bool write_msgs_cfg(scfg_t* cfg) md(dir); SAFEPRINTF(smb.file, "%smail", dir); if (smb_open(&smb) != 0) { - return(false); + return false; } if (!filelength(fileno(smb.shd_fp))) { smb.status.max_msgs = 0; @@ -579,22 +579,22 @@ bool write_msgs_cfg(scfg_t* cfg) smb.status.attr = SMB_EMAIL; int i = smb_create(&smb); smb_close(&smb); - return(i == SMB_SUCCESS); + return i == SMB_SUCCESS; } if (smb_locksmbhdr(&smb) != 0) { smb_close(&smb); - return(false); + return false; } if (smb_getstatus(&smb) != 0) { smb_close(&smb); - return(false); + return false; } smb.status.max_msgs = 0; smb.status.max_crcs = cfg->mail_maxcrcs; smb.status.max_age = cfg->mail_maxage; if (smb_putstatus(&smb) != 0) { smb_close(&smb); - return(false); + return false; } smb_close(&smb); } diff --git a/src/sbbs3/services.c b/src/sbbs3/services.c index 0f7a257255c4191d04a263de6c38a61ee670b8a8..1c814cb9aa8eb0e50659fd728663a2861fdc752c 100644 --- a/src/sbbs3/services.c +++ b/src/sbbs3/services.c @@ -184,11 +184,11 @@ static bool winsock_startup(void) if ((status = WSAStartup(MAKEWORD(1, 1), &WSAData)) == 0) { lprintf(LOG_DEBUG, "%s %s", WSAData.szDescription, WSAData.szSystemStatus); WSAInitialized = true; - return (true); + return true; } lprintf(LOG_CRIT, "!WinSock startup ERROR %d", status); - return (false); + return false; } #else /* No WINSOCK */ @@ -226,7 +226,7 @@ static ulong active_clients(void) for (i = 0; i < services; i++) total_clients += protected_uint32_value(service[i].clients); - return(total_clients); + return total_clients; } static void update_clients(void) @@ -296,7 +296,7 @@ static SOCKET open_socket(int family, int type, service_t* serv) sock = socket(family, type, IPPROTO_IP); if (sock != INVALID_SOCKET) open_socket_cb(sock, serv); - return(sock); + return sock; } static int close_socket(SOCKET sock) @@ -305,7 +305,7 @@ static int close_socket(SOCKET sock) int result; if (sock == INVALID_SOCKET) - return(-1); + return -1; shutdown(sock, SHUT_RDWR); /* required on Unix */ result = closesocket(sock); @@ -314,7 +314,7 @@ static int close_socket(SOCKET sock) if (result != 0) lprintf(LOG_WARNING, "%04d !ERROR %d closing socket: %s", sock, SOCKET_ERRNO, SOCKET_STRERROR(err, sizeof(err))); - return(result); + return result; } /* Global JavaScript Methods */ @@ -333,10 +333,10 @@ js_log(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((client = (service_client_t*)JS_GetContextPrivate(cx)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (startup == NULL || startup->lputs == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc > 1 && JSVAL_IS_NUMBER(argv[i])) { if (!JS_ValueToInt32(cx, argv[i++], &level)) @@ -348,7 +348,7 @@ js_log(JSContext *cx, uintN argc, jsval *arglist) JSVALUE_TO_MSTRING(cx, argv[i], line, NULL); HANDLE_PENDING(cx, line); if (line == NULL) - return(JS_FALSE); + return JS_FALSE; strncat(str, line, sizeof(str) / 2); free(line); strcat(str, " "); @@ -367,7 +367,7 @@ js_log(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(JS_NewStringCopyZ(cx, str))); - return(JS_TRUE); + return JS_TRUE; } static void badlogin(SOCKET sock, char* user, char* passwd, client_t* client, union xp_sockaddr* addr) @@ -414,18 +414,18 @@ js_login(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(JS_FALSE)); if ((client = (service_client_t*)JS_GetContextPrivate(cx)) == NULL) - return(JS_FALSE); + return JS_FALSE; /* User name or number */ JSVALUE_TO_ASTRING(cx, argv[0], user, 128, NULL); if (user == NULL) - return(JS_FALSE); + return JS_FALSE; /* Password */ if (argc > 1) { JSVALUE_TO_ASTRING(cx, argv[1], pass, LEN_PASS + 2, NULL); if (pass == NULL) - return(JS_FALSE); + return JS_FALSE; } rc = JS_SUSPENDREQUEST(cx); memset(&client->user, 0, sizeof(user_t)); @@ -444,14 +444,14 @@ js_login(JSContext *cx, uintN argc, jsval *arglist) , client->socket, client->service->protocol, user); badlogin(client->socket, user, pass, client->client, &client->addr); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } if (client->user.misc & (DELETED | INACTIVE)) { lprintf(LOG_WARNING, "%04d %s !DELETED OR INACTIVE USER #%d: %s" , client->socket, client->service->protocol, client->user.number, user); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } /* Password */ @@ -460,21 +460,21 @@ js_login(JSContext *cx, uintN argc, jsval *arglist) , client->socket, client->service->protocol, client->user.alias); badlogin(client->socket, user, pass, client->client, &client->addr); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } if (!chk_ars(&scfg, startup->login_ars, &client->user, client->client)) { lprintf(LOG_NOTICE, "%04d %s <%s> !Insufficient server access: %s" , client->socket, client->service->protocol, client->user.alias, startup->login_ars); badlogin(client->socket, user, NULL, client->client, &client->addr); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } if (!chk_ars(&scfg, client->service->login_ars, &client->user, client->client)) { lprintf(LOG_NOTICE, "%04d %s <%s> !Insufficient service access: %s" , client->socket, client->service->protocol, client->user.alias, client->service->login_ars); badlogin(client->socket, user, NULL, client->client, &client->addr); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } JS_RESUMEREQUEST(cx, rc); @@ -545,7 +545,7 @@ js_login(JSContext *cx, uintN argc, jsval *arglist) mqtt_user_login(&mqtt, client->client); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -559,10 +559,10 @@ js_logout(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(JS_FALSE)); if ((client = (service_client_t*)JS_GetContextPrivate(cx)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (client->user.number < 1) /* Not logged in */ - return(JS_TRUE); + return JS_TRUE; rc = JS_SUSPENDREQUEST(cx); if (!logoutuserdat(&scfg, &client->user, time(NULL), client->logintime)) @@ -582,7 +582,7 @@ js_logout(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(JS_TRUE)); - return(JS_TRUE); + return JS_TRUE; } /* @@ -714,7 +714,7 @@ js_client_add(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((service_client = (service_client_t*)JS_GetContextPrivate(cx)) == NULL) - return(JS_FALSE); + return JS_FALSE; protected_uint32_adjust(&service_client->service->clients, 1); update_clients(); @@ -757,7 +757,7 @@ js_client_add(JSContext *cx, uintN argc, jsval *arglist) if (cstr) free(cstr); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -775,7 +775,7 @@ js_client_update(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((service_client = (service_client_t*)JS_GetContextPrivate(cx)) == NULL) - return(JS_FALSE); + return JS_FALSE; memset(&client, 0, sizeof(client)); client.size = sizeof(client); @@ -811,7 +811,7 @@ js_client_update(JSContext *cx, uintN argc, jsval *arglist) if (cstr) free(cstr); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } @@ -826,7 +826,7 @@ js_client_remove(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((service_client = (service_client_t*)JS_GetContextPrivate(cx)) == NULL) - return(JS_FALSE); + return JS_FALSE; sock = js_socket(cx, argv[0]); if (sock < 0) @@ -851,7 +851,7 @@ js_client_remove(JSContext *cx, uintN argc, jsval *arglist) lprintf(LOG_DEBUG, "%s client_remove(%04u)" , service_client->service->protocol, sock); #endif - return(JS_TRUE); + return JS_TRUE; } static JSContext* @@ -864,7 +864,7 @@ js_initcx(JSRuntime* js_runtime, SOCKET sock, service_client_t* service_client, if ((js_cx = JS_NewContext(js_runtime, JAVASCRIPT_CONTEXT_STACK)) == NULL) { errprintf(LOG_CRIT, WHERE, "%04d %s JavaScript: Failed to create new context", sock, service_client->service->protocol); - return(NULL); + return NULL; } JS_SetOptions(js_cx, startup->js.options); JS_BEGINREQUEST(js_cx); @@ -978,10 +978,10 @@ js_initcx(JSRuntime* js_runtime, SOCKET sock, service_client_t* service_client, JS_RemoveObjectRoot(js_cx, glob); JS_ENDREQUEST(js_cx); JS_DestroyContext(js_cx); - return(NULL); + return NULL; } - return(js_cx); + return js_cx; } static JSBool @@ -993,7 +993,7 @@ js_OperationCallback(JSContext *cx) JS_SetOperationCallback(cx, NULL); if ((client = (service_client_t*)JS_GetContextPrivate(cx)) == NULL) { JS_SetOperationCallback(cx, js_OperationCallback); - return(JS_FALSE); + return JS_FALSE; } /* Terminated? */ @@ -1001,7 +1001,7 @@ js_OperationCallback(JSContext *cx) JS_ReportWarning(cx, "Terminated"); client->callback.counter = 0; JS_SetOperationCallback(cx, js_OperationCallback); - return(JS_FALSE); + return JS_FALSE; } ret = js_CommonOperationCallback(cx, &client->callback); @@ -1687,7 +1687,7 @@ static service_t* read_services_ini(const char* services_ini, service_t* service if ((fp = fopen(services_ini, "r")) == NULL) { errprintf(LOG_CRIT, WHERE, "!ERROR %d (%s) opening %s", errno, strerror(errno), services_ini); - return(NULL); + return NULL; } lprintf(LOG_DEBUG, "Reading %s", services_ini); @@ -1771,7 +1771,7 @@ static service_t* read_services_ini(const char* services_ini, service_t* service errprintf(LOG_CRIT, WHERE, "!MALLOC FAILURE"); free(default_interfaces); iniFreeStringList(sec_list); - return(service); + return service; } service = np; service[*services] = serv; @@ -1781,7 +1781,7 @@ static service_t* read_services_ini(const char* services_ini, service_t* service iniFreeStringList(sec_list); strListFree(&list); - return(service); + return service; } static void cleanup(int code) @@ -1845,7 +1845,7 @@ const char* services_ver(void) , GIT_DATE, compiler ); - return(ver); + return ver; } void service_udp_sock_cb(SOCKET sock, void *cbdata) diff --git a/src/sbbs3/sexyz.c b/src/sbbs3/sexyz.c index d6e83076b9c078321d743ebdd110bd2253f4da02..50daf14a3ec11561b653c3f97293cf5e9c5a24a3 100644 --- a/src/sbbs3/sexyz.c +++ b/src/sbbs3/sexyz.c @@ -154,11 +154,11 @@ static BOOL winsock_startup(void) if ((status = WSAStartup(MAKEWORD(1, 1), &WSAData)) == 0) { fprintf(statfp, "%s %s\n", WSAData.szDescription, WSAData.szSystemStatus); - return(TRUE); + return TRUE; } fprintf(errfp, "!WinSock startup ERROR %d\n", status); - return(FALSE); + return FALSE; } #else /* No WINSOCK */ @@ -223,7 +223,7 @@ static int lprintf(int level, const char *fmt, ...) vsnprintf(sbuf, sizeof(sbuf), fmt, argptr); sbuf[sizeof(sbuf) - 1] = 0; va_end(argptr); - return(lputs(NULL, level, sbuf)); + return lputs(NULL, level, sbuf); } void break_handler(int type) @@ -264,10 +264,10 @@ char* dszlog_filename(char* str) p = getfname(p); if (!dszlog_quotes) - return(p); + return p; SAFEPRINTF(path, "\"%s\"", p); - return(path); + return path; } static char *chr(uchar ch) @@ -276,46 +276,46 @@ static char *chr(uchar ch) if (mode & ZMODEM) { switch (ch) { - case ZRQINIT: return("ZRQINIT"); - case ZRINIT: return("ZRINIT"); - case ZSINIT: return("ZSINIT"); - case ZACK: return("ZACK"); - case ZFILE: return("ZFILE"); - case ZSKIP: return("ZSKIP"); - case ZNAK: return("ZNAK"); - case ZABORT: return("ZABORT"); - case ZFIN: return("ZFIN"); - case ZRPOS: return("ZRPOS"); - case ZDATA: return("ZDATA"); - case ZEOF: return("ZEOF"); - case ZPAD: return("ZPAD"); - case ZDLE: return("ZDLE"); - case ZDLEE: return("ZDLEE"); - case ZBIN: return("ZBIN"); - case ZHEX: return("ZHEX"); - case ZBIN32: return("ZBIN32"); - case ZRESC: return("ZRESC"); - case ZCRCE: return("ZCRCE"); - case ZCRCG: return("ZCRCG"); - case ZCRCQ: return("ZCRCQ"); - case ZCRCW: return("ZCRCW"); + case ZRQINIT: return "ZRQINIT"; + case ZRINIT: return "ZRINIT"; + case ZSINIT: return "ZSINIT"; + case ZACK: return "ZACK"; + case ZFILE: return "ZFILE"; + case ZSKIP: return "ZSKIP"; + case ZNAK: return "ZNAK"; + case ZABORT: return "ZABORT"; + case ZFIN: return "ZFIN"; + case ZRPOS: return "ZRPOS"; + case ZDATA: return "ZDATA"; + case ZEOF: return "ZEOF"; + case ZPAD: return "ZPAD"; + case ZDLE: return "ZDLE"; + case ZDLEE: return "ZDLEE"; + case ZBIN: return "ZBIN"; + case ZHEX: return "ZHEX"; + case ZBIN32: return "ZBIN32"; + case ZRESC: return "ZRESC"; + case ZCRCE: return "ZCRCE"; + case ZCRCG: return "ZCRCG"; + case ZCRCQ: return "ZCRCQ"; + case ZCRCW: return "ZCRCW"; } } else { switch (ch) { - case SOH: return("SOH"); - case STX: return("STX"); - case ETX: return("ETX"); - case EOT: return("EOT"); - case ACK: return("ACK"); - case NAK: return("NAK"); - case CAN: return("CAN"); + case SOH: return "SOH"; + case STX: return "STX"; + case ETX: return "ETX"; + case EOT: return "EOT"; + case ACK: return "ACK"; + case NAK: return "NAK"; + case CAN: return "CAN"; } } if (ch >= ' ' && ch <= '~') sprintf(str, "'%c' (%02Xh)", ch, ch); else sprintf(str, "%u (%02Xh)", ch, ch); - return(str); + return str; } void dump(BYTE* buf, int len) @@ -376,7 +376,7 @@ int sendbuf(SOCKET s, void *buf, size_t buflen) else { sent += ret; if (sent >= buflen) - return(sent); + return sent; } } @@ -419,7 +419,7 @@ static int recv_buffer(int timeout /* seconds */) for (;;) { if (inbuf_len > inbuf_pos) - return(inbuf_len - inbuf_pos); + return inbuf_len - inbuf_pos; #ifdef __unix__ if (stdio) { i = read(STDIN_FILENO, inbuf, sizeof(inbuf)); @@ -528,7 +528,7 @@ int recv_byte(void* unused, unsigned timeout /* seconds */) lprintf(LOG_WARNING, "Socket Disconnected"); } else lprintf(LOG_ERR, "recv error %d (%d)", i, SOCKET_ERRNO); - return(NOINP); + return NOINP; } if (telnet) { @@ -544,7 +544,7 @@ int recv_byte(void* unused, unsigned timeout /* seconds */) telnet_cmdlen = 0; if (debug_rx) lprintf(LOG_DEBUG, "RX: %s", chr(TELNET_IAC)); - return(TELNET_IAC); + return TELNET_IAC; } } if (telnet_cmdlen) { @@ -575,10 +575,10 @@ int recv_byte(void* unused, unsigned timeout /* seconds */) } if (debug_rx) lprintf(LOG_DEBUG, "RX: %s", chr(ch)); - return(ch); + return ch; } - return(NOINP); + return NOINP; } #if !SINGLE_THREADED @@ -614,12 +614,12 @@ int send_byte(void* unused, uchar ch, unsigned timeout) newline = TRUE; if ((result = RingBufFree(&outbuf)) < len) { lprintf(LOG_ERR, "Still not enough space in ring buffer (need %d, avail=%d)", len, result); - return(-1); + return -1; } } if ((result = RingBufFree(&outbuf)) < len) { lprintf(LOG_ERR, "Not enough space in ring buffer (need %d, avail=%d) although empty event is set!", len, result); - return(-1); + return -1; } } @@ -631,7 +631,7 @@ int send_byte(void* unused, uchar ch, unsigned timeout) if (debug_tx) lprintf(LOG_DEBUG, "TX: %s", chr(ch)); #endif - return(0); + return 0; } #else @@ -655,10 +655,10 @@ int send_byte(void* unused, uchar ch, unsigned timeout) if (i == len) { if (debug_tx) lprintf(LOG_DEBUG, "TX: %s", chr(ch)); - return(0); + return 0; } - return(-1); + return -1; } #endif @@ -771,7 +771,7 @@ uint64_t num_blocks(unsigned block_num, uint64_t offset, uint64_t len, unsigned blocks = block_num + (remain / block_size); if (remain % block_size) blocks++; - return(blocks); + return blocks; } /************************************************/ @@ -932,7 +932,7 @@ static int send_files(char** fname, uint fnames) if (xm.total_files < 1) { lprintf(LOG_ERR, "No files to send"); - return(-1); + return -1; } if (xm.total_files > 1) lprintf(LOG_INFO, "Sending %lu files (%" PRId64 " KB total)" @@ -1037,13 +1037,13 @@ static int send_files(char** fname, uint fnames) zmodem_get_zfin(&zm); if (fnum < fnames) /* error occurred */ - return(-1); + return -1; if (!success) - return(-1); + return -1; if (mode & XMODEM) - return(0); + return 0; if (mode & YMODEM) { if (xmodem_get_mode(&xm)) { @@ -1063,7 +1063,7 @@ static int send_files(char** fname, uint fnames) lprintf(LOG_INFO, "Overall - Time %02lu:%02lu KBytes: %" PRId64 " CPS: %lu" , t / 60, t % 60, total_bytes / 1024, total_bytes / t); } - return(0); /* success */ + return 0; /* success */ } static int receive_files(char** fname_list, int fnames) @@ -1118,11 +1118,11 @@ static int receive_files(char** fname_list, int fnames) if (errors > xm.max_errors || xm.cancelled) { lprintf(LOG_ERR, "Error fetching YMODEM header block"); xmodem_cancel(&xm); - return(1); + return 1; } if (!block[0]) { lprintf(LOG_INFO, "Received YMODEM termination block"); - return(0); + return 0; } ftime = total_files = 0; total_bytes = 0; @@ -1143,9 +1143,9 @@ static int receive_files(char** fname_list, int fnames) i = zmodem_recv_init(&zm); if (zm.cancelled) - return(1); + return 1; if (i < 0) - return(-1); + return -1; switch (i) { case ZFILE: SAFECOPY(fname, zm.current_file_name); @@ -1156,9 +1156,9 @@ static int receive_files(char** fname_list, int fnames) break; case ZFIN: case ZCOMPL: - return(!success); + return !success; default: - return(-1); + return -1; } } file_bytes_left = file_bytes; @@ -1217,7 +1217,7 @@ static int receive_files(char** fname_list, int fnames) continue; } xmodem_cancel(&xm); - return(1); + return 1; } if (!(mode & XMODEM) && max_file_size != 0 && file_bytes > max_file_size) { @@ -1227,7 +1227,7 @@ static int receive_files(char** fname_list, int fnames) continue; } xmodem_cancel(&xm); - return(1); + return 1; } if (lc_filenames) { @@ -1242,7 +1242,7 @@ static int receive_files(char** fname_list, int fnames) continue; } xmodem_cancel(&xm); - return(1); + return 1; } if (mode & XMODEM) @@ -1318,7 +1318,7 @@ static int receive_files(char** fname_list, int fnames) , errno, wr, (uint64_t)ftello(fp)); fclose(fp); xmodem_cancel(&xm); - return(1); + return 1; } file_bytes_left -= wr; block_num++; @@ -1392,7 +1392,7 @@ static int receive_files(char** fname_list, int fnames) , total_bytes / 1024 ); } - return(!success); /* 0=success */ + return !success; /* 0=success */ } void bail(int code) @@ -1490,7 +1490,7 @@ static void init_stdio(void) BOOL RingBufIsEmpty(void *buf) { - return(RingBufFull(buf) == 0); + return RingBufFull(buf) == 0; } #endif diff --git a/src/sbbs3/sftp.cpp b/src/sbbs3/sftp.cpp index 9fe79c2a6888f4b1e78d36e8cdde0730d160464d..704c45efe4be4317b33a8b6d5afd7b9004c531bf 100644 --- a/src/sbbs3/sftp.cpp +++ b/src/sbbs3/sftp.cpp @@ -713,7 +713,7 @@ sftp_resolve_path(char *target, const char *path, size_t size) if (target == NULL) { size = MAX_PATH + 1; if ((target = (char*)malloc(size)) == NULL) { - return(NULL); + return NULL; } } strncpy(target, path, size); @@ -743,7 +743,7 @@ sftp_resolve_path(char *target, const char *path, size_t size) target[0] = '/'; target[1] = 0; } - return(target); + return target; } static char * diff --git a/src/sbbs3/smbutil.c b/src/sbbs3/smbutil.c index 375b4ccf0c1d7ad1f1c58f6eb9b68391da181ed7..ffeb6b48dbb1058f156e34dea90c58ac63cb86e5 100644 --- a/src/sbbs3/smbutil.c +++ b/src/sbbs3/smbutil.c @@ -163,7 +163,7 @@ ulong lf_expand(uchar* inbuf, uchar* outbuf) outbuf[j++] = inbuf[i]; } outbuf[j] = 0; - return(j); + return j; } char* gen_msgid(smb_t* smb, smbmsg_t* msg, char* msgid, size_t maxlen) @@ -510,7 +510,7 @@ char *my_timestr(time_t intime) gm = localtime(&intime); if (gm == NULL) { strcpy(str, "Invalid Time"); - return(str); + return str; } if (gm->tm_hour >= 12) { if (gm->tm_hour == 12) @@ -529,7 +529,7 @@ char *my_timestr(time_t intime) sprintf(str, "%s %02d %4d %02d:%02d %s" , mon[gm->tm_mon], gm->tm_mday, 1900 + gm->tm_year , hour, gm->tm_min, mer); - return(str); + return str; } /****************************************************************************/ @@ -1948,7 +1948,7 @@ int main(int argc, char **argv) if (i) { fprintf(errfp, "\n%s!smb_locksmbhdr returned %d: %s\n" , beep, i, smb.last_error); - return(1); + return 1; } postmsg((char)toupper(cmd[y]), to, to_number, to_address, from, from_number, subj, fp); fclose(fp); @@ -1974,7 +1974,7 @@ int main(int argc, char **argv) if ((i = smb_lock(&smb)) != 0) { fprintf(errfp, "\n%s!smb_lock returned %d: %s\n" , beep, i, smb.last_error); - return(i); + return i; } printf("%s locked successfully\n", smb.file); if (cmd[y] == 'L') // Lock base @@ -2069,5 +2069,5 @@ int main(int argc, char **argv) bail(0); - return(-1); /* never gets here */ + return -1; /* never gets here */ } diff --git a/src/sbbs3/sockopts.c b/src/sbbs3/sockopts.c index 4c26a6f740a8f9f7fd0e07b01b45b5cc1da7c115..5e15c49dbc02e6958117f5fc1fec4ae3ce6ffd99 100644 --- a/src/sbbs3/sockopts.c +++ b/src/sbbs3/sockopts.c @@ -36,7 +36,7 @@ int set_socket_options(scfg_t* cfg, SOCKET sock, const char* protocol, char* err if (result) { safe_snprintf(error, errlen, "%d getting socket option type (%d)" , SOCKET_ERRNO, SO_TYPE); - return(result); + return result; } /* Set user defined socket options */ @@ -47,7 +47,7 @@ int set_socket_options(scfg_t* cfg, SOCKET sock, const char* protocol, char* err // Set the only sane choice... setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&optval, sizeof(optval)); #endif - return(0); + return 0; } list = iniReadFile(fp); fclose(fp); @@ -67,5 +67,5 @@ int set_socket_options(scfg_t* cfg, SOCKET sock, const char* protocol, char* err iniFreeStringList(list); - return(result); + return result; } diff --git a/src/sbbs3/str.cpp b/src/sbbs3/str.cpp index 4fa5b88c7f30a3ba13efd1c9ba816012a107df50..315af26dac596b597c3b0999dc90a927d111cbc1 100644 --- a/src/sbbs3/str.cpp +++ b/src/sbbs3/str.cpp @@ -687,7 +687,7 @@ size_t sbbs_t::gettmplt(char *strout, const char *templt, int mode) CRLF; if (!(sys_status & SS_ABORT)) strcpy(strout, str); // Not SAFECOPY()able - return(c); + return c; } /*****************************************************************************/ @@ -701,7 +701,7 @@ bool sbbs_t::inputnstime32(time32_t *dt) retval = inputnstime(&tmptime); *dt = (time32_t)tmptime; - return(retval); + return retval; } bool sbbs_t::inputnstime(time_t *dt) @@ -716,19 +716,19 @@ bool sbbs_t::inputnstime(time_t *dt) CRLF; if (localtime_r(dt, &tm) == NULL) { errormsg(WHERE, ERR_CHK, "time ptr", 0); - return(FALSE); + return FALSE; } bputs(text[NScanYear]); ultoa(tm.tm_year + 1900, str, 10); if (!getstr(str, 4, K_EDIT | K_AUTODEL | K_NUMBER | K_NOCRLF) || sys_status & SS_ABORT) { CRLF; - return(false); + return false; } tm.tm_year = atoi(str); if (tm.tm_year < 1970) { /* unix time is seconds since 1/1/1970 */ CRLF; - return(false); + return false; } tm.tm_year -= 1900; /* tm_year is years since 1900 */ @@ -736,12 +736,12 @@ bool sbbs_t::inputnstime(time_t *dt) ultoa(tm.tm_mon + 1, str, 10); if (!getstr(str, 2, K_EDIT | K_AUTODEL | K_NUMBER | K_NOCRLF) || sys_status & SS_ABORT) { CRLF; - return(false); + return false; } tm.tm_mon = atoi(str); if (tm.tm_mon < 1 || tm.tm_mon > 12) { CRLF; - return(false); + return false; } tm.tm_mon--; /* tm_mon is zero-based */ @@ -749,12 +749,12 @@ bool sbbs_t::inputnstime(time_t *dt) ultoa(tm.tm_mday, str, 10); if (!getstr(str, 2, K_EDIT | K_AUTODEL | K_NUMBER | K_NOCRLF) || sys_status & SS_ABORT) { CRLF; - return(false); + return false; } tm.tm_mday = atoi(str); if (tm.tm_mday < 1 || tm.tm_mday > 31) { CRLF; - return(false); + return false; } bputs(text[NScanHour]); if (cfg.sys_misc & SM_MILITARY) @@ -776,25 +776,25 @@ bool sbbs_t::inputnstime(time_t *dt) ultoa(hour, str, 10); if (!getstr(str, 2, K_EDIT | K_AUTODEL | K_NUMBER | K_NOCRLF) || sys_status & SS_ABORT) { CRLF; - return(false); + return false; } tm.tm_hour = atoi(str); if (tm.tm_hour > 24) { CRLF; - return(false); + return false; } bputs(text[NScanMinute]); ultoa(tm.tm_min, str, 10); if (!getstr(str, 2, K_EDIT | K_AUTODEL | K_NUMBER | K_NOCRLF) || sys_status & SS_ABORT) { CRLF; - return(false); + return false; } tm.tm_min = atoi(str); if (tm.tm_min > 59) { CRLF; - return(false); + return false; } tm.tm_sec = 0; if (!(cfg.sys_misc & SM_MILITARY) && tm.tm_hour && tm.tm_hour < 13) { @@ -814,7 +814,7 @@ bool sbbs_t::inputnstime(time_t *dt) } tm.tm_isdst = -1; /* Do not adjust for DST */ *dt = mktime(&tm); - return(true); + return true; } /*****************************************************************************/ @@ -832,11 +832,11 @@ bool sbbs_t::chkpass(char *passwd, user_t* user, bool unique) if (strlen(pass) < cfg.min_pwlen) { bputs(text[PasswordTooShort]); - return(false); + return false; } if (unique && strcmp(pass, user->pass) == 0) { bputs(text[PasswordNotChanged]); - return(false); + return false; } d = strlen(pass); for (c = 1; c < d; c++) @@ -844,21 +844,21 @@ bool sbbs_t::chkpass(char *passwd, user_t* user, bool unique) break; if (c == d) { bputs(text[PasswordInvalid]); - return(false); + return false; } for (c = 0; c < 3; c++) /* check for 1234 and ABCD */ if (pass[c] != pass[c + 1] + 1) break; if (c == 3) { bputs(text[PasswordObvious]); - return(false); + return false; } for (c = 0; c < 3; c++) /* check for 4321 and ZYXW */ if (pass[c] != pass[c + 1] - 1) break; if (c == 3) { bputs(text[PasswordObvious]); - return(false); + return false; } SAFECOPY(name, user->name); strupr(name); @@ -903,9 +903,9 @@ bool sbbs_t::chkpass(char *passwd, user_t* user, bool unique) ) { bputs(text[PasswordObvious]); - return(false); + return false; } - return(!trashcan(pass, "password")); + return !trashcan(pass, "password"); } /****************************************************************************/ @@ -969,12 +969,12 @@ bool sbbs_t::trashcan(const char *insearchof, const char *name, struct trash* tr flush_output(500); // give time for tx buffer to clear before disconnect } } - return(result); + return result; } char* sbbs_t::timestr(time_t intime) { - return(::timestr(&cfg, (time32_t)intime, timestr_output)); + return ::timestr(&cfg, (time32_t)intime, timestr_output); } char* sbbs_t::datestr(time_t t, char* str) @@ -1208,15 +1208,15 @@ bool sbbs_t::spy(uint i /* node_num */) if (!i || i > MAX_NODES) { bprintf("Invalid node number: %d\r\n", i); - return(false); + return false; } if (i == cfg.node_num) { bprintf("Can't spy on yourself.\r\n"); - return(false); + return false; } if (spy_socket[i - 1] != INVALID_SOCKET) { bprintf("Node %d already being spied (%x)\r\n", i, spy_socket[i - 1]); - return(false); + return false; } bprintf("*** Synchronet Remote Spy on Node %d: Ctrl-C to Abort ***" "\r\n\r\n", i); @@ -1291,7 +1291,7 @@ bool sbbs_t::spy(uint i /* node_num */) } spy_socket[i - 1] = INVALID_SOCKET; - return(true); + return true; } void sbbs_t::time_bank(void) diff --git a/src/sbbs3/str_util.c b/src/sbbs3/str_util.c index c22bcb9409760ad2e8a89592f011a572a7d0ae1c..9b10a159bf123639c2ff2c38eb554da26375d2a8 100644 --- a/src/sbbs3/str_util.c +++ b/src/sbbs3/str_util.c @@ -281,7 +281,7 @@ char* u32toac(uint32_t l, char *string, char sep) if (j > 0 && !(k % 3)) string[j--] = sep; } - return(string); + return string; } char* u64toac(uint64_t l, char *string, char sep) @@ -314,7 +314,7 @@ char* truncstr(char* str, const char* set) if (p != NULL && *p != 0) *p = 0; - return(p); + return p; } /****************************************************************************/ @@ -343,7 +343,7 @@ char* rot13(char* str) *(p++) = ch; } - return(str); + return str; } /****************************************************************************/ @@ -367,7 +367,7 @@ char* backslashcolon(char *str) /****************************************************************************/ int pstrcmp(const char **str1, const char **str2) { - return(strcmp(*str1, *str2)); + return strcmp(*str1, *str2); } /****************************************************************************/ @@ -379,7 +379,7 @@ int strsame(const char *str1, const char *str2) for (i = 0; str1[i]; i++) if (str1[i] == str2[i]) j++; - return(j); + return j; } @@ -392,7 +392,7 @@ char *hexplus(uint num, char *str) str[0] = num / 0x100 ? 'f' + (num / 0x10) - 0xf : str[1]; str[1] = str[2]; str[2] = 0; - return(str); + return str; } /****************************************************************************/ @@ -405,7 +405,7 @@ ulong ahtoul(const char *str) while ((l = (*str++) | 0x20) != 0x20) val = (l & 0xf) + (l >> 6 & 1) * 9 + val * 16; - return(val); + return val; } /****************************************************************************/ @@ -418,7 +418,7 @@ uint32_t ahtou32(const char *str) while ((l = (*str++) | 0x20) != 0x20) val = (l & 0xf) + (l >> 6 & 1) * 9 + val * 16; - return(val); + return val; } /****************************************************************************/ @@ -430,11 +430,11 @@ uint hptoi(const char *str) uint i; if (!str[1] || toupper(str[0]) <= 'F') - return(ahtoul(str)); + return ahtoul(str); SAFECOPY(tmp, str); tmp[0] = 'F'; i = ahtoul(tmp) + ((toupper(str[0]) - 'F') * 0x10); - return(i); + return i; } /****************************************************************************/ @@ -457,9 +457,9 @@ bool valid_ctrl_a_attr(char a) case 'N': /* normal */ case 'R': /* red fg */ case 'W': /* white fg */ - /* "Rainbow" attribute is not valid for messages (no ANSI equivalent) - case 'X': // rainbow - */ + /* "Rainbow" attribute is not valid for messages (no ANSI equivalent) + case 'X': // rainbow + */ case 'Y': /* yellow fg */ case '0': /* black bg */ case '1': /* red bg */ @@ -469,9 +469,9 @@ bool valid_ctrl_a_attr(char a) case '5': /* magenta bg */ case '6': /* cyan bg */ case '7': /* white bg */ - return(true); + return true; } - return(false); + return false; } /****************************************************************************/ @@ -531,7 +531,7 @@ size_t strip_invalid_attr(char *str) dest[d++] = str[c]; } dest[d] = 0; - return(a); + return a; } /****************************************************************************/ @@ -595,7 +595,7 @@ char* ascii_str(uchar* str) *p = exascii_to_ascii_char(*p); p++; } - return((char*)str); + return (char*)str; } char* replace_named_values(const char* src @@ -668,7 +668,7 @@ char* replace_named_values(const char* src } *p = 0; /* terminate string in destination buffer */ - return(buf); + return buf; } /****************************************************************************/ diff --git a/src/sbbs3/telnet.c b/src/sbbs3/telnet.c index 5dfab97a24a50f9929cb3bb3152562cc916e1cbe..533fb96fdf30fa96952c05a2c569554f621abf55 100644 --- a/src/sbbs3/telnet.c +++ b/src/sbbs3/telnet.c @@ -29,26 +29,26 @@ const char* telnet_cmd_desc(uchar cmd) static char unknown[32]; switch (cmd) { - case TELNET_IAC: return("IAC"); - case TELNET_DONT: return("DON'T"); - case TELNET_DO: return("DO"); - case TELNET_WONT: return("WON'T"); - case TELNET_WILL: return("WILL"); - - case TELNET_SB: return("SB"); - case TELNET_GA: return("GA"); - case TELNET_EL: return("EL"); - case TELNET_EC: return("EC"); - case TELNET_AYT: return("AYT"); - case TELNET_AO: return("AO"); - case TELNET_IP: return("IP"); - case TELNET_BRK: return("BRK"); - case TELNET_SYNC: return("SYNC"); - case TELNET_NOP: return("NOP"); + case TELNET_IAC: return "IAC"; + case TELNET_DONT: return "DON'T"; + case TELNET_DO: return "DO"; + case TELNET_WONT: return "WON'T"; + case TELNET_WILL: return "WILL"; + + case TELNET_SB: return "SB"; + case TELNET_GA: return "GA"; + case TELNET_EL: return "EL"; + case TELNET_EC: return "EC"; + case TELNET_AYT: return "AYT"; + case TELNET_AO: return "AO"; + case TELNET_IP: return "IP"; + case TELNET_BRK: return "BRK"; + case TELNET_SYNC: return "SYNC"; + case TELNET_NOP: return "NOP"; default: sprintf(unknown, "%d", cmd); - return(unknown); + return unknown; } } @@ -102,13 +102,13 @@ const char* telnet_opt_desc(uchar opt) static char unknown[32]; if (opt < sizeof(telnet_option_descriptions) / sizeof(char*)) - return(telnet_option_descriptions[opt]); + return telnet_option_descriptions[opt]; if (opt == TELNET_EXOPL) - return("Extended Options List"); + return "Extended Options List"; sprintf(unknown, "%d", opt); - return(unknown); + return unknown; } uchar telnet_opt_ack(uchar cmd) diff --git a/src/sbbs3/text_defaults.c b/src/sbbs3/text_defaults.c index fe3a2b31fd578553314f15a0e226cc2884f7e7f5..ff40bfbcf94468a2c31cb535f75054230ec8d62d 100644 --- a/src/sbbs3/text_defaults.c +++ b/src/sbbs3/text_defaults.c @@ -4,1494 +4,1494 @@ #include "text_defaults.h" -const char * const text_defaults[TOTAL_TEXT]={ - "\x01\x6e\x01\x68\x01\x63\xda\xc4\xc4\xc4\xc4\xc4\xc4\x01\x6e\xc4\xc4\xc4\xc4\xc4\xc4\x01\x68\x01\x6b\xc4\xc4\xc4\xc4\xc4\xc4\xc4" - "\x01\x6e\x01\x63\xc4\xc4\xc4\xc4\xc4\xfa\xfa\xfa\xfa\x0d\x0a\x01\x68\xb3\x20\x01\x62\x53\x75\x62\x6a\x01\x6e\x01\x62\x3a\x20\x01" - "\x68\x01\x63\x25\x2e\x37\x30\x73" // 001 MsgSubj - ,"\x0d\x0a\xb3\x20\x01\x62\x41\x74\x74\x72\x01\x6e\x01\x62\x3a\x20\x01\x68\x01\x63\x25\x73\x25\x73\x25\x73\x25\x73\x25\x73\x25\x73" - "\x25\x73\x25\x73\x25\x73\x25\x73\x25\x73\x25\x73\x25\x73\x25\x73\x25\x73\x25\x73\x25\x73" // 002 MsgAttr - ,"\x0d\x0a\xb3\x20\x01\x62\x54\x6f\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x68\x01\x63\x25\x2e\x37\x30\x73" // 003 MsgTo - ,"\x20\x23\x25\x73" // 004 MsgToExt - ,"\x20\x28\x25\x2e\x34\x30\x73\x29" // 005 MsgToNet - ,"\x0d\x0a\x01\x77\xb3\x20\x01\x62\x46\x72\x6f\x6d\x01\x6e\x01\x62\x3a\x20\x01\x68\x01\x63\x25\x2e\x33\x33\x73" // 006 MsgFrom - ,"\x20\x23\x25\x73" // 007 MsgFromExt - ,"\x20\x28\x25\x2e\x33\x35\x73\x29" // 008 MsgFromNet - ,"\x0d\x0a\x01\x77\xb3\x20\x01\x62\x44\x61\x74\x65\x01\x6e\x01\x62\x3a\x20\x01\x68\x01\x63\x25\x2e\x32\x34\x73\x20\x25\x73\x20\x28" - "\x25\x73\x29\x0d\x0a\x01\x77\xc0\xc4\xc4\xc4\xc4\xc4\xc4\x01\x63\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\x01\x6e\xc4\xc4\xc4\xc4\xc4" - "\xc4\xc4\xc4\xc4\xc4\x01\x68\x01\x6b\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\x01\x6e\x01\x63\xc4\xc4\xc4\xc4\xc4\xc4\xc4\x01\x62\xc4\xc4" - "\xc4\xc4\xc4\xc4\xc4\xfa\xfa\xfa\xfa\xfa\xfa\x01\x6e" // 009 MsgDate - ,"\x01\x5f\x01\x3f\x01\x62\x01\x68\x45\x2d\x6d\x61\x69\x6c\x20\x28\x55\x73\x65\x72\x20\x6e\x61\x6d\x65\x20\x6f\x72\x20\x6e\x75\x6d" - "\x62\x65\x72\x29\x01\x5c\x3a\x20\x01\x77" // 010 Email - ,"\x0d\x0a\x50\x6f\x73\x74\x20\x6f\x6e\x20\x25\x73\x01\x5c\x20\x25\x73" // 011 Post - ,"\x01\x72\x01\x68\x0d\x0a\x07\x59\x6f\x75\x20\x68\x61\x76\x65\x20\x73\x65\x6e\x74\x20\x74\x6f\x6f\x20\x6d\x61\x6e\x79\x20\x45\x2d" - "\x6d\x61\x69\x6c\x73\x20\x74\x6f\x64\x61\x79\x2e\x0d\x0a" // 012 TooManyEmailsToday - ,"\x01\x72\x01\x68\x0d\x0a\x07\x59\x6f\x75\x20\x68\x61\x76\x65\x20\x70\x6f\x73\x74\x65\x64\x20\x74\x6f\x6f\x20\x6d\x61\x6e\x79\x20" - "\x74\x69\x6d\x65\x73\x20\x74\x6f\x64\x61\x79\x2e\x0d\x0a" // 013 TooManyPostsToday - ,"\x01\x5b\x07\x01\x6e\x01\x72\x01\x68\x43\x61\x6e\x6e\x6f\x74\x20\x61\x64\x64\x20\x01\x77\x25\x73\x01\x72\x20\x74\x6f\x20\x71\x75" - "\x65\x75\x65\x20\x2d\x20\x01\x6e" // 014 CantAddToQueue - ,"\x01\x6e\x0d\x0a\x54\x68\x65\x20\x73\x65\x6e\x64\x69\x6e\x67\x20\x6f\x66\x20\x6d\x61\x69\x6c\x20\x69\x73\x20\x62\x65\x79\x6f\x6e" - "\x64\x20\x79\x6f\x75\x72\x20\x61\x62\x69\x6c\x69\x74\x79\x2e\x0d\x0a" // 015 R_Email - ,"\x01\x6e\x0d\x0a\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x70\x6f\x73\x74\x20\x6d\x65\x73\x73\x61\x67\x65\x73\x2e\x0d\x0a" // 016 R_Post - ,"\x01\x6e\x0d\x0a\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x73\x65\x6e\x64\x20\x45\x2d\x6d\x61\x69\x6c\x20\x74\x6f\x20\x25\x73\x2e" - "\x0d\x0a" // 017 R_Feedback - ,"\x01\x6e\x01\x3f\x01\x6d\x53\x65\x6e\x64\x69\x6e\x67\x20\x45\x2d\x6d\x61\x69\x6c\x20\x74\x6f\x20\x01\x68\x25\x73\x20\x01\x6e\x01" - "\x6d\x23\x25\x75\x01\x6e\x0d\x0a" // 018 Emailing - ,"\x01\x6e\x01\x3f\x01\x6d\x50\x6f\x73\x74\x69\x6e\x67\x20\x6f\x6e\x20\x01\x68\x25\x73\x01\x6e\x01\x6d\x01\x5c\x20\x25\x73\x0d\x0a" - "" // 019 Posting - ,"\x0d\x0a\x4e\x65\x77\x20\x66\x69\x6c\x65\x2e\x0d\x0a" // 020 NewFile - ,"\x01\x5f\x0d\x0a\x01\x79\x01\x68\x53\x75\x62\x6a\x65\x63\x74\x01\x5c\x3a\x20" // 021 SubjectPrompt - ,"\x01\x6e\x01\x67\x0d\x0a\x45\x6e\x74\x65\x72\x20\x6d\x65\x73\x73\x61\x67\x65\x20\x6e\x6f\x77\x20\x28\x01\x68\x25\x64\x01\x6e\x01" - "\x67\x20\x6c\x69\x6e\x65\x73\x20\x6d\x61\x78\x29\x2e\x20\x01\x5c\x54\x79\x70\x65\x20\x01\x68\x2f\x3f\x01\x6e\x01\x67\x20\x6f\x6e" - "\x20\x61\x20\x6e\x65\x77\x20\x6c\x69\x6e\x65\x20\x66\x6f\x72\x20\x6d\x65\x6e\x75\x2e\x0d\x0a\x01\x6e" // 022 EnterMsgNow - ,"\x01\x6e\x01\x67\x0d\x0a\x52\x61\x77\x20\x6d\x65\x73\x73\x61\x67\x65\x20\x69\x6e\x70\x75\x74\x20\x28\x01\x68\x25\x75\x01\x6e\x01" - "\x67\x20\x62\x79\x74\x65\x73\x20\x6d\x61\x78\x29\x2e\x20\x01\x68\x43\x74\x72\x6c\x2d\x5a\x01\x6e\x01\x67\x20\x74\x6f\x20\x73\x61" - "\x76\x65\x2c\x20\x01\x68\x43\x74\x72\x6c\x2d\x43\x01\x6e\x01\x67\x20\x74\x6f\x20\x61\x62\x6f\x72\x74\x2e\x01\x6e\x0d\x0a\x0d\x0a" - "" // 023 EnterMsgNowRaw - ,"\x01\x6e\x01\x68\x01\x72\x4c\x69\x6e\x65\x20\x6c\x69\x6d\x69\x74\x20\x28\x01\x77\x25\x75\x01\x72\x29\x20\x72\x65\x61\x63\x68\x65" - "\x64\x2e\x01\x6e\x0d\x0a" // 024 NoMoreLines - ,"\x4f\x6e\x6c\x79\x20\x25\x75\x20\x6c\x69\x6e\x65\x73\x20\x6c\x65\x66\x74\x2e\x0d\x0a" // 025 OnlyNLinesLeft - ,"\x0d\x0a\x0d\x0a\x01\x6e\x01\x72\x01\x68\x01\x69\x4f\x75\x74\x20\x6f\x66\x20\x62\x79\x74\x65\x73\x2e\x01\x6e\x0d\x0a" // 026 OutOfBytes - ,"\x49\x6e\x76\x61\x6c\x69\x64\x20\x6c\x69\x6e\x65\x20\x6e\x75\x6d\x62\x65\x72\x0d\x0a" // 027 InvalidLineNumber - ,"\x01\x6e\x4d\x65\x73\x73\x61\x67\x65\x20\x63\x6c\x65\x61\x72\x65\x64\x2e\x0d\x0a" // 028 MsgCleared - ,"\x57\x69\x74\x68\x20\x6c\x69\x6e\x65\x20\x6e\x75\x6d\x62\x65\x72\x73" // 029 WithLineNumbersQ - ,"\x01\x3f\x01\x72\x01\x68\x01\x69\x41\x62\x6f\x72\x74\x65\x64\x2e\x01\x6e\x0d\x0a" // 030 Aborted - ,"\x0d\x0a\x41\x6e\x6f\x6e\x79\x6d\x6f\x75\x73" // 031 AnonymousQ - ,"\x41\x4e\x4f\x4e\x59\x4d\x4f\x55\x53" // 032 Anonymous - ,"\x01\x6e\x01\x68\x0d\x0a\x53\x61\x76\x69\x6e\x67\x20\x40\x45\x4c\x4c\x49\x50\x53\x49\x53\x40" // 033 Saving - ,"\x01\x5b\x01\x62\x53\x61\x76\x65\x64\x20\x01\x77\x25\x75\x01\x62\x20\x63\x68\x61\x72\x61\x63\x74\x65\x72\x73\x20\x28\x01\x77\x25" - "\x75\x01\x62\x20\x6c\x69\x6e\x65\x73\x29\x2e\x01\x6e\x0d\x0a" // 034 SavedNBytes - ,"\x01\x6e\x0d\x0a\x57\x72\x69\x74\x69\x6e\x67\x20\x49\x6e\x64\x65\x78\x20\x40\x45\x4c\x4c\x49\x50\x53\x49\x53\x40" // 035 WritingIndx - ,"\x01\x5b\x01\x6e\x01\x6d\x45\x2d\x6d\x61\x69\x6c\x20\x73\x65\x6e\x74\x20\x74\x6f\x20\x01\x68\x25\x73\x20\x01\x6e\x01\x6d\x23\x25" - "\x64\x2e\x01\x6e\x0d\x0a" // 036 Emailed - ,"\x01\x5b\x01\x6e\x01\x6d\x50\x6f\x73\x74\x65\x64\x20\x6f\x6e\x20\x01\x68\x25\x73\x01\x6e\x01\x6d\x20\x25\x73\x2e\x0d\x0a" // 037 Posted - ,"\x07\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x32\x64\x3a\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x73\x65\x6e\x74\x20\x79" - "\x6f\x75\x20\x45\x2d\x6d\x61\x69\x6c\x2e\x0d\x0a" // 038 EmailNodeMsg - ,"\x01\x6e\x0d\x0a\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x66\x6f\x72\x77\x61\x72\x64\x20\x6d\x61\x69\x6c\x2e\x0d\x0a" // 039 R_Forward - ,"\x01\x6e\x01\x6d\x46\x6f\x72\x77\x61\x72\x64\x65\x64\x20\x62\x79\x20\x01\x68\x25\x73\x01\x6e\x01\x6d\x20\x6f\x6e\x20\x01\x68\x25" - "\x73\x01\x6e\x0d\x0a" // 040 ForwardedFrom - ,"\x01\x6e\x01\x6d\x0d\x0a\x4d\x61\x69\x6c\x20\x66\x6f\x72\x77\x61\x72\x64\x65\x64\x20\x74\x6f\x20\x01\x68\x25\x73\x01\x6e\x0d\x0a" - "" // 041 Forwarded - ,"\x01\x62\x01\x68\x41\x75\x74\x6f\x20\x6d\x65\x73\x73\x61\x67\x65\x20\x62\x79\x3a\x20\x01\x63\x25\x73\x01\x62\x20\x6f\x6e\x20\x25" - "\x73\x01\x6e\x0d\x0a\x0d\x0a" // 042 AutoMsgBy - ,"\x0d\x0a\x41\x75\x74\x6f\x20\x4d\x65\x73\x73\x61\x67\x65\x01\x5c\x20\x7e\x52\x65\x61\x64\x2c\x20\x7e\x57\x72\x69\x74\x65\x2c\x20" - "\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 043 AutoMsg - ,"\x01\x6e\x0d\x0a\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x77\x72\x69\x74\x65\x20\x74\x6f\x20\x74\x68\x65\x20\x61\x75\x74\x6f\x2d" - "\x6d\x65\x73\x73\x61\x67\x65\x2e\x0d\x0a" // 044 R_AutoMsg - ,"\x01\x6e\x0d\x0a\x59\x6f\x75\x20\x68\x61\x76\x65\x20\x6e\x6f\x20\x25\x73\x2e\x0d\x0a" // 045 NoMailWaiting - ,"\x01\x5f\x0d\x0a\x01\x71\x01\x67\x01\x68\x4d\x61\x69\x6c\x20\x57\x61\x69\x74\x69\x6e\x67\x20\x28\x25\x73\x20\x66\x69\x72\x73\x74" - "\x29\x3a\x0d\x0a\x0d\x0a" // 046 MailWaitingLstHdr - ,"\x01\x67\x01\x68\x25\x34\x64\x20\x01\x6e\x01\x67\x25\x2d\x32\x35\x2e\x32\x35\x73\x20\x01\x68\x25\x63\x01\x6e\x01\x67\x20\x25\x73" - "\x0d\x0a" // 047 MailWaitingLstFmt - ,"\x01\x5f\x0d\x0a\x01\x79\x01\x68\x53\x74\x61\x72\x74\x20\x77\x69\x74\x68\x20\x6e\x75\x6d\x62\x65\x72\x20\x5b\x01\x77\x25\x75\x01" - "\x79\x5d\x3a\x20\x01\x77" // 048 StartWithN - ,"\x0d\x0a\x01\x6e\x01\x63\xfe\x20\x01\x62\x01\x68\x52\x65\x61\x64\x69\x6e\x67\x20\x45\x2d\x6d\x61\x69\x6c\x20\x01\x6e\x01\x63\xfe" - "\x20\x01\x62\x01\x68\x28\x01\x77\x01\x60\x3f\x01\x62\x3d\x4d\x65\x6e\x75\x29\x01\x5c\x20\x28\x01\x77\x25\x75\x01\x62\x20\x6f\x66" - "\x20\x01\x77\x25\x75\x01\x62\x29\x3a\x20\x01\x6e\x01\x7e" // 049 ReadingMail - ,"\x01\x6e\x0d\x0a\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x72\x65\x70\x6c\x79\x20\x74\x6f\x20\x74\x68\x69\x73\x20\x6d\x65\x73\x73" - "\x61\x67\x65\x2e\x0d\x0a" // 050 CantReplyToMsg - ,"\x20\x20\x01\x68\x01\x62\x52\x65\x01\x6e\x01\x62\x3a\x20\x01\x68\x01\x63\x40\x4d\x53\x47\x5f\x53\x55\x42\x4a\x45\x43\x54\x40\x01" - "\x6e\x0d\x0a\x0d\x0a" // 051 Regarding - ,"\x20\x20\x01\x68\x01\x62\x52\x65\x01\x6e\x01\x62\x3a\x20\x01\x68\x01\x63\x40\x4d\x53\x47\x5f\x53\x55\x42\x4a\x45\x43\x54\x40\x0d" - "\x0a\x20\x20\x01\x62\x42\x79\x01\x6e\x01\x62\x3a\x20\x01\x68\x01\x63\x40\x4d\x53\x47\x5f\x46\x52\x4f\x4d\x5f\x4e\x41\x4d\x45\x40" - "\x20\x01\x62\x6f\x6e\x20\x01\x63\x40\x4d\x53\x47\x5f\x44\x41\x54\x45\x40\x01\x6e\x0d\x0a\x0d\x0a" // 052 RegardingByOn - ,"\x20\x20\x01\x68\x01\x62\x52\x65\x01\x6e\x01\x62\x3a\x20\x01\x68\x01\x63\x40\x4d\x53\x47\x5f\x53\x55\x42\x4a\x45\x43\x54\x40\x0d" - "\x0a\x20\x20\x01\x62\x42\x79\x01\x6e\x01\x62\x3a\x20\x01\x68\x01\x63\x40\x4d\x53\x47\x5f\x46\x52\x4f\x4d\x5f\x4e\x41\x4d\x45\x40" - "\x20\x01\x62\x74\x6f\x20\x01\x63\x40\x4d\x53\x47\x5f\x54\x4f\x5f\x4e\x41\x4d\x45\x40\x20\x01\x62\x6f\x6e\x20\x01\x63\x40\x4d\x53" - "\x47\x5f\x44\x41\x54\x45\x40\x01\x6e\x0d\x0a\x0d\x0a" // 053 RegardingByToOn - ,"\x44\x65\x6c\x65\x74\x65\x20\x6d\x61\x69\x6c\x20\x66\x72\x6f\x6d\x20\x25\x73" // 054 DeleteMailQ - ,"\x4f\x4b" // 055 OK - ,"\x0d\x0a\x01\x5f\x01\x62\x01\x68\x46\x6f\x72\x77\x61\x72\x64\x20\x6d\x61\x69\x6c\x20\x74\x6f\x01\x5c\x3a\x20\x01\x77" // 056 ForwardMailTo - ,"\x53\x61\x76\x65\x2f\x41\x70\x70\x65\x6e\x64\x20\x6d\x65\x73\x73\x61\x67\x65\x20\x74\x6f\x20\x61\x6e\x6f\x74\x68\x65\x72\x20\x66" - "\x69\x6c\x65" // 057 SaveMsgToFile - ,"\x01\x5f\x01\x79\x01\x68\x50\x61\x74\x68\x2f\x46\x69\x6c\x65\x6e\x61\x6d\x65\x20\x74\x6f\x20\x77\x72\x69\x74\x65\x20\x74\x6f\x01" - "\x5c\x3a\x20\x01\x6e" // 058 FileToWriteTo - ,"\x01\x6e\x0d\x0a\x59\x6f\x75\x20\x68\x61\x76\x65\x20\x6e\x6f\x20\x73\x65\x6e\x74\x20\x6d\x65\x73\x73\x61\x67\x65\x73\x20\x70\x65" - "\x6e\x64\x69\x6e\x67\x2e\x0d\x0a" // 059 NoMailSent - ,"\x0d\x0a\x01\x71\x01\x67\x01\x68\x4d\x61\x69\x6c\x20\x74\x68\x61\x74\x20\x79\x6f\x75\x27\x76\x65\x20\x73\x65\x6e\x74\x20\x73\x74" - "\x69\x6c\x6c\x20\x70\x65\x6e\x64\x69\x6e\x67\x01\x5c\x20\x28\x25\x73\x20\x66\x69\x72\x73\x74\x29\x3a\x0d\x0a\x0d\x0a\x01\x6e" // 060 MailSentLstHdr - ,"\x01\x6e\x0d\x0a\x01\x63\xfe\x20\x01\x68\x01\x62\x52\x65\x61\x64\x69\x6e\x67\x20\x53\x65\x6e\x74\x20\x45\x2d\x6d\x61\x69\x6c\x20" - "\x01\x6e\x01\x63\xfe\x20\x01\x68\x01\x62\x28\x01\x77\x01\x60\x3f\x01\x62\x3d\x4d\x65\x6e\x75\x29\x01\x5c\x20\x28\x01\x77\x25\x75" - "\x01\x62\x20\x6f\x66\x20\x01\x77\x25\x75\x01\x62\x29\x3a\x20\x01\x6e\x01\x7e" // 061 ReadingSentMail - ,"\x01\x68\x01\x3f\x01\x6d\x49\x6e\x74\x65\x72\x6e\x65\x74\x20\x4d\x61\x69\x6c\x20\x54\x6f\x3a\x20\x01\x77\x25\x73\x01\x6d\x0d\x0a" - "\x46\x72\x6f\x6d\x3a\x20\x01\x77\x25\x73\x0d\x0a" // 062 InternetMailing - ,"\x01\x6e\x0d\x0a\x4e\x6f\x20\x6d\x61\x69\x6c\x20\x6f\x6e\x20\x73\x79\x73\x74\x65\x6d\x2e\x0d\x0a" // 063 NoMailOnSystem - ,"\x01\x6e\x0d\x0a\x01\x63\xfe\x20\x01\x68\x01\x62\x52\x65\x61\x64\x69\x6e\x67\x20\x41\x6c\x6c\x20\x45\x2d\x6d\x61\x69\x6c\x20\x01" - "\x6e\x01\x63\xfe\x20\x01\x68\x01\x62\x28\x01\x77\x25\x75\x20\x01\x62\x6f\x66\x20\x01\x77\x25\x75\x01\x62\x29\x3a\x20\x01\x6e" // 064 ReadingAllMail - ,"\x01\x5f\x0d\x0a\x01\x67\x01\x68\x20\x20\x20\x20\x20\x20\x46\x72\x6f\x6d\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20" - "\x20\x20\x20\x20\x20\x54\x6f\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x41\x20\x53\x75" - "\x62\x6a\x65\x63\x74\x0d\x0a\x01\x6e" // 065 MailOnSystemLstHdr - ,"\x01\x67\x01\x68\x25\x35\x64\x01\x6e\x01\x67\x20\x25\x2d\x32\x32\x2e\x32\x32\x73\x20\x25\x2d\x32\x32\x2e\x32\x32\x73\x20\x01\x68" - "\x25\x63\x01\x6e\x01\x67\x20\x25\x73\x0d\x0a" // 066 MailOnSystemLstFmt - ,"\x01\x2d\x0d\x0a\x01\x63\x25\x2d\x31\x35\x2e\x31\x35\x73\x20\x01\x79\x01\x68\x25\x2d\x34\x34\x2e\x34\x34\x73\x20\x01\x6e\x01\x63" - "\x4e\x65\x77\x3a\x01\x68\x25\x35\x75\x20\x01\x6e\x01\x63\x6f\x66\x01\x68\x20\x25\x2d\x75" // 067 NScanStatusFmt - ,"\x01\x2d\x0d\x0a\x01\x63\x25\x2d\x32\x30\x73\x20\x01\x79\x01\x68\x25\x2d\x35\x30\x73\x20\x01\x77\x25\x36\x75" // 068 SearchSubFmt - ,"\x0d\x0a\x4e\x6f\x20\x6d\x65\x73\x73\x61\x67\x65\x73\x20\x68\x61\x76\x65\x20\x62\x65\x65\x6e\x20\x70\x6f\x73\x74\x65\x64\x20\x6f" - "\x6e\x20\x25\x73\x20\x25\x73\x0d\x0a" // 069 NoMsgsOnSub - ,"\x0d\x0a\x01\x6e\x01\x63\x50\x6f\x73\x74\x20\x3a\x20\x5b\x01\x68\x25\x75\x01\x6e\x01\x63\x5d\x5b\x01\x68\x25\x75\x01\x6e\x01\x63" - "\x5d\x20\x01\x68\x25\x75\x01\x6e\x01\x63\x2f\x01\x68\x25\x75" // 070 ZScanPostHdr - ,"\x01\x6e\x0d\x0a\x01\x63\xfe\x20\x01\x68\x01\x62\x52\x65\x61\x64\x69\x6e\x67\x20\x01\x6e\x01\x63\xfe\x20\x25\x34\x75\x08\x08\x08" - "\x08\x25\x73\x01\x5c\x20\x25\x34\x75\x08\x08\x08\x08\x01\x68\x25\x73\x20\x01\x6e\x01\x63\x28\x01\x68\x01\x60\x3f\x01\x6e\x01\x63" - "\x3d\x4d\x65\x6e\x75\x29\x20\x28\x01\x68\x25\x75\x01\x6e\x01\x63\x20\x6f\x66\x20\x01\x68\x25\x75\x01\x6e\x01\x63\x29\x3a\x20\x01" - "\x6e\x01\x7e" // 071 ReadingSub - ,"\x0d\x0a\x59\x6f\x75\x20\x64\x69\x64\x6e\x27\x74\x20\x70\x6f\x73\x74\x20\x6d\x65\x73\x73\x61\x67\x65\x20\x23\x25\x64\x0d\x0a" // 072 YouDidntPostMsgN - ,"\x01\x3f\x44\x65\x6c\x65\x74\x65\x20\x6d\x65\x73\x73\x61\x67\x65\x20\x23\x25\x75\x20\x27\x25\x73\x27" // 073 DeletePostQ - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x49\x01\x6e\x01\x62\x5d\x20\x01\x68\x41\x75\x74\x6f\x4c\x6f\x67\x6f\x6e\x20\x76\x69\x61\x20" - "\x49\x50\x20\x61\x64\x64\x72\x65\x73\x73\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 074 UserDefaultsAutoLogon - ,"\x01\x6e\x0d\x0a\x01\x6d\x25\x73\x20\x73\x65\x6e\x74\x20\x74\x6f\x20\x01\x68\x25\x73\x20\x23\x25\x75\x0d\x0a" // 075 MsgSentToUser - ,"\x01\x5f\x0d\x0a\x01\x79\x01\x68\x54\x65\x78\x74\x20\x74\x6f\x20\x73\x65\x61\x72\x63\x68\x20\x66\x6f\x72\x01\x5c\x3a\x20" // 076 SearchStringPrompt - ,"\x01\x77\x01\x68\xc4\xc4\xc4\xc4\xc4\x5b\x01\x69\x01\x72\x25\x63\x01\x6e\x01\x68\x5d\xc4\xc4\xc4\xc4\xb4\x20\x01\x79\x50\x72\x69" - "\x76\x61\x74\x65\x20\x43\x68\x61\x74\x20\x2d\x20\x01\x72\x43\x74\x72\x6c\x2d\x43\x20\x74\x6f\x20\x51\x75\x69\x74\x20\x01\x79\x2d" - "\x20\x54\x69\x6d\x65\x20\x4c\x65\x66\x74\x3a\x20\x01\x67\x25\x2d\x38\x73\x01\x77\x20\xc3\xc4\xc4\xc4\xc4\x5b\x01\x69\x01\x62\x25" - "\x63\x01\x6e\x01\x68\x5d\xc4\xc4\xc4\xc4\xc4" // 077 PrivateChatSeparator - ,"\x01\x67\x01\x68\x25\x35\x75\x01\x6e\x01\x67\x20\x25\x2d\x32\x32\x2e\x32\x32\x73\x20\x25\x2d\x32\x32\x2e\x32\x32\x73\x20\x01\x68" - "\x25\x63\x01\x6e\x01\x67\x20\x25\x73\x0d\x0a" // 078 SubMsgLstFmt - ,"\x01\x77\x01\x68\xc4\xc4\xc4\xc4\xc4\x5b\x01\x69\x01\x72\x25\x63\x01\x6e\x01\x68\x5d\xc4\xc4\xc4\xc4\xb4\x20\x01\x72\x53\x70\x6c" - "\x69\x74\x2d\x53\x63\x72\x65\x65\x6e\x20\x01\x63\x53\x79\x73\x6f\x70\x01\x72\x20\x43\x68\x61\x74\x20\x20\x20\x20\x20\x20\x20\x20" - "\x20\x20\x01\x79\x54\x69\x6d\x65\x20\x4c\x65\x66\x74\x3a\x20\x01\x67\x25\x2d\x38\x73\x01\x77\x20\xc3\xc4\xc4\xc4\xc4\x5b\x01\x69" - "\x01\x62\x25\x63\x01\x6e\x01\x68\x5d\xc4\xc4\xc4\xc4\xc4" // 079 SysopChatSeparator - ,"\x0d\x0a\x0d\x0a\x4e\x6f\x20\x74\x65\x78\x74\x20\x66\x69\x6c\x65\x20\x73\x65\x63\x74\x69\x6f\x6e\x73\x20\x61\x76\x61\x69\x6c\x61" - "\x62\x6c\x65\x2e\x0d\x0a" // 080 NoTextSections - ,"\x01\x6c\x01\x5f\x01\x63\x01\x68\x47\x65\x6e\x65\x72\x61\x6c\x20\x54\x65\x78\x74\x20\x46\x69\x6c\x65\x20\x53\x65\x63\x74\x69\x6f" - "\x6e\x73\x3a\x0d\x0a\x0d\x0a" // 081 TextSectionLstHdr - ,"\x01\x6e\x01\x63\x3c\x01\x68\x25\x64\x01\x6e\x01\x63\x3e\x20\x25\x73\x0d\x0a" // 082 TextSectionLstFmt - ,"\x0d\x0a\x40\x4d\x4e\x45\x3a\x43\x40\x40\x57\x68\x69\x63\x68\x40\x20\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 083 WhichTextSection - ,"\x01\x6c\x01\x5f\x01\x63\x01\x68\x25\x73\x20\x46\x69\x6c\x65\x73\x3a\x0d\x0a\x0d\x0a" // 084 TextFilesLstHdr - ,"\x01\x63\x01\x68\x25\x33\x64\x3a\x20\x01\x6e\x01\x63\x25\x73" // 085 TextFilesLstFmt - ,"\x0d\x0a\x40\x4d\x4e\x45\x3a\x43\x40\x40\x57\x68\x69\x63\x68\x40\x2c\x20\x7e\x41\x64\x64\x2c\x20\x7e\x52\x65\x6d\x6f\x76\x65\x2c" - "\x20\x7e\x45\x64\x69\x74\x2c\x20\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 086 WhichTextFileSysop - ,"\x0d\x0a\x40\x4d\x4e\x45\x3a\x43\x40\x40\x57\x68\x69\x63\x68\x40\x20\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 087 WhichTextFile - ,"\x01\x5f\x0d\x0a\x01\x79\x01\x68\x42\x65\x66\x6f\x72\x65\x20\x77\x68\x69\x63\x68\x20\x66\x69\x6c\x65\x20\x5b\x6c\x61\x73\x74\x5d" - "\x3a\x20\x01\x6e" // 088 AddTextFileBeforeWhich - ,"\x0d\x0a\x50\x61\x74\x68\x20\x61\x6e\x64\x20\x66\x69\x6c\x65\x6e\x61\x6d\x65\x20\x28\x6e\x6f\x20\x70\x61\x74\x68\x20\x69\x6e\x64" - "\x69\x63\x61\x74\x65\x73\x20\x25\x73\x74\x65\x78\x74\x2f\x25\x73\x2f\x66\x69\x6c\x65\x6e\x61\x6d\x65\x29\x3a\x0d\x0a" // 089 AddTextFilePath - ,"\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3a\x0d\x0a" // 090 AddTextFileDesc - ,"\x01\x5f\x0d\x0a\x01\x79\x01\x68\x52\x65\x6d\x6f\x76\x65\x20\x40\x57\x68\x69\x63\x68\x40\x3a\x20\x01\x6e" // 091 RemoveWhichTextFile - ,"\x44\x65\x6c\x65\x74\x65\x20\x25\x73" // 092 DeleteTextFileQ - ,"\x01\x5f\x0d\x0a\x01\x79\x01\x68\x45\x64\x69\x74\x20\x40\x57\x68\x69\x63\x68\x40\x3a\x20\x01\x6e" // 093 EditWhichTextFile - ,"\x0d\x0a\x53\x65\x61\x72\x63\x68\x20\x61\x6c\x6c\x20\x67\x72\x6f\x75\x70\x73\x20\x66\x6f\x72\x20\x6e\x65\x77\x20\x6d\x65\x73\x73" - "\x61\x67\x65\x73" // 094 NScanAllGrpsQ - ,"\x0d\x0a\x53\x65\x61\x72\x63\x68\x20\x61\x6c\x6c\x20\x67\x72\x6f\x75\x70\x73\x20\x66\x6f\x72\x20\x75\x6e\x2d\x72\x65\x61\x64\x20" - "\x6d\x65\x73\x73\x61\x67\x65\x73\x20\x74\x6f\x20\x79\x6f\x75" // 095 SScanAllGrpsQ - ,"\x0d\x0a\x41\x72\x65\x20\x79\x6f\x75\x20\x73\x75\x72\x65" // 096 AreYouSureQ - ,"\x0d\x0a\x0d\x0a\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x63\x68\x61\x74\x2e\x0d\x0a" // 097 R_Chat - ,"\x52\x45\x3a\x20\x46\x65\x65\x64\x62\x61\x63\x6b\x0d\x0a\x0d\x0a" // 098 ReFeedback - ,"\x0d\x0a\x01\x67\x01\x68\x53\x79\x73\x74\x65\x6d\x20\x49\x6e\x66\x6f\x72\x6d\x61\x74\x69\x6f\x6e\x3a\x0d\x0a\x0d\x0a\x01\x68" // 099 SiHdr - ,"\x01\x62\x01\x68\x53\x79\x73\x74\x65\x6d\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 100 SiSysName - ,"\x01\x62\x51\x57\x4b\x20\x49\x44\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 101 SiSysID - ,"\x01\x62\x46\x69\x64\x6f\x4e\x65\x74\x20\x41\x64\x64\x72\x65\x73\x73\x20\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 102 SiSysFaddr - ,"\x01\x62\x50\x6f\x73\x74\x4c\x69\x6e\x6b\x20\x53\x69\x74\x65\x20\x20\x20\x3a\x20\x01\x63\x25\x73\x20\x25\x75\x0d\x0a" // 103 SiSysPsite - ,"\x01\x62\x4c\x6f\x63\x61\x74\x69\x6f\x6e\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 104 SiSysLocation - ,"\x01\x62\x4f\x70\x65\x72\x61\x74\x6f\x72\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 105 SiSysop - ,"\x01\x62\x4e\x6f\x64\x65\x73\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x75\x0d\x0a" // 106 SiSysNodes - ,"\x01\x62\x4e\x6f\x64\x65\x20\x23\x01\x63\x25\x2d\x33\x64\x20\x20\x20\x20\x20\x20\x20\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 107 SiNodeNumberName - ,"\x01\x62\x4e\x6f\x64\x65\x20\x50\x68\x6f\x6e\x65\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 108 SiNodePhone - ,"\x01\x62\x54\x6f\x74\x61\x6c\x20\x4c\x6f\x67\x6f\x6e\x73\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 109 SiTotalLogons - ,"\x01\x62\x4c\x6f\x67\x6f\x6e\x73\x20\x54\x6f\x64\x61\x79\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 110 SiLogonsToday - ,"\x01\x62\x54\x6f\x74\x61\x6c\x20\x54\x69\x6d\x65\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x73\x20\x6d\x69\x6e\x75\x74\x65\x73" - "\x0d\x0a" // 111 SiTotalTime - ,"\x01\x62\x54\x69\x6d\x65\x20\x54\x6f\x64\x61\x79\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x73\x20\x6d\x69\x6e\x75\x74\x65\x73" - "\x0d\x0a" // 112 SiTimeToday - ,"\x0d\x0a\x56\x69\x65\x77\x20\x73\x79\x73\x74\x65\x6d\x20\x69\x6e\x66\x6f\x72\x6d\x61\x74\x69\x6f\x6e\x20\x66\x69\x6c\x65\x01\x5c" - "" // 113 ViewSysInfoFileQ - ,"\x56\x69\x65\x77\x20\x6c\x6f\x67\x6f\x6e\x20\x6d\x65\x73\x73\x61\x67\x65" // 114 ViewLogonMsgQ - ,"\x0d\x0a\x0d\x0a\x53\x6f\x72\x72\x79\x2c\x20\x79\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x72\x65\x61\x64\x20\x6d\x61\x69\x6c\x20\x79" - "\x6f\x75\x27\x76\x65\x20\x73\x65\x6e\x74\x2e\x0d\x0a" // 115 R_ReadSentMail - ,"\x0d\x0a\x01\x77\x01\x68\x4d\x65\x73\x73\x61\x67\x65\x20\x53\x63\x61\x6e\x20" // 116 MessageScan - ,"\x01\x6e\x01\x63\x28\x01\x68\x25\x75\x20\x01\x6e\x01\x63\x73\x75\x62\x2d\x62\x6f\x61\x72\x64\x73\x29\x01\x68\x01\x77\x20\x63\x6f" - "\x6d\x70\x6c\x65\x74\x65\x2e\x0d\x0a" // 117 MessageScanComplete - ,"\x01\x72\x01\x69\x61\x62\x6f\x72\x74\x65\x64\x2e\x01\x6e\x0d\x0a" // 118 MessageScanAborted - ,"\x0d\x0a\x4c\x6f\x67\x20\x6f\x66\x66" // 119 LogOffQ - ,"\x0d\x0a\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x70\x6f\x73\x74\x20\x6f\x6e\x20\x74\x68\x69\x73\x20\x73\x75\x62\x2e\x0d\x0a" // 120 CantPostOnSub - ,"\x01\x6e\x01\x3f\x01\x6d\x53\x65\x6e\x64\x69\x6e\x67\x20\x6d\x65\x73\x73\x61\x67\x65\x20\x74\x6f\x20\x01\x68\x25\x73\x0d\x0a" // 121 SendingMessageToUser - ,"\x0d\x0a\x01\x72\x01\x68\x4e\x6f\x20\x6f\x74\x68\x65\x72\x20\x61\x63\x74\x69\x76\x65\x20\x6e\x6f\x64\x65\x73\x2e\x01\x6e\x0d\x0a" - "" // 122 NoOtherActiveNodes - ,"\x01\x3f\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x75\x73\x65\x20\x74\x68\x65\x20\x65\x78\x74\x65\x72\x6e\x61\x6c\x20\x70\x72\x6f" - "\x67\x72\x61\x6d\x73\x2e\x0d\x0a" // 123 R_ExternalPrograms - ,"\x0d\x0a\x01\x2d\x01\x67\x55\x73\x61\x67\x65\x20\x53\x74\x61\x74\x69\x73\x74\x69\x63\x73\x20\x66\x6f\x72\x20\x01\x68\x25\x73\x20" - "\x23\x25\x64\x01\x6e\x0d\x0a\x0d\x0a" // 124 UserStats - ,"\x01\x2d\x01\x67\x53\x75\x62\x2d\x62\x6f\x61\x72\x64\x73\x20\x6f\x66\x20\x01\x68\x25\x2d\x34\x30\x73\x20\x20\x20\x20\x20\x20\x20" - "\x01\x6e\x01\x67\x50\x6f\x73\x74\x73\x0d\x0a\x0d\x0a\x01\x68" // 125 SubLstHdr - ,"\x01\x6e\x01\x67\x5b\x01\x68\x25\x75\x01\x6e\x01\x67\x5d\x20\x25\x2d\x34\x30\x73\x20\x25\x31\x32\x73\x20\x01\x68\x25\x35\x75\x0d" - "\x0a" // 126 SubLstFmt - ,"\x0d\x0a\x01\x71\x01\x5f\x01\x67\x01\x68\x4d\x65\x73\x73\x61\x67\x65\x20\x47\x72\x6f\x75\x70\x73\x01\x6e\x01\x67\x20\x20\x20\x20" - "\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20" - "\x20\x20\x20\x20\x20\x20\x20\x20\x53\x75\x62\x2d\x62\x6f\x61\x72\x64\x73\x0d\x0a\x0d\x0a\x01\x68" // 127 GrpLstHdr - ,"\x01\x6e\x01\x67\x5b\x01\x68\x25\x75\x01\x6e\x01\x67\x5d\x20\x25\x2d\x34\x30\x73\x20\x25\x31\x32\x73\x20\x01\x68\x25\x34\x75\x0d" - "\x0a" // 128 GrpLstFmt - ,"\x0d\x0a\x47\x72\x6f\x75\x70\x20\x74\x6f\x20\x63\x6f\x6e\x66\x69\x67\x75\x72\x65\x20\x6e\x65\x77\x20\x6d\x65\x73\x73\x61\x67\x65" - "\x20\x73\x63\x61\x6e\x20\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 129 NScanCfgWhichGrp - ,"\x0d\x0a\x47\x72\x6f\x75\x70\x20\x74\x6f\x20\x63\x6f\x6e\x66\x69\x67\x75\x72\x65\x20\x79\x6f\x75\x72\x20\x6d\x65\x73\x73\x61\x67" - "\x65\x20\x73\x63\x61\x6e\x20\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 130 SScanCfgWhichGrp - ,"\x01\x6c\x01\x2d\x01\x67\x53\x75\x62\x2d\x62\x6f\x61\x72\x64\x73\x20\x6f\x66\x20\x01\x68\x25\x73\x3a\x0d\x0a\x0d\x0a\x01\x68" // 131 CfgSubLstHdr - ,"\x01\x6e\x01\x67\x5b\x01\x68\x25\x64\x01\x6e\x01\x67\x5d\x20\x25\x2d\x34\x30\x2e\x34\x30\x73\x20\x20\x01\x68\x25\x73\x0d\x0a" // 132 CfgSubLstFmt - ,"\x01\x6c\x01\x5f\x01\x67\x01\x68\x4d\x65\x73\x73\x61\x67\x65\x20\x47\x72\x6f\x75\x70\x73\x3a\x0d\x0a\x0d\x0a" // 133 CfgGrpLstHdr - ,"\x01\x6e\x01\x67\x5b\x01\x68\x25\x64\x01\x6e\x01\x67\x5d\x20\x25\x73\x01\x68\x0d\x0a" // 134 CfgGrpLstFmt - ,"\x0d\x0a\x53\x75\x62\x2d\x62\x6f\x61\x72\x64\x20\x74\x6f\x20\x74\x6f\x67\x67\x6c\x65\x20\x6e\x65\x77\x20\x6d\x65\x73\x73\x61\x67" - "\x65\x20\x73\x63\x61\x6e\x2c\x20\x7e\x40\x41\x6c\x6c\x40\x2c\x20\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 135 NScanCfgWhichSub - ,"\x0d\x0a\x53\x75\x62\x2d\x62\x6f\x61\x72\x64\x20\x74\x6f\x20\x74\x6f\x67\x67\x6c\x65\x20\x79\x6f\x75\x72\x20\x6d\x65\x73\x73\x61" - "\x67\x65\x20\x73\x63\x61\x6e\x2c\x20\x7e\x40\x41\x6c\x6c\x40\x2c\x20\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 136 SScanCfgWhichSub - ,"\x01\x6e\x01\x67\x5b\x01\x68\x25\x64\x01\x6e\x01\x67\x5d\x20\x25\x2d\x34\x30\x2e\x34\x30\x73\x20\x20\x01\x68\x01\x63\x25\x73\x0d" - "\x0a" // 137 SubPtrLstFmt - ,"\x0d\x0a\x53\x65\x74\x20\x6e\x65\x77\x2d\x73\x63\x61\x6e\x20\x70\x6f\x69\x6e\x74\x65\x72\x20\x66\x6f\x72\x01\x5c\x20\x40\x57\x68" - "\x69\x63\x68\x40\x2c\x20\x7e\x40\x41\x6c\x6c\x40\x2c\x20\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 138 WhichOrAll - ,"\x0d\x0a\x52\x61\x77\x20\x49\x6e\x70\x75\x74\x2f\x4f\x75\x74\x70\x75\x74\x20\x4d\x6f\x64\x65\x20\x69\x73\x20\x6e\x6f\x77\x3a\x20" - "\x01\x68" // 139 RawMsgInputModeIsNow - ,"\x4f\x46\x46" // 140 Unused140 - ,"\x4f\x4e" // 141 Unused141 - ,"\x0d\x0a\x01\x6e\x01\x6d\x50\x61\x67\x69\x6e\x67\x20\x01\x68\x25\x73\x20\x23\x25\x75\x01\x6e\x01\x6d\x20\x66\x6f\x72\x20\x70\x72" - "\x69\x76\x61\x74\x65\x20\x63\x68\x61\x74\x0d\x0a" // 142 PagingUser - ,"\x0d\x0a\x01\x2d\x01\x67\x53\x79\x73\x74\x65\x6d\x20\x53\x74\x61\x74\x69\x73\x74\x69\x63\x73\x3a\x0d\x0a\x0d\x0a\x01\x6e" // 143 SystemStatsHdr - ,"\x0d\x0a\x01\x2d\x01\x67\x4e\x6f\x64\x65\x20\x23\x25\x64\x20\x53\x74\x61\x74\x69\x73\x74\x69\x63\x73\x3a\x0d\x0a\x0d\x0a\x01\x6e" - "" // 144 NodeStatsHdr - ,"\x54\x6f\x74\x61\x6c\x20\x4c\x6f\x67\x6f\x6e\x73\x20\x20\x20\x20\x3a\x20\x25\x73\x0d\x0a" // 145 StatsTotalLogons - ,"\x4c\x6f\x67\x6f\x6e\x73\x20\x54\x6f\x64\x61\x79\x20\x20\x20\x20\x3a\x20\x25\x73\x0d\x0a" // 146 StatsLogonsToday - ,"\x54\x6f\x74\x61\x6c\x20\x54\x69\x6d\x65\x20\x20\x20\x20\x20\x20\x3a\x20\x25\x73\x20\x6d\x69\x6e\x75\x74\x65\x73\x0d\x0a" // 147 StatsTotalTime - ,"\x54\x69\x6d\x65\x20\x54\x6f\x64\x61\x79\x20\x20\x20\x20\x20\x20\x3a\x20\x25\x73\x20\x6d\x69\x6e\x75\x74\x65\x73\x0d\x0a" // 148 StatsTimeToday - ,"\x55\x70\x6c\x6f\x61\x64\x73\x20\x54\x6f\x64\x61\x79\x20\x20\x20\x3a\x20\x25\x73\x20\x62\x79\x74\x65\x73\x20\x69\x6e\x20\x25\x75" - "\x20\x66\x69\x6c\x65\x73\x0d\x0a" // 149 StatsUploadsToday - ,"\x44\x6f\x77\x6e\x6c\x6f\x61\x64\x73\x20\x54\x6f\x64\x61\x79\x20\x3a\x20\x25\x73\x20\x62\x79\x74\x65\x73\x20\x69\x6e\x20\x25\x75" - "\x20\x66\x69\x6c\x65\x73\x0d\x0a" // 150 StatsDownloadsToday - ,"\x50\x6f\x73\x74\x73\x20\x54\x6f\x64\x61\x79\x20\x20\x20\x20\x20\x3a\x20\x25\x73\x0d\x0a" // 151 StatsPostsToday - ,"\x45\x2d\x6d\x61\x69\x6c\x73\x20\x54\x6f\x64\x61\x79\x20\x20\x20\x3a\x20\x25\x73\x0d\x0a" // 152 StatsEmailsToday - ,"\x46\x65\x65\x64\x62\x61\x63\x6b\x20\x54\x6f\x64\x61\x79\x20\x20\x3a\x20\x25\x73\x0d\x0a" // 153 StatsFeedbacksToday - ,"\x01\x5f\x0d\x0a\x01\x79\x01\x68\x43\x68\x61\x6e\x67\x65\x20\x74\x6f\x20\x28\x55\x73\x65\x72\x20\x4e\x61\x6d\x65\x20\x6f\x72\x20" - "\x4e\x75\x6d\x62\x65\x72\x29\x01\x5c\x3a\x20\x01\x6e" // 154 ChUserPrompt - ,"\x50\x57\x3a\x20" // 155 ChUserPwPrompt - ,"\x0d\x0a\x59\x6f\x75\x20\x6d\x75\x73\x74\x20\x69\x6e\x63\x6c\x75\x64\x65\x20\x61\x20\x63\x6f\x6d\x6d\x61\x20\x69\x6e\x20\x79\x6f" - "\x75\x72\x20\x6c\x6f\x63\x61\x74\x69\x6f\x6e\x2e\x0d\x0a" // 156 CommaInLocationRequired - ,"\x0d\x0a\x45\x72\x72\x6f\x72\x20\x6c\x6f\x67\x3a\x0d\x0a" // 157 ErrorLogHdr - ,"\x44\x65\x6c\x65\x74\x65\x20\x65\x72\x72\x6f\x72\x20\x6c\x6f\x67" // 158 DeleteErrorLogQ - ,"\x0d\x0a\x01\x6e\x01\x72\x01\x68\x44\x69\x72\x65\x63\x74\x6f\x72\x79\x20\x64\x6f\x65\x73\x20\x6e\x6f\x74\x20\x65\x78\x69\x73\x74" - "\x3a\x20\x01\x63\x25\x73\x01\x6e\x0d\x0a" // 159 DirectoryDoesNotExist - ,"\x0d\x0a\x43\x6c\x65\x61\x72\x20\x63\x72\x69\x74\x69\x63\x61\x6c\x20\x65\x72\x72\x6f\x72\x20\x63\x6f\x75\x6e\x74\x65\x72\x73\x20" - "\x6f\x6e\x20\x61\x6c\x6c\x20\x6e\x6f\x64\x65\x73" // 160 ClearErrCounter - ,"\x0d\x0a\x49\x6e\x76\x61\x6c\x69\x64\x20\x6e\x6f\x64\x65\x2e\x0d\x0a" // 161 InvalidNode - ,"\x01\x6e\x01\x3f\x01\x6d\x53\x65\x6e\x64\x69\x6e\x67\x20\x74\x65\x6c\x65\x67\x72\x61\x6d\x20\x74\x6f\x20\x01\x68\x25\x73\x20\x23" - "\x25\x75\x01\x6e\x01\x6d\x0d\x0a\x28\x4d\x61\x78\x69\x6d\x75\x6d\x20\x6f\x66\x20\x35\x20\x6c\x69\x6e\x65\x73\x2c\x20\x42\x6c\x61" - "\x6e\x6b\x20\x6c\x69\x6e\x65\x20\x65\x6e\x64\x73\x2c\x20\x43\x74\x72\x6c\x2d\x43\x20\x74\x6f\x20\x61\x62\x6f\x72\x74\x29\x3a\x0d" - "\x0a\x01\x67\x01\x68" // 162 SendingTelegramToUser - ,"\x44\x65\x6c\x65\x74\x65\x20\x47\x75\x72\x75\x20\x66\x69\x6c\x65" // 163 DeleteGuruLogQ - ,"\x01\x6e\x01\x67\x07\x54\x65\x6c\x65\x67\x72\x61\x6d\x20\x66\x72\x6f\x6d\x20\x01\x6e\x01\x68\x25\x73\x01\x6e\x01\x67\x20\x6f\x6e" - "\x20\x25\x73\x3a\x0d\x0a\x01\x68" // 164 TelegramFmt - ,"\x01\x3f\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x2e\x0d\x0a" // 165 R_Download - ,"\x01\x2f\x01\x77\x01\x68\x53\x65\x61\x72\x63\x68\x69\x6e\x67\x20\x63\x75\x72\x72\x65\x6e\x74\x20\x6c\x69\x62\x72\x61\x72\x79\x20" - "\x40\x45\x4c\x4c\x49\x50\x53\x49\x53\x40\x0d\x0a\x01\x71" // 166 SearchingAllDirs - ,"\x01\x77\x01\x68\x53\x65\x61\x72\x63\x68\x69\x6e\x67\x20\x61\x6c\x6c\x20\x6c\x69\x62\x72\x61\x72\x69\x65\x73\x20\x40\x45\x4c\x4c" - "\x49\x50\x53\x49\x53\x40\x0d\x0a\x01\x71" // 167 SearchingAllLibs - ,"\x0d\x0a\x01\x77\x01\x68\x25\x75\x20\x46\x69\x6c\x65\x73\x20\x4c\x69\x73\x74\x65\x64\x2e\x0d\x0a" // 168 NFilesListed - ,"\x01\x3f\x01\x77\x01\x68\x45\x6d\x70\x74\x79\x20\x64\x69\x72\x65\x63\x74\x6f\x72\x79\x2e\x0d\x0a" // 169 EmptyDir - ,"\x01\x3f\x01\x63\x53\x65\x61\x72\x63\x68\x69\x6e\x67\x20\x66\x6f\x72\x20\x66\x69\x6c\x65\x73\x20\x75\x70\x6c\x6f\x61\x64\x65\x64" - "\x20\x61\x66\x74\x65\x72\x01\x5c\x20\x01\x68\x25\x73\x01\x6e\x0d\x0a" // 170 NScanHdr - ,"\x01\x3f\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x72\x65\x6d\x6f\x76\x65\x20\x66\x69\x6c\x65\x73\x2e\x0d\x0a" // 171 R_RemoveFiles - ,"\x01\x3f\x54\x68\x69\x73\x20\x64\x69\x72\x65\x63\x74\x6f\x72\x79\x20\x69\x73\x20\x66\x75\x6c\x6c\x2e\x0d\x0a" // 172 DirFull - ,"\x01\x3f\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x75\x70\x6c\x6f\x61\x64\x2e\x0d\x0a" // 173 R_Upload - ,"\x01\x3f\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x75\x70\x6c\x6f\x61\x64\x20\x68\x65\x72\x65\x2e\x0d\x0a" // 174 CantUploadHere - ,"\x01\x5f\x01\x3f\x01\x79\x01\x68\x46\x69\x6c\x65\x73\x70\x65\x63\x3a\x20\x01\x6e\x01\x7e" // 175 FileSpec - ,"\x53\x59\x3a\x20" // 176 SystemPassword - ,"\x01\x3f\x4e\x6f\x20\x73\x79\x73\x6f\x70\x20\x64\x69\x72\x65\x63\x74\x6f\x72\x79\x20\x69\x73\x20\x63\x6f\x6e\x66\x69\x67\x75\x72" - "\x65\x64\x2e\x0d\x0a" // 177 NoSysopDir - ,"\x01\x3f\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x75\x70\x6c\x6f\x61\x64\x20\x74\x6f\x20\x74\x68\x65\x20\x73\x79\x73\x6f\x70\x2e" - "\x0d\x0a" // 178 CantUploadToSysop - ,"\x01\x2d\x01\x67\x44\x69\x72\x65\x63\x74\x6f\x72\x69\x65\x73\x20\x6f\x66\x20\x01\x68\x25\x2d\x34\x30\x2e\x34\x30\x73\x20\x20\x20" - "\x20\x20\x01\x6e\x01\x67\x46\x69\x6c\x65\x73\x0d\x0a\x0d\x0a\x01\x68" // 179 DirLstHdr - ,"\x01\x6e\x01\x67\x28\x01\x68\x25\x75\x01\x6e\x01\x67\x29\x20\x25\x2d\x34\x30\x2e\x34\x30\x73\x20\x25\x31\x32\x2e\x31\x32\x73\x20" - "\x01\x68\x25\x34\x75\x0d\x0a" // 180 DirLstFmt - ,"\x0d\x0a\x01\x71\x01\x5f\x01\x67\x01\x68\x46\x69\x6c\x65\x20\x4c\x69\x62\x72\x61\x72\x69\x65\x73\x20\x01\x6e\x01\x67\x20\x20\x20" - "\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20" - "\x20\x20\x20\x20\x20\x20\x20\x44\x69\x72\x65\x63\x74\x6f\x72\x69\x65\x73\x0d\x0a\x0d\x0a\x01\x68" // 181 LibLstHdr - ,"\x01\x6e\x01\x67\x28\x01\x68\x25\x75\x01\x6e\x01\x67\x29\x20\x25\x2d\x34\x30\x2e\x34\x30\x73\x20\x25\x31\x32\x2e\x31\x32\x73\x20" - "\x01\x68\x25\x34\x75\x0d\x0a" // 182 LibLstFmt - ,"\x01\x6e\x0d\x0a\x49\x6e\x76\x61\x6c\x69\x64\x20\x4e\x65\x74\x4d\x61\x69\x6c\x20\x61\x64\x64\x72\x65\x73\x73\x01\x5c\x3a\x20\x01" - "\x68\x25\x73\x01\x6e\x0d\x0a" // 183 InvalidNetMailAddr - ,"\x01\x5f\x0d\x0a\x01\x67\x01\x68\x25\x73\x20\x01\x6e\x01\x67\x54\x72\x61\x6e\x73\x66\x65\x72\x20\x50\x6f\x6c\x69\x63\x79\x0d\x0a" - "\x0d\x0a\x01\x6e" // 184 TransferPolicyHdr - ,"\x01\x6e\x01\x68\x5b\x01\x79\x01\x7e\x25\x63\x01\x77\x5d\x20\x01\x62\x25\x2d\x32\x35\x73\x20\x20" // 185 TransferProtLstFmt - ,"\x49\x6e\x69\x74\x69\x61\x6c\x20\x75\x70\x6c\x6f\x61\x64\x73\x20\x61\x72\x65\x20\x72\x65\x77\x61\x72\x64\x65\x64\x20\x77\x69\x74" - "\x68\x20\x25\x64\x25\x25\x20\x6f\x66\x20\x74\x68\x65\x20\x63\x72\x65\x64\x69\x74\x20\x76\x61\x6c\x75\x65\x0d\x0a" // 186 TpUpload - ,"\x41\x6c\x6c\x20\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x73\x20\x61\x72\x65\x20\x72\x65\x77\x61\x72\x64\x65\x64\x20\x77\x69\x74\x68\x20" - "\x25\x64\x25\x25\x20\x6f\x66\x20\x74\x68\x65\x20\x63\x72\x65\x64\x69\x74\x20\x76\x61\x6c\x75\x65\x0d\x0a" // 187 TpDownload - ,"\x01\x3f\x4e\x6f\x20\x75\x73\x65\x72\x20\x64\x69\x72\x65\x63\x74\x6f\x72\x79\x20\x69\x73\x20\x63\x6f\x6e\x66\x69\x67\x75\x72\x65" - "\x64\x2e\x0d\x0a" // 188 NoUserDir - ,"\x0d\x0a\x54\x68\x65\x72\x65\x20\x61\x72\x65\x20\x6e\x6f\x20\x66\x69\x6c\x65\x73\x20\x66\x6f\x72\x20\x79\x6f\x75\x2e\x0d\x0a" // 189 NoFilesForYou - ,"\x01\x3f\x55\x73\x65\x72\x20\x74\x72\x61\x6e\x73\x66\x65\x72\x20\x64\x69\x72\x65\x63\x74\x6f\x72\x79\x20\x69\x73\x20\x66\x75\x6c" - "\x6c\x2e\x0d\x0a" // 190 UserDirFull - ,"\x01\x3f\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x73\x65\x6e\x64\x20\x66\x69\x6c\x65\x73\x20\x74\x6f\x20\x75\x73\x65\x72\x73\x2e" - "\x0d\x0a" // 191 CantUploadToUser - ,"\x01\x6e\x01\x63\x4c\x69\x62\x72\x61\x72\x79\x20\x20\x20\x3a\x20\x28\x25\x75\x29\x20\x25\x73\x01\x79\x01\x68" // 192 BoxHdrLib - ,"\x01\x6e\x01\x63\x44\x69\x72\x65\x63\x74\x6f\x72\x79\x20\x3a\x20\x28\x25\x75\x29\x20\x25\x73\x01\x79\x01\x68" // 193 BoxHdrDir - ,"\x01\x6e\x01\x63\x46\x69\x6c\x65\x73\x20\x20\x20\x20\x20\x3a\x20\x25\x75\x01\x79\x01\x68" // 194 BoxHdrFiles - ,"\x01\x6e\x01\x63\x28\x01\x68\x25\x75\x01\x6e\x01\x63\x29\x20\x25\x73\x20" // 195 ShortHdrLib - ,"\x01\x6e\x01\x63\x28\x01\x68\x25\x75\x01\x6e\x01\x63\x29\x20\x25\x73" // 196 ShortHdrDir - ,"\x01\x72\x01\x68\x46\x69\x6c\x65\x6e\x61\x6d\x65\x73\x2c\x20\x73\x70\x65\x63\x73\x2c\x20\x6f\x72\x20\x66\x6c\x61\x67\x73\x20\x5b" - "\x4e\x6f\x6e\x65\x5d\x3a\x20\x01\x6d\x01\x68\x01\x7e" // 197 BatchDlFlags - ,"\x0d\x0a\x07\x01\x72\x01\x68\x01\x69\x42\x61\x74\x63\x68\x20\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x71\x75\x65\x75\x65\x20\x69\x73" - "\x20\x66\x75\x6c\x6c\x2e\x01\x6e\x0d\x0a" // 198 BatchDlQueueIsFull - ,"\x01\x5f\x01\x3f\x01\x79\x01\x68\x46\x69\x6c\x65\x73\x70\x65\x63\x20\x5b\x01\x77\x41\x6c\x6c\x20\x46\x69\x6c\x65\x73\x01\x79\x5d" - "\x3a\x20\x01\x6e" // 199 FileSpecStarDotStar - ,"\x01\x3f\x01\x72\x01\x68\x01\x69\x4e\x6f\x74\x20\x65\x6e\x6f\x75\x67\x68\x20\x66\x72\x65\x65\x20\x64\x69\x73\x6b\x20\x73\x70\x61" - "\x63\x65\x2e\x01\x6e\x0d\x0a\x0d\x0a\x01\x68\x54\x68\x65\x20\x73\x79\x73\x6f\x70\x20\x68\x61\x73\x20\x62\x65\x65\x6e\x20\x6e\x6f" - "\x74\x69\x66\x69\x65\x64\x2e\x01\x6e\x0d\x0a" // 200 LowDiskSpace - ,"\x0d\x0a\x25\x73\x20\x62\x79\x74\x65\x73\x20\x66\x72\x65\x65\x0d\x0a\x0d\x0a" // 201 DiskNBytesFree - ,"\x01\x5f\x01\x79\x01\x68\x46\x69\x6c\x65\x6e\x61\x6d\x65\x3a\x20\x01\x6e" // 202 Filename - ,"\x01\x2f\x01\x72\x01\x68\x42\x61\x64\x20\x66\x69\x6c\x65\x6e\x61\x6d\x65\x3a\x20\x27\x25\x73\x27\x0d\x0a" // 203 BadFilename - ,"\x55\x70\x6c\x6f\x61\x64\x20\x27\x25\x73\x27\x20\x74\x6f\x20\x53\x79\x73\x6f\x70\x20\x64\x69\x72\x65\x63\x74\x6f\x72\x79" // 204 UploadToSysopDirQ - ,"\x55\x70\x6c\x6f\x61\x64\x20\x27\x25\x73\x27\x20\x74\x6f\x20\x55\x73\x65\x72\x20\x64\x69\x72\x65\x63\x74\x6f\x72\x79" // 205 UploadToUserDirQ - ,"\x55\x70\x6c\x6f\x61\x64\x20\x27\x25\x73\x27\x20\x74\x6f\x20\x25\x73\x01\x5c\x20\x25\x73" // 206 UploadToCurDirQ - ,"\x0d\x0a\x01\x72\x01\x68\x01\x69\x54\x68\x61\x74\x20\x66\x69\x6c\x65\x20\x69\x73\x20\x61\x6c\x72\x65\x61\x64\x79\x20\x74\x68\x65" - "\x72\x65\x21\x01\x6e\x0d\x0a" // 207 FileAlreadyThere - ,"\x54\x68\x61\x74\x20\x66\x69\x6c\x65\x20\x69\x73\x20\x61\x6c\x72\x65\x61\x64\x79\x20\x6f\x6e\x20\x64\x69\x73\x6b\x2e\x01\x5c\x20" - "\x41\x64\x64\x20\x74\x6f\x20\x64\x61\x74\x61\x20\x62\x61\x73\x65" // 208 FileOnDiskAddQ - ,"\x0d\x0a\x01\x72\x01\x68\x01\x69\x54\x68\x61\x74\x20\x66\x69\x6c\x65\x20\x69\x73\x20\x6e\x6f\x74\x20\x6f\x6e\x20\x64\x69\x73\x6b" - "\x21\x01\x6e\x0d\x0a" // 209 FileNotOnDisk - ,"\x0d\x0a\x01\x72\x01\x68\x01\x69\x50\x6c\x65\x61\x73\x65\x20\x75\x70\x6c\x6f\x61\x64\x20\x66\x69\x6c\x65\x73\x20\x77\x69\x74\x68" - "\x20\x74\x68\x65\x20\x66\x6f\x6c\x6c\x6f\x77\x69\x6e\x67\x20\x65\x78\x74\x65\x6e\x73\x69\x6f\x6e\x73\x20\x6f\x6e\x6c\x79\x3a\x01" - "\x6e\x0d\x0a\x01\x77\x01\x68" // 210 TheseFileExtsOnly - ,"\x0d\x0a\x01\x6e\x01\x68\x25\x73\x01\x72\x01\x68\x01\x69\x20\x68\x61\x73\x20\x61\x6c\x72\x65\x61\x64\x79\x20\x62\x65\x65\x6e\x20" - "\x75\x70\x6c\x6f\x61\x64\x65\x64\x20\x74\x6f\x01\x6e\x01\x63\x20\x25\x73\x20\x01\x68\x25\x73\x01\x6e\x0d\x0a" // 211 FileAlreadyOnline - ,"\x0d\x0a\x01\x77\x01\x68\x48\x69\x74\x20\x5b\x45\x4e\x54\x45\x52\x5d\x20\x61\x66\x74\x65\x72\x20\x6c\x61\x73\x74\x20\x64\x65\x73" - "\x74\x69\x6e\x61\x74\x69\x6f\x6e\x20\x75\x73\x65\x72\x2e\x0d\x0a\x0d\x0a" // 212 EnterAfterLastDestUser - ,"\x01\x5f\x01\x79\x01\x68\x53\x65\x6e\x64\x20\x66\x69\x6c\x65\x20\x74\x6f\x20\x28\x55\x73\x65\x72\x20\x6e\x61\x6d\x65\x20\x6f\x72" - "\x20\x6e\x75\x6d\x62\x65\x72\x29\x01\x5c\x3a\x20\x01\x6e" // 213 SendFileToUser - ,"\x0d\x0a\x01\x72\x01\x68\x01\x69\x44\x75\x70\x6c\x69\x63\x61\x74\x65\x20\x75\x73\x65\x72\x01\x6e\x0d\x0a\x0d\x0a" // 214 DuplicateUser - ,"\x07\x0d\x0a\x01\x72\x01\x68\x01\x69\x25\x73\x20\x77\x6f\x75\x6c\x64\x6e\x27\x74\x20\x62\x65\x20\x61\x62\x6c\x65\x20\x74\x6f\x20" - "\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x69\x74\x21\x01\x6e\x0d\x0a\x0d\x0a" // 215 UserWontBeAbleToDl - ,"\x07\x0d\x0a\x01\x72\x01\x68\x01\x69\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x73\x65\x6e\x64\x20\x79\x6f\x75\x72\x73\x65\x6c\x66" - "\x20\x66\x69\x6c\x65\x73\x2e\x01\x6e\x0d\x0a\x0d\x0a" // 216 CantSendYourselfFiles - ,"\x0d\x0a\x01\x2d\x01\x67\x41\x64\x64\x65\x64\x20\x74\x6f\x20\x64\x65\x73\x74\x69\x6e\x61\x74\x69\x6f\x6e\x20\x75\x73\x65\x72\x20" - "\x6c\x69\x73\x74\x01\x5c\x3a\x20\x01\x77\x01\x68\x25\x73\x20\x23\x25\x73\x0d\x0a\x0d\x0a\x01\x6e" // 217 UserAddedToDestList - ,"\x0d\x0a\x01\x2d\x01\x67\x48\x6f\x77\x20\x64\x6f\x20\x79\x6f\x75\x20\x72\x61\x74\x65\x20\x74\x68\x65\x20\x63\x6f\x6e\x74\x65\x6e" - "\x74\x20\x6f\x66\x20\x74\x68\x69\x73\x20\x66\x69\x6c\x65\x20\x28\x01\x68\x01\x77\x47\x01\x6e\x01\x67\x2c\x20\x01\x68\x01\x77\x52" - "\x01\x6e\x01\x67\x2c\x20\x6f\x72\x20\x01\x68\x01\x77\x58\x01\x6e\x01\x67\x29\x01\x5c\x3a\x20\x01\x6e" // 218 RateThisFile - ,"\x5b\x25\x63\x5d\x20" // 219 Rated - ,"\x49\x73\x20\x74\x68\x69\x73\x20\x75\x70\x6c\x6f\x61\x64\x20\x70\x61\x72\x74\x20\x6f\x66\x20\x61\x20\x73\x65\x74\x01\x5c\x20\x28" - "\x6d\x75\x6c\x74\x69\x70\x6c\x65\x20\x66\x69\x6c\x65\x73\x29" // 220 MultipleDiskQ - ,"\x01\x5f\x01\x79\x01\x68\x48\x6f\x77\x20\x6d\x61\x6e\x79\x20\x66\x69\x6c\x65\x73\x20\x74\x6f\x74\x61\x6c\x3a\x20\x01\x6e" // 221 HowManyDisksTotal - ,"\x01\x5f\x01\x79\x01\x68\x57\x68\x69\x63\x68\x20\x66\x69\x6c\x65\x20\x6e\x75\x6d\x62\x65\x72\x20\x69\x73\x20\x79\x6f\x75\x72\x20" - "\x75\x70\x6c\x6f\x61\x64\x3a\x20\x01\x6e" // 222 NumberOfFile - ,"\x20\x5b\x25\x32\x2e\x32\x64\x2f\x25\x32\x2e\x32\x64\x5d" // 223 FileOneOfTen - ,"\x20\x5b\x25\x64\x2f\x25\x64\x5d" // 224 FileOneOfTwo - ,"\x0d\x0a\x01\x2d\x01\x67\x45\x6e\x74\x65\x72\x20\x61\x20\x64\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x6e\x6f\x77\x2e\x0d\x0a" - "\x3a\x20" // 225 EnterDescNow - ,"\x4e\x6f\x20\x64\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x67\x69\x76\x65\x6e\x2e" // 226 NoDescription - ,"\x0d\x0a\x50\x72\x6f\x74\x6f\x63\x6f\x6c\x20\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 227 ProtocolOrQuit - ,"\x0d\x0a\x50\x72\x6f\x74\x6f\x63\x6f\x6c\x2c\x20\x7e\x42\x61\x74\x63\x68\x20\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 228 ProtocolBatchOrQuit - ,"\x0d\x0a\x07\x01\x72\x01\x68\x01\x69\x42\x61\x74\x63\x68\x20\x75\x70\x6c\x6f\x61\x64\x20\x71\x75\x65\x75\x65\x20\x69\x73\x20\x66" - "\x75\x6c\x6c\x2e\x01\x6e\x0d\x0a" // 229 BatchUlQueueIsFull - ,"\x0d\x0a\x01\x6e\x01\x6d\x01\x68\x25\x73\x20\x01\x6e\x01\x6d\x61\x64\x64\x65\x64\x20\x74\x6f\x20\x62\x61\x74\x63\x68\x20\x75\x70" - "\x6c\x6f\x61\x64\x20\x71\x75\x65\x75\x65\x01\x63\x01\x5c\x20\x2d\x20\x46\x69\x6c\x65\x73\x3a\x20\x01\x68\x25\x75\x20\x01\x6e\x01" - "\x63\x28\x01\x68\x25\x75\x01\x6e\x01\x63\x20\x4d\x61\x78\x29\x0d\x0a" // 230 FileAddedToUlQueue - ,"\x01\x6e\x01\x3f\x01\x67\x01\x68\x25\x73\x01\x79\x3a\x20\x01\x77\x7e\x42\x01\x79\x61\x74\x63\x68\x20\x64\x6f\x77\x6e\x6c\x6f\x61" - "\x64\x2c\x20\x01\x77\x7e\x45\x01\x79\x64\x69\x74\x20\x69\x6e\x66\x6f\x2f\x01\x77\x7e\x44\x01\x79\x65\x73\x63\x2c\x20\x01\x77\x7e" - "\x56\x01\x79\x69\x65\x77\x20\x66\x69\x6c\x65\x2c\x20\x01\x77\x7e\x51\x01\x79\x75\x69\x74\x2c\x20\x01\x77\x7e\x50\x01\x79\x72\x65" - "\x76\x20\x6f\x72\x20\x5b\x7e\x4e\x65\x78\x74\x5d\x3a\x20\x01\x77" // 231 FileInfoEditPrompt - ,"\x01\x6e\x01\x3f\x01\x67\x01\x68\x25\x73\x01\x79\x3a\x20\x01\x77\x7e\x42\x01\x79\x61\x74\x63\x68\x20\x64\x6f\x77\x6e\x6c\x6f\x61" - "\x64\x2c\x20\x01\x77\x7e\x45\x01\x79\x78\x74\x65\x6e\x64\x65\x64\x20\x69\x6e\x66\x6f\x2c\x20\x01\x77\x7e\x56\x01\x79\x69\x65\x77" - "\x20\x66\x69\x6c\x65\x2c\x20\x01\x77\x7e\x51\x01\x79\x75\x69\x74\x2c\x20\x01\x77\x7e\x50\x01\x79\x72\x65\x76\x20\x6f\x72\x20\x5b" - "\x7e\x4e\x65\x78\x74\x5d\x3a\x20\x01\x77" // 232 FileInfoPrompt - ,"\x0d\x0a\x7e\x40\x51\x75\x69\x74\x40\x20\x6f\x72\x20\x5b\x7e\x4e\x65\x78\x74\x5d\x3a\x20" // 233 QuitOrNext - ,"\x7e\x52\x65\x6d\x6f\x76\x65\x2c\x20\x7e\x4d\x6f\x76\x65\x2c\x20\x7e\x45\x64\x69\x74\x2c\x20\x7e\x44\x65\x73\x63\x2c\x20\x7e\x56" - "\x69\x65\x77\x2c\x20\x7e\x40\x51\x75\x69\x74\x40\x2c\x20\x7e\x50\x72\x65\x76\x20\x6f\x72\x20\x5b\x7e\x4e\x65\x78\x74\x5d\x3a\x20" - "" // 234 RExemptRemoveFilePrompt - ,"\x01\x6e\x28\x25\x64\x29\x20\x25\x73\x0d\x0a" // 235 MoveToLibLstFmt - ,"\x01\x5f\x0d\x0a\x01\x79\x01\x68\x4c\x69\x62\x72\x61\x72\x79\x20\x5b\x25\x64\x5d\x3a\x20\x01\x6e" // 236 MoveToLibPrompt - ,"\x01\x6e\x28\x25\x64\x29\x20\x25\x73\x0d\x0a" // 237 MoveToDirLstFmt - ,"\x01\x5f\x0d\x0a\x01\x79\x01\x68\x44\x69\x72\x65\x63\x74\x6f\x72\x79\x20\x5b\x25\x64\x5d\x3a\x20\x01\x6e" // 238 MoveToDirPrompt - ,"\x25\x73\x20\x6d\x6f\x76\x65\x64\x20\x74\x6f\x20\x25\x73\x20\x25\x73\x2e\x0d\x0a" // 239 MovedFile - ,"\x0d\x0a\x43\x6c\x6f\x73\x65\x20\x66\x69\x6c\x65\x20\x72\x65\x63\x6f\x72\x64" // 240 CloseFileRecordQ - ,"\x7e\x52\x65\x6d\x6f\x76\x65\x2c\x20\x7e\x43\x72\x65\x64\x69\x74\x73\x2c\x20\x7e\x46\x69\x6c\x65\x20\x6f\x6e\x6c\x79\x2c\x20\x7e" - "\x4d\x6f\x76\x65\x2c\x20\x7e\x45\x64\x69\x74\x2c\x20\x7e\x44\x65\x73\x63\x2c\x20\x7e\x56\x69\x65\x77\x2c\x20\x7e\x40\x51\x75\x69" - "\x74\x40\x2c\x20\x7e\x50\x72\x65\x76\x20\x6f\x72\x20\x5b\x7e\x4e\x65\x78\x74\x5d\x3a\x20" // 241 SysopRemoveFilePrompt - ,"\x7e\x52\x65\x6d\x6f\x76\x65\x2c\x20\x7e\x45\x64\x69\x74\x2c\x20\x7e\x44\x65\x73\x63\x2c\x20\x7e\x56\x69\x65\x77\x2c\x20\x7e\x40" - "\x51\x75\x69\x74\x40\x2c\x20\x7e\x50\x72\x65\x76\x20\x6f\x72\x20\x5b\x7e\x4e\x65\x78\x74\x5d\x3a\x20" // 242 UserRemoveFilePrompt - ,"\x0d\x0a\x01\x6e\x01\x72\x01\x68\x46\x69\x6c\x65\x20\x64\x6f\x65\x73\x20\x6e\x6f\x74\x20\x65\x78\x69\x73\x74\x3a\x20\x01\x63\x25" - "\x73\x01\x6e\x0d\x0a" // 243 FileDoesNotExist - ,"\x07\x0d\x0a\x01\x72\x01\x68\x01\x69\x43\x6f\x75\x6c\x64\x6e\x27\x74\x20\x72\x65\x6d\x6f\x76\x65\x20\x27\x25\x73\x27\x2e\x01\x6e" - "\x0d\x0a" // 244 CouldntRemoveFile - ,"\x44\x65\x6c\x65\x74\x65\x20\x66\x69\x6c\x65" // 245 DeleteFileQ - ,"\x41\x64\x64\x20\x25\x73\x20\x74\x6f\x20\x25\x73\x20\x25\x73" // 246 AddToOfflineDirQ - ,"\x52\x65\x6d\x6f\x76\x65\x20\x63\x72\x65\x64\x69\x74\x73" // 247 RemoveCreditsQ - ,"\x0d\x0a\x55\x73\x65\x72\x20\x6e\x6f\x74\x20\x61\x76\x61\x69\x6c\x61\x62\x6c\x65\x2e\x0d\x0a" // 248 UserNotFound - ,"\x01\x5f\x01\x79\x01\x68\x43\x72\x65\x64\x69\x74\x73\x20\x74\x6f\x20\x72\x65\x6d\x6f\x76\x65\x20\x66\x72\x6f\x6d\x20\x75\x70\x6c" - "\x6f\x61\x64\x65\x72\x20\x28\x25\x73\x29\x3a\x20\x01\x6e" // 249 CreditsToRemove - ,"\x01\x5f\x01\x77\x01\x68\x25\x73\x20\x77\x61\x73\x20\x72\x65\x6d\x6f\x76\x65\x64\x2e\x0d\x0a\x01\x6e\x01\x67\x59\x6f\x75\x20\x6c" - "\x6f\x73\x74\x20\x25\x73\x20\x63\x72\x65\x64\x69\x74\x73\x2e\x0d\x0a" // 250 FileRemovedUserMsg - ,"\x01\x5f\x01\x3f\x01\x79\x01\x68\x46\x69\x6c\x65\x6e\x61\x6d\x65\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x6e" // 251 EditFilename - ,"\x0d\x0a\x01\x72\x01\x68\x01\x69\x45\x72\x72\x6f\x72\x20\x72\x65\x6e\x61\x6d\x69\x6e\x67\x20\x25\x73\x20\x74\x6f\x20\x25\x73\x01" - "\x6e\x0d\x0a" // 252 CouldntRenameFile - ,"\x25\x73\x20\x72\x65\x6e\x61\x6d\x65\x64\x20\x74\x6f\x20\x25\x73\x0d\x0a" // 253 FileRenamed - ,"\x01\x5f\x01\x79\x01\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x6e" // 254 EditDescription - ,"\x55\x4e\x55\x53\x45\x44\x32\x35\x35" // 255 Unused255 - ,"\x01\x5f\x01\x79\x01\x68\x55\x70\x6c\x6f\x61\x64\x65\x72\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x6e" // 256 EditUploader - ,"\x01\x5f\x01\x79\x01\x68\x43\x72\x65\x64\x69\x74\x20\x76\x61\x6c\x75\x65\x20\x20\x20\x20\x20\x3a\x20\x01\x6e" // 257 EditCreditValue - ,"\x01\x5f\x01\x79\x01\x68\x54\x69\x6d\x65\x73\x20\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x65\x64\x20\x3a\x20\x01\x6e" // 258 EditTimesDownloaded - ,"\x45\x64\x69\x74\x20\x65\x78\x74\x65\x6e\x64\x65\x64\x20\x64\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e" // 259 EditExtDescriptionQ - ,"\x55\x4e\x55\x53\x45\x44\x32\x36\x30" // 260 Unused260 - ,"\x0d\x0a\x01\x77\x01\x68\x59\x6f\x75\x20\x6f\x6e\x6c\x79\x20\x68\x61\x76\x65\x20\x25\x73\x20\x63\x72\x65\x64\x69\x74\x73\x2e\x0d" - "\x0a" // 261 YouOnlyHaveNCredits - ,"\x0d\x0a\x59\x6f\x75\x20\x64\x6f\x6e\x27\x74\x20\x68\x61\x76\x65\x20\x65\x6e\x6f\x75\x67\x68\x20\x63\x72\x65\x64\x69\x74\x73\x2e" - "\x0d\x0a" // 262 NotEnoughCredits - ,"\x0d\x0a\x01\x77\x01\x68\x4e\x6f\x74\x20\x65\x6e\x6f\x75\x67\x68\x20\x74\x69\x6d\x65\x20\x6c\x65\x66\x74\x20\x74\x6f\x20\x74\x72" - "\x61\x6e\x73\x66\x65\x72\x2e\x0d\x0a" // 263 NotEnoughTimeToDl - ,"\x0d\x0a\x50\x72\x6f\x74\x6f\x63\x6f\x6c\x2c\x20\x7e\x42\x61\x74\x63\x68\x2c\x20\x7e\x40\x51\x75\x69\x74\x40\x2c\x20\x6f\x72\x20" - "\x5b\x7e\x4e\x65\x78\x74\x5d\x3a\x20" // 264 ProtocolBatchQuitOrNext - ,"\x0d\x0a\x42\x75\x6c\x6b\x20\x55\x70\x6c\x6f\x61\x64\x20\x25\x73\x20\x25\x73\x20\x44\x69\x72\x65\x63\x74\x6f\x72\x79\x0d\x0a\x28" - "\x45\x6e\x74\x65\x72\x20\x27\x2d\x27\x20\x66\x6f\x72\x20\x64\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x74\x6f\x20\x73\x6b\x69" - "\x70\x20\x66\x69\x6c\x65\x29\x3a\x0d\x0a" // 265 BulkUpload - ,"\x01\x5f\x01\x79\x01\x68\x25\x2d\x31\x32\x73\x01\x77\x25\x37\x73\x01\x62\x3a" // 266 BulkUploadDescPrompt - ,"\x0d\x0a\x01\x72\x01\x68\x01\x69\x4e\x6f\x20\x66\x69\x6c\x65\x73\x20\x69\x6e\x20\x62\x61\x74\x63\x68\x20\x71\x75\x65\x75\x65\x2e" - "\x01\x6e\x0d\x0a\x0d\x0a\x01\x6d\x55\x73\x65\x20\x01\x68\x44\x01\x6e\x01\x6d\x20\x6f\x72\x20\x01\x68\x55\x01\x6e\x01\x6d\x20\x74" - "\x6f\x20\x61\x64\x64\x20\x66\x69\x6c\x65\x73\x20\x74\x6f\x20\x74\x68\x65\x20\x71\x75\x65\x75\x65\x2e\x0d\x0a" // 267 NoFilesInBatchQueue - ,"\x01\x5f\x0d\x0a\x01\x79\x01\x68\x42\x61\x74\x63\x68\x3a\x20\x01\x6e" // 268 BatchMenuPrompt - ,"\x0d\x0a\x43\x6c\x65\x61\x72\x20\x75\x70\x6c\x6f\x61\x64\x20\x71\x75\x65\x75\x65" // 269 ClearUploadQueueQ - ,"\x0d\x0a\x55\x70\x6c\x6f\x61\x64\x20\x71\x75\x65\x75\x65\x20\x63\x6c\x65\x61\x72\x65\x64\x2e\x0d\x0a" // 270 UploadQueueCleared - ,"\x0d\x0a\x43\x6c\x65\x61\x72\x20\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x71\x75\x65\x75\x65" // 271 ClearDownloadQueueQ - ,"\x0d\x0a\x44\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x71\x75\x65\x75\x65\x20\x63\x6c\x65\x61\x72\x65\x64\x2e\x0d\x0a" // 272 DownloadQueueCleared - ,"\x0d\x0a\x44\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x71\x75\x65\x75\x65\x20\x69\x73\x20\x65\x6d\x70\x74\x79\x2e\x0d\x0a" // 273 DownloadQueueIsEmpty - ,"\x0d\x0a\x01\x2d\x01\x67\x01\x68\x55\x70\x6c\x6f\x61\x64\x20\x51\x75\x65\x75\x65\x3a\x01\x6e\x01\x67\x20\x20\x20\x20\x20\x20\x20" - "\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x44\x65\x73\x63\x72\x69\x70\x74" - "\x69\x6f\x6e\x0d\x0a\x0d\x0a\x01\x6e" // 274 UploadQueueLstHdr - ,"\x01\x67\x01\x68\x25\x32\x64\x3a\x20\x01\x6e\x01\x67\x25\x2d\x33\x38\x73\x20\x20\x25\x73\x0d\x0a" // 275 UploadQueueLstFmt - ,"\x0d\x0a\x01\x2d\x01\x67\x01\x68\x44\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x51\x75\x65\x75\x65\x3a\x01\x6e\x01\x67\x20\x20\x20\x20\x20" - "\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x43\x72\x65\x64\x69\x74\x73\x20" - "\x20\x20\x20\x20\x20\x42\x79\x74\x65\x73\x20\x20\x20\x20\x20\x20\x20\x20\x54\x69\x6d\x65\x0d\x0a\x0d\x0a\x01\x6e" // 276 DownloadQueueLstHdr - ,"\x01\x67\x01\x68\x25\x32\x64\x3a\x20\x01\x6e\x01\x67\x25\x2d\x33\x35\x73\x20\x25\x31\x31\x2e\x31\x31\x73\x20\x25\x31\x31\x2e\x31" - "\x31\x73\x20\x20\x20\x20\x20\x25\x73\x0d\x0a" // 277 DownloadQueueLstFmt - ,"\x0d\x0a\x01\x77\x01\x68\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20" - "\x20\x20\x20\x20\x20\x20\x54\x6f\x74\x61\x6c\x73\x3a\x20\x25\x31\x31\x2e\x31\x31\x73\x20\x25\x31\x31\x2e\x31\x31\x73\x20\x20\x20" - "\x20\x20\x25\x73\x0d\x0a" // 278 DownloadQueueTotals - ,"\x0d\x0a\x01\x2d\x01\x67\x52\x65\x6d\x6f\x76\x65\x20\x77\x68\x69\x63\x68\x20\x66\x69\x6c\x65\x28\x73\x29\x20\x66\x72\x6f\x6d\x20" - "\x75\x70\x6c\x6f\x61\x64\x20\x71\x75\x65\x75\x65\x20\x28\x31\x2d\x25\x64\x29\x3a\x20\x01\x6e" // 279 RemoveWhichFromUlQueue - ,"\x0d\x0a\x01\x2d\x01\x67\x52\x65\x6d\x6f\x76\x65\x20\x77\x68\x69\x63\x68\x20\x66\x69\x6c\x65\x28\x73\x29\x20\x66\x72\x6f\x6d\x20" - "\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x71\x75\x65\x75\x65\x20\x28\x31\x2d\x25\x64\x29\x3a\x20\x01\x6e" // 280 RemoveWhichFromDlQueue - ,"\x0d\x0a\x55\x70\x6c\x6f\x61\x64\x20\x71\x75\x65\x75\x65\x20\x69\x73\x20\x65\x6d\x70\x74\x79\x2e\x0d\x0a" // 281 UploadQueueIsEmpty - ,"\x0d\x0a\x48\x61\x6e\x67\x20\x75\x70\x20\x61\x66\x74\x65\x72\x20\x74\x72\x61\x6e\x73\x66\x65\x72" // 282 HangUpAfterXferQ - ,"\x0d\x0a\x01\x77\x01\x68\x53\x74\x61\x72\x74\x20\x25\x73\x20\x74\x72\x61\x6e\x73\x66\x65\x72\x20\x6e\x6f\x77\x20\x28\x43\x74\x72" - "\x6c\x2d\x58\x20\x74\x6f\x20\x61\x62\x6f\x72\x74\x29\x3a\x0d\x0a\x01\x6e" // 283 StartXferNow - ,"\x01\x5f\x0d\x0a\x01\x62\x01\x68\x44\x69\x73\x63\x6f\x6e\x6e\x65\x63\x74\x69\x6e\x67\x20\x40\x45\x4c\x4c\x49\x50\x53\x49\x53\x40" - "\x20\x01\x77\x48\x01\x62\x61\x6e\x67\x20\x75\x70\x20\x6f\x72\x20\x01\x77\x41\x01\x62\x62\x6f\x72\x74\x20" // 284 Disconnecting - ,"\x01\x5b\x01\x77\x01\x68\x47\x6f\x6f\x64\x2d\x62\x79\x65\x21\x20\x20\x28\x54\x69\x6d\x65\x20\x55\x73\x65\x64\x3a\x20\x40\x54\x55" - "\x53\x45\x44\x40\x29\x01\x3e" // 285 Disconnected - ,"\x01\x72\x01\x68\x01\x69\x25\x73\x20\x4e\x4f\x54\x20\x53\x45\x4e\x54\x21\x01\x6e\x0d\x0a" // 286 FileNotSent - ,"\x44\x65\x6c\x65\x74\x69\x6e\x67\x20\x66\x69\x6c\x65\x73\x20\x69\x6e\x20\x74\x65\x6d\x70\x20\x64\x69\x72\x65\x63\x74\x6f\x72\x79" - "\x20\x40\x45\x4c\x4c\x49\x50\x53\x49\x53\x40\x0d\x0a" // 287 RemovingTempFiles - ,"\x01\x5f\x01\x79\x01\x68\x45\x78\x74\x72\x61\x63\x74\x20\x66\x72\x6f\x6d\x3a\x20\x01\x6e" // 288 ExtractFrom - ,"\x0d\x0a\x55\x6e\x65\x78\x74\x72\x61\x63\x74\x61\x62\x6c\x65\x20\x66\x69\x6c\x65\x20\x74\x79\x70\x65\x2e\x0d\x0a" // 289 UnextractableFile - ,"\x0d\x0a\x46\x69\x6c\x65\x20\x6e\x6f\x74\x20\x66\x6f\x75\x6e\x64\x2e\x0d\x0a" // 290 FileNotFound - ,"\x0d\x0a\x7e\x45\x78\x74\x72\x61\x63\x74\x20\x66\x69\x6c\x65\x28\x73\x29\x2c\x20\x7e\x56\x69\x65\x77\x20\x61\x72\x63\x68\x69\x76" - "\x65\x2c\x20\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 291 ExtractFilesPrompt - ,"\x01\x5f\x01\x3f\x01\x79\x01\x68\x54\x65\x6d\x70\x20\x44\x69\x72\x65\x63\x74\x6f\x72\x79\x3a\x20\x01\x6e" // 292 TempDirPrompt - ,"\x01\x6e\x0d\x0a\x25\x73\x20\x6e\x6f\x74\x20\x63\x72\x65\x61\x74\x65\x64\x20\x79\x65\x74\x2e\x0d\x0a\x0d\x0a\x55\x73\x65\x20\x74" - "\x68\x65\x20\x01\x68\x41\x01\x6e\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x20\x74\x6f\x20\x63\x72\x65\x61\x74\x65\x20\x69\x74\x2e\x0d\x0a" - "" // 293 TempFileNotCreatedYet - ,"\x0d\x0a\x55\x70\x6c\x6f\x61\x64\x65\x72\x3a\x20\x25\x73\x0d\x0a\x46\x69\x6c\x65\x6e\x61\x6d\x65\x3a\x20\x25\x73\x0d\x0a" // 294 TempFileInfo - ,"\x0d\x0a\x25\x73\x20\x62\x79\x74\x65\x73\x20\x69\x6e\x20\x25\x75\x20\x66\x69\x6c\x65\x73\x0d\x0a" // 295 TempDirTotal - ,"\x0d\x0a\x25\x75\x20\x66\x69\x6c\x65\x73\x20\x72\x65\x6d\x6f\x76\x65\x64\x2e\x0d\x0a" // 296 NFilesRemoved - ,"\x54\x61\x67\x20\x74\x68\x69\x73\x20\x66\x69\x6c\x65" // 297 TagFileQ - ,"\x01\x68\x01\x79\x45\x6e\x74\x65\x72\x20\x28\x73\x70\x61\x63\x65\x2d\x73\x65\x70\x61\x72\x61\x74\x65\x64\x29\x20\x54\x61\x67\x73" - "\x01\x5c\x3a\x20" // 298 TagFilePrompt - ,"\x55\x4e\x55\x53\x45\x44\x32\x39\x39" // 299 Unused299 - ,"\x01\x5f\x01\x68\x01\x77\x25\x73\x01\x6e\x01\x63\x20\x77\x61\x73\x20\x25\x73\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x65\x64\x20\x62\x79" - "\x20\x01\x68\x25\x73\x0d\x0a" // 300 FreeDownloadUserMsg - ,"\x0d\x0a\x01\x6e\x01\x67\x41\x75\x74\x68\x6f\x72\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 301 FiAuthor - ,"\x0d\x0a\x01\x6e\x01\x67\x47\x72\x6f\x75\x70\x20\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 302 FiGroup - ,"\x01\x77\x01\x68\x0d\x0a\x25\x73\x20\x69\x73\x20\x61\x6c\x72\x65\x61\x64\x79\x20\x69\x6e\x20\x74\x68\x65\x20\x71\x75\x65\x75\x65" - "\x2e\x0d\x0a" // 303 FileAlreadyInQueue - ,"\x01\x77\x01\x68\x01\x2f\x46\x69\x6c\x65\x20\x69\x73\x20\x6e\x6f\x74\x20\x6f\x6e\x6c\x69\x6e\x65\x2e\x0d\x0a" // 304 FileIsNotOnline - ,"\x01\x6e\x0d\x0a\x01\x6d\x01\x68\x25\x73\x20\x01\x6e\x01\x6d\x61\x64\x64\x65\x64\x20\x74\x6f\x20\x62\x61\x74\x63\x68\x20\x64\x6f" - "\x77\x6e\x6c\x6f\x61\x64\x20\x71\x75\x65\x75\x65\x01\x5c\x20\x2d\x0d\x0a\x01\x63\x46\x69\x6c\x65\x73\x3a\x20\x01\x68\x25\x75\x01" - "\x6e\x01\x63\x20\x28\x01\x68\x25\x75\x01\x6e\x01\x63\x20\x4d\x61\x78\x29\x20\x20\x43\x72\x65\x64\x69\x74\x73\x3a\x20\x01\x68\x25" - "\x73\x01\x6e\x01\x63\x20\x20\x42\x79\x74\x65\x73\x3a\x20\x01\x68\x25\x73\x01\x6e\x01\x63\x20\x20\x54\x69\x6d\x65\x3a\x20\x01\x68" - "\x25\x73\x0d\x0a" // 305 FileAddedToBatDlQueue - ,"\x0d\x0a\x01\x6e\x01\x72\x01\x68\x54\x68\x65\x20\x73\x79\x73\x6f\x70\x20\x68\x61\x73\x20\x6e\x6f\x74\x20\x63\x6f\x6e\x66\x69\x67" - "\x75\x72\x65\x64\x20\x01\x77\x25\x73\x01\x72\x20\x61\x73\x20\x61\x20\x76\x69\x65\x77\x61\x62\x6c\x65\x20\x66\x69\x6c\x65\x20\x74" - "\x79\x70\x65\x2e\x0d\x0a" // 306 NonviewableFile - ,"\x01\x72\x01\x68\x01\x69\x25\x73\x20\x4e\x4f\x54\x20\x52\x45\x43\x45\x49\x56\x45\x44\x21\x01\x6e\x0d\x0a" // 307 FileNotReceived - ,"\x0d\x0a\x07\x01\x72\x01\x68\x01\x69\x25\x73\x20\x48\x41\x44\x20\x45\x52\x52\x4f\x52\x53\x20\x2d\x20\x4e\x4f\x54\x20\x55\x50\x4c" - "\x4f\x41\x44\x45\x44\x21\x01\x6e\x0d\x0a" // 308 FileHadErrors - ,"\x01\x72\x01\x68\x01\x69\x25\x73\x20\x49\x53\x20\x5a\x45\x52\x4f\x20\x4c\x45\x4e\x47\x54\x48\x20\x2d\x20\x4e\x4f\x54\x20\x55\x50" - "\x4c\x4f\x41\x44\x45\x44\x21\x01\x6e\x0d\x0a" // 309 FileZeroLength - ,"\x01\x5f\x01\x77\x01\x68\x25\x73\x20\x28\x25\x73\x20\x62\x79\x74\x65\x73\x29\x20\x72\x65\x63\x65\x69\x76\x65\x64\x2e\x0d\x0a" // 310 FileNBytesReceived - ,"\x01\x5f\x01\x77\x01\x68\x25\x73\x20\x28\x25\x73\x20\x62\x79\x74\x65\x73\x29\x20\x73\x65\x6e\x74\x2e\x0d\x0a" // 311 FileNBytesSent - ,"\x01\x5f\x01\x68\x01\x77\x25\x73\x01\x6e\x01\x63\x20\x77\x61\x73\x20\x25\x73\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x65\x64\x20\x62\x79" - "\x20\x01\x68\x25\x73\x0d\x0a\x01\x6e\x01\x67\x59\x6f\x75\x20\x77\x65\x72\x65\x20\x61\x77\x61\x72\x64\x65\x64\x20\x01\x68\x25\x73" - "\x01\x6e\x01\x67\x20\x63\x72\x65\x64\x69\x74\x73\x2e\x0d\x0a" // 312 DownloadUserMsg - ,"\x70\x61\x72\x74\x69\x61\x6c\x6c\x79\x20" // 313 Partially - ,"\x01\x6c\x01\x6e\x01\x67\x4c\x69\x62\x72\x61\x72\x79\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x28\x25\x75\x29\x20\x25\x73" // 314 FiLib - ,"\x0d\x0a\x01\x6e\x01\x67\x44\x69\x72\x65\x63\x74\x6f\x72\x79\x20\x20\x20\x3a\x01\x68\x20\x28\x25\x75\x29\x20\x25\x73" // 315 FiDir - ,"\x0d\x0a\x01\x6e\x01\x67\x46\x69\x6c\x65\x6e\x61\x6d\x65\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 316 FiFilename - ,"\x0d\x0a\x01\x6e\x01\x67\x53\x69\x7a\x65\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73\x20\x28\x25\x73\x29\x20\x62\x79" - "\x74\x65\x73" // 317 FiFileSize - ,"\x0d\x0a\x01\x6e\x01\x67\x43\x72\x65\x64\x69\x74\x20\x63\x6f\x73\x74\x20\x3a\x01\x68\x20\x25\x73" // 318 FiCredits - ,"\x0d\x0a\x01\x6e\x01\x67\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x3a\x01\x68\x20\x25\x73" // 319 FiDescription - ,"\x0d\x0a\x01\x6e\x01\x67\x55\x70\x6c\x6f\x61\x64\x65\x64\x20\x62\x79\x20\x3a\x01\x68\x20\x25\x73" // 320 FiUploadedBy - ,"\x0d\x0a\x01\x6e\x01\x67\x46\x69\x6c\x65\x20\x64\x61\x74\x65\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 321 FiFileDate - ,"\x0d\x0a\x01\x6e\x01\x67\x55\x70\x6c\x6f\x61\x64\x65\x64\x20\x6f\x6e\x20\x3a\x01\x68\x20\x25\x73" // 322 FiDateUled - ,"\x0d\x0a\x01\x6e\x01\x67\x4c\x61\x73\x74\x20\x44\x2f\x4c\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 323 FiDateDled - ,"\x0d\x0a\x01\x6e\x01\x67\x54\x69\x6d\x65\x73\x20\x44\x2f\x4c\x65\x64\x20\x3a\x01\x68\x20\x25\x75" // 324 FiTimesDled - ,"\x0d\x0a\x01\x6e\x01\x67\x54\x69\x6d\x65\x20\x74\x6f\x20\x44\x2f\x4c\x20\x3a\x01\x68\x20\x25\x73\x20\x61\x74\x20\x25\x75\x20\x63" - "\x70\x73" // 325 FiTransferTime - ,"\x0d\x0a\x01\x6e\x01\x67\x54\x61\x67\x73\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 326 FiTags - ,"\x0d\x0a\x01\x6e\x01\x67\x55\x70\x6c\x6f\x61\x64\x65\x64\x20\x74\x6f\x20\x3a\x01\x68\x20\x25\x73" // 327 FiUploadedTo - ,"\x0d\x0a\x01\x6e\x01\x67\x25\x2d\x36\x2e\x36\x73\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 328 FiChecksum - ,"\x07\x07\x0d\x0a\x01\x68\x01\x72\x48\x01\x62\x61\x01\x67\x70\x01\x79\x70\x01\x63\x79\x20\x01\x6d\x42\x01\x77\x69\x01\x72\x72\x01" - "\x67\x74\x01\x62\x68\x01\x63\x64\x01\x6d\x61\x01\x79\x79\x20\x01\x77\x74\x01\x72\x6f\x20\x01\x67\x79\x01\x62\x6f\x01\x63\x75\x0d" - "\x0a\x07\x07\x01\x6d\x48\x01\x79\x61\x01\x77\x70\x01\x72\x70\x01\x67\x79\x20\x01\x62\x42\x01\x63\x69\x01\x6d\x72\x01\x79\x74\x01" - "\x77\x68\x01\x72\x64\x01\x67\x61\x01\x62\x79\x20\x01\x63\x74\x01\x6d\x6f\x20\x01\x79\x79\x01\x77\x6f\x01\x72\x75\x01\x67\x2e\x01" - "\x62\x2e\x01\x63\x2e\x0d\x0a\x0d\x0a" // 329 HappyBirthday - ,"\x01\x77\x01\x68\x59\x6f\x75\x20\x68\x61\x76\x65\x6e\x27\x74\x20\x63\x68\x61\x6e\x67\x65\x64\x20\x79\x6f\x75\x72\x20\x70\x61\x73" - "\x73\x77\x6f\x72\x64\x20\x69\x6e\x20\x6d\x6f\x72\x65\x20\x74\x68\x61\x6e\x20\x25\x64\x20\x64\x61\x79\x73\x2e\x0d\x0a\x0d\x0a" // 330 TimeToChangePw - ,"\x0d\x0a\x45\x6e\x74\x65\x72\x20\x61\x20\x64\x69\x66\x66\x65\x72\x65\x6e\x74\x20\x70\x61\x73\x73\x77\x6f\x72\x64\x01\x5c" // 331 NewPasswordQ - ,"\x01\x5f\x01\x3f\x01\x79\x01\x68\x4e\x65\x77\x20\x70\x61\x73\x73\x77\x6f\x72\x64\x20\x28\x25\x75\x2d\x25\x75\x20\x63\x68\x61\x72" - "\x73\x29\x01\x5c\x3a\x20" // 332 NewPasswordPromptFmt - ,"\x01\x5f\x01\x79\x01\x68\x56\x65\x72\x69\x66\x79\x20\x28\x65\x6e\x74\x65\x72\x20\x61\x67\x61\x69\x6e\x29\x01\x5c\x3a\x20\x01\x6e" - "" // 333 VerifyPassword - ,"\x07\x01\x72\x01\x68\x57\x72\x6f\x6e\x67\x21" // 334 Wrong - ,"\x01\x77\x01\x68\x50\x61\x73\x73\x77\x6f\x72\x64\x20\x63\x68\x61\x6e\x67\x65\x64\x2e\x0d\x0a" // 335 PasswordChanged - ,"\x53\x6f\x72\x72\x79\x2c\x20\x79\x6f\x75\x20\x68\x61\x76\x65\x20\x6e\x6f\x20\x6d\x6f\x72\x65\x20\x6c\x6f\x67\x6f\x6e\x73\x20\x61" - "\x6c\x6c\x6f\x77\x65\x64\x20\x74\x6f\x64\x61\x79\x2e\x0d\x0a" // 336 NoMoreLogons - ,"\x59\x6f\x75\x20\x63\x61\x6e\x20\x6f\x6e\x6c\x79\x20\x6c\x6f\x67\x6f\x6e\x20\x6f\x6e\x63\x65\x20\x61\x20\x64\x61\x79\x2e\x0d\x0a" - "" // 337 R_Logons - ,"\x01\x5f\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x79\x45\x6e\x74\x65\x72\x20" - "\x79\x6f\x75\x72\x20\x66\x75\x6c\x6c\x20\x6e\x61\x6d\x65\x20\x6f\x72\x20\x61\x6c\x69\x61\x73\x01\x5c\x3a\x20\x01\x77" // 338 EnterYourAlias - ,"\x01\x5f\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x79\x45\x6e\x74\x65\x72\x20" - "\x79\x6f\x75\x72\x20\x66\x75\x6c\x6c\x20\x72\x65\x61\x6c\x20\x6e\x61\x6d\x65\x01\x5c\x3a\x20\x01\x77" // 339 EnterYourRealName - ,"\x01\x5f\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x79\x45\x6e\x74\x65\x72\x20" - "\x79\x6f\x75\x72\x20\x63\x6f\x6d\x70\x61\x6e\x79\x20\x6e\x61\x6d\x65\x01\x5c\x3a\x20\x01\x77" // 340 EnterYourCompany - ,"\x01\x5f\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x79\x45\x6e\x74\x65\x72\x20" - "\x79\x6f\x75\x72\x20\x68\x61\x6e\x64\x6c\x65\x20\x6f\x72\x20\x63\x61\x6c\x6c\x2d\x73\x69\x67\x6e\x01\x5c\x3a\x20\x01\x77" // 341 EnterYourHandle - ,"\x01\x5f\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x79\x45\x6e\x74\x65\x72\x20" - "\x79\x6f\x75\x72\x20\x67\x65\x6e\x64\x65\x72\x20\x28\x40\x47\x45\x4e\x44\x45\x52\x53\x40\x29\x01\x5c\x3a\x20\x01\x77" // 342 EnterYourGender - ,"\x01\x5f\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x79\x45\x6e\x74\x65\x72\x20" - "\x79\x6f\x75\x72\x20\x73\x74\x72\x65\x65\x74\x20\x61\x64\x64\x72\x65\x73\x73\x01\x5c\x3a\x20\x01\x77" // 343 EnterYourAddress - ,"\x01\x5f\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x79\x45\x6e\x74\x65\x72\x20" - "\x79\x6f\x75\x72\x20\x76\x6f\x69\x63\x65\x20\x70\x68\x6f\x6e\x65\x20\x6e\x75\x6d\x62\x65\x72\x01\x5c\x3a\x20\x01\x77" // 344 EnterYourPhoneNumber - ,"\x01\x5f\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x79\x45\x6e\x74\x65\x72\x20" - "\x79\x6f\x75\x72\x20\x62\x69\x72\x74\x68\x64\x61\x79\x20\x28\x40\x42\x44\x41\x54\x45\x46\x4d\x54\x40\x29\x01\x5c\x3a\x20\x01\x77" - "" // 345 EnterYourBirthday - ,"\x01\x5f\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x79\x45\x6e\x74\x65\x72\x20" - "\x79\x6f\x75\x72\x20\x6c\x6f\x63\x61\x74\x69\x6f\x6e\x01\x5c\x20\x28\x65\x2e\x67\x2e\x20\x63\x69\x74\x79\x2c\x20\x73\x74\x61\x74" - "\x65\x29\x01\x5c\x3a\x20\x01\x77" // 346 EnterYourCityState - ,"\x01\x5f\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x79\x45\x6e\x74\x65\x72\x20" - "\x79\x6f\x75\x72\x20\x7a\x69\x70\x20\x28\x6f\x72\x20\x70\x6f\x73\x74\x61\x6c\x29\x20\x63\x6f\x64\x65\x01\x5c\x3a\x20\x01\x77" // 347 EnterYourZipCode - ,"\x01\x5f\x01\x79\x01\x68\x43\x6c\x69\x65\x6e\x74\x20\x28\x4e\x61\x6d\x65\x20\x6f\x72\x20\x41\x64\x64\x72\x65\x73\x73\x29\x01\x5c" - "\x3a\x20\x01\x77" // 348 EnterYourComputer - ,"\x41\x72\x65\x20\x79\x6f\x75\x20\x63\x6f\x6e\x6e\x65\x63\x74\x69\x6e\x67\x20\x66\x72\x6f\x6d\x20\x4e\x6f\x72\x74\x68\x20\x41\x6d" - "\x65\x72\x69\x63\x61" // 349 CallingFromNorthAmericaQ - ,"\x49\x73\x20\x74\x68\x65\x20\x61\x62\x6f\x76\x65\x20\x69\x6e\x66\x6f\x72\x6d\x61\x74\x69\x6f\x6e\x20\x63\x6f\x72\x72\x65\x63\x74" - "\x01\x5c" // 350 UserInfoCorrectQ - ,"\x01\x62\x55\x73\x65\x72\x20\x23\x01\x63\x25\x2d\x34\x64\x20\x20\x20\x20\x20\x20\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 351 LiUserNumberName - ,"\x01\x62\x4c\x6f\x67\x6f\x6e\x73\x20\x54\x6f\x64\x61\x79\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x2d\x35\x75\x20\x01\x62\x28\x4d\x61" - "\x78\x20\x01\x63\x25\x75\x01\x62\x29\x0d\x0a" // 352 LiLogonsToday - ,"\x01\x62\x54\x69\x6d\x65\x20\x6f\x6e\x20\x54\x6f\x64\x61\x79\x20\x20\x20\x3a\x20\x01\x63\x25\x2d\x35\x75\x20\x01\x62\x28\x4d\x61" - "\x78\x20\x01\x63\x25\x75\x01\x62\x29\x0d\x0a" // 353 LiTimeonToday - ,"\x01\x62\x4d\x61\x69\x6c\x20\x57\x61\x69\x74\x69\x6e\x67\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x2d\x35\x75\x20\x01\x62\x28\x55\x6e" - "\x72\x65\x61\x64\x20\x01\x63\x25\x75\x01\x62\x29\x0d\x0a" // 354 LiMailWaiting - ,"\x01\x62\x01\x68\x53\x79\x73\x6f\x70\x20\x69\x73\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 355 LiSysopIs - ,"\x41\x76\x61\x69\x6c\x61\x62\x6c\x65" // 356 LiSysopAvailable - ,"\x4e\x6f\x74\x20\x41\x76\x61\x69\x6c\x61\x62\x6c\x65" // 357 LiSysopNotAvailable - ,"\x01\x72\x01\x68\x01\x69\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x70\x6f\x73\x73\x69\x62\x6c\x79\x20\x62\x65\x20\x69\x6e\x20\x74" - "\x77\x6f\x20\x70\x6c\x61\x63\x65\x73\x20\x61\x74\x20\x74\x68\x65\x20\x73\x61\x6d\x65\x20\x74\x69\x6d\x65\x2e\x01\x6e\x0d\x0a" // 358 UserOnTwoNodes - ,"\x07\x01\x72\x01\x68\x01\x69\x25\x64\x20\x63\x72\x69\x74\x69\x63\x61\x6c\x20\x65\x72\x72\x6f\x72\x73\x20\x68\x61\x76\x65\x20\x6f" - "\x63\x63\x75\x72\x72\x65\x64\x2e\x20\x54\x79\x70\x65\x20\x3b\x45\x52\x52\x20\x61\x74\x20\x6d\x61\x69\x6e\x20\x6d\x65\x6e\x75\x2e" - "\x01\x6e\x0d\x0a" // 359 CriticalErrors - ,"\x01\x5f\x01\x77\x01\x68\x59\x6f\x75\x20\x68\x61\x76\x65\x20\x25\x64\x20\x55\x73\x65\x72\x20\x74\x6f\x20\x55\x73\x65\x72\x20\x46" - "\x69\x6c\x65\x20\x54\x72\x61\x6e\x73\x66\x65\x72\x25\x73\x20\x77\x61\x69\x74\x69\x6e\x67\x20\x66\x6f\x72\x20\x79\x6f\x75\x0d\x0a" - "" // 360 UserXferForYou - ,"\x01\x5f\x01\x77\x01\x68\x59\x6f\x75\x20\x68\x61\x76\x65\x20\x73\x65\x6e\x74\x20\x25\x64\x20\x75\x6e\x72\x65\x63\x65\x69\x76\x65" - "\x64\x20\x55\x73\x65\x72\x20\x74\x6f\x20\x55\x73\x65\x72\x20\x46\x69\x6c\x65\x20\x54\x72\x61\x6e\x73\x66\x65\x72\x25\x73\x0d\x0a" - "" // 361 UnreceivedUserXfer - ,"\x52\x65\x61\x64\x20\x79\x6f\x75\x72\x20\x6d\x61\x69\x6c\x20\x6e\x6f\x77" // 362 ReadYourMailNowQ - ,"\x53\x6f\x72\x72\x79\x2c\x20\x74\x68\x65\x20\x73\x79\x73\x74\x65\x6d\x20\x69\x73\x20\x63\x6c\x6f\x73\x65\x64\x20\x74\x6f\x20\x6e" - "\x65\x77\x20\x75\x73\x65\x72\x73\x2e\x0d\x0a" // 363 NoNewUsers - ,"\x4e\x65\x77\x20\x55\x73\x65\x72\x20\x50\x61\x73\x73\x77\x6f\x72\x64\x01\x5c\x3a\x20" // 364 NewUserPasswordPrompt - ,"\x55\x73\x65\x20\x61\x75\x74\x6f\x6d\x61\x74\x69\x63\x20\x74\x65\x72\x6d\x69\x6e\x61\x6c\x20\x74\x79\x70\x65\x20\x64\x65\x74\x65" - "\x63\x74\x69\x6f\x6e" // 365 AutoTerminalQ - ,"\x44\x6f\x65\x73\x20\x79\x6f\x75\x72\x20\x74\x65\x72\x6d\x69\x6e\x61\x6c\x20\x73\x75\x70\x70\x6f\x72\x74\x20\x41\x4e\x53\x49" // 366 AnsiTerminalQ - ,"\x44\x6f\x65\x73\x20\x79\x6f\x75\x72\x20\x74\x65\x72\x6d\x69\x6e\x61\x6c\x20\x64\x69\x73\x70\x6c\x61\x79\x20\x63\x6f\x6c\x6f\x72" - "\x73" // 367 ColorTerminalQ - ,"\x01\x6e\x01\x67\x41\x72\x65\x20\x79\x6f\x75\x20\x75\x73\x69\x6e\x67\x20\x01\x68\x52\x49\x50\x74\x65\x72\x6d\x01\x6e\x01\x67\x20" - "\x6f\x72\x20\x61\x20\x01\x68\x52\x49\x50\x73\x63\x72\x69\x70\x20\x01\x6e\x01\x67\x63\x6f\x6d\x70\x61\x74\x69\x62\x6c\x65\x20\x74" - "\x65\x72\x6d\x69\x6e\x61\x6c\x20\x70\x72\x6f\x67\x72\x61\x6d\x3f\x0d\x0a\x01\x68\x01\x77\x49\x4d\x50\x4f\x52\x54\x41\x4e\x54\x3a" - "\x01\x6e\x01\x67\x20\x49\x66\x20\x79\x6f\x75\x20\x61\x72\x65\x20\x6e\x6f\x74\x20\x61\x62\x73\x6f\x6c\x75\x74\x65\x6c\x79\x20\x73" - "\x75\x72\x65\x2c\x20\x68\x69\x74\x20\x01\x68\x01\x77\x01\x69\x4e\x01\x6e\x01\x62\x01\x68" // 368 RipTerminalQ - ,"\x44\x6f\x65\x73\x20\x79\x6f\x75\x72\x20\x74\x65\x72\x6d\x69\x6e\x61\x6c\x20\x73\x75\x70\x70\x6f\x72\x74\x20\x49\x42\x4d\x20\x65" - "\x78\x74\x65\x6e\x64\x65\x64\x20\x41\x53\x43\x49\x49\x20\x28\x43\x50\x34\x33\x37\x29" // 369 ExAsciiTerminalQ - ,"\x01\x6e\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x75\x73\x65\x20\x74\x68\x61\x74\x20\x6e\x61\x6d\x65\x01\x5c\x20\x28\x64\x75\x70" - "\x6c\x69\x63\x61\x74\x65\x20\x6f\x72\x20\x69\x6e\x76\x61\x6c\x69\x64\x29\x2e\x0d\x0a" // 370 YouCantUseThatName - ,"\x01\x6c\x01\x2d\x01\x67\x59\x6f\x75\x72\x20\x70\x61\x73\x73\x77\x6f\x72\x64\x20\x69\x73\x20\x01\x68\x25\x73\x0d\x0a" // 371 YourPasswordIs - ,"\x0d\x0a\x01\x5f\x01\x77\x01\x68\x44\x6f\x6e\x27\x74\x20\x66\x6f\x72\x67\x65\x74\x20\x61\x6e\x64\x20\x6b\x65\x65\x70\x20\x69\x74" - "\x20\x63\x6f\x6e\x66\x69\x64\x65\x6e\x74\x69\x61\x6c\x2e\x0d\x0a\x0d\x0a\x01\x79\x01\x68\x45\x6e\x74\x65\x72\x20\x74\x68\x69\x73" - "\x20\x70\x61\x73\x73\x77\x6f\x72\x64\x20\x66\x6f\x72\x20\x76\x65\x72\x69\x66\x69\x63\x61\x74\x69\x6f\x6e\x01\x5c\x3a\x20\x01\x77" - "" // 372 NewUserPasswordVerify - ,"\x07\x0d\x0a\x01\x72\x01\x68\x49\x6e\x63\x6f\x72\x72\x65\x63\x74\x2c\x20\x74\x72\x79\x20\x61\x67\x61\x69\x6e\x2e\x0d\x0a" // 373 IncorrectPassword - ,"\x01\x5f\x0d\x0a\x01\x79\x01\x68\x4d\x61\x67\x69\x63\x20\x77\x6f\x72\x64\x3a\x20\x01\x77" // 374 MagicWordPrompt - ,"\x0d\x0a\x53\x6f\x72\x72\x79\x2c\x20\x74\x68\x61\x74\x20\x77\x61\x73\x20\x6e\x6f\x74\x20\x74\x68\x65\x20\x6d\x61\x67\x69\x63\x20" - "\x77\x6f\x72\x64\x2e\x0d\x0a" // 375 FailedMagicWord - ,"\x53\x6f\x72\x72\x79\x2c\x20\x74\x68\x65\x20\x73\x79\x73\x74\x65\x6d\x20\x69\x73\x20\x66\x75\x6c\x6c\x2e" // 376 SystemFull - ,"\x2a\x4e\x45\x57\x20\x55\x53\x45\x52\x2a\x20\x20\x25\x2d\x33\x30\x2e\x33\x30\x73\x20\x20\x41\x67\x65\x2f\x53\x65\x78\x2f\x42\x44" - "\x61\x79\x20\x3a\x20\x25\x2d\x32\x64\x20\x25\x63\x20\x25\x73\x0d\x0a\x52\x65\x61\x6c\x20\x6e\x61\x6d\x65\x20\x3a\x20\x25\x2d\x33" - "\x30\x2e\x33\x30\x73\x20\x20\x50\x68\x6f\x6e\x65\x20\x6e\x75\x6d\x62\x65\x72\x20\x3a\x20\x25\x73\x0d\x0a\x43\x6f\x6d\x70\x75\x74" - "\x65\x72\x20\x20\x3a\x20\x25\x2d\x33\x30\x2e\x33\x30\x73\x20\x20\x43\x6f\x6e\x6e\x65\x63\x74\x69\x6f\x6e\x20\x20\x20\x3a\x20\x25" - "\x73\x0d\x0a\x0d\x0a" // 377 NewUserFeedbackHdr - ,"\x07\x0d\x0a\x01\x72\x01\x68\x01\x69\x59\x6f\x75\x20\x6d\x75\x73\x74\x20\x6c\x65\x61\x76\x65\x20\x25\x73\x20\x6d\x61\x69\x6c\x20" - "\x69\x6e\x20\x6f\x72\x64\x65\x72\x20\x74\x6f\x20\x62\x65\x20\x76\x61\x6c\x69\x64\x61\x74\x65\x64\x21\x01\x6e\x0d\x0a" // 378 NoFeedbackWarning - ,"\x0d\x0a\x0d\x0a\x4e\x6f\x20\x65\x78\x74\x65\x72\x6e\x61\x6c\x20\x70\x72\x6f\x67\x72\x61\x6d\x73\x20\x61\x76\x61\x69\x6c\x61\x62" - "\x6c\x65\x2e\x0d\x0a" // 379 NoXtrnPrograms - ,"\x01\x6e\x01\x63\x01\x68\x25\x73\x20\x01\x6e\x01\x63\x45\x78\x74\x65\x72\x6e\x61\x6c\x20\x50\x72\x6f\x67\x72\x61\x6d\x73\x3a\x0d" - "\x0a\x0d\x0a" // 380 XtrnProgLstHdr - ,"\x01\x6e\x01\x63\x4e\x75\x6d\x20\x01\x68\xb3\x01\x6e\x01\x63\x20\x4e\x61\x6d\x65\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20" - "\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20" // 381 XtrnProgLstTitles - ,"\x01\x68\xc4\xc4\xc4\xc4\xc5\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4" - "\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\x20" // 382 XtrnProgLstUnderline - ,"\x01\x68\x01\x63\x25\x33\x75\x20\xb3\x20\x01\x6e\x01\x63\x25\x2d\x33\x32\x2e\x33\x32\x73\x01\x68\x20" // 383 XtrnProgLstFmt - ,"\x0d\x0a\x40\x4d\x4e\x45\x3a\x43\x40\x40\x57\x68\x69\x63\x68\x40\x20\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 384 WhichXtrnProg - ,"\x0d\x0a\x25\x73\x20\x69\x73\x20\x63\x75\x72\x72\x65\x6e\x74\x6c\x79\x20\x72\x75\x6e\x6e\x69\x6e\x67\x20\x25\x73\x20\x6f\x6e\x20" - "\x6e\x6f\x64\x65\x20\x25\x64\x2e\x0d\x0a\x0d\x0a\x54\x72\x79\x20\x61\x67\x61\x69\x6e\x20\x6c\x61\x74\x65\x72\x2e\x0d\x0a\x0d\x0a" - "" // 385 UserRunningXtrn - ,"\x52\x65\x6d\x6f\x76\x65\x20\x6e\x6f\x64\x65\x20\x6c\x6f\x63\x6b" // 386 RemoveNodeLockQ - ,"\x01\x6e\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x75\x73\x65\x20\x74\x68\x61\x74\x20\x6d\x61\x69\x6c\x20\x61\x64\x64\x72\x65\x73" - "\x73\x20\x28\x64\x75\x70\x6c\x69\x63\x61\x74\x65\x20\x6f\x72\x20\x69\x6e\x76\x61\x6c\x69\x64\x29\x2e\x0d\x0a" // 387 YouCantUseThatNetmail - ,"\x59\x6f\x75\x20\x64\x6f\x20\x6e\x6f\x74\x20\x68\x61\x76\x65\x20\x73\x75\x66\x66\x69\x63\x69\x65\x6e\x74\x20\x61\x63\x63\x65\x73" - "\x73\x20\x66\x6f\x72\x20\x74\x68\x69\x73\x20\x6e\x6f\x64\x65\x2e" // 388 NoNodeAccess - ,"\x01\x6e\x01\x72\x01\x68\x0d\x0a\x53\x6f\x72\x72\x79\x2c\x20\x74\x68\x69\x73\x20\x6e\x6f\x64\x65\x20\x69\x73\x20\x74\x65\x6d\x70" - "\x6f\x72\x61\x72\x69\x6c\x79\x20\x63\x6c\x6f\x73\x65\x64\x20\x66\x6f\x72\x20\x6d\x61\x69\x6e\x74\x65\x6e\x61\x6e\x63\x65\x2e\x01" - "\x6e\x0d\x0a" // 389 NodeLocked - ,"\x0d\x0a\x55\x6e\x6b\x6e\x6f\x77\x6e\x20\x75\x73\x65\x72\x0d\x0a" // 390 UnknownUser - ,"\x07\x49\x6e\x76\x61\x6c\x69\x64\x20\x4c\x6f\x67\x6f\x6e\x0d\x0a" // 391 InvalidLogon - ,"\x25\x32\x2e\x32\x64\x2f\x25\x32\x2e\x32\x64\x2f\x25\x32\x2e\x32\x64\x20\x54\x3a\x25\x35\x75\x20\x20\x20\x4c\x3a\x25\x33\x75\x20" - "\x20\x20\x50\x3a\x25\x33\x75\x20\x20\x20\x45\x3a\x25\x33\x75\x20\x20\x20\x46\x3a\x25\x33\x75\x20\x20\x20\x55\x3a\x25\x36\x75\x6b" - "\x20\x25\x33\x75\x20\x20\x44\x3a\x25\x36\x75\x6b\x20\x25\x33\x75\x0d\x0a" // 392 SlogFmt - ,"\x4c\x6f\x63\x61\x6c\x6c\x79" // 393 Locally - ,"\x0d\x0a\x53\x6f\x72\x74\x20\x61\x6c\x70\x68\x61\x62\x65\x74\x69\x63\x61\x6c\x6c\x79" // 394 SortAlphaQ - ,"\x0d\x0a\x01\x6d\x01\x68\x43\x68\x65\x63\x6b\x69\x6e\x67\x20\x53\x6c\x6f\x74\x73\x20\x40\x45\x4c\x4c\x49\x50\x53\x49\x53\x40" // 395 CheckingSlots - ,"\x01\x6e\x01\x68\x25\x2d\x33\x32\x2e\x33\x32\x73\x01\x6e\x01\x6d\x25\x2d\x33\x30\x2e\x33\x30\x73\x01\x68\x25\x2d\x38\x2e\x38\x73" - "\x20\x01\x6e\x01\x6d\x25\x2d\x38\x2e\x38\x73\x0d\x0a" // 396 UserListFmt - ,"\x01\x5b\x01\x68\x01\x77\x25\x64\x01\x62\x20\x74\x6f\x74\x61\x6c\x20\x75\x73\x65\x72\x73\x2e\x20\x20\x20\x20\x20\x20\x20\x20\x0d" - "\x0a" // 397 NTotalUsers - ,"\x01\x77\x25\x64\x20\x01\x62\x75\x73\x65\x72\x73\x20\x77\x69\x74\x68\x20\x61\x63\x63\x65\x73\x73\x20\x74\x6f\x20\x63\x75\x72\x72" - "\x65\x6e\x74\x20\x73\x75\x62\x2d\x62\x6f\x61\x72\x64\x2e\x0d\x0a" // 398 NUsersOnCurSub - ,"\x01\x77\x25\x64\x20\x01\x62\x75\x73\x65\x72\x73\x20\x77\x69\x74\x68\x20\x61\x63\x63\x65\x73\x73\x20\x74\x6f\x20\x63\x75\x72\x72" - "\x65\x6e\x74\x20\x64\x69\x72\x65\x63\x74\x6f\x72\x79\x2e\x0d\x0a" // 399 NUsersOnCurDir - ,"\x0d\x0a\x01\x2d\x01\x63\x43\x75\x72\x72\x65\x6e\x74\x20\x4e\x65\x77\x2d\x53\x63\x61\x6e\x20\x64\x61\x74\x65\x2f\x74\x69\x6d\x65" - "\x01\x5c\x3a\x20\x01\x68" // 400 NScanDate - ,"\x01\x79\x01\x68\x59\x65\x61\x72\x3a\x20\x01\x77" // 401 NScanYear - ,"\x20\x20\x01\x79\x4d\x6f\x6e\x74\x68\x3a\x20\x01\x77" // 402 NScanMonth - ,"\x20\x20\x01\x79\x44\x61\x79\x3a\x20\x01\x77" // 403 NScanDay - ,"\x20\x20\x01\x79\x48\x6f\x75\x72\x3a\x20\x01\x77" // 404 NScanHour - ,"\x20\x20\x01\x79\x4d\x69\x6e\x75\x74\x65\x3a\x20\x01\x77" // 405 NScanMinute - ,"\x20\x70\x6d" // 406 NScanPmQ - ,"\x20\x61\x6d" // 407 NScanAmQ - ,"\x01\x72\x01\x68\x01\x69\x4e\x6f\x74\x20\x6c\x6f\x6e\x67\x20\x65\x6e\x6f\x75\x67\x68\x21\x01\x6e" // 408 PasswordTooShort - ,"\x01\x72\x01\x68\x01\x69\x54\x68\x61\x74\x27\x73\x20\x79\x6f\x75\x72\x20\x63\x75\x72\x72\x65\x6e\x74\x20\x70\x61\x73\x73\x77\x6f" - "\x72\x64\x21\x01\x6e" // 409 PasswordNotChanged - ,"\x01\x72\x01\x68\x01\x69\x59\x6f\x75\x20\x63\x61\x6c\x6c\x20\x74\x68\x61\x74\x20\x61\x20\x70\x61\x73\x73\x77\x6f\x72\x64\x3f\x01" - "\x6e" // 410 PasswordInvalid - ,"\x01\x72\x01\x68\x01\x69\x54\x68\x61\x74\x20\x70\x61\x73\x73\x77\x6f\x72\x64\x20\x69\x73\x20\x74\x6f\x6f\x20\x6f\x62\x76\x69\x6f" - "\x75\x73\x21\x01\x6e" // 411 PasswordObvious - ,"\x55\x4e\x55\x53\x45\x44\x34\x31\x32" // 412 Unused412 - ,"\x55\x4e\x55\x53\x45\x44\x34\x31\x33" // 413 Unused413 - ,"\x55\x4e\x55\x53\x45\x44\x34\x31\x34" // 414 Unused414 - ,"\x55\x4e\x55\x53\x45\x44\x34\x31\x35" // 415 Unused415 - ,"\x55\x4e\x55\x53\x45\x44\x34\x31\x36" // 416 Unused416 - ,"\x55\x4e\x55\x53\x45\x44\x34\x31\x37" // 417 Unused417 - ,"\x07\x0d\x0a\x4e\x6f\x20\x75\x73\x65\x72\x20\x64\x61\x74\x61\x20\x64\x65\x66\x69\x6e\x65\x64\x2e\x0d\x0a" // 418 NoUserData - ,"\x01\x72\x01\x68\xae\xae\xae\x20\x01\x69\x44\x45\x4c\x45\x54\x45\x44\x01\x6e\x01\x72\x01\x68\x20\xaf\xaf\xaf\x0d\x0a" // 419 DeletedUser - ,"\x01\x62\x01\x68\xae\xae\xae\x20\x01\x69\x49\x4e\x41\x43\x54\x49\x56\x45\x01\x6e\x01\x62\x01\x68\x20\xaf\xaf\xaf\x0d\x0a" // 420 InactiveUser - ,"\x01\x6e\x01\x63\x41\x6c\x69\x61\x73\x20\x20\x20\x20\x20\x3a\x20\x01\x68\x25\x2d\x33\x30\x2e\x33\x30\x73\x20\x20\x01\x6e\x01\x63" - "\x50\x61\x73\x73\x20\x01\x68\x25\x73\x01\x6e\x01\x63\x3a\x20\x01\x68\x25\x73\x0d\x0a" // 421 UeditAliasPassword - ,"\x01\x6e\x01\x63\x52\x65\x61\x6c\x20\x4e\x61\x6d\x65\x20\x3a\x20\x01\x68\x25\x2d\x33\x30\x2e\x33\x30\x73\x20\x20\x01\x6e\x01\x63" - "\x50\x68\x6f\x6e\x65\x20\x6e\x75\x6d\x62\x65\x72\x20\x3a\x20\x01\x68\x25\x73\x0d\x0a" // 422 UeditRealNamePhone - ,"\x01\x6e\x01\x63\x41\x64\x64\x72\x65\x73\x73\x20\x20\x20\x3a\x20\x01\x68\x25\x2d\x33\x30\x2e\x33\x30\x73\x20\x20\x01\x6e\x01\x63" - "\x41\x67\x65\x2f\x53\x65\x78\x2f\x42\x44\x61\x79\x20\x3a\x20\x01\x68\x25\x32\x64\x20\x25\x63\x20\x25\x73\x0d\x0a" // 423 UeditAddressBirthday - ,"\x01\x6e\x01\x63\x4c\x6f\x63\x61\x74\x69\x6f\x6e\x20\x20\x3a\x20\x01\x68\x25\x2d\x33\x30\x2e\x33\x30\x73\x20\x20\x01\x6e\x01\x63" - "\x5a\x69\x70\x20\x43\x6f\x64\x65\x20\x20\x20\x20\x20\x3a\x20\x01\x68\x25\x73\x0d\x0a" // 424 UeditLocationZipcode - ,"\x01\x6e\x01\x63\x4e\x6f\x74\x65\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x68\x25\x2d\x33\x30\x2e\x33\x30\x73\x20\x20\x01\x6e\x01\x63" - "\x48\x61\x6e\x64\x6c\x65\x20\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x68\x25\x73\x0d\x0a" // 425 UeditNoteHandle - ,"\x01\x6e\x01\x63\x43\x6c\x69\x65\x6e\x74\x20\x20\x20\x20\x3a\x20\x01\x68\x25\x2d\x33\x30\x2e\x33\x30\x73\x20\x20\x01\x6e\x01\x63" - "\x50\x72\x6f\x74\x6f\x63\x6f\x6c\x20\x20\x20\x20\x20\x3a\x20\x01\x68\x25\x73\x0d\x0a" // 426 UeditComputerModem - ,"\x01\x6e\x01\x63\x43\x6f\x6d\x6d\x65\x6e\x74\x20\x25\x63\x20\x3a\x20\x01\x68\x25\x73\x0d\x0a" // 427 UeditCommentLine - ,"\x01\x6e\x01\x63\x46\x69\x72\x73\x74\x20\x6f\x6e\x20\x20\x3a\x20\x01\x68\x25\x2d\x38\x2e\x38\x73\x20\x20\x01\x6e\x01\x63\x45\x78" - "\x70\x69\x72\x65\x20\x20\x20\x20\x3a\x20\x01\x68\x25\x2d\x38\x2e\x38\x73\x20\x20\x01\x6e\x01\x63\x4c\x61\x73\x74\x20\x6f\x6e\x20" - "\x20\x20\x3a\x20\x01\x68\x25\x2d\x38\x2e\x38\x73\x20\x20\x25\x30\x32\x75\x3a\x25\x30\x32\x75\x0d\x0a" // 428 UserDates - ,"\x01\x6e\x01\x63\x54\x69\x6d\x65\x20\x6f\x6e\x20\x20\x20\x3a\x20\x01\x68\x25\x2d\x35\x75\x20\x20\x20\x20\x20\x01\x6e\x01\x63\x54" - "\x6f\x64\x61\x79\x20\x20\x20\x20\x20\x3a\x20\x01\x68\x25\x2d\x35\x75\x25\x2d\x35\x75\x01\x6e\x01\x63\x4c\x61\x73\x74\x20\x63\x61" - "\x6c\x6c\x20\x3a\x20\x01\x68\x25\x2d\x35\x75\x25\x2d\x35\x75\x01\x6e\x01\x63\x45\x78\x74\x72\x61\x20\x3a\x20\x01\x68\x25\x75\x0d" - "\x0a" // 429 UserTimes - ,"\x01\x6e\x01\x63\x4c\x6f\x67\x6f\x6e\x73\x20\x20\x20\x20\x3a\x20\x01\x68\x25\x2d\x35\x75\x20\x20\x20\x20\x20\x01\x6e\x01\x63\x54" - "\x6f\x64\x61\x79\x20\x20\x20\x20\x20\x3a\x20\x01\x68\x25\x2d\x35\x75\x25\x2d\x35\x75\x01\x6e\x01\x63\x50\x6f\x73\x74\x73\x20\x20" - "\x20\x20\x20\x3a\x20\x01\x68\x25\x2d\x35\x75\x25\x2d\x35\x75\x01\x6e\x01\x63\x54\x6f\x64\x61\x79\x20\x3a\x20\x01\x68\x25\x75\x0d" - "\x0a" // 430 UserLogons - ,"\x01\x6e\x01\x63\x45\x2d\x6d\x61\x69\x6c\x73\x20\x20\x20\x3a\x20\x01\x68\x25\x2d\x35\x75\x20\x20\x20\x20\x20\x01\x6e\x01\x63\x54" - "\x6f\x20\x73\x79\x73\x6f\x70\x20\x20\x3a\x20\x01\x68\x25\x2d\x35\x75\x20\x20\x20\x20\x20\x01\x6e\x01\x63\x57\x61\x69\x74\x69\x6e" - "\x67\x20\x20\x20\x3a\x20\x01\x68\x25\x2d\x35\x75\x20\x20\x20\x20\x20\x01\x6e\x01\x63\x54\x6f\x64\x61\x79\x20\x3a\x20\x01\x68\x25" - "\x75\x0d\x0a" // 431 UserEmails - ,"\x01\x6e\x01\x63\x4e\x65\x74\x4d\x61\x69\x6c\x20\x20\x20\x3a\x20\x01\x68\x25\x73\x0d\x0a" // 432 UserNetMail - ,"\x01\x6e\x01\x63\x55\x70\x6c\x6f\x61\x64\x73\x20\x20\x20\x3a\x20\x01\x68\x25\x39\x2e\x39\x73\x20\x01\x6e\x01\x63\x62\x79\x74\x65" - "\x73\x20\x69\x6e\x20\x01\x68\x25\x75\x20\x01\x6e\x01\x63\x66\x69\x6c\x65\x73\x0d\x0a" // 433 UserUploads - ,"\x01\x6e\x01\x63\x44\x6f\x77\x6e\x6c\x6f\x61\x64\x73\x20\x3a\x20\x01\x68\x25\x39\x2e\x39\x73\x20\x01\x6e\x01\x63\x62\x79\x74\x65" - "\x73\x20\x69\x6e\x20\x01\x68\x25\x75\x20\x01\x6e\x01\x63\x66\x69\x6c\x65\x73\x20\x25\x73\x0d\x0a" // 434 UserDownloads - ,"\x2d\x20\x4c\x65\x65\x63\x68\x3a\x20\x01\x72\x01\x68\x01\x69\x25\x75\x01\x6e" // 435 UserLeech - ,"\x01\x6e\x01\x63\x43\x72\x65\x64\x69\x74\x73\x20\x20\x20\x3a\x20\x01\x68\x25\x39\x2e\x39\x73\x20\x01\x6e\x01\x63\x66\x72\x65\x65" - "\x3a\x20\x01\x68\x25\x73\x20\x01\x6e\x01\x63\x28\x01\x68\x25\x73\x20\x01\x6e\x01\x63\x70\x65\x72\x20\x64\x61\x79\x29\x0d\x0a" // 436 UserCredits - ,"\x01\x6e\x01\x63\x4d\x69\x6e\x75\x74\x65\x73\x20\x20\x20\x3a\x20\x01\x68\x25\x39\x2e\x39\x73\x0d\x0a" // 437 UserMinutes - ,"\x0d\x0a\x01\x6e\x01\x63\x53\x65\x63\x20\x4c\x65\x76\x65\x6c\x20\x3a\x20\x01\x68\x25\x64\x0d\x0a" // 438 UeditSecLevel - ,"\x01\x6e\x01\x63\x46\x6c\x61\x67\x73\x20\x23\x31\x20\x20\x3a\x20\x01\x68\x25\x2d\x32\x36\x73\x20\x20\x20\x01\x6e\x01\x63\x46\x6c" - "\x61\x67\x73\x20\x23\x33\x20\x20\x3a\x20\x01\x68\x25\x73\x0d\x0a\x01\x6e\x01\x63\x46\x6c\x61\x67\x73\x20\x23\x32\x20\x20\x3a\x20" - "\x01\x68\x25\x2d\x32\x36\x73\x20\x20\x20\x01\x6e\x01\x63\x46\x6c\x61\x67\x73\x20\x23\x34\x20\x20\x3a\x20\x01\x68\x25\x73\x0d\x0a" - "" // 439 UeditFlags - ,"\x01\x6e\x01\x63\x45\x78\x65\x6d\x70\x74\x69\x6f\x6e\x20\x3a\x20\x01\x68\x25\x2d\x32\x36\x73\x20\x20\x20\x01\x6e\x01\x63\x52\x65" - "\x73\x74\x72\x69\x63\x74\x73\x20\x3a\x20\x01\x68\x25\x73\x0d\x0a" // 440 UeditExempts - ,"\x01\x5f\x01\x79\x01\x68\x55\x73\x65\x72\x20\x65\x64\x69\x74\x20\x28\x01\x77\x01\x60\x3f\x01\x79\x3d\x4d\x65\x6e\x75\x29\x20\x28" - "\x01\x77\x25\x75\x01\x79\x20\x6f\x66\x20\x01\x77\x25\x75\x01\x79\x29\x3a\x20\x01\x6e" // 441 UeditPrompt - ,"\x52\x65\x73\x74\x6f\x72\x65\x20\x55\x73\x65\x72" // 442 UeditRestoreQ - ,"\x41\x63\x74\x69\x76\x61\x74\x65\x20\x55\x73\x65\x72" // 443 UeditActivateQ - ,"\x44\x65\x6c\x65\x74\x65\x20\x55\x73\x65\x72" // 444 UeditDeleteQ - ,"\x55\x73\x65\x72\x20\x68\x61\x73\x20\x6d\x61\x69\x6c\x20\x77\x61\x69\x74\x69\x6e\x67\x2e\x20\x52\x65\x61\x64\x2f\x44\x65\x6c\x65" - "\x74\x65\x20\x69\x74" // 445 UeditReadUserMailWQ - ,"\x55\x73\x65\x72\x20\x68\x61\x73\x20\x73\x65\x6e\x74\x20\x6d\x61\x69\x6c\x2e\x20\x52\x65\x61\x64\x2f\x44\x65\x6c\x65\x74\x65\x20" - "\x69\x74" // 446 UeditReadUserMailSQ - ,"\x44\x65\x61\x63\x74\x69\x76\x61\x74\x65\x20\x55\x73\x65\x72" // 447 UeditDeactivateUserQ - ,"\x43\x68\x61\x6e\x67\x65\x20\x45\x78\x65\x6d\x70\x74\x69\x6f\x6e\x73" // 448 ChangeExemptionQ - ,"\x20\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x25\x73\x0d\x0a\x54\x6f\x67\x67\x6c\x65\x3a\x20" // 449 FlagEditing - ,"\x01\x5f\x01\x79\x01\x68\x47\x6f\x20\x74\x6f\x20\x4e\x61\x6d\x65\x20\x6f\x72\x20\x4e\x75\x6d\x62\x65\x72\x3a\x20\x01\x6e" // 450 GoToUser - ,"\x01\x5f\x01\x79\x01\x68\x4c\x61\x73\x74\x20\x6f\x6e\x20\x28\x40\x44\x41\x54\x45\x46\x4d\x54\x40\x29\x3a\x20\x01\x77" // 451 UeditLastOn - ,"\x01\x5f\x01\x79\x01\x68\x46\x69\x72\x73\x74\x20\x6f\x6e\x20\x28\x40\x44\x41\x54\x45\x46\x4d\x54\x40\x29\x3a\x20\x01\x77" // 452 UeditFirstOn - ,"\x01\x5f\x01\x79\x01\x68\x45\x78\x70\x69\x72\x65\x20\x28\x40\x44\x41\x54\x45\x46\x4d\x54\x40\x29\x3a\x20\x01\x77" // 453 UeditExpire - ,"\x01\x5f\x01\x79\x01\x68\x50\x61\x73\x73\x77\x6f\x72\x64\x20\x4c\x61\x73\x74\x20\x4d\x6f\x64\x69\x66\x69\x65\x64\x20\x28\x40\x44" - "\x41\x54\x45\x46\x4d\x54\x40\x29\x3a\x20\x01\x77" // 454 UeditPwModDate - ,"\x01\x5f\x01\x79\x01\x68\x4c\x65\x76\x65\x6c\x3a\x20\x01\x77" // 455 UeditML - ,"\x01\x5f\x01\x79\x01\x68\x4e\x6f\x74\x65\x3a\x20\x01\x77" // 456 UeditNote - ,"\x01\x5f\x01\x79\x01\x68\x43\x6f\x6d\x6d\x65\x6e\x74\x3a\x20\x01\x77" // 457 UeditComment - ,"\x01\x5f\x01\x79\x01\x68\x55\x70\x6c\x6f\x61\x64\x20\x42\x79\x74\x65\x73\x3a\x20\x01\x77" // 458 UeditUlBytes - ,"\x01\x5f\x01\x79\x01\x68\x54\x6f\x74\x61\x6c\x20\x55\x70\x6c\x6f\x61\x64\x73\x3a\x20\x01\x77" // 459 UeditUploads - ,"\x01\x5f\x01\x79\x01\x68\x44\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x42\x79\x74\x65\x73\x3a\x20\x01\x77" // 460 UeditDlBytes - ,"\x01\x5f\x01\x79\x01\x68\x54\x6f\x74\x61\x6c\x20\x44\x6f\x77\x6e\x6c\x6f\x61\x64\x73\x3a\x20\x01\x77" // 461 UeditDownloads - ,"\x01\x5f\x01\x79\x01\x68\x4c\x65\x65\x63\x68\x20\x44\x6f\x77\x6e\x6c\x6f\x61\x64\x73\x3a\x20\x01\x77" // 462 UeditLeech - ,"\x25\x64\x3a\x20\x4c\x3a\x20\x25\x32\x64\x20\x20\x46\x3a\x20\x25\x73\x20\x20\x45\x58\x3a\x20\x25\x73\x0d\x0a\x20\x20\x52\x45\x3a" - "\x20\x25\x73\x0d\x0a" // 463 QuickValidateFmt - ,"\x0d\x0a\x01\x5f\x01\x79\x01\x68\x56\x61\x6c\x69\x64\x61\x74\x65\x3a\x20\x01\x6e" // 464 QuickValidatePrompt - ,"\x01\x5f\x01\x79\x01\x68\x50\x61\x73\x73\x77\x6f\x72\x64\x3a\x20\x01\x77" // 465 UeditPassword - ,"\x01\x5f\x01\x79\x01\x68\x43\x72\x65\x64\x69\x74\x73\x3a\x20\x01\x77" // 466 UeditCredits - ,"\x01\x5f\x01\x79\x01\x68\x4d\x69\x6e\x75\x74\x65\x73\x3a\x20\x01\x77" // 467 UeditMinutes - ,"\x43\x6f\x70\x79\x20\x75\x73\x65\x72" // 468 UeditCopyUserQ - ,"\x01\x5f\x01\x79\x01\x68\x54\x6f\x20\x73\x6c\x6f\x74\x20\x23\x3a\x20\x01\x6e" // 469 UeditCopyUserToSlot - ,"\x43\x68\x61\x6e\x67\x65\x20\x52\x65\x73\x74\x72\x69\x63\x74\x69\x6f\x6e\x73" // 470 ChangeRestrictsQ - ,"\x01\x5f\x01\x79\x01\x68\x41\x64\x6a\x75\x73\x74\x20\x43\x72\x65\x64\x69\x74\x73\x20\x28\x2d\x20\x74\x6f\x20\x73\x75\x62\x74\x72" - "\x61\x63\x74\x2c\x20\x4d\x20\x6f\x72\x20\x4b\x20\x3d\x20\x4d\x65\x67\x61\x2f\x4b\x69\x6c\x6f\x62\x79\x74\x65\x73\x2c\x20\x6f\x72" - "\x20\x24\x29\x01\x5c\x3a\x20\x01\x6e" // 471 ModifyCredits - ,"\x01\x5f\x01\x79\x01\x68\x41\x64\x6a\x75\x73\x74\x20\x4d\x69\x6e\x75\x74\x65\x73\x20\x28\x2d\x20\x74\x6f\x20\x73\x75\x62\x74\x72" - "\x61\x63\x74\x2c\x20\x48\x20\x3d\x20\x48\x6f\x75\x72\x73\x29\x01\x5c\x3a\x20\x01\x6e" // 472 ModifyMinutes - ,"\x0d\x0a\x44\x65\x6c\x65\x74\x65\x20\x51\x75\x65\x73\x74\x69\x6f\x6e\x6e\x61\x69\x72\x65" // 473 DeleteQuestionaireQ - ,"\x01\x68\x01\x62\x55\x73\x65\x72\x20\x53\x65\x74\x74\x69\x6e\x67\x73\x20\x66\x6f\x72\x20\x01\x77\x25\x73\x20\x23\x25\x64\x01\x62" - "\x3a\x0d\x0a\x0d\x0a" // 474 UserDefaultsHdr - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x54\x01\x6e\x01\x62\x5d\x20\x01\x68\x54\x65\x72\x6d\x69\x6e\x61\x6c\x20\x4d\x6f\x64\x65\x20" - "\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x01\x5c\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 475 UserDefaultsTerminal - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x45\x01\x6e\x01\x62\x5d\x20\x01\x68\x45\x78\x74\x65\x72\x6e\x61\x6c\x20\x45\x64\x69\x74\x6f" - "\x72\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x01\x5c\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 476 UserDefaultsXeditor - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x4c\x01\x6e\x01\x62\x5d\x20\x01\x68\x54\x65\x72\x6d\x69\x6e\x61\x6c\x20\x44\x69\x6d\x65\x6e" - "\x73\x69\x6f\x6e\x73\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x01\x5c\x3a\x20\x01\x63\x25\x73\x2c\x20\x25\x73\x0d" - "\x0a" // 477 UserDefaultsRows - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x58\x01\x6e\x01\x62\x5d\x20\x01\x68\x45\x78\x70\x65\x72\x74\x20\x4d\x65\x6e\x75\x20\x4d\x6f" - "\x64\x65\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 478 UserDefaultsMenuMode - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x50\x01\x6e\x01\x62\x5d\x20\x01\x68\x53\x63\x72\x65\x65\x6e\x20\x50\x61\x75\x73\x65\x20\x20" - "\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 479 UserDefaultsPause - ,"" // 480 UserDefaultsHotKey - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x53\x01\x6e\x01\x62\x5d\x20\x01\x68\x53\x70\x69\x6e\x6e\x69\x6e\x67\x20\x43\x75\x72\x73\x6f" - "\x72\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x01\x5c\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 481 UserDefaultsCursor - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x43\x01\x6e\x01\x62\x5d\x20\x01\x68\x43\x6c\x65\x61\x72\x20\x53\x63\x72\x65\x65\x6e\x20\x42" - "\x65\x74\x77\x65\x65\x6e\x20\x4d\x65\x73\x73\x61\x67\x65\x73\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 482 UserDefaultsCLS - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x4e\x01\x6e\x01\x62\x5d\x20\x01\x68\x41\x73\x6b\x20\x46\x6f\x72\x20\x4e\x65\x77\x20\x4d\x65" - "\x73\x73\x61\x67\x65\x2f\x46\x69\x6c\x65\x20\x53\x63\x61\x6e\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 483 UserDefaultsAskNScan - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x59\x01\x6e\x01\x62\x5d\x20\x01\x68\x41\x73\x6b\x20\x46\x6f\x72\x20\x59\x6f\x75\x72\x20\x55" - "\x6e\x2d\x72\x65\x61\x64\x20\x4d\x73\x67\x20\x53\x63\x61\x6e\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 484 UserDefaultsAskSScan - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x46\x01\x6e\x01\x62\x5d\x20\x01\x68\x41\x75\x74\x6f\x6d\x61\x74\x69\x63\x20\x4e\x65\x77\x20" - "\x46\x69\x6c\x65\x20\x53\x63\x61\x6e\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 485 UserDefaultsANFS - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x52\x01\x6e\x01\x62\x5d\x20\x01\x68\x52\x65\x6d\x65\x6d\x62\x65\x72\x20\x43\x75\x72\x72\x65" - "\x6e\x74\x20\x53\x75\x62\x2d\x62\x6f\x61\x72\x64\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 486 UserDefaultsRemember - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x42\x01\x6e\x01\x62\x5d\x20\x01\x68\x42\x61\x74\x63\x68\x20\x44\x6f\x77\x6e\x6c\x6f\x61\x64" - "\x20\x46\x69\x6c\x65\x20\x46\x6c\x61\x67\x67\x69\x6e\x67\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 487 UserDefaultsBatFlag - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x4d\x01\x6e\x01\x62\x5d\x20\x01\x68\x46\x6f\x72\x77\x61\x72\x64\x20\x45\x2d\x6d\x61\x69\x6c" - "\x20\x74\x6f\x20\x4e\x65\x74\x4d\x61\x69\x6c\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x01\x5c\x20\x01\x62\x28\x01" - "\x63\x25\x2e\x33\x37\x73\x01\x62\x29\x0d\x0a" // 488 UserDefaultsNetMail - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x4b\x01\x6e\x01\x62\x5d\x20\x01\x68\x43\x6f\x6d\x6d\x61\x6e\x64\x20\x53\x68\x65\x6c\x6c\x20" - "\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x01\x5c\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 489 UserDefaultsCommandSet - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x44\x01\x6e\x01\x62\x5d\x20\x01\x68\x44\x65\x66\x61\x75\x6c\x74\x20\x74\x6f\x20\x51\x75\x69" - "\x65\x74\x20\x4d\x6f\x64\x65\x20\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 490 UserDefaultsQuiet - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x57\x01\x6e\x01\x62\x5d\x20\x01\x68\x43\x68\x61\x6e\x67\x65\x20\x50\x61\x73\x73\x77\x6f\x72" - "\x64\x20\x6f\x72\x20\x53\x69\x67\x6e\x61\x74\x75\x72\x65\x0d\x0a" // 491 UserDefaultsPassword - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x41\x01\x6e\x01\x62\x5d\x20\x01\x68\x54\x65\x6d\x70\x6f\x72\x61\x72\x79\x2f\x51\x57\x4b\x20" - "\x41\x72\x63\x68\x69\x76\x65\x20\x54\x79\x70\x65\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 492 UserDefaultsArcType - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x5a\x01\x6e\x01\x62\x5d\x20\x01\x68\x44\x65\x66\x61\x75\x6c\x74\x20\x44\x6f\x77\x6e\x6c\x6f" - "\x61\x64\x20\x50\x72\x6f\x74\x6f\x63\x6f\x6c\x20\x20\x20\x20\x01\x6e\x01\x62\x01\x5c\x3a\x20\x01\x63\x25\x73\x20\x01\x62\x25\x73" - "\x0d\x0a" // 493 UserDefaultsProtocol - ,"\x0d\x0a\x01\x6e\x01\x68\x01\x62\x40\x57\x68\x69\x63\x68\x40\x20\x6f\x72\x20\x5b\x01\x77\x51\x01\x62\x5d\x20\x74\x6f\x20\x40\x51" - "\x75\x69\x74\x40\x3a\x20\x01\x63" // 494 UserDefaultsWhich - ,"\x4f\x6e" // 495 On - ,"\x4f\x66\x66" // 496 Off - ,"\x01\x5f\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x79\x54\x65\x72\x6d\x69\x6e" - "\x61\x6c\x20\x72\x6f\x77\x73\x20\x5b\x01\x77\x41\x75\x74\x6f\x01\x79\x5d\x3a\x20\x01\x6e" // 497 HowManyRows - ,"\x0d\x0a\x01\x5f\x01\x79\x01\x68\x43\x75\x72\x72\x65\x6e\x74\x20\x50\x61\x73\x73\x77\x6f\x72\x64\x3a\x20\x01\x77" // 498 CurrentPassword - ,"\x46\x6f\x72\x77\x61\x72\x64\x20\x70\x65\x72\x73\x6f\x6e\x61\x6c\x20\x65\x2d\x6d\x61\x69\x6c\x20\x74\x6f\x20\x6e\x65\x74\x77\x6f" - "\x72\x6b\x20\x6d\x61\x69\x6c\x20\x61\x64\x64\x72\x65\x73\x73" // 499 ForwardMailQ - ,"\x01\x5f\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x79\x4e\x65\x74\x77\x6f\x72" - "\x6b\x20\x6d\x61\x69\x6c\x20\x61\x64\x64\x72\x65\x73\x73\x01\x5c\x20\x28\x45\x78\x61\x6d\x70\x6c\x65\x3a\x20\x75\x73\x65\x72\x40" - "\x64\x6f\x6d\x61\x69\x6e\x29\x0d\x0a\x20\x3a\x20" // 500 EnterNetMailAddress - ,"\x01\x6e\x01\x6c\x01\x67\x53\x65\x6c\x65\x63\x74\x20\x01\x68\x25\x73\x01\x6e\x01\x67\x3a\x0d\x0a\x0d\x0a" // 501 SelectItemHdr - ,"\x01\x67\x01\x68\x25\x33\x64\x3a\x20\x01\x6e\x01\x67\x25\x73\x0d\x0a" // 502 SelectItemFmt - ,"\x0d\x0a\x40\x57\x68\x69\x63\x68\x40\x2c\x20\x7e\x40\x51\x75\x69\x74\x40\x20\x6f\x72\x20\x5b\x25\x75\x5d\x3a\x20" // 503 SelectItemWhich - ,"\x01\x5f\x01\x77\x01\x68\x0d\x0a\x0d\x0a\x25\x73\x20\x69\x73\x20\x68\x65\x72\x65\x2e\x2e\x2e\x0d\x0a\x0d\x0a\x01\x6e" // 504 SysopIsHere - ,"\x0d\x0a\x01\x5f\x01\x77\x01\x68\x45\x6e\x64\x20\x6f\x66\x20\x63\x68\x61\x74\x2e\x0d\x0a\x0d\x0a\x01\x6e" // 505 EndOfChat - ,"\x0d\x0a\x01\x5f\x01\x79\x01\x68\x43\x68\x61\x74\x3a\x20\x01\x6e" // 506 ChatPrompt - ,"\x3f\x3f\x3f\x3f" // 507 AnonUserChatHandle - ,"\x0d\x0a\x01\x6e\x01\x2d\x01\x67\x4d\x75\x6c\x74\x69\x6e\x6f\x64\x65\x20\x43\x68\x61\x74\x20\x2d\x20\x54\x79\x70\x65\x20\x01\x68" - "\x2f\x3f\x01\x6e\x01\x67\x20\x66\x6f\x72\x20\x6d\x65\x6e\x75\x2e\x0d\x0a" // 508 WelcomeToMultiChat - ,"\x0d\x0a\x01\x77\x01\x68\x57\x65\x6c\x63\x6f\x6d\x65\x20\x74\x6f\x20\x43\x68\x61\x6e\x6e\x65\x6c\x20\x25\x64\x20\x28\x01\x63\x25" - "\x73\x01\x77\x29\x0d\x0a\x0d\x0a\x01\x6e" // 509 WelcomeToChannelN - ,"\x01\x5f\x01\x77\x01\x68\x25\x33\x64\x20\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x69\x6e\x20\x6d\x75\x6c\x74\x69\x6e\x6f\x64\x65" - "\x20\x63\x68\x61\x74\x20\x63\x68\x61\x6e\x6e\x65\x6c\x20\x25\x64\x20\x6c\x6f\x63\x61\x6c\x6c\x79\x2e\x0d\x0a" // 510 NodeInMultiChatLocally - ,"\x0d\x0a\x01\x6e\x01\x6d\x01\x68\x59\x6f\x75\x27\x72\x65\x20\x6f\x6e\x20\x74\x68\x65\x20\x41\x69\x72\x21\x0d\x0a\x0d\x0a\x01\x6e" - "" // 511 YoureOnTheAir - ,"\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x32\x64\x3a\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x6a\x6f\x69\x6e\x65\x64\x20" - "\x6d\x75\x6c\x74\x69\x6e\x6f\x64\x65\x20\x63\x68\x61\x74\x20\x63\x68\x61\x6e\x6e\x65\x6c\x20\x25\x75\x2e\x0d\x0a\x01\x6e" // 512 NodeJoinedMultiChat - ,"\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x32\x64\x3a\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x6c\x65\x66\x74\x20\x6d\x75" - "\x6c\x74\x69\x6e\x6f\x64\x65\x20\x63\x68\x61\x74\x20\x63\x68\x61\x6e\x6e\x65\x6c\x20\x25\x75\x2e\x0d\x0a" // 513 NodeLeftMultiChat - ,"\x01\x5f\x01\x79\x01\x68\x43\x6f\x6d\x6d\x61\x6e\x64\x3a\x20\x01\x6e" // 514 MultiChatCommandPrompt - ,"\x25\x73\x20\x68\x61\x73\x20\x70\x61\x73\x73\x77\x6f\x72\x64\x20\x70\x72\x6f\x74\x65\x63\x74\x65\x64\x20\x74\x68\x69\x73\x20\x63" - "\x68\x61\x6e\x6e\x65\x6c\x0d\x0a\x50\x61\x73\x73\x77\x6f\x72\x64\x3a\x20" // 515 PasswordProtected - ,"\x0d\x0a\x43\x6f\x72\x72\x65\x63\x74\x2e\x0d\x0a" // 516 CorrectPassword - ,"\x01\x72\x01\x68\x0d\x0a\x57\x72\x6f\x6e\x67\x20\x70\x61\x73\x73\x77\x6f\x72\x64\x2e\x0d\x0a" // 517 WrongPassword - ,"\x50\x61\x73\x73\x77\x6f\x72\x64\x20\x70\x72\x6f\x74\x65\x63\x74\x20\x74\x68\x69\x73\x20\x63\x68\x61\x6e\x6e\x65\x6c" // 518 PasswordProtectChanQ - ,"\x0d\x0a\x01\x5f\x01\x79\x01\x68\x50\x61\x73\x73\x77\x6f\x72\x64\x3a\x20" // 519 PasswordPrompt - ,"\x01\x5f\x01\x67\x01\x68\x25\x2d\x38\x2e\x38\x73\x20\x01\x77\x25\x32\x64\x25\x63\x20\x01\x6e\x01\x67\x25\x73" // 520 ChatLineFmt - ,"\x0d\x0a\x53\x79\x73\x6f\x70\x20\x70\x61\x67\x65\x20\x69\x73\x20\x6e\x6f\x77\x20\x25\x73\x0d\x0a" // 521 SysopPageIsNow - ,"\x0d\x0a\x25\x73\x20\x69\x73\x20\x6e\x6f\x74\x20\x61\x76\x61\x69\x6c\x61\x62\x6c\x65\x2e\x0d\x0a" // 522 SysopIsNotAvailable - ,"\x43\x68\x61\x74\x20\x77\x69\x74\x68\x20\x25\x73\x20\x69\x6e\x73\x74\x65\x61\x64" // 523 ChatWithGuruInsteadQ - ,"\x0d\x0a\x01\x62\x01\x68\x50\x72\x69\x76\x61\x74\x65\x3a\x20\x01\x67\x7e\x54\x01\x6e\x01\x67\x65\x6c\x65\x67\x72\x61\x6d\x2c\x20" - "\x01\x68\x7e\x4d\x01\x6e\x01\x67\x65\x73\x73\x61\x67\x65\x2c\x20\x01\x68\x7e\x43\x01\x6e\x01\x67\x68\x61\x74\x2c\x20\x6f\x72\x20" - "\x01\x68\x7e\x51\x01\x6e\x01\x67\x75\x69\x74\x3a\x20\x01\x63\x01\x68" // 524 PrivateMsgPrompt - ,"\x0d\x0a\x01\x68\x01\x79\x4e\x6f\x64\x65\x2c\x20\x55\x73\x65\x72\x20\x6e\x61\x6d\x65\x2c\x20\x01\x77\x23\x01\x79\x4e\x75\x6d\x62" - "\x65\x72\x2c\x20\x01\x77\x27\x01\x79\x48\x61\x6e\x64\x6c\x65\x2c\x01\x5c\x20\x6f\x72\x20\x01\x77\x5e\x55\x01\x79\x73\x65\x72\x20" - "\x6c\x69\x73\x74\x3a\x20\x01\x77\x01\x68" // 525 NodeToPrivateChat - ,"\x0d\x0a\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x64\x20\x69\x73\x20\x69\x6e\x20\x70\x72\x69\x76\x61\x74\x65\x20\x63\x68" - "\x61\x74\x20\x77\x69\x74\x68\x20\x61\x6e\x6f\x74\x68\x65\x72\x20\x6e\x6f\x64\x65\x2e\x0d\x0a" // 526 NodeNAlreadyInPChat - ,"\x0d\x0a\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x64\x20\x69\x73\x20\x6e\x6f\x74\x20\x69\x6e\x20\x75\x73\x65\x2e\x0d\x0a" - "" // 527 NodeNIsNotInUse - ,"\x0d\x0a\x54\x68\x65\x72\x65\x27\x73\x20\x6e\x6f\x20\x6e\x65\x65\x64\x20\x74\x6f\x20\x70\x61\x67\x65\x20\x79\x6f\x75\x72\x73\x65" - "\x6c\x66\x2e\x0d\x0a" // 528 NoNeedToPageSelf - ,"\x0d\x0a\x01\x72\x01\x68\x01\x69\x44\x6f\x6e\x27\x74\x20\x62\x75\x67\x20\x25\x73\x2e\x01\x6e\x0d\x0a" // 529 CantPageNode - ,"\x07\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x32\x64\x3a\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x69\x73\x20\x70\x61\x67" - "\x69\x6e\x67\x20\x79\x6f\x75\x20\x74\x6f\x20\x63\x68\x61\x74\x2e\x0d\x0a" // 530 NodePageMsg - ,"\x07\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x32\x64\x3a\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x69\x73\x20\x70\x61\x67" - "\x69\x6e\x67\x20\x61\x6c\x6c\x20\x6e\x6f\x64\x65\x73\x20\x74\x6f\x20\x63\x68\x61\x74\x2e\x0d\x0a" // 531 AllNodePageMsg - ,"\x07\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x32\x64\x3a\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x69\x73\x20\x70\x61\x67" - "\x69\x6e\x67\x20\x79\x6f\x75\x20\x66\x6f\x72\x20\x70\x72\x69\x76\x61\x74\x65\x20\x63\x68\x61\x74\x2e\x0d\x0a" // 532 NodePChatPageMsg - ,"\x0d\x0a\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x73\x65\x6e\x64\x20\x6d\x65\x73\x73\x61\x67\x65\x73\x2e\x0d\x0a" // 533 R_SendMessages - ,"\x0d\x0a\x01\x68\x01\x79\x4e\x6f\x64\x65\x2c\x20\x4e\x61\x6d\x65\x2c\x20\x01\x77\x23\x01\x79\x4e\x75\x6d\x62\x65\x72\x2c\x20\x01" - "\x77\x27\x01\x79\x48\x61\x6e\x64\x6c\x65\x2c\x01\x5c\x20\x01\x77\x5e\x55\x01\x79\x73\x65\x72\x20\x6c\x69\x73\x74\x2c\x20\x6f\x72" - "\x20\x01\x77\x41\x6c\x6c\x01\x79\x3a\x20\x01\x77\x01\x68" // 534 NodeToSendMsgTo - ,"\x0d\x0a\x54\x68\x65\x72\x65\x27\x73\x20\x6e\x6f\x20\x6e\x65\x65\x64\x20\x74\x6f\x20\x73\x65\x6e\x64\x20\x61\x20\x6d\x65\x73\x73" - "\x61\x67\x65\x20\x74\x6f\x20\x79\x6f\x75\x72\x73\x65\x6c\x66\x2e\x0d\x0a" // 535 NoNeedToSendMsgToSelf - ,"\x01\x5f\x01\x79\x01\x68\x0d\x0a\x4d\x65\x73\x73\x61\x67\x65\x01\x5c\x3a\x20" // 536 NodeMsgPrompt - ,"\x07\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x32\x64\x3a\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x73\x65\x6e\x74\x20\x79" - "\x6f\x75\x20\x61\x20\x6d\x65\x73\x73\x61\x67\x65\x3a\x0d\x0a\x01\x77\x01\x68\x01\x34\x25\x73\x01\x6e\x0d\x0a" // 537 NodeMsgFmt - ,"\x07\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x32\x64\x3a\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x73\x65\x6e\x74\x20\x61" - "\x6c\x6c\x20\x6e\x6f\x64\x65\x73\x20\x61\x20\x6d\x65\x73\x73\x61\x67\x65\x3a\x0d\x0a\x01\x77\x01\x68\x01\x34\x25\x73\x01\x6e\x0d" - "\x0a" // 538 AllNodeMsgFmt - ,"\x0d\x0a\x50\x61\x67\x69\x6e\x67\x20\x25\x73\x2e\x2e\x2e" // 539 PagingGuru - ,"\x01\x6e\x0d\x0a\x01\x63\x57\x61\x69\x74\x69\x6e\x67\x20\x66\x6f\x72\x20\x01\x68\x4e\x6f\x64\x65\x20\x25\x64\x20\x01\x6e\x01\x63" - "\x74\x6f\x20\x6a\x6f\x69\x6e\x20\x70\x72\x69\x76\x61\x74\x65\x20\x63\x68\x61\x74\x2e\x20\x48\x69\x74\x20\x01\x68\x01\x69\x43\x74" - "\x72\x6c\x2d\x43\x01\x6e\x01\x63\x20\x74\x6f\x20\x61\x62\x6f\x72\x74\x2e\x01\x6e\x0d\x0a\x0d\x0a" // 540 WaitingForNodeInPChat - ,"\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x32\x64\x3a\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x6a\x6f\x69\x6e\x65\x64\x20" - "\x70\x72\x69\x76\x61\x74\x65\x20\x63\x68\x61\x74\x2e\x01\x6e\x0d\x0a" // 541 NodeJoinedPrivateChat - ,"\x0d\x0a\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x32\x64\x3a\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x6c\x65\x66\x74\x20" - "\x70\x72\x69\x76\x61\x74\x65\x20\x63\x68\x61\x74\x2e\x01\x6e\x0d\x0a" // 542 NodeLeftPrivateChat - ,"\x4e\x6f\x20\x6f\x6e\x65\x20\x68\x61\x73\x20\x6c\x6f\x67\x67\x65\x64\x20\x6f\x6e\x20\x74\x6f\x64\x61\x79\x2e\x0d\x0a" // 543 NoOneHasLoggedOnToday - ,"\x55\x4e\x55\x53\x45\x44\x35\x34\x34" // 544 Unused544 - ,"\x0d\x0a\x01\x6e\x01\x68\x01\x6d\x25\x2d\x32\x64\x20\x01\x6e\x01\x6d\x25\x2d\x36\x75\x20\x01\x77\x01\x68\x25\x2d\x32\x35\x2e\x32" - "\x35\x73\x20\x01\x6d\x25\x2d\x32\x35\x2e\x32\x35\x73\x01\x6e\x01\x6d\x25\x30\x32\x75\x3a\x25\x30\x32\x75\x20\x01\x68\x25\x2d\x38" - "\x2e\x38\x73\x20\x01\x6e\x01\x6d\x25\x33\x64" // 545 LastFewCallersFmt - ,"\x0d\x0a\x01\x67\x01\x68\x4c\x6f\x67\x6f\x6e\x73\x20\x54\x6f\x64\x61\x79\x3a\x01\x6e\x01\x67" // 546 CallersToday - ,"\x44\x6f\x20\x79\x6f\x75\x20\x6d\x65\x61\x6e\x20\x25\x73\x20\x23\x25\x75\x20\x28\x7e\x40\x59\x65\x73\x40\x2c\x20\x7e\x40\x4e\x6f" - "\x40\x2c\x20\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x29\x20\x3f\x20" // 547 DoYouMeanThisUserQ - ,"\x55\x4e\x4b\x4e\x4f\x57\x4e\x20\x55\x53\x45\x52" // 548 UNKNOWN_USER - ,"\x0d\x0a\x54\x69\x6d\x65\x27\x73\x20\x75\x70\x2e\x0d\x0a" // 549 TimesUp - ,"\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x32\x64\x3a\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x6c\x6f\x67\x67\x65\x64\x20" - "\x6f\x66\x66\x0d\x0a\x01\x6e" // 550 NodeLoggedOff - ,"\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x32\x64\x3a\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x6c\x6f\x67\x67\x65\x64\x20" - "\x6f\x6e\x20\x25\x73\x0d\x0a\x01\x6e" // 551 NodeLoggedOnAtNbps - ,"\x01\x6e\x01\x62\x01\x68\x0d\x0a\x0d\x0a\x4c\x6f\x67\x6f\x6e\x20\x54\x69\x6d\x65\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x73" - "\x0d\x0a" // 552 TiLogon - ,"\x01\x62\x4c\x6f\x63\x61\x6c\x20\x54\x69\x6d\x65\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x73\x20\x25\x73\x0d\x0a" // 553 TiNow - ,"\x01\x62\x54\x69\x6d\x65\x20\x55\x73\x65\x64\x20\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 554 TiTimeon - ,"\x01\x62\x54\x69\x6d\x65\x20\x52\x65\x6d\x61\x69\x6e\x69\x6e\x67\x20\x20\x3a\x20\x01\x63\x25\x73\x0d\x0a\x0d\x0a" // 555 TiTimeLeft - ,"\x0d\x0a\x0d\x0a\x01\x6e\x43\x74\x72\x6c\x2d\x4b\x65\x79\x20\x43\x6f\x6d\x6d\x61\x6e\x64\x73\x20\x28\x66\x72\x6f\x6d\x20\x6d\x6f" - "\x73\x74\x20\x61\x6e\x79\x77\x68\x65\x72\x65\x29\x0d\x0a\x0d\x0a\x01\x68\x5e\x4b\x20\x20\x01\x6e\x54\x68\x69\x73\x20\x4d\x65\x6e" - "\x75\x0d\x0a\x01\x68\x5e\x43\x20\x20\x01\x6e\x41\x62\x6f\x72\x74\x20\x43\x75\x72\x72\x65\x6e\x74\x20\x50\x72\x6f\x63\x65\x73\x73" - "\x0d\x0a\x01\x68\x5e\x4f\x20\x20\x01\x6e\x54\x6f\x67\x67\x6c\x65\x20\x50\x61\x75\x73\x65\x20\x50\x72\x6f\x6d\x70\x74\x20\x54\x65" - "\x6d\x70\x6f\x72\x61\x72\x69\x6c\x79\x0d\x0a\x01\x68\x5e\x5a\x20\x20\x01\x6e\x54\x6f\x67\x67\x6c\x65\x20\x52\x61\x77\x20\x49\x6e" - "\x70\x75\x74\x2f\x4f\x75\x74\x70\x75\x74\x20\x4d\x6f\x64\x65\x01\x5c\x20\x28\x65\x2e\x67\x2e\x20\x66\x6f\x72\x20\x41\x53\x43\x49" - "\x49\x2d\x75\x70\x6c\x6f\x61\x64\x69\x6e\x67\x20\x6d\x73\x67\x20\x74\x65\x78\x74\x29\x0d\x0a\x01\x68\x5e\x55\x20\x20\x01\x6e\x4c" - "\x69\x73\x74\x20\x55\x73\x65\x72\x73\x20\x4f\x6e\x6c\x69\x6e\x65\x0d\x0a\x01\x68\x5e\x50\x20\x20\x01\x6e\x53\x65\x6e\x64\x20\x49" - "\x6e\x73\x74\x61\x6e\x74\x2d\x4d\x65\x73\x73\x61\x67\x65\x73\x20\x61\x6e\x64\x20\x54\x65\x6c\x65\x67\x72\x61\x6d\x73\x0d\x0a\x01" - "\x68\x5e\x54\x20\x20\x01\x6e\x54\x69\x6d\x65\x20\x49\x6e\x66\x6f\x72\x6d\x61\x74\x69\x6f\x6e\x0d\x0a\x0d\x0a" // 556 ControlKeyMenu - ,"\x0d\x0a\x01\x6e\x59\x6f\x75\x27\x76\x65\x20\x74\x61\x6b\x65\x6e\x20\x74\x6f\x6f\x20\x6c\x6f\x6e\x67\x20\x74\x6f\x20\x6c\x6f\x67" - "\x20\x6f\x6e\x2e\x0d\x0a" // 557 TakenTooLongToLogon - ,"\x0d\x0a\x01\x6e\x59\x6f\x75\x27\x76\x65\x20\x62\x65\x65\x6e\x20\x69\x6e\x61\x63\x74\x69\x76\x65\x20\x74\x6f\x6f\x20\x6c\x6f\x6e" - "\x67\x2e\x0d\x0a" // 558 CallBackWhenYoureThere - ,"\x40\x45\x58\x45\x43\x3a\x79\x65\x73\x6e\x6f\x62\x61\x72\x40" // 559 YesNoQuestion - ,"\x59\x65\x73" // 560 Yes - ,"\x4e\x6f" // 561 No - ,"\x40\x45\x58\x45\x43\x3a\x6e\x6f\x79\x65\x73\x62\x61\x72\x40" // 562 NoYesQuestion - ,"\x01\x5f\x01\x72\x01\x68\x5b\x48\x69\x74\x20\x61\x20\x6b\x65\x79\x5d\x20" // 563 Pause - ,"\x43\x6f\x6e\x74\x69\x6e\x75\x65" // 564 ContinueQ - ,"\x01\x2d\x01\x67\x0d\x0a\x53\x79\x73\x74\x65\x6d\x20\x53\x74\x61\x74\x69\x73\x74\x69\x63\x73\x20\x4c\x6f\x67\x3a\x0d\x0a\x0d\x0a" - "\x01\x6e" // 565 SysStatsLogHdr - ,"\x01\x2d\x01\x67\x0d\x0a\x4e\x6f\x64\x65\x20\x23\x25\x64\x20\x53\x74\x61\x74\x69\x73\x74\x69\x63\x73\x20\x4c\x6f\x67\x3a\x0d\x0a" - "\x0d\x0a\x01\x6e" // 566 NodeStatsLogHdr - ,"\x01\x5f\x01\x72\x01\x68\x59\x6f\x75\x72\x20\x74\x69\x6d\x65\x20\x68\x61\x73\x20\x62\x65\x65\x6e\x20\x72\x65\x64\x75\x63\x65\x64" - "\x20\x64\x75\x65\x20\x74\x6f\x20\x61\x6e\x20\x75\x70\x63\x6f\x6d\x69\x6e\x67\x20\x65\x76\x65\x6e\x74\x20\x6f\x6e\x20\x01\x77\x25" - "\x73\x0d\x0a\x0d\x0a" // 567 ReducedTime - ,"\x01\x6e\x0d\x0a\x54\x69\x6d\x65\x64\x20\x45\x76\x65\x6e\x74\x20\x2d\x20\x4e\x6f\x64\x65\x3a\x20\x25\x64\x20\x20\x20\x54\x69\x6d" - "\x65\x3a\x20\x25\x30\x32\x64\x3a\x25\x30\x32\x64\x20\x20\x20\x4c\x61\x73\x74\x20\x52\x61\x6e\x3a\x20\x25\x73\x0d\x0a" // 568 EventInfo - ,"\x01\x5f\x01\x72\x01\x68\x01\x69\x01\x3f\x43\x6f\x6e\x6e\x65\x63\x74\x69\x6f\x6e\x20\x77\x69\x6c\x6c\x20\x62\x65\x20\x64\x72\x6f" - "\x70\x70\x65\x64\x20\x69\x6e\x20\x25\x64\x20\x6d\x69\x6e\x75\x74\x65\x73\x20\x64\x75\x65\x20\x74\x6f\x20\x75\x70\x63\x6f\x6d\x69" - "\x6e\x67\x20\x65\x76\x65\x6e\x74\x2e\x01\x6e" // 569 UploadBeforeEvent - ,"\x01\x5f\x01\x79\x01\x68\x0d\x0a\x51\x57\x4b\x3a\x20\x01\x6e" // 570 QWKPrompt - ,"\x0d\x0a\x43\x74\x72\x6c\x2d\x41\x20\x63\x6f\x64\x65\x73\x3a\x20\x7e\x45\x78\x70\x61\x6e\x64\x20\x74\x6f\x20\x41\x4e\x53\x49\x2c" - "\x20\x7e\x4c\x65\x61\x76\x65\x20\x69\x6e\x2c\x20\x6f\x72\x20\x5b\x53\x74\x72\x69\x70\x5d\x3a\x20" // 571 QWKCtrlACodes - ,"\x0d\x0a\x01\x5f\x01\x68\x01\x77\x50\x61\x63\x6b\x69\x6e\x67\x20\x53\x75\x62\x2d\x62\x6f\x61\x72\x64\x2e\x2e\x2e\x20\x20\x20\x20" - "\x20\x20" // 572 QWKPackingSubboard - ,"\x01\x5b\x01\x62\x50\x61\x63\x6b\x65\x64\x3a\x01\x77\x25\x34\x75\x20\x01\x62\x6f\x66\x01\x77\x20\x25\x75\x01\x3e" // 573 QWKPackedSubboard - ,"\x0d\x0a\x01\x5f\x01\x68\x01\x77\x50\x61\x63\x6b\x69\x6e\x67\x20\x45\x2d\x6d\x61\x69\x6c\x2e\x2e\x2e\x20\x20\x20\x20\x20\x20\x20" - "\x20\x20\x20\x20\x20" // 574 QWKPackingEmail - ,"\x01\x5b\x01\x62\x50\x61\x63\x6b\x65\x64\x20\x01\x77\x25\x75\x01\x62\x20\x45\x2d\x6d\x61\x69\x6c\x20\x6d\x65\x73\x73\x61\x67\x65" - "\x73\x2e\x01\x3e" // 575 QWKPackedEmail - ,"\x0d\x0a\x01\x5f\x01\x68\x01\x77\x55\x6e\x70\x61\x63\x6b\x69\x6e\x67\x20\x40\x45\x4c\x4c\x49\x50\x53\x49\x53\x40" // 576 QWKUnpacking - ,"\x01\x5b\x01\x5f\x01\x68\x01\x62\x55\x6e\x70\x61\x63\x6b\x65\x64\x2e\x01\x3e" // 577 QWKUnpacked - ,"\x01\x5f\x01\x77\x01\x68\x4e\x6f\x20\x6e\x65\x77\x20\x6d\x65\x73\x73\x61\x67\x65\x73\x2e\x0d\x0a" // 578 QWKNoNewMessages - ,"\x0d\x0a\x01\x72\x01\x68\x01\x69\x50\x61\x63\x6b\x65\x74\x20\x43\x6f\x6d\x70\x72\x65\x73\x73\x69\x6f\x6e\x20\x46\x61\x69\x6c\x65" - "\x64\x21\x01\x6e\x0d\x0a" // 579 QWKCompressionFailed - ,"\x0d\x0a\x01\x72\x01\x68\x01\x69\x43\x61\x6e\x27\x74\x20\x45\x78\x74\x72\x61\x63\x74\x21\x01\x6e\x0d\x0a" // 580 QWKExtractionFailed - ,"\x0d\x0a\x01\x72\x01\x68\x01\x69\x52\x65\x70\x6c\x79\x20\x6e\x6f\x74\x20\x72\x65\x63\x65\x69\x76\x65\x64\x21\x01\x6e\x0d\x0a" // 581 QWKReplyNotReceived - ,"\x01\x5f\x01\x77\x01\x68\x49\x6e\x76\x61\x6c\x69\x64\x20\x43\x6f\x6e\x66\x65\x72\x65\x6e\x63\x65\x20\x25\x64\x0d\x0a" // 582 QWKInvalidConferenceN - ,"\x0d\x0a\x01\x5f\x01\x68\x01\x77\x43\x72\x65\x61\x74\x69\x6e\x67\x20\x25\x73\x2e\x2e\x2e" // 583 CreatingFileList - ,"\x01\x5b\x01\x62\x43\x72\x65\x61\x74\x65\x64\x20\x25\x73\x01\x3e" // 584 CreatedFileList - ,"\x01\x5b\x01\x62\x4e\x6f\x20\x46\x69\x6c\x65\x73\x2e\x01\x3e" // 585 NoFiles - ,"\x0d\x0a\x4d\x65\x73\x73\x61\x67\x65\x20\x70\x6f\x69\x6e\x74\x65\x72\x73\x20\x72\x65\x73\x65\x74\x20\x74\x6f\x20\x69\x6e\x69\x74" - "\x69\x61\x6c\x20\x76\x61\x6c\x75\x65\x73\x2e\x0d\x0a" // 586 MsgPtrsInitialized - ,"\x01\x2d\x0d\x0a\x01\x67\x54\x68\x65\x20\x63\x75\x72\x72\x65\x6e\x74\x20\x63\x6f\x6e\x76\x65\x72\x73\x69\x6f\x6e\x20\x72\x61\x74" - "\x65\x20\x69\x73\x20\x01\x68\x25\x75\x20\x01\x6e\x01\x67\x6d\x69\x6e\x75\x74\x65\x73\x20\x66\x6f\x72\x20\x01\x68\x31\x30\x30\x6b" - "\x01\x6e\x01\x67\x20\x63\x72\x65\x64\x69\x74\x73\x2e\x0d\x0a\x0d\x0a\x01\x6e" // 587 ConversionRate - ,"\x0d\x0a\x01\x5f\x01\x62\x01\x68\x48\x6f\x77\x20\x6d\x61\x6e\x79\x20\x01\x77\x31\x30\x30\x6b\x20\x01\x62\x63\x72\x65\x64\x69\x74" - "\x20\x62\x6c\x6f\x63\x6b\x73\x20\x74\x6f\x20\x63\x6f\x6e\x76\x65\x72\x74\x01\x5c\x20\x74\x6f\x20\x6d\x69\x6e\x75\x74\x65\x73\x20" - "\x28\x01\x77\x25\x75\x20\x4d\x61\x78\x01\x62\x29\x3a\x20\x01\x6e" // 588 CreditsToMin - ,"\x01\x2d\x01\x72\x01\x68\x01\x69\x59\x6f\x75\x20\x68\x61\x76\x65\x20\x74\x6f\x6f\x20\x6d\x61\x6e\x79\x20\x6d\x69\x6e\x75\x74\x65" - "\x73\x2e\x01\x6e\x0d\x0a" // 589 YouHaveTooManyMinutes - ,"\x0d\x0a\x59\x6f\x75\x20\x61\x72\x65\x20\x63\x6f\x6e\x6e\x65\x63\x74\x65\x64\x20\x74\x6f\x20\x61\x20\x62\x69\x6c\x6c\x69\x6e\x67" - "\x20\x6e\x6f\x64\x65\x20\x66\x6f\x72\x20\x25\x73\x20\x42\x42\x53\x2e\x0d\x0a\x59\x6f\x75\x72\x20\x70\x68\x6f\x6e\x65\x20\x6e\x75" - "\x6d\x62\x65\x72\x20\x77\x69\x6c\x6c\x20\x62\x65\x20\x63\x68\x61\x72\x67\x65\x64\x20\x24\x25\x64\x20\x69\x66\x20\x79\x6f\x75\x20" - "\x64\x6f\x20\x6e\x6f\x74\x20\x68\x61\x6e\x67\x20\x75\x70\x20\x77\x69\x74\x68\x69\x6e\x20\x33\x30\x20\x73\x65\x63\x6f\x6e\x64\x73" - "\x2e\x0d\x0a\x0d\x0a\x50\x6c\x65\x61\x73\x65\x20\x77\x61\x69\x74\x2c\x20\x6f\x72\x20\x68\x69\x74\x20\x61\x6e\x79\x20\x6b\x65\x79" - "\x20\x74\x6f\x20\x68\x61\x6e\x67\x20\x75\x70\x20\x6e\x6f\x77\x2e\x2e\x2e" // 590 BillingNodeMsg - ,"\x43\x6f\x6e\x76\x65\x72\x74\x20\x31\x30\x30\x6b\x20\x63\x72\x65\x64\x69\x74\x73\x20\x74\x6f\x20\x25\x75\x20\x6d\x69\x6e\x75\x74" - "\x65\x73" // 591 Convert100ktoNminQ - ,"\x0d\x0a\x25\x75\x20\x63\x72\x65\x64\x69\x74\x73\x20\x68\x61\x76\x65\x20\x62\x65\x65\x6e\x20\x61\x64\x64\x65\x64\x20\x74\x6f\x20" - "\x79\x6f\x75\x72\x20\x61\x63\x63\x6f\x75\x6e\x74\x2e\x0d\x0a" // 592 CreditedAccount - ,"\x0d\x0a\x41\x4e\x53\x49\x20\x43\x61\x70\x74\x75\x72\x65\x20\x69\x73\x20\x6e\x6f\x77\x20\x25\x73\x0d\x0a" // 593 ANSICaptureIsNow - ,"\x01\x6e\x01\x6d\x0d\x0a\x52\x65\x74\x72\x69\x65\x76\x69\x6e\x67\x20\x01\x68\x25\x73\x01\x6e\x01\x6d\x2e\x2e\x2e" // 594 RetrievingFile - ,"\x55\x4e\x55\x53\x45\x44\x35\x39\x35" // 595 Unused595 - ,"\x0d\x0a\x50\x72\x69\x76\x61\x74\x65" // 596 PrivatePostQ - ,"\x0d\x0a\x01\x5f\x01\x79\x01\x68\x50\x6f\x73\x74\x20\x74\x6f\x3a\x20" // 597 PostTo - ,"\x0d\x0a\x50\x72\x69\x76\x61\x74\x65\x20\x70\x6f\x73\x74\x73\x20\x72\x65\x71\x75\x69\x72\x65\x20\x61\x20\x64\x65\x73\x74\x69\x6e" - "\x61\x74\x69\x6f\x6e\x20\x75\x73\x65\x72\x20\x6e\x61\x6d\x65\x2e\x0d\x0a" // 598 NoToUser - ,"\x0d\x0a\x01\x5f\x01\x77\x01\x68\x55\x73\x69\x6e\x67\x20\x79\x6f\x75\x72\x20\x72\x65\x61\x6c\x20\x6e\x61\x6d\x65\x20\x40\x45\x4c" - "\x4c\x49\x50\x53\x49\x53\x40\x0d\x0a" // 599 UsingRealName - ,"\x0d\x0a\x01\x5f\x01\x77\x01\x68\x50\x6f\x73\x74\x69\x6e\x67\x20\x50\x72\x69\x76\x61\x74\x65\x6c\x79\x20\x40\x45\x4c\x4c\x49\x50" - "\x53\x49\x53\x40\x0d\x0a" // 600 PostingPrivately - ,"\x0d\x0a\x01\x5f\x01\x77\x01\x68\x50\x6f\x73\x74\x69\x6e\x67\x20\x61\x6e\x6f\x6e\x79\x6d\x6f\x75\x73\x6c\x79\x20\x40\x45\x4c\x4c" - "\x49\x50\x53\x49\x53\x40\x0d\x0a" // 601 PostingAnonymously - ,"\x0d\x0a\x43\x61\x6e\x27\x74\x20\x64\x65\x6c\x65\x74\x65\x20\x70\x6f\x73\x74\x73\x20\x6f\x6e\x20\x74\x68\x69\x73\x20\x73\x75\x62" - "\x2d\x62\x6f\x61\x72\x64\x2e\x0d\x0a" // 602 CantDeletePosts - ,"\x0d\x0a\x01\x68\x01\x67\x53\x75\x62\x2d\x62\x6f\x61\x72\x64\x20\x49\x6e\x66\x6f\x72\x6d\x61\x74\x69\x6f\x6e\x3a\x0d\x0a\x0d\x0a" - "\x01\x6e" // 603 SubInfoHdr - ,"\x01\x6e\x01\x68\x01\x62\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20" - "\x01\x63\x25\x73\x0d\x0a" // 604 SubInfoLongName - ,"\x01\x6e\x01\x68\x01\x62\x4e\x61\x6d\x65\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20" - "\x01\x63\x25\x73\x0d\x0a" // 605 SubInfoShortName - ,"\x01\x6e\x01\x68\x01\x62\x51\x57\x4b\x20\x4e\x61\x6d\x65\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20" - "\x01\x63\x25\x73\x0d\x0a" // 606 SubInfoQWKName - ,"\x01\x6e\x01\x68\x01\x62\x4d\x65\x73\x73\x61\x67\x65\x73\x20\x52\x65\x74\x61\x69\x6e\x65\x64\x20\x20\x20\x20\x20\x20\x20\x3a\x20" - "\x01\x63\x25\x75\x0d\x0a" // 607 SubInfoMaxMsgs - ,"\x01\x6e\x01\x68\x01\x62\x0d\x0a\x51\x57\x4b\x20\x70\x61\x63\x6b\x65\x74\x20\x6e\x65\x74\x77\x6f\x72\x6b\x20\x63\x6f\x6e\x66\x65" - "\x72\x65\x6e\x63\x65\x20\x75\x73\x69\x6e\x67\x20\x74\x68\x65\x20\x74\x61\x67\x6c\x69\x6e\x65\x3a\x01\x6e\x0d\x0a\x20\xfe\x20\x25" - "\x73\x01\x6e\x0d\x0a" // 608 SubInfoTagLine - ,"\x01\x6e\x01\x68\x01\x62\x0d\x0a\x46\x69\x64\x6f\x4e\x65\x74\x20\x45\x63\x68\x6f\x4d\x61\x69\x6c\x20\x63\x6f\x6e\x66\x65\x72\x65" - "\x6e\x63\x65\x20\x75\x73\x69\x6e\x67\x20\x74\x68\x65\x20\x6f\x72\x69\x67\x69\x6e\x20\x6c\x69\x6e\x65\x3a\x01\x6e\x0d\x0a\x20\x2a" - "\x20\x4f\x72\x69\x67\x69\x6e\x3a\x20\x25\x73\x20\x28\x25\x73\x29\x0d\x0a" // 609 SubInfoFidoNet - ,"" // 610 SubInfoViewFileQ - ,"\x0d\x0a\x01\x67\x01\x68\x44\x69\x72\x65\x63\x74\x6f\x72\x79\x20\x49\x6e\x66\x6f\x72\x6d\x61\x74\x69\x6f\x6e\x3a\x0d\x0a\x0d\x0a" - "\x01\x6e" // 611 DirInfoHdr - ,"\x01\x6e\x01\x68\x01\x62\x4c\x6f\x6e\x67\x20\x4e\x61\x6d\x65\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20" - "\x01\x63\x25\x73\x0d\x0a" // 612 DirInfoLongName - ,"\x01\x6e\x01\x68\x01\x62\x53\x68\x6f\x72\x74\x20\x4e\x61\x6d\x65\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20" - "\x01\x63\x25\x73\x0d\x0a" // 613 DirInfoShortName - ,"\x01\x6e\x01\x68\x01\x62\x41\x6c\x6c\x6f\x77\x65\x64\x20\x46\x69\x6c\x65\x20\x45\x78\x74\x65\x6e\x73\x69\x6f\x6e\x73\x20\x3a\x20" - "\x01\x63\x25\x73\x0d\x0a" // 614 DirInfoAllowedExts - ,"\x01\x6e\x01\x68\x01\x62\x4d\x61\x78\x69\x6d\x75\x6d\x20\x46\x69\x6c\x65\x73\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20" - "\x01\x63\x25\x75\x0d\x0a" // 615 DirInfoMaxFiles - ,"" // 616 DirInfoViewFileQ - ,"\x01\x6e\x0d\x0a\x4e\x6f\x20\x4e\x65\x74\x4d\x61\x69\x6c\x20\x61\x6c\x6c\x6f\x77\x65\x64\x2e\x0d\x0a" // 617 NoNetMailAllowed - ,"\x0d\x0a\x49\x74\x20\x77\x69\x6c\x6c\x20\x63\x6f\x73\x74\x20\x79\x6f\x75\x20\x25\x75\x20\x63\x72\x65\x64\x69\x74\x73\x20\x74\x6f" - "\x20\x73\x65\x6e\x64\x20\x4e\x65\x74\x4d\x61\x69\x6c\x2e\x20\x43\x6f\x6e\x74\x69\x6e\x75\x65" // 618 NetMailCostContinueQ - ,"\x01\x6e\x01\x3f\x01\x6d\x4e\x65\x74\x4d\x61\x69\x6c\x20\x54\x6f\x3a\x20\x01\x68\x25\x73\x01\x6e\x01\x6d\x20\x28\x01\x68\x25\x73" - "\x01\x6e\x01\x6d\x29\x0d\x0a\x46\x72\x6f\x6d\x3a\x20\x01\x68\x25\x73\x01\x6e\x01\x6d\x20\x28\x01\x68\x25\x73\x01\x6e\x01\x6d\x29" - "\x0d\x0a" // 619 NetMailing - ,"\x52\x65\x6d\x6f\x76\x65\x20\x74\x68\x69\x73\x20\x73\x75\x62\x2d\x62\x6f\x61\x72\x64\x20\x66\x72\x6f\x6d\x20\x79\x6f\x75\x72\x20" - "\x6e\x65\x77\x2d\x73\x63\x61\x6e\x20\x6c\x69\x73\x74" // 620 RemoveFromNewScanQ - ,"\x0d\x0a\x7e\x53\x75\x62\x2d\x62\x6f\x61\x72\x64\x3a\x20\x40\x53\x55\x42\x40\x2c\x01\x5c\x20\x7e\x47\x72\x6f\x75\x70\x3a\x20\x40" - "\x47\x52\x50\x40\x2c\x20\x6f\x72\x20\x7e\x40\x41\x6c\x6c\x40\x3a\x20" // 621 SubGroupOrAll - ,"\x0d\x0a\x7e\x44\x69\x72\x65\x63\x74\x6f\x72\x79\x3a\x20\x40\x44\x49\x52\x40\x2c\x01\x5c\x20\x7e\x4c\x69\x62\x72\x61\x72\x79\x3a" - "\x20\x40\x4c\x49\x42\x40\x2c\x20\x6f\x72\x20\x7e\x40\x41\x6c\x6c\x40\x3a\x20" // 622 DirLibOrAll - ,"\x0d\x0a\x01\x5f\x01\x79\x01\x68\x45\x6e\x74\x65\x72\x20\x70\x61\x74\x68\x01\x5c\x3a\x20" // 623 EnterPath - ,"\x01\x3f\x44\x69\x73\x70\x6c\x61\x79\x20\x65\x78\x74\x65\x6e\x64\x65\x64\x20\x66\x69\x6c\x65\x20\x69\x6e\x66\x6f\x72\x6d\x61\x74" - "\x69\x6f\x6e" // 624 DisplayExtendedFileInfoQ - ,"\x0d\x0a\x44\x69\x73\x70\x6c\x61\x79\x20\x53\x75\x62\x6a\x65\x63\x74\x73\x20\x4f\x6e\x6c\x79" // 625 DisplaySubjectsOnlyQ - ,"\x0d\x0a\x45\x63\x68\x6f\x20\x69\x73\x20\x6e\x6f\x77\x20\x25\x73\x20\x0d\x0a" // 626 EchoIsNow - ,"\x0d\x0a\x01\x6e\x01\x79\x01\x68\x50\x72\x69\x76\x61\x74\x65\x20\x43\x68\x61\x74\x20\x2d\x20\x01\x62\x43\x74\x72\x6c\x2d\x43\x20" - "\x74\x6f\x20\x51\x75\x69\x74\x01\x6e\x0d\x0a\x0d\x0a" // 627 WelcomeToPrivateChat - ,"\x0d\x0a\x01\x6e\x01\x67\x55\x70\x6c\x6f\x61\x64\x69\x6e\x67\x20\x01\x68\x25\x73\x2e\x52\x45\x50\x0d\x0a" // 628 UploadingREP - ,"\x01\x6e\x01\x67\x52\x65\x63\x65\x69\x76\x65\x64\x20\x01\x6e\x01\x68\x25\x73\x01\x6e\x01\x67\x20\x66\x72\x6f\x6d\x20\x01\x68\x25" - "\x73\x01\x6e\x01\x67\x20\x76\x69\x61\x20\x51\x57\x4b\x2e\x0d\x0a" // 629 ReceivedFileViaQWK - ,"\x01\x72\x01\x68\x01\x69\x0d\x51\x57\x4b\x20\x70\x61\x63\x6b\x65\x74\x20\x6d\x65\x73\x73\x61\x67\x65\x20\x6c\x69\x6d\x69\x74\x20" - "\x72\x65\x61\x63\x68\x65\x64\x2e\x01\x6e\x01\x68\x0d\x0a" // 630 QWKmsgLimitReached - ,"\x0d\x0a\x01\x6e\x50\x72\x69\x76\x61\x74\x65\x20\x70\x6f\x73\x74\x73\x20\x6e\x6f\x74\x20\x61\x6c\x6c\x6f\x77\x65\x64\x20\x6f\x6e" - "\x20\x74\x68\x69\x73\x20\x73\x75\x62\x2e\x0d\x0a" // 631 PrivatePostsNotAllowed - ,"\x01\x5f\x01\x77\x01\x68\x4c\x6f\x61\x64\x69\x6e\x67\x20\x6d\x65\x73\x73\x61\x67\x65\x20\x70\x6f\x69\x6e\x74\x65\x72\x73\x2e\x2e" - "\x01\x69\x2e\x01\x6e\x20" // 632 LoadingMsgPtrs - ,"\x01\x5b\x01\x3e" // 633 LoadedMsgPtrs - ,"\x0d\x0a\x51\x75\x6f\x74\x65\x20\x6f\x72\x69\x67\x69\x6e\x61\x6c\x20\x6d\x65\x73\x73\x61\x67\x65" // 634 QuoteMessageQ - ,"\x0d\x0a\x01\x62\x01\x68\x4c\x69\x6e\x65\x20\x6e\x75\x6d\x62\x65\x72\x73\x20\x28\x23\x2c\x23\x29\x2c\x20\x52\x61\x6e\x67\x65\x20" - "\x28\x23\x2d\x23\x29\x2c\x01\x5c\x20\x01\x77\x7e\x4c\x01\x62\x69\x73\x74\x20\x6f\x72\x20\x5b\x25\x73\x5d\x3a\x20\x01\x77" // 635 QuoteLinesPrompt - ,"\x0d\x0a\x01\x5f\x01\x63\x01\x68\x4d\x75\x6c\x74\x69\x6e\x6f\x64\x65\x20\x43\x68\x61\x74\x20\x43\x68\x61\x6e\x6e\x65\x6c\x73\x3a" - "\x0d\x0a\x0d\x0a" // 636 ChatChanLstHdr - ,"\x01\x6e\x01\x63\x4e\x75\x6d\x20\x4e\x61\x6d\x65\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20" - "\x20\x20\x20\x20\x20\x43\x6f\x73\x74" // 637 ChatChanLstTitles - ,"\x01\x68\xc4\xc4\xc4\x20\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\x20" - "\x20\x20\x20\xc4\xc4\xc4\xc4" // 638 ChatChanLstUnderline - ,"\x01\x68\x01\x63\x25\x33\x75\x20\x01\x6e\x01\x63\x25\x2d\x32\x35\x2e\x32\x35\x73\x01\x68\x25\x38\x75" // 639 ChatChanLstFmt - ,"\x0d\x0a\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x61\x63\x63\x65\x73\x73\x20\x74\x68\x61\x74\x20\x63\x68\x61\x6e\x6e\x65\x6c\x2e" - "\x0d\x0a" // 640 CantAccessThatChannel - ,"\x0d\x0a\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x66\x72\x6f\x6d\x20\x74\x68\x69\x73\x20\x64" - "\x69\x72\x65\x63\x74\x6f\x72\x79\x2e\x0d\x0a" // 641 CantDownloadFromDir - ,"\x01\x5f\x01\x77\x01\x68\x53\x65\x61\x72\x63\x68\x69\x6e\x67\x20\x66\x6f\x72\x20\x64\x75\x70\x6c\x69\x63\x61\x74\x65\x73\x2e\x2e" - "\x01\x69\x2e\x01\x6e\x20" // 642 SearchingForDupes - ,"\x01\x5b\x01\x3e" // 643 SearchedForDupes - ,"\x01\x6e\x01\x68\x59\x6f\x75\x72\x20\x61\x63\x63\x6f\x75\x6e\x74\x20\x77\x69\x6c\x6c\x20\x65\x78\x70\x69\x72\x65\x20\x69\x6e\x20" - "\x01\x72\x01\x69\x25\x64\x01\x6e\x01\x68\x20\x64\x61\x79\x73\x2e\x0d\x0a" // 644 AccountWillExpireInNDays - ,"\x01\x6e\x01\x72\x01\x68\x01\x69\x59\x6f\x75\x72\x20\x61\x63\x63\x6f\x75\x6e\x74\x20\x68\x61\x73\x20\x65\x78\x70\x69\x72\x65\x64" - "\x21\x01\x6e\x0d\x0a" // 645 AccountHasExpired - ,"\x0d\x0a\x44\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x66\x69\x6c\x65\x73\x20\x69\x6e\x20\x62\x61\x74\x63\x68\x20\x71\x75\x65\x75\x65\x20" - "\x6e\x6f\x77" // 646 DownloadBatchQ - ,"\x01\x5f\x01\x72\x01\x68\x0d\x0a\x57\x61\x69\x74\x69\x6e\x67\x20\x66\x6f\x72\x20\x53\x6c\x6f\x77\x20\x4d\x65\x64\x69\x61\x20\x44" - "\x65\x76\x69\x63\x65\x20\x23\x25\x75\x2e\x2e\x2e" // 647 WaitingForDeviceN - ,"\x01\x6e\x01\x79\x01\x68\x25\x73\x01\x6e\x01\x63\x20\x73\x65\x6e\x74\x20\x79\x6f\x75\x20\x45\x2d\x6d\x61\x69\x6c\x2e\x0d\x0a" // 648 UserSentYouMail - ,"\x01\x6e\x01\x79\x01\x68\x25\x73\x01\x6e\x01\x63\x20\x73\x65\x6e\x74\x20\x79\x6f\x75\x20\x61\x20\x66\x69\x6c\x65\x2e\x0d\x0a" // 649 UserSentYouFile - ,"\x01\x6e\x01\x79\x01\x68\x25\x73\x01\x6e\x01\x63\x20\x72\x65\x61\x64\x20\x79\x6f\x75\x72\x20\x45\x2d\x6d\x61\x69\x6c\x20\x6f\x6e" - "\x20\x25\x73\x2e\x0d\x0a" // 650 UserReadYourMail - ,"\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x32\x64\x3a\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x72\x65\x61\x64\x20\x79\x6f" - "\x75\x72\x20\x45\x2d\x6d\x61\x69\x6c\x2e\x0d\x0a" // 651 UserReadYourMailNodeMsg - ,"\x0d\x0a\x40\x57\x68\x69\x63\x68\x40\x2c\x20\x7e\x40\x51\x75\x69\x74\x40\x2c\x20\x6f\x72\x20\x5b\x25\x75\x5d\x3a\x20" // 652 JoinWhichGrp - ,"\x0d\x0a\x40\x57\x68\x69\x63\x68\x40\x2c\x20\x7e\x40\x51\x75\x69\x74\x40\x2c\x20\x6f\x72\x20\x5b\x25\x75\x5d\x3a\x20" // 653 JoinWhichSub - ,"\x0d\x0a\x40\x57\x68\x69\x63\x68\x40\x2c\x20\x7e\x40\x51\x75\x69\x74\x40\x2c\x20\x6f\x72\x20\x5b\x25\x75\x5d\x3a\x20" // 654 JoinWhichLib - ,"\x0d\x0a\x40\x57\x68\x69\x63\x68\x40\x2c\x20\x7e\x40\x51\x75\x69\x74\x40\x2c\x20\x6f\x72\x20\x5b\x25\x75\x5d\x3a\x20" // 655 JoinWhichDir - ,"\x01\x6c\x01\x2d\x01\x67\x44\x69\x72\x65\x63\x74\x6f\x72\x69\x65\x73\x20\x6f\x66\x20\x01\x68\x25\x73\x3a\x0d\x0a\x0d\x0a\x01\x68" - "" // 656 CfgDirLstHdr - ,"\x20\x01\x6e\x01\x67\x28\x01\x68\x25\x64\x01\x6e\x01\x67\x29\x20\x25\x73\x01\x68\x0d\x0a" // 657 CfgDirLstFmt - ,"\x01\x6c\x01\x5f\x01\x67\x01\x68\x46\x69\x6c\x65\x20\x4c\x69\x62\x72\x61\x72\x69\x65\x73\x3a\x0d\x0a\x0d\x0a" // 658 CfgLibLstHdr - ,"\x01\x6e\x01\x67\x28\x01\x68\x25\x64\x01\x6e\x01\x67\x29\x20\x25\x73\x01\x68\x0d\x0a" // 659 CfgLibLstFmt - ,"\x01\x5f\x01\x63\x01\x68\x4c\x69\x73\x74\x69\x6e\x67\x20\x01\x6e\x01\x63\x28\x01\x68\x25\x75\x01\x6e\x01\x63\x29\x20\x25\x73\x20" - "\x28\x01\x68\x25\x75\x01\x6e\x01\x63\x29\x20\x25\x73\x20\x28\x01\x68\x01\x60\x3f\x01\x6e\x01\x63\x3d\x4d\x65\x6e\x75\x29\x20\x28" - "\x25\x35\x75\x08\x08\x08\x08\x08\x01\x68\x25\x75\x01\x6e\x01\x63\x20\x46\x69\x6c\x65\x73\x01\x6e\x01\x63\x29\x3a\x20\x01\x6e\x01" - "\x7e" // 660 BatchFlagPrompt - ,"\x01\x6e\x01\x3e\x01\x71\x01\x6c\x01\x34\x20\x01\x68\x01\x79\x5b\x01\x77\x01\x7e\x44\x01\x79\x5d\x6f\x77\x6e\x6c\x6f\x61\x64\x20" - "\x20\x01\x68\x01\x79\x5b\x01\x77\x01\x7e\x42\x01\x79\x5d\x61\x74\x63\x68\x20\x20\x5b\x01\x77\x01\x7e\x56\x01\x79\x5d\x69\x65\x77" - "\x20\x43\x6f\x6e\x74\x65\x6e\x74\x20\x20\x5b\x01\x77\x01\x7e\x45\x01\x79\x5d\x78\x74\x65\x6e\x64\x65\x64\x20\x49\x6e\x66\x6f\x20" - "\x20\x5b\x01\x77\x01\x7e\x50\x01\x79\x5d\x72\x65\x76\x69\x6f\x75\x73\x20\x50\x61\x67\x65\x20\x20\x5b\x01\x77\x01\x7e\x51\x01\x79" - "\x5d\x75\x69\x74\x01\x3e\x01\x6e\x0d\x0a" // 661 FileListBatchCommands - ,"\x01\x3f\x44\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x61\x74\x74\x61\x63\x68\x65\x64\x20\x66\x69\x6c\x65\x01\x5c\x3a\x20\x01\x77\x25\x73" - "\x01\x62\x20\x28\x25\x73\x20\x62\x79\x74\x65\x73\x29" // 662 DownloadAttachedFileQ - ,"\x0d\x0a\x0d\x0a\x01\x6e\x54\x69\x6d\x65\x20\x6c\x65\x66\x74\x20\x3a\x20\x25\x31\x33\x75\x0d\x0a" // 663 FreeMinLeft - ,"\x01\x62\x01\x68\x0d\x0a\x54\x69\x6d\x65\x20\x6c\x65\x66\x74\x20\x74\x6f\x20\x64\x65\x70\x6f\x73\x69\x74\x20\x69\x6e\x20\x6d\x69" - "\x6e\x75\x74\x65\x20\x62\x61\x6e\x6b\x01\x5c\x20\x28\x01\x77\x25\x75\x20\x4d\x61\x78\x01\x62\x29\x3a\x20\x01\x6e" // 664 FreeMinToDeposit - ,"\x0d\x0a\x45\x2d\x6d\x61\x69\x6c\x20\x66\x69\x6c\x65\x20\x61\x74\x74\x61\x63\x68\x6d\x65\x6e\x74\x73\x20\x6e\x6f\x74\x20\x61\x6c" - "\x6c\x6f\x77\x65\x64\x2e\x0d\x0a" // 665 EmailFilesNotAllowed - ,"\x0d\x0a\x01\x6e\x53\x6f\x72\x72\x79\x2c\x20\x79\x6f\x75\x20\x68\x61\x76\x65\x20\x69\x6e\x73\x75\x66\x66\x69\x63\x69\x65\x6e\x74" - "\x20\x61\x63\x63\x65\x73\x73\x20\x74\x6f\x20\x72\x75\x6e\x20\x74\x68\x61\x74\x20\x70\x72\x6f\x67\x72\x61\x6d\x2e\x0d\x0a\x0d\x0a" - "\x01\x70" // 666 CantRunThatProgram - ,"\x01\x6e\x01\x68\x0d\x0a\x07\x0d\x0a\x59\x6f\x75\x20\x6f\x6e\x6c\x79\x20\x68\x61\x76\x65\x20\x01\x72\x01\x69\x25\x75\x01\x6e\x01" - "\x68\x20\x6d\x69\x6e\x75\x74\x65\x25\x73\x20\x6c\x65\x66\x74\x2e\x0d\x0a\x0d\x0a" // 667 OnlyXminutesLeft - ,"\x01\x5b\x01\x6e\x01\x72\x01\x68\x01\x69\x07\x07\x40\x4e\x41\x4d\x45\x40\x21\x20\x01\x6e\x01\x68\x41\x72\x65\x20\x79\x6f\x75\x20" - "\x72\x65\x61\x6c\x6c\x79\x20\x74\x68\x65\x72\x65\x3f\x20\x01\x6e\x01\x3e" // 668 AreYouThere - ,"\x4c\x65\x76\x65\x6c\x20\x25\x75" // 669 NoAccessLevel - ,"\x41\x67\x65\x20\x25\x75" // 670 NoAccessAge - ,"\x42\x50\x53\x20\x25\x75" // 671 NoAccessBPS - ,"\x43\x72\x65\x64\x69\x74\x73\x20\x25\x75" // 672 NoAccessCredit - ,"\x4e\x6f\x64\x65\x20\x25\x75" // 673 NoAccessNode - ,"\x55\x73\x65\x72\x20\x25\x75" // 674 NoAccessUser - ,"\x44\x61\x79\x73\x20\x74\x69\x6c\x6c\x20\x65\x78\x70\x69\x72\x65\x20\x25\x75" // 675 NoAccessExpire - ,"\x54\x69\x6d\x65\x20\x4c\x65\x66\x74\x20\x25\x75" // 676 NoAccessTimeLeft - ,"\x54\x69\x6d\x65\x20\x55\x73\x65\x64\x20\x25\x75" // 677 NoAccessTimeUsed - ,"\x54\x69\x6d\x65\x20\x6f\x66\x20\x64\x61\x79\x20\x25\x30\x32\x64\x3a\x25\x30\x32\x64" // 678 NoAccessTime - ,"\x50\x6f\x73\x74\x2f\x43\x61\x6c\x6c\x20\x52\x61\x74\x69\x6f\x20\x25\x75" // 679 NoAccessPCR - ,"\x55\x70\x6c\x6f\x61\x64\x2f\x44\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x52\x61\x74\x69\x6f\x20\x25\x75" // 680 NoAccessUDR - ,"\x55\x70\x6c\x6f\x61\x64\x2f\x44\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x46\x69\x6c\x65\x20\x52\x61\x74\x69\x6f\x20\x25\x75" // 681 NoAccessUDFR - ,"\x46\x6c\x61\x67\x20\x31\x20\x25\x63" // 682 NoAccessFlag1 - ,"\x46\x6c\x61\x67\x20\x32\x20\x25\x63" // 683 NoAccessFlag2 - ,"\x46\x6c\x61\x67\x20\x33\x20\x25\x63" // 684 NoAccessFlag3 - ,"\x46\x6c\x61\x67\x20\x34\x20\x25\x63" // 685 NoAccessFlag4 - ,"\x53\x65\x78\x20\x25\x63" // 686 NoAccessSex - ,"\x45\x78\x65\x6d\x70\x74\x69\x6f\x6e\x20\x25\x63" // 687 NoAccessExempt - ,"\x52\x65\x73\x74\x72\x69\x63\x74\x69\x6f\x6e\x20\x25\x63" // 688 NoAccessRest - ,"\x44\x61\x79\x20\x6f\x66\x20\x77\x65\x65\x6b\x20\x25\x73" // 689 NoAccessDay - ,"\x47\x72\x6f\x75\x70\x20\x25\x75" // 690 NoAccessGroup - ,"\x53\x75\x62\x2d\x62\x6f\x61\x72\x64\x20\x25\x75" // 691 NoAccessSub - ,"\x4c\x69\x62\x72\x61\x72\x79\x20\x25\x75" // 692 NoAccessLib - ,"\x44\x69\x72\x65\x63\x74\x6f\x72\x79\x20\x25\x75" // 693 NoAccessDir - ,"\x01\x6e\x01\x68\x4e\x6f\x64\x65\x20\x53\x74\x61\x74\x75\x73\x0d\x0a\x01\x63\xc4\xc4\xc4\xc4\x20\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4" - "\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\x0d\x0a" // 694 NodeLstHdr - ,"" // 695 NodeActionMainMenu - ,"" // 696 NodeActionReadingMsgs - ,"" // 697 NodeActionReadingMail - ,"" // 698 NodeActionSendingMail - ,"" // 699 NodeActionReadingTextFiles - ,"" // 700 NodeActionReadingSentMail - ,"" // 701 NodeActionPostingMsg - ,"" // 702 NodeActionAutoMsg - ,"" // 703 NodeActionXtrnMenu - ,"" // 704 NodeActionSettings - ,"" // 705 NodeActionFileMenu - ,"" // 706 NodeActionDownloadingFile - ,"" // 707 NodeActionUploadingFile - ,"" // 708 NodeActionBiXferFile - ,"" // 709 NodeActionListingFiles - ,"" // 710 NodeActionLoggingOn - ,"" // 711 NodeActionLocalChat - ,"" // 712 NodeActionMultiChat - ,"" // 713 NodeActionGuruChat - ,"" // 714 NodeActionChatMenu - ,"" // 715 NodeActionSysop - ,"" // 716 NodeActionQWKmenu - ,"" // 717 NodeActionPrivateChat - ,"" // 718 NodeActionPagingNode - ,"" // 719 NodeActionRetrievingFile - ,"" // 720 NodeActionCustom - ,"\x56\x69\x65\x77\x20\x73\x69\x67\x6e\x61\x74\x75\x72\x65" // 721 ViewSignatureQ - ,"\x44\x65\x6c\x65\x74\x65\x20\x73\x69\x67\x6e\x61\x74\x75\x72\x65" // 722 DeleteSignatureQ - ,"\x43\x72\x65\x61\x74\x65\x2f\x45\x64\x69\x74\x20\x73\x69\x67\x6e\x61\x74\x75\x72\x65" // 723 CreateEditSignatureQ - ,"\x53\x70\x69\x6e\x6e\x69\x6e\x67\x20\x63\x75\x72\x73\x6f\x72\x20\x6f\x6e\x20\x70\x61\x75\x73\x65\x20\x70\x72\x6f\x6d\x70\x74\x73" - "" // 724 SpinningCursorOnPauseQ - ,"\x55\x73\x65\x20\x61\x6e\x20\x65\x78\x74\x65\x72\x6e\x61\x6c\x20\x65\x64\x69\x74\x6f\x72" // 725 UseExternalEditorQ - ,"\x45\x78\x74\x65\x72\x6e\x61\x6c\x20\x45\x64\x69\x74\x6f\x72" // 726 ExternalEditorHeading - ,"\x43\x6f\x6d\x6d\x61\x6e\x64\x20\x53\x68\x65\x6c\x6c" // 727 CommandShellHeading - ,"\x41\x72\x63\x68\x69\x76\x65\x20\x54\x79\x70\x65" // 728 ArchiveTypeHeading - ,"\x56\x61\x6c\x69\x64\x61\x74\x65\x20\x6d\x65\x73\x73\x61\x67\x65\x20\x23\x25\x75\x20\x27\x25\x73\x27" // 729 ValidatePostQ - ,"\x57\x61\x69\x74\x69\x6e\x67\x20\x66\x6f\x72\x20\x63\x6f\x6e\x6e\x65\x63\x74\x69\x6f\x6e" // 730 NodeStatusWaitingForCall - ,"\x41\x74\x20\x6c\x6f\x67\x69\x6e\x20\x70\x72\x6f\x6d\x70\x74" // 731 NodeStatusLogon - ,"\x4e\x65\x77\x20\x75\x73\x65\x72\x20\x61\x70\x70\x6c\x79\x69\x6e\x67\x20\x66\x6f\x72\x20\x61\x63\x63\x65\x73\x73" // 732 NodeStatusNewUser - ,"\x4f\x66\x66\x6c\x69\x6e\x65" // 733 NodeStatusOffline - ,"\x57\x61\x69\x74\x69\x6e\x67\x20\x66\x6f\x72\x20\x61\x6c\x6c\x20\x6e\x6f\x64\x65\x73\x20\x74\x6f\x20\x62\x65\x63\x6f\x6d\x65\x20" - "\x69\x6e\x61\x63\x74\x69\x76\x65" // 734 NodeStatusEventWaiting - ,"\x52\x75\x6e\x6e\x69\x6e\x67\x20\x65\x78\x74\x65\x72\x6e\x61\x6c\x20\x65\x76\x65\x6e\x74" // 735 NodeStatusEventRunning - ,"\x57\x61\x69\x74\x69\x6e\x67\x20\x66\x6f\x72\x20\x6e\x6f\x64\x65\x20\x25\x75\x20\x74\x6f\x20\x66\x69\x6e\x69\x73\x68\x20\x65\x78" - "\x74\x65\x72\x6e\x61\x6c\x20\x65\x76\x65\x6e\x74" // 736 NodeStatusEventLimbo - ,"\x20\x76\x69\x61\x20\x74\x65\x6c\x6e\x65\x74" // 737 NodeConnectionTelnet - ,"\x20\x76\x69\x61\x20\x72\x6c\x6f\x67\x69\x6e" // 738 NodeConnectionRLogin - ,"\x20\x76\x69\x61\x20\x73\x73\x68" // 739 NodeConnectionSSH - ,"\x20\x61\x74\x20\x25\x75\x62\x70\x73" // 740 NodeConnectionModem - ,"\x01\x68\x01\x62\x51\x57\x4b\x20\x53\x65\x74\x74\x69\x6e\x67\x73\x20\x66\x6f\x72\x20\x01\x77\x25\x73\x20\x23\x25\x75\x01\x62\x3a" - "\x01\x6e\x0d\x0a\x0d\x0a" // 741 QWKSettingsHdr - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x41\x01\x6e\x01\x62\x5d\x20\x01\x68\x43\x74\x72\x6c\x2d\x41\x20\x43\x6f\x6c\x6f\x72\x20\x43" - "\x6f\x64\x65\x73\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 742 QWKSettingsCtrlA - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x54\x01\x6e\x01\x62\x5d\x20\x01\x68\x41\x72\x63\x68\x69\x76\x65\x20\x54\x79\x70\x65\x20\x20" - "\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 743 QWKSettingsArchive - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x45\x01\x6e\x01\x62\x5d\x20\x01\x68\x49\x6e\x63\x6c\x75\x64\x65\x20\x45\x2d\x6d\x61\x69\x6c" - "\x20\x4d\x65\x73\x73\x61\x67\x65\x73\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 744 QWKSettingsEmail - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x49\x01\x6e\x01\x62\x5d\x20\x01\x68\x49\x6e\x63\x6c\x75\x64\x65\x20\x46\x69\x6c\x65\x20\x41" - "\x74\x74\x61\x63\x68\x6d\x65\x6e\x74\x73\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 745 QWKSettingsAttach - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x44\x01\x6e\x01\x62\x5d\x20\x01\x68\x44\x65\x6c\x65\x74\x65\x20\x20\x45\x2d\x6d\x61\x69\x6c" - "\x20\x41\x75\x74\x6f\x6d\x61\x74\x69\x63\x61\x6c\x6c\x79\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 746 QWKSettingsDeleteEmail - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x46\x01\x6e\x01\x62\x5d\x20\x01\x68\x49\x6e\x63\x6c\x75\x64\x65\x20\x4e\x65\x77\x20\x46\x69" - "\x6c\x65\x73\x20\x4c\x69\x73\x74\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 747 QWKSettingsNewFilesList - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x4e\x01\x6e\x01\x62\x5d\x20\x01\x68\x49\x6e\x63\x6c\x75\x64\x65\x20\x49\x6e\x64\x65\x78\x20" - "\x46\x69\x6c\x65\x73\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 748 QWKSettingsIndex - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x43\x01\x6e\x01\x62\x5d\x20\x01\x68\x49\x6e\x63\x6c\x75\x64\x65\x20\x43\x6f\x6e\x74\x72\x6f" - "\x6c\x20\x46\x69\x6c\x65\x73\x20\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 749 QWKSettingsControl - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x48\x01\x6e\x01\x62\x5d\x20\x01\x68\x49\x6e\x63\x6c\x75\x64\x65\x20\x48\x45\x41\x44\x45\x52" - "\x53\x2e\x44\x41\x54\x20\x46\x69\x6c\x65\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 750 QWKSettingsHeaders - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x59\x01\x6e\x01\x62\x5d\x20\x01\x68\x49\x6e\x63\x6c\x75\x64\x65\x20\x4d\x65\x73\x73\x61\x67" - "\x65\x73\x20\x66\x72\x6f\x6d\x20\x59\x6f\x75\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 751 QWKSettingsBySelf - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x5a\x01\x6e\x01\x62\x5d\x20\x01\x68\x49\x6e\x63\x6c\x75\x64\x65\x20\x54\x69\x6d\x65\x20\x5a" - "\x6f\x6e\x65\x20\x28\x40\x54\x5a\x29\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 752 QWKSettingsTimeZone - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x50\x01\x6e\x01\x62\x5d\x20\x01\x68\x49\x6e\x63\x6c\x75\x64\x65\x20\x4d\x65\x73\x73\x61\x67" - "\x65\x20\x50\x61\x74\x68\x20\x28\x40\x56\x49\x41\x29\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 753 QWKSettingsVIA - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x4d\x01\x6e\x01\x62\x5d\x20\x01\x68\x49\x6e\x63\x6c\x75\x64\x65\x20\x4d\x65\x73\x73\x61\x67" - "\x65\x2f\x52\x65\x70\x6c\x79\x20\x49\x44\x73\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 754 QWKSettingsMsgID - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x58\x01\x6e\x01\x62\x5d\x20\x01\x68\x45\x78\x74\x65\x6e\x64\x65\x64\x20\x28\x51\x57\x4b\x45" - "\x29\x20\x50\x61\x63\x6b\x65\x74\x20\x46\x6f\x72\x6d\x61\x74\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 755 QWKSettingsExtended - ,"\x0d\x0a\x01\x6e\x01\x68\x01\x62\x40\x57\x68\x69\x63\x68\x40\x20\x6f\x72\x20\x5b\x01\x77\x51\x01\x62\x5d\x75\x69\x74\x3a\x20\x01" - "\x63" // 756 QWKSettingsWhich - ,"\x01\x6e\x0d\x0a\x53\x6f\x72\x72\x79\x2c\x20\x79\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x65\x64\x69\x74\x20\x74\x68\x69\x73\x20\x6d" - "\x65\x73\x73\x61\x67\x65\x2e\x0d\x0a" // 757 CantEditMsg - ,"\x01\x6e\x0d\x0a\x53\x6f\x72\x72\x79\x2c\x20\x79\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x64\x65\x6c\x65\x74\x65\x20\x6d\x65\x73\x73" - "\x61\x67\x65\x20\x23\x25\x75\x2e\x0d\x0a" // 758 CantDeleteMsg - ,"\x01\x6e\x0d\x0a\x53\x6f\x72\x72\x79\x2c\x20\x79\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x72\x65\x61\x64\x20\x6d\x65\x73\x73\x61\x67" - "\x65\x73\x20\x6f\x6e\x20\x25\x73\x20\x25\x73\x0d\x0a" // 759 CantReadSub - ,"\x0d\x53\x6f\x72\x72\x79\x2c\x20\x79\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x70\x6f\x73\x74\x20\x74\x68\x61\x74\x20\x6d\x65\x73\x73" - "\x61\x67\x65\x2e\x01\x5c\x20\x52\x65\x61\x73\x6f\x6e\x3a\x20\x25\x73\x0d\x0a" // 760 CantPostMsg - ,"\x0d\x0a\x01\x79\x01\x68\x4f\x70\x65\x72\x61\x74\x6f\x72\x3a\x20\x01\x77" // 761 OperatorPrompt - ,"\x41\x64\x64\x20\x74\x68\x69\x73\x20\x73\x75\x62\x2d\x62\x6f\x61\x72\x64\x20\x74\x6f\x20\x79\x6f\x75\x72\x20\x6e\x65\x77\x2d\x73" - "\x63\x61\x6e\x20\x6c\x69\x73\x74" // 762 AddSubToNewScanQ - ,"\x01\x6e\x01\x72\x01\x69\x57\x41\x52\x4e\x49\x4e\x47\x3a\x20\x59\x6f\x75\x20\x61\x72\x65\x20\x72\x65\x61\x64\x69\x6e\x67\x20\x6d" - "\x65\x73\x73\x61\x67\x65\x73\x01\x5c\x20\x70\x61\x73\x74\x20\x74\x68\x65\x20\x6c\x61\x73\x74\x20\x75\x6e\x76\x61\x6c\x69\x64\x61" - "\x74\x65\x64\x20\x6d\x65\x73\x73\x61\x67\x65\x20\x28\x25\x75\x29" // 763 UnvalidatedWarning - ,"\x01\x6e\x01\x68\x53\x74\x61\x72\x74\x69\x6e\x67\x20\x6e\x65\x77\x20\x75\x73\x65\x72\x20\x72\x65\x67\x69\x73\x74\x72\x61\x74\x69" - "\x6f\x6e\x20\x40\x45\x4c\x4c\x49\x50\x53\x49\x53\x40\x0d\x0a" // 764 StartingNewUserRegistration - ,"\x0d\x0a\x0d\x0a\x01\x6e\x43\x74\x72\x6c\x2d\x4b\x65\x79\x20\x43\x6f\x6d\x6d\x61\x6e\x64\x73\x20\x28\x64\x75\x72\x69\x6e\x67\x20" - "\x6c\x69\x6e\x65\x20\x69\x6e\x70\x75\x74\x29\x0d\x0a\x0d\x0a\x01\x68\x5e\x4b\x20\x20\x01\x6e\x54\x68\x69\x73\x20\x4d\x65\x6e\x75" - "\x0d\x0a\x01\x68\x5e\x43\x20\x20\x01\x6e\x41\x62\x6f\x72\x74\x20\x43\x75\x72\x72\x65\x6e\x74\x20\x4c\x69\x6e\x65\x20\x49\x6e\x70" - "\x75\x74\x0d\x0a\x01\x68\x5e\x42\x20\x20\x01\x6e\x4d\x6f\x76\x65\x20\x74\x6f\x20\x42\x65\x67\x69\x6e\x6e\x69\x6e\x67\x20\x6f\x66" - "\x20\x4c\x69\x6e\x65\x0d\x0a\x01\x68\x5e\x45\x20\x20\x01\x6e\x4d\x6f\x76\x65\x20\x74\x6f\x20\x45\x6e\x64\x20\x6f\x66\x20\x4c\x69" - "\x6e\x65\x0d\x0a\x01\x68\x5e\x46\x20\x20\x01\x6e\x4d\x6f\x76\x65\x20\x43\x75\x72\x73\x6f\x72\x20\x46\x6f\x72\x77\x61\x72\x64\x20" - "\x28\x74\x6f\x20\x74\x68\x65\x20\x72\x69\x67\x68\x74\x29\x0d\x0a\x01\x68\x5e\x4e\x20\x20\x01\x6e\x4d\x6f\x76\x65\x20\x74\x6f\x20" - "\x4e\x65\x78\x74\x20\x57\x6f\x72\x64\x20\x69\x6e\x20\x4c\x69\x6e\x65\x0d\x0a\x01\x68\x5e\x5c\x20\x20\x01\x6e\x4d\x6f\x76\x65\x20" - "\x74\x6f\x20\x50\x72\x65\x76\x69\x6f\x75\x73\x20\x57\x6f\x72\x64\x20\x69\x6e\x20\x4c\x69\x6e\x65\x0d\x0a\x01\x68\x5e\x44\x20\x20" - "\x01\x6e\x44\x65\x6c\x65\x74\x65\x20\x57\x6f\x72\x64\x20\x74\x6f\x20\x74\x68\x65\x20\x52\x69\x67\x68\x74\x0d\x0a\x01\x68\x5e\x57" - "\x20\x20\x01\x6e\x44\x65\x6c\x65\x74\x65\x20\x57\x6f\x72\x64\x20\x74\x6f\x20\x74\x68\x65\x20\x4c\x65\x66\x74\x0d\x0a\x01\x68\x5e" - "\x48\x20\x20\x01\x6e\x44\x65\x6c\x65\x74\x65\x20\x43\x68\x61\x72\x61\x63\x74\x65\x72\x20\x74\x6f\x20\x74\x68\x65\x20\x4c\x65\x66" - "\x74\x0d\x0a\x01\x68\x5e\x59\x20\x20\x01\x6e\x44\x65\x6c\x65\x74\x65\x20\x74\x6f\x20\x45\x6e\x64\x20\x6f\x66\x20\x4c\x69\x6e\x65" - "\x0d\x0a\x01\x68\x5e\x58\x20\x20\x01\x6e\x44\x65\x6c\x65\x74\x65\x20\x45\x6e\x74\x69\x72\x65\x20\x4c\x69\x6e\x65\x0d\x0a\x01\x68" - "\x5e\x4c\x20\x20\x01\x6e\x43\x65\x6e\x74\x65\x72\x20\x4c\x69\x6e\x65\x20\x28\x61\x6e\x64\x20\x63\x6f\x6d\x70\x6c\x65\x74\x65\x20" - "\x69\x6e\x70\x75\x74\x29\x0d\x0a\x01\x68\x5e\x5a\x20\x20\x01\x6e\x55\x6e\x64\x6f\x20\x28\x72\x65\x76\x65\x72\x74\x20\x65\x64\x69" - "\x74\x65\x64\x20\x4c\x69\x6e\x65\x29\x0d\x0a\x01\x68\x5e\x56\x20\x20\x01\x6e\x54\x6f\x67\x67\x6c\x65\x20\x49\x6e\x73\x65\x72\x74" - "\x2f\x4f\x76\x65\x72\x77\x72\x69\x74\x65\x20\x4d\x6f\x64\x65\x0d\x0a\x01\x68\x5e\x52\x20\x20\x01\x6e\x52\x65\x64\x72\x61\x77\x20" - "\x4c\x69\x6e\x65\x0d\x0a\x01\x68\x5e\x41\x20\x20\x01\x6e\x49\x6e\x73\x65\x72\x74\x20\x41\x74\x74\x72\x69\x62\x75\x74\x65\x20\x43" - "\x6f\x64\x65\x20\x28\x69\x66\x20\x61\x6c\x6c\x6f\x77\x65\x64\x29\x0d\x0a\x01\x68\x5e\x47\x20\x20\x01\x6e\x49\x6e\x73\x65\x72\x74" - "\x20\x42\x65\x65\x70\x20\x28\x69\x66\x20\x61\x6c\x6c\x6f\x77\x65\x64\x29\x0d\x0a\x01\x68\x5e\x55\x20\x20\x01\x6e\x4c\x69\x73\x74" - "\x20\x55\x73\x65\x72\x73\x20\x4f\x6e\x6c\x69\x6e\x65\x0d\x0a\x01\x68\x5e\x50\x20\x20\x01\x6e\x53\x65\x6e\x64\x20\x49\x6e\x73\x74" - "\x61\x6e\x74\x2d\x4d\x65\x73\x73\x61\x67\x65\x73\x20\x61\x6e\x64\x20\x54\x65\x6c\x65\x67\x72\x61\x6d\x73\x0d\x0a\x01\x68\x5e\x54" - "\x20\x20\x01\x6e\x54\x69\x6d\x65\x20\x49\x6e\x66\x6f\x72\x6d\x61\x74\x69\x6f\x6e\x0d\x0a\x0d\x0a" // 765 GetStrMenu - ,"\x44\x69\x73\x70\x6c\x61\x79\x20\x55\x6e\x72\x65\x61\x64\x20\x4d\x65\x73\x73\x61\x67\x65\x73\x20\x4f\x6e\x6c\x79" // 766 DisplayUnreadMessagesOnlyQ - ,"\x4e\x6f\x20\x6d\x65\x73\x73\x61\x67\x65\x73\x20\x66\x6f\x75\x6e\x64\x2e" // 767 NoMessagesFound - ,"\x01\x6e\x01\x63\x49\x50\x20\x41\x64\x64\x72\x20\x20\x20\x3a\x20\x01\x68\x25\x73\x0d\x0a" // 768 UserIpAddr - ,"\x73\x65\x63\x6f\x6e\x64\x73" // 769 Seconds - ,"\x6d\x69\x6e\x75\x74\x65\x73" // 770 Minutes - ,"\x68\x6f\x75\x72\x73" // 771 Hours - ,"\x64\x61\x79\x73" // 772 Days - ,"\x6d\x6f\x6e\x74\x68\x73" // 773 Months - ,"\x79\x65\x61\x72\x73" // 774 Years - ,"\x61\x67\x6f" // 775 InThePast - ,"\x66\x72\x6f\x6d\x20\x6e\x6f\x77" // 776 InTheFuture - ,"\x25\x73\x20\x25\x73\x20\x25\x73" // 777 AgeOfPostedItem - ,"\x4c\x6f\x67\x67\x69\x6e\x67\x20\x6f\x75\x74\x20\x01\x68\x25\x73" // 778 NodeStatusLogout - ,"\x0d\x0a\x01\x68\x01\x72\x53\x6f\x72\x72\x79\x2c\x20\x76\x6f\x74\x69\x6e\x67\x20\x69\x73\x20\x6e\x6f\x74\x20\x61\x6c\x6c\x6f\x77" - "\x65\x64\x20\x68\x65\x72\x65\x2e\x0d\x0a" // 779 VotingNotAllowed - ,"\x0d\x0a\x01\x68\x01\x72\x53\x6f\x72\x72\x79\x2c\x20\x79\x6f\x75\x27\x76\x65\x20\x61\x6c\x72\x65\x61\x64\x79\x20\x76\x6f\x74\x65" - "\x64\x20\x6f\x6e\x20\x74\x68\x69\x73\x2e\x0d\x0a" // 780 VotedAlready - ,"\x0d\x0a\x01\x68\x01\x72\x53\x6f\x72\x72\x79\x2c\x20\x79\x6f\x75\x27\x72\x65\x20\x6e\x6f\x74\x20\x61\x6c\x6c\x6f\x77\x65\x64\x20" - "\x74\x6f\x20\x76\x6f\x74\x65\x2e\x0d\x0a" // 781 R_Voting - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x56\x01\x6e\x01\x62\x5d\x20\x01\x68\x49\x6e\x63\x6c\x75\x64\x65\x20\x56\x4f\x54\x49\x4e\x47" - "\x2e\x44\x41\x54\x20\x46\x69\x6c\x65\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 782 QWKSettingsVoting - ,"\x0d\x0a\x56\x6f\x74\x65\x20\x66\x6f\x72\x20\x6d\x65\x73\x73\x61\x67\x65\x3a\x20\x7e\x55\x70\x2c\x20\x7e\x44\x6f\x77\x6e\x2c\x20" - "\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 783 VoteMsgUpDownOrQuit - ,"\x0d\x0a\xb3\x20\x01\x62\x4d\x73\x67\x20\x01\x6e\x01\x62\x3a\x20\x01\x68\x01\x63\x56\x6f\x74\x65\x64\x20\x55\x70\x20\x25\x75\x20" - "\x74\x69\x6d\x65\x73\x25\x73\x20\x61\x6e\x64\x20\x44\x6f\x77\x6e\x20\x25\x75\x20\x74\x69\x6d\x65\x73\x25\x73\x20\x28\x53\x63\x6f" - "\x72\x65\x3a\x20\x25\x64\x29" // 784 MsgVotes - ,"\x01\x6e\x01\x68\x4f\x6e\x20\x25\x73\x2c\x20\x69\x6e\x20\x01\x63\x25\x73\x20\x01\x6e\x01\x63\x25\x73\x0d\x0a\x01\x68\x01\x6d\x25" - "\x73\x20\x01\x63\x55\x70\x01\x6e\x01\x6d\x2d\x76\x6f\x74\x65\x64\x20\x79\x6f\x75\x72\x20\x6d\x65\x73\x73\x61\x67\x65\x3a\x20\x01" - "\x6e\x01\x68\x25\x73\x0d\x0a" // 785 MsgUpVoteNotice - ,"\x01\x6e\x01\x68\x4f\x6e\x20\x25\x73\x2c\x20\x69\x6e\x20\x01\x63\x25\x73\x20\x01\x6e\x01\x63\x25\x73\x0d\x0a\x01\x68\x01\x6d\x25" - "\x73\x20\x01\x72\x44\x6f\x77\x6e\x01\x6e\x01\x6d\x2d\x76\x6f\x74\x65\x64\x20\x79\x6f\x75\x72\x20\x6d\x65\x73\x73\x61\x67\x65\x3a" - "\x20\x01\x6e\x01\x68\x25\x73\x0d\x0a" // 786 MsgDownVoteNotice - ,"\x01\x6e\x01\x68\x4f\x6e\x20\x25\x73\x2c\x20\x69\x6e\x20\x01\x63\x25\x73\x20\x01\x6e\x01\x63\x25\x73\x0d\x0a\x01\x68\x01\x6d\x25" - "\x73\x20\x76\x6f\x74\x65\x64\x20\x69\x6e\x20\x79\x6f\x75\x72\x20\x70\x6f\x6c\x6c\x3a\x20\x01\x6e\x01\x68\x25\x73\x0d\x0a" // 787 PollVoteNotice - ,"\x01\x6e\x01\x63\x01\x68\x25\x32\x75\x01\x6e\x01\x63\x3a\x20" // 788 PollAnswerNumber - ,"\x25\x2d\x2a\x2e\x2a\x73\x20\x5b\x25\x2d\x34\x75\x20\x25\x33\x2e\x30\x66\x25\x25\x5d" // 789 PollAnswerFmt - ,"\x20\xfb" // 790 PollAnswerChecked - ,"\x01\x6e\x01\x6c\x01\x67\x42\x61\x6c\x6c\x6f\x74\x20\x66\x6f\x72\x20\x01\x68\x25\x73\x0d\x0a\x0d\x0a" // 791 BallotHdr - ,"\x01\x6e\x01\x63\x01\x68\x25\x32\x75\x01\x6e\x01\x63\x3a\x20\x25\x2d\x2a\x2e\x2a\x73\x20\x01\x68\x25\x73\x0d\x0a" // 792 BallotAnswerFmt - ,"\x0d\x0a\x54\x6f\x67\x67\x6c\x65\x20\x40\x57\x68\x69\x63\x68\x40\x20\x76\x6f\x74\x65\x20\x28\x75\x70\x20\x74\x6f\x20\x25\x75\x29" - "\x2c\x20\x7e\x40\x51\x75\x69\x74\x40\x20\x6f\x72\x20\x5b\x43\x61\x73\x74\x5d\x3a\x20" // 793 BallotVoteWhich - ,"\x4f\x6e\x6c\x79" // 794 Only - ,"\x01\x6e\x01\x68\x01\x63\x0d\x0a\x53\x50\x41\x4d\x20\x56\x69\x73\x69\x62\x69\x6c\x69\x74\x79\x20\x69\x73\x20\x6e\x6f\x77\x3a\x20" - "\x01\x77" // 795 SPAMVisibilityIsNow - ,"\x0d\x0a\x54\x6f\x20\x76\x6f\x74\x65\x20\x69\x6e\x20\x74\x68\x69\x73\x20\x70\x6f\x6c\x6c\x2c\x20\x68\x69\x74\x20\x7e\x56\x20\x6e" - "\x6f\x77\x2e\x0d\x0a" // 796 VoteInThisPollNow - ,"\x01\x6e\x01\x6d\x4d\x49\x4d\x45\x2d\x64\x65\x63\x6f\x64\x65\x64\x20\x25\x73\x20\x25\x73\x2d\x74\x65\x78\x74\x3a\x01\x6e\x0d\x0a" - "" // 797 MIMEDecodedPlainTextFmt - ,"\x01\x2f\x40\x45\x58\x45\x43\x3a\x53\x48\x4f\x57\x4d\x53\x47\x41\x56\x41\x54\x41\x52\x40\x0d\x0a" // 798 MsgHdrBodySeparator - ,"\x01\x2f\x0d\x0a\x40\x45\x58\x45\x43\x3a\x53\x48\x4f\x57\x46\x49\x4c\x45\x41\x56\x41\x54\x41\x52\x40" // 799 FileHdrDescSeparator - ,"\x52\x65\x6d\x6f\x76\x65\x20\x66\x69\x6c\x65\x20\x66\x72\x6f\x6d\x20\x64\x61\x74\x61\x62\x61\x73\x65" // 800 RemoveFileQ - ,"\x4f\x72\x69\x67\x69\x6e\x61\x74\x69\x6e\x67\x20\x41\x64\x64\x72\x65\x73\x73" // 801 OriginFidoAddr - ,"\x01\x6e\x01\x68\xfb\x20\x01\x6d\x25\x2e\x37\x37\x73\x0d\x0a" // 802 VoteNoticeFmt - ,"\x0d\x0a\x54\x61\x67\x20\x74\x68\x69\x73\x20\x6d\x65\x73\x73\x61\x67\x65" // 803 TagMessageQ - ,"\x0d\x0a\x01\x68\x01\x79\x45\x6e\x74\x65\x72\x20\x28\x73\x70\x61\x63\x65\x2d\x73\x65\x70\x61\x72\x61\x74\x65\x64\x29\x20\x54\x61" - "\x67\x73\x01\x5c\x3a\x20" // 804 TagMessagePrompt - ,"\x0d\x0a\xb3\x20\x01\x62\x54\x61\x67\x73\x01\x6e\x01\x62\x3a\x20\x01\x68\x01\x63\x25\x2e\x37\x30\x73" // 805 MsgTags - ,"\x54\x65\x72\x6d\x69\x6e\x61\x6c\x20\x74\x79\x70\x65" // 806 NoAccessTerminal - ,"\x0d\x0a" // 807 LongLineContinuationPrefix - ,"\x53\x63\x61\x6e\x6e\x69\x6e\x67" // 808 Scanning - ,"\x44\x6f\x6e\x65" // 809 Done - ,"\x01\x5b\x01\x3e" // 810 Scanned - ,"\x01\x6e\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x68\x01\x79\x48\x49\x54\x20" - "\x79\x6f\x75\x72\x20\x01\x77\x42\x41\x43\x4b\x53\x50\x41\x43\x45\x01\x79\x20\x6f\x72\x20\x44\x45\x4c\x45\x54\x45\x2d\x4c\x45\x46" - "\x54\x20\x6b\x65\x79\x3a\x20" // 811 HitYourBackspaceKey - ,"\x01\x5c\x01\x6e\x01\x63\x43\x68\x61\x72\x61\x63\x74\x65\x72\x20\x01\x68\x25\x75\x20\x28\x25\x30\x32\x58\x68\x29\x20\x01\x6e\x01" - "\x63\x72\x65\x63\x65\x69\x76\x65\x64\x2e\x0d\x0a" // 812 CharacterReceivedFmt - ,"\x01\x72\x01\x68\x21\x55\x6e\x73\x75\x70\x70\x6f\x72\x74\x65\x64\x20\x62\x61\x63\x6b\x73\x70\x61\x63\x65\x20\x6b\x65\x79\x3a\x20" - "\x01\x77\x25\x30\x32\x58\x68\x0d\x0a" // 813 InvalidBackspaceKeyFmt - ,"" // 814 SwapDeleteKeyQ - ,"\x01\x6e\x01\x68\x43\x42\x4d\x2f\x01\x79\x50\x45\x54\x53\x43\x49\x49\x01\x77\x20\x74\x65\x72\x6d\x69\x6e\x61\x6c\x20\x64\x65\x74" - "\x65\x63\x74\x65\x64\x2e\x0d\x0a" // 815 PetTerminalDetected - ,"\x41\x72\x65\x20\x79\x6f\x75\x20\x75\x73\x69\x6e\x67\x20\x61\x20\x43\x42\x4d\x2f\x50\x45\x54\x53\x43\x49\x49\x20\x74\x65\x72\x6d" - "\x69\x6e\x61\x6c" // 816 PetTerminalQ - ,"\x41\x75\x74\x6f\x20" // 817 TerminalAutoDetect - ,"\x63\x6f\x6c\x75\x6d\x6e\x73" // 818 TerminalColumns - ,"\x72\x6f\x77\x73" // 819 TerminalRows - ,"\x28\x6d\x6f\x6e\x6f\x29\x20" // 820 TerminalMonochrome - ,"\x28\x63\x6f\x6c\x6f\x72\x29\x20" // 821 TerminalColor - ,"\x28\x69\x43\x45\x20\x63\x6f\x6c\x6f\x72\x29\x20" // 822 TerminalIceColor - ,"\x44\x6f\x65\x73\x20\x79\x6f\x75\x72\x20\x74\x65\x72\x6d\x69\x6e\x61\x6c\x20\x64\x69\x73\x70\x6c\x61\x79\x20\x62\x72\x69\x67\x68" - "\x74\x20\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x20\x28\x69\x43\x45\x29\x20\x63\x6f\x6c\x6f\x72\x73\x0d\x0a\x20\x20\x20\x20\x01" - "\x6e\x28\x69\x2e\x65\x2e\x20\x01\x69\x01\x6b\x01\x33\x74\x68\x69\x73\x20\x74\x65\x78\x74\x01\x6e\x20\x69\x73\x20\x62\x6c\x61\x63" - "\x6b\x20\x6f\x6e\x20\x79\x65\x6c\x6c\x6f\x77\x20\x61\x6e\x64\x20\x4e\x4f\x54\x20\x42\x4c\x49\x4e\x4b\x49\x4e\x47\x29" // 823 IceColorTerminalQ - ,"\x44\x6f\x65\x73\x20\x79\x6f\x75\x72\x20\x74\x65\x72\x6d\x69\x6e\x61\x6c\x20\x73\x75\x70\x70\x6f\x72\x74\x20\x55\x54\x46\x2d\x38" - "" // 824 Utf8TerminalQ - ,"\x0d\x0a\xb3\x20\x01\x62\x43\x43\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x68\x01\x63\x25\x2e\x37\x30\x73" // 825 MsgCarbonCopyList - ,"\x01\x6e\x01\x68\x4c\x6f\x67\x67\x69\x6e\x67\x20\x6f\x6e\x20\x74\x6f\x20\x40\x42\x42\x53\x40\x01\x5c\x20\x61\x73\x20\x40\x41\x4c" - "\x49\x41\x53\x40\x20\x40\x45\x4c\x4c\x49\x50\x53\x49\x53\x40\x01\x6e\x0d\x0a\x40\x52\x45\x53\x45\x54\x50\x41\x55\x53\x45\x40" // 826 LoggingOn - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x55\x01\x6e\x01\x62\x5d\x20\x01\x68\x49\x6e\x63\x6c\x75\x64\x65\x20\x55\x54\x46\x2d\x38\x20" - "\x43\x68\x61\x72\x61\x63\x74\x65\x72\x73\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 827 QWKSettingsUtf8 - ,"\x01\x6e\x01\x6d\x01\x68\x25\x73\x01\x6e\x01\x6d\x25\x2e\x30\x73\x20\x70\x6f\x73\x74\x65\x64\x20\x74\x6f\x20\x79\x6f\x75\x20\x6f" - "\x6e\x20\x01\x68\x25\x73\x20\x01\x6e\x01\x6d\x25\x73\x0d\x0a" // 828 MsgPostedToYouVia - ,"\x75\x6e\x6c\x69\x6d\x69\x74\x65\x64" // 829 Unlimited - ,"\x20\x76\x69\x61\x20\x72\x61\x77" // 830 NodeConnectionRaw - ,"\x44\x6f\x65\x73\x20\x79\x6f\x75\x72\x20\x74\x65\x72\x6d\x69\x6e\x61\x6c\x20\x73\x75\x70\x70\x6f\x72\x74\x20\x6d\x6f\x75\x73\x65" - "\x20\x72\x65\x70\x6f\x72\x74\x69\x6e\x67" // 831 MouseTerminalQ - ,"\x28\x6d\x6f\x75\x73\x65\x29\x20" // 832 TerminalMouse - ,"\x2d\x3e\x29\xb3\x28\x3c\x2d\x3c\x28\xb3\x29\x3e" // 833 SpinningCursor0 - ,"\xb3\x2f\xc4\x5c" // 834 SpinningCursor1 - ,"\xb3\x5c\xc4\x2f" // 835 SpinningCursor2 - ,"\xb0\xb1\xb2\xdb\xb2\xb1" // 836 SpinningCursor3 - ,"\x2d\x3d\xf0\x3d" // 837 SpinningCursor4 - ,"\xda\xc0\xd9\xbf" // 838 SpinningCursor5 - ,"\xda\xbf\xd9\xc0" // 839 SpinningCursor6 - ,"\xdc\xde\xdf\xdd" // 840 SpinningCursor7 - ,"\xdc\xdd\xdf\xde" // 841 SpinningCursor8 - ,"\xfa\xf9\xfe\xf9" // 842 SpinningCursor9 - ,"\x01\x5f\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x79\x54\x65\x72\x6d\x69\x6e" - "\x61\x6c\x20\x63\x6f\x6c\x75\x6d\x6e\x73\x20\x5b\x01\x77\x41\x75\x74\x6f\x01\x79\x5d\x3a\x20\x01\x6e" // 843 HowManyColumns - ,"\x01\x5b\x01\x6e\x01\x6d\x49\x6e\x74\x65\x72\x6e\x65\x74\x20\x6d\x61\x69\x6c\x20\x73\x65\x6e\x74\x20\x74\x6f\x20\x01\x68\x25\x73" - "\x01\x6e\x0d\x0a" // 844 InternetMailSent - ,"\x01\x5b\x01\x6e\x01\x6d\x46\x69\x64\x6f\x20\x4e\x65\x74\x4d\x61\x69\x6c\x20\x73\x65\x6e\x74\x20\x74\x6f\x20\x01\x68\x25\x73\x20" - "\x40\x25\x73\x01\x6e\x0d\x0a" // 845 FidoNetMailSent - ,"\x01\x5b\x01\x6e\x01\x6d\x51\x57\x4b\x20\x4e\x65\x74\x4d\x61\x69\x6c\x20\x73\x65\x6e\x74\x20\x74\x6f\x20\x01\x68\x25\x73\x20\x28" - "\x25\x73\x29\x01\x6e\x0d\x0a" // 846 QWKNetMailSent - ,"\x4d\x65\x73\x73\x61\x67\x65\x73\x20\x74\x6f\x20\x79\x6f\x75\x20\x6f\x6e\x6c\x79" // 847 MsgsToYouOnlyQ - ,"\x54\x6f\x20\x59\x6f\x75\x20\x4f\x6e\x6c\x79" // 848 ToYouOnly - ,"\x0d\x0a\x45\x6e\x74\x65\x72\x20\x6e\x75\x6d\x62\x65\x72\x20\x6f\x66\x20\x6d\x65\x73\x73\x61\x67\x65\x73\x20\x66\x72\x6f\x6d\x20" - "\x65\x6e\x64\x2c\x01\x5c\x20\x7e\x44\x61\x74\x65\x2c\x20\x7e\x40\x51\x75\x69\x74\x40\x2c\x20\x6f\x72\x20\x5b\x4c\x61\x73\x74\x20" - "\x4d\x65\x73\x73\x61\x67\x65\x5d\x3a\x20" // 849 SetMsgPtrPrompt - ,"\x44\x4c" // 850 DateLastKeys - ,"\x44\x4c" // 851 DirLibKeys - ,"\x53\x47" // 852 SubGroupKeys - ,"\x41" // 853 Unused853 - ,"\x41\x6c\x6c" // 854 All - ,"\x4c\x69\x73\x74" // 855 List - ,"\x25\x2e\x30\x73\x01\x6e\x01\x6d\x4e\x65\x77\x20\x65\x2d\x6d\x61\x69\x6c\x20\x66\x72\x6f\x6d\x20\x01\x68\x25\x73\x20\x01\x6e\x3c" - "\x01\x68\x25\x73\x01\x6e\x3e\x0d\x0a" // 856 InternetMailReceived - ,"\x01\x6e\x01\x6d\x61\x6e\x64\x20\x69\x74\x20\x77\x61\x73\x20\x61\x75\x74\x6f\x6d\x61\x74\x69\x63\x61\x6c\x6c\x79\x20\x66\x6f\x72" - "\x77\x61\x72\x64\x65\x64\x20\x74\x6f\x01\x5c\x3a\x20\x01\x68\x25\x73\x01\x6e\x0d\x0a" // 857 InternetMailForwarded - ,"\x25\x2e\x30\x73\x01\x6e\x01\x68\x01\x6d\x25\x73\x20\x01\x6e\x01\x6d\x73\x65\x6e\x74\x20\x79\x6f\x75\x20\x4e\x65\x74\x4d\x61\x69" - "\x6c\x25\x73\x01\x5c\x20\x66\x72\x6f\x6d\x20\x01\x68\x25\x73\x01\x6e\x0d\x0a" // 858 FidoNetMailReceived - ,"\x20\x77\x69\x74\x68\x20\x61\x74\x74\x61\x63\x68\x6d\x65\x6e\x74" // 859 WithAttachment - ,"\x25\x2e\x30\x73\x01\x6e\x01\x68\x01\x6d\x25\x73\x20\x01\x6e\x01\x6d\x73\x65\x6e\x74\x20\x79\x6f\x75\x20\x45\x63\x68\x6f\x4d\x61" - "\x69\x6c\x20\x6f\x6e\x20\x01\x68\x25\x73\x20\x01\x6e\x01\x6d\x25\x73\x01\x6e\x0d\x0a" // 860 FidoEchoMailReceived - ,"\x01\x5f\x01\x77\x01\x68\x43\x61\x6c\x63\x75\x6c\x61\x74\x69\x6e\x67\x20\x66\x69\x6c\x65\x27\x73\x20\x68\x61\x73\x68\x20\x76\x61" - "\x6c\x75\x65\x73\x20\x40\x45\x4c\x4c\x49\x50\x53\x49\x53\x40\x01\x6e" // 861 HashingFile - ,"\x01\x5b\x01\x3e" // 862 HashedFile - ,"\x4e\x65\x77\x20\x55\x73\x65\x72\x20\x56\x61\x6c\x69\x64\x61\x74\x69\x6f\x6e" // 863 NewUserValEmailSubj - ,"\x07\x07\x07" // 864 InactivityAlert - ,"\x4e\x6f\x6e\x65" // 865 None - ,"\x57\x68\x69\x63\x68" // 866 Which - ,"\x4e\x65\x78\x74" // 867 Next - ,"\x50\x72\x65\x76" // 868 Previous - ,"\x51\x75\x69\x74" // 869 Quit - ,"\x4c\x61\x6e\x67\x75\x61\x67\x65" // 870 Language - ,"\x45\x6e\x67\x6c\x69\x73\x68" // 871 LANG - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x49\x01\x6e\x01\x62\x5d\x20\x01\x68\x25\x2d\x32\x39\x73\x01\x6e\x01\x62\x01\x5c\x3a\x20\x01" - "\x63\x25\x73\x0d\x0a" // 872 UserDefaultsLanguage - ,"\x2a" // 873 PasswordChar - ,"\x20\x76\x69\x61\x20\x73\x66\x74\x70" // 874 NodeConnectionSFTP - ,"\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x57\x01\x6e\x01\x62\x5d\x20\x01\x68\x57\x6f\x72\x64\x2d\x77\x72\x61\x70\x20\x4d\x65\x73\x73" - "\x61\x67\x65\x20\x54\x65\x78\x74\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 875 QWKSettingsWrapText - ,"\x01\x2f\x55\x6e\x6b\x6e\x6f\x77\x6e\x20\x75\x70\x6c\x6f\x61\x64\x65\x72\x20\x28\x25\x73\x29\x20\x6f\x66\x20\x66\x69\x6c\x65\x01" - "\x5c\x3a\x20\x25\x73" // 876 UnknownUploader - ,"\x46\x52\x45\x45" // 877 FREE - ,"\x53\x75\x6e" // 878 Sun - ,"\x4d\x6f\x6e" // 879 Mon - ,"\x54\x75\x65" // 880 Tue - ,"\x57\x65\x64" // 881 Wed - ,"\x54\x68\x75" // 882 Thu - ,"\x46\x72\x69" // 883 Fri - ,"\x53\x61\x74" // 884 Sat - ,"\x4a\x61\x6e" // 885 Jan - ,"\x46\x65\x62" // 886 Feb - ,"\x4d\x61\x72" // 887 Mar - ,"\x41\x70\x72" // 888 Apr - ,"\x4d\x61\x79" // 889 May - ,"\x4a\x75\x6e" // 890 Jun - ,"\x4a\x75\x6c" // 891 Jul - ,"\x41\x75\x67" // 892 Aug - ,"\x53\x65\x70" // 893 Sep - ,"\x4f\x63\x74" // 894 Oct - ,"\x4e\x6f\x76" // 895 Nov - ,"\x44\x65\x63" // 896 Dec - ,"\x07\x40\x41\x4c\x49\x41\x53\x40\x20\x70\x61\x67\x65\x64\x20\x79\x6f\x75\x20\x74\x6f\x20\x63\x68\x61\x74\x20\x66\x72\x6f\x6d\x20" - "\x6e\x6f\x64\x65\x20\x40\x4e\x4f\x44\x45\x40\x07" // 897 SysopPageNotification - ,"\x61\x74\x20\x6d\x61\x69\x6e\x20\x6d\x65\x6e\x75" // 898 NodeActivityMainMenu - ,"\x72\x65\x61\x64\x69\x6e\x67\x20\x6d\x65\x73\x73\x61\x67\x65\x73" // 899 NodeActivityReadingMsgs - ,"\x72\x65\x61\x64\x69\x6e\x67\x20\x6d\x61\x69\x6c" // 900 NodeActivityReadingMail - ,"\x73\x65\x6e\x64\x69\x6e\x67\x20\x6d\x61\x69\x6c" // 901 NodeActivitySendingMail - ,"\x72\x65\x61\x64\x69\x6e\x67\x20\x74\x65\x78\x74\x20\x66\x69\x6c\x65\x73" // 902 NodeActivityReadingTextFiles - ,"\x72\x65\x61\x64\x69\x6e\x67\x20\x73\x65\x6e\x74\x20\x6d\x61\x69\x6c" // 903 NodeActivityReadingSentMail - ,"\x70\x6f\x73\x74\x69\x6e\x67\x20\x6d\x65\x73\x73\x61\x67\x65" // 904 NodeActivityPostingMsg - ,"\x70\x6f\x73\x74\x69\x6e\x67\x20\x61\x75\x74\x6f\x2d\x6d\x65\x73\x73\x61\x67\x65" // 905 NodeActivityAutoMsg - ,"\x61\x74\x20\x65\x78\x74\x65\x72\x6e\x61\x6c\x20\x70\x72\x6f\x67\x72\x61\x6d\x20\x6d\x65\x6e\x75" // 906 NodeActivityXtrnMenu - ,"\x72\x75\x6e\x6e\x69\x6e\x67" // 907 NodeActivityRunningXtrn - ,"\x63\x68\x61\x6e\x67\x69\x6e\x67\x20\x73\x65\x74\x74\x69\x6e\x67\x73" // 908 NodeActivitySettings - ,"\x61\x74\x20\x66\x69\x6c\x65\x20\x6d\x65\x6e\x75" // 909 NodeActivityFileMenu - ,"\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x69\x6e\x67\x20\x66\x69\x6c\x65\x73" // 910 NodeActivityDownloadingFile - ,"\x75\x70\x6c\x6f\x61\x64\x69\x6e\x67\x20\x66\x69\x6c\x65\x73" // 911 NodeActivityUploadingFile - ,"\x74\x72\x61\x6e\x73\x66\x65\x72\x72\x69\x6e\x67\x20\x66\x69\x6c\x65\x73\x20\x62\x69\x64\x69\x72\x65\x63\x74\x69\x6f\x6e\x61\x6c" - "" // 912 NodeActivityBiXferFile - ,"\x6c\x69\x73\x74\x69\x6e\x67\x20\x66\x69\x6c\x65\x73" // 913 NodeActivityListingFiles - ,"\x6c\x6f\x67\x67\x69\x6e\x67\x20\x6f\x6e" // 914 NodeActivityLoggingOn - ,"\x63\x68\x61\x74\x74\x69\x6e\x67\x20\x77\x69\x74\x68\x20\x25\x73" // 915 NodeActivityLocalChat - ,"\x69\x6e\x20\x6d\x75\x6c\x74\x69\x6e\x6f\x64\x65\x20\x63\x68\x61\x74\x20\x63\x68\x61\x6e\x6e\x65\x6c\x20\x25\x64" // 916 NodeActivityChatChannel - ,"\x69\x6e\x20\x6d\x75\x6c\x74\x69\x6e\x6f\x64\x65\x20\x67\x6c\x6f\x62\x61\x6c\x20\x63\x68\x61\x74\x20\x63\x68\x61\x6e\x6e\x65\x6c" - "" // 917 NodeActivityGlobalChat - ,"\x69\x6e\x20\x63\x68\x61\x74\x20\x73\x65\x63\x74\x69\x6f\x6e" // 918 NodeActivityChatMenu - ,"\x70\x65\x72\x66\x6f\x72\x6d\x69\x6e\x67\x20\x73\x79\x73\x6f\x70\x20\x61\x63\x74\x69\x76\x69\x74\x79" // 919 NodeActivitySysop - ,"\x74\x72\x61\x6e\x73\x66\x65\x72\x72\x69\x6e\x67\x20\x51\x57\x4b\x20\x70\x61\x63\x6b\x65\x74" // 920 NodeActivityQWKmenu - ,"\x63\x68\x61\x74\x74\x69\x6e\x67\x20\x77\x69\x74\x68\x20\x6e\x6f\x64\x65\x20\x25\x75" // 921 NodeActivityNodeChat - ,"\x70\x61\x67\x69\x6e\x67\x20\x6e\x6f\x64\x65\x20\x25\x75\x20\x66\x6f\x72\x20\x70\x72\x69\x76\x61\x74\x65\x20\x63\x68\x61\x74" // 922 NodeActivityPagingNode - ,"\x72\x65\x74\x72\x69\x65\x76\x69\x6e\x67\x20\x66\x69\x6c\x65\x20\x66\x72\x6f\x6d\x20\x64\x65\x76\x69\x63\x65\x20\x23\x25\x64" // 923 NodeActivityRetrievingFile - ,"\x70\x65\x72\x66\x6f\x72\x6d\x69\x6e\x67\x20\x63\x75\x73\x74\x6f\x6d\x20\x61\x63\x74\x69\x76\x69\x74\x79" // 924 NodeActivityCustom - ,"\x6e\x65\x76\x65\x72" // 925 Never - ,"\x44\x65\x6c\x65\x74\x69\x6e\x67" // 926 Deleting - ,"\x01\x5b\x01\x3e" // 927 DoneDeleting - ,"\x44\x65\x6c\x65\x74\x65\x64" // 928 Deleted - ,"\x40\x44\x65\x6c\x65\x74\x65\x64\x40\x20\x25\x64\x20\x25\x73" // 929 DeletedNumberItems - ,"\x45\x2d\x4d\x61\x69\x6c" // 930 E_Mail - ,"\x45\x2d\x4d\x61\x69\x6c\x73" // 931 E_Mails +const char * const text_defaults[TOTAL_TEXT] = { + "\x01\x6e\x01\x68\x01\x63\xda\xc4\xc4\xc4\xc4\xc4\xc4\x01\x6e\xc4\xc4\xc4\xc4\xc4\xc4\x01\x68\x01\x6b\xc4\xc4\xc4\xc4\xc4\xc4\xc4" + "\x01\x6e\x01\x63\xc4\xc4\xc4\xc4\xc4\xfa\xfa\xfa\xfa\x0d\x0a\x01\x68\xb3\x20\x01\x62\x53\x75\x62\x6a\x01\x6e\x01\x62\x3a\x20\x01" + "\x68\x01\x63\x25\x2e\x37\x30\x73" // 001 MsgSubj + , "\x0d\x0a\xb3\x20\x01\x62\x41\x74\x74\x72\x01\x6e\x01\x62\x3a\x20\x01\x68\x01\x63\x25\x73\x25\x73\x25\x73\x25\x73\x25\x73\x25\x73" + "\x25\x73\x25\x73\x25\x73\x25\x73\x25\x73\x25\x73\x25\x73\x25\x73\x25\x73\x25\x73\x25\x73" // 002 MsgAttr + , "\x0d\x0a\xb3\x20\x01\x62\x54\x6f\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x68\x01\x63\x25\x2e\x37\x30\x73" // 003 MsgTo + , "\x20\x23\x25\x73" // 004 MsgToExt + , "\x20\x28\x25\x2e\x34\x30\x73\x29" // 005 MsgToNet + , "\x0d\x0a\x01\x77\xb3\x20\x01\x62\x46\x72\x6f\x6d\x01\x6e\x01\x62\x3a\x20\x01\x68\x01\x63\x25\x2e\x33\x33\x73" // 006 MsgFrom + , "\x20\x23\x25\x73" // 007 MsgFromExt + , "\x20\x28\x25\x2e\x33\x35\x73\x29" // 008 MsgFromNet + , "\x0d\x0a\x01\x77\xb3\x20\x01\x62\x44\x61\x74\x65\x01\x6e\x01\x62\x3a\x20\x01\x68\x01\x63\x25\x2e\x32\x34\x73\x20\x25\x73\x20\x28" + "\x25\x73\x29\x0d\x0a\x01\x77\xc0\xc4\xc4\xc4\xc4\xc4\xc4\x01\x63\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\x01\x6e\xc4\xc4\xc4\xc4\xc4" + "\xc4\xc4\xc4\xc4\xc4\x01\x68\x01\x6b\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\x01\x6e\x01\x63\xc4\xc4\xc4\xc4\xc4\xc4\xc4\x01\x62\xc4\xc4" + "\xc4\xc4\xc4\xc4\xc4\xfa\xfa\xfa\xfa\xfa\xfa\x01\x6e" // 009 MsgDate + , "\x01\x5f\x01\x3f\x01\x62\x01\x68\x45\x2d\x6d\x61\x69\x6c\x20\x28\x55\x73\x65\x72\x20\x6e\x61\x6d\x65\x20\x6f\x72\x20\x6e\x75\x6d" + "\x62\x65\x72\x29\x01\x5c\x3a\x20\x01\x77" // 010 Email + , "\x0d\x0a\x50\x6f\x73\x74\x20\x6f\x6e\x20\x25\x73\x01\x5c\x20\x25\x73" // 011 Post + , "\x01\x72\x01\x68\x0d\x0a\x07\x59\x6f\x75\x20\x68\x61\x76\x65\x20\x73\x65\x6e\x74\x20\x74\x6f\x6f\x20\x6d\x61\x6e\x79\x20\x45\x2d" + "\x6d\x61\x69\x6c\x73\x20\x74\x6f\x64\x61\x79\x2e\x0d\x0a" // 012 TooManyEmailsToday + , "\x01\x72\x01\x68\x0d\x0a\x07\x59\x6f\x75\x20\x68\x61\x76\x65\x20\x70\x6f\x73\x74\x65\x64\x20\x74\x6f\x6f\x20\x6d\x61\x6e\x79\x20" + "\x74\x69\x6d\x65\x73\x20\x74\x6f\x64\x61\x79\x2e\x0d\x0a" // 013 TooManyPostsToday + , "\x01\x5b\x07\x01\x6e\x01\x72\x01\x68\x43\x61\x6e\x6e\x6f\x74\x20\x61\x64\x64\x20\x01\x77\x25\x73\x01\x72\x20\x74\x6f\x20\x71\x75" + "\x65\x75\x65\x20\x2d\x20\x01\x6e" // 014 CantAddToQueue + , "\x01\x6e\x0d\x0a\x54\x68\x65\x20\x73\x65\x6e\x64\x69\x6e\x67\x20\x6f\x66\x20\x6d\x61\x69\x6c\x20\x69\x73\x20\x62\x65\x79\x6f\x6e" + "\x64\x20\x79\x6f\x75\x72\x20\x61\x62\x69\x6c\x69\x74\x79\x2e\x0d\x0a" // 015 R_Email + , "\x01\x6e\x0d\x0a\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x70\x6f\x73\x74\x20\x6d\x65\x73\x73\x61\x67\x65\x73\x2e\x0d\x0a" // 016 R_Post + , "\x01\x6e\x0d\x0a\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x73\x65\x6e\x64\x20\x45\x2d\x6d\x61\x69\x6c\x20\x74\x6f\x20\x25\x73\x2e" + "\x0d\x0a" // 017 R_Feedback + , "\x01\x6e\x01\x3f\x01\x6d\x53\x65\x6e\x64\x69\x6e\x67\x20\x45\x2d\x6d\x61\x69\x6c\x20\x74\x6f\x20\x01\x68\x25\x73\x20\x01\x6e\x01" + "\x6d\x23\x25\x75\x01\x6e\x0d\x0a" // 018 Emailing + , "\x01\x6e\x01\x3f\x01\x6d\x50\x6f\x73\x74\x69\x6e\x67\x20\x6f\x6e\x20\x01\x68\x25\x73\x01\x6e\x01\x6d\x01\x5c\x20\x25\x73\x0d\x0a" + "" // 019 Posting + , "\x0d\x0a\x4e\x65\x77\x20\x66\x69\x6c\x65\x2e\x0d\x0a" // 020 NewFile + , "\x01\x5f\x0d\x0a\x01\x79\x01\x68\x53\x75\x62\x6a\x65\x63\x74\x01\x5c\x3a\x20" // 021 SubjectPrompt + , "\x01\x6e\x01\x67\x0d\x0a\x45\x6e\x74\x65\x72\x20\x6d\x65\x73\x73\x61\x67\x65\x20\x6e\x6f\x77\x20\x28\x01\x68\x25\x64\x01\x6e\x01" + "\x67\x20\x6c\x69\x6e\x65\x73\x20\x6d\x61\x78\x29\x2e\x20\x01\x5c\x54\x79\x70\x65\x20\x01\x68\x2f\x3f\x01\x6e\x01\x67\x20\x6f\x6e" + "\x20\x61\x20\x6e\x65\x77\x20\x6c\x69\x6e\x65\x20\x66\x6f\x72\x20\x6d\x65\x6e\x75\x2e\x0d\x0a\x01\x6e" // 022 EnterMsgNow + , "\x01\x6e\x01\x67\x0d\x0a\x52\x61\x77\x20\x6d\x65\x73\x73\x61\x67\x65\x20\x69\x6e\x70\x75\x74\x20\x28\x01\x68\x25\x75\x01\x6e\x01" + "\x67\x20\x62\x79\x74\x65\x73\x20\x6d\x61\x78\x29\x2e\x20\x01\x68\x43\x74\x72\x6c\x2d\x5a\x01\x6e\x01\x67\x20\x74\x6f\x20\x73\x61" + "\x76\x65\x2c\x20\x01\x68\x43\x74\x72\x6c\x2d\x43\x01\x6e\x01\x67\x20\x74\x6f\x20\x61\x62\x6f\x72\x74\x2e\x01\x6e\x0d\x0a\x0d\x0a" + "" // 023 EnterMsgNowRaw + , "\x01\x6e\x01\x68\x01\x72\x4c\x69\x6e\x65\x20\x6c\x69\x6d\x69\x74\x20\x28\x01\x77\x25\x75\x01\x72\x29\x20\x72\x65\x61\x63\x68\x65" + "\x64\x2e\x01\x6e\x0d\x0a" // 024 NoMoreLines + , "\x4f\x6e\x6c\x79\x20\x25\x75\x20\x6c\x69\x6e\x65\x73\x20\x6c\x65\x66\x74\x2e\x0d\x0a" // 025 OnlyNLinesLeft + , "\x0d\x0a\x0d\x0a\x01\x6e\x01\x72\x01\x68\x01\x69\x4f\x75\x74\x20\x6f\x66\x20\x62\x79\x74\x65\x73\x2e\x01\x6e\x0d\x0a" // 026 OutOfBytes + , "\x49\x6e\x76\x61\x6c\x69\x64\x20\x6c\x69\x6e\x65\x20\x6e\x75\x6d\x62\x65\x72\x0d\x0a" // 027 InvalidLineNumber + , "\x01\x6e\x4d\x65\x73\x73\x61\x67\x65\x20\x63\x6c\x65\x61\x72\x65\x64\x2e\x0d\x0a" // 028 MsgCleared + , "\x57\x69\x74\x68\x20\x6c\x69\x6e\x65\x20\x6e\x75\x6d\x62\x65\x72\x73" // 029 WithLineNumbersQ + , "\x01\x3f\x01\x72\x01\x68\x01\x69\x41\x62\x6f\x72\x74\x65\x64\x2e\x01\x6e\x0d\x0a" // 030 Aborted + , "\x0d\x0a\x41\x6e\x6f\x6e\x79\x6d\x6f\x75\x73" // 031 AnonymousQ + , "\x41\x4e\x4f\x4e\x59\x4d\x4f\x55\x53" // 032 Anonymous + , "\x01\x6e\x01\x68\x0d\x0a\x53\x61\x76\x69\x6e\x67\x20\x40\x45\x4c\x4c\x49\x50\x53\x49\x53\x40" // 033 Saving + , "\x01\x5b\x01\x62\x53\x61\x76\x65\x64\x20\x01\x77\x25\x75\x01\x62\x20\x63\x68\x61\x72\x61\x63\x74\x65\x72\x73\x20\x28\x01\x77\x25" + "\x75\x01\x62\x20\x6c\x69\x6e\x65\x73\x29\x2e\x01\x6e\x0d\x0a" // 034 SavedNBytes + , "\x01\x6e\x0d\x0a\x57\x72\x69\x74\x69\x6e\x67\x20\x49\x6e\x64\x65\x78\x20\x40\x45\x4c\x4c\x49\x50\x53\x49\x53\x40" // 035 WritingIndx + , "\x01\x5b\x01\x6e\x01\x6d\x45\x2d\x6d\x61\x69\x6c\x20\x73\x65\x6e\x74\x20\x74\x6f\x20\x01\x68\x25\x73\x20\x01\x6e\x01\x6d\x23\x25" + "\x64\x2e\x01\x6e\x0d\x0a" // 036 Emailed + , "\x01\x5b\x01\x6e\x01\x6d\x50\x6f\x73\x74\x65\x64\x20\x6f\x6e\x20\x01\x68\x25\x73\x01\x6e\x01\x6d\x20\x25\x73\x2e\x0d\x0a" // 037 Posted + , "\x07\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x32\x64\x3a\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x73\x65\x6e\x74\x20\x79" + "\x6f\x75\x20\x45\x2d\x6d\x61\x69\x6c\x2e\x0d\x0a" // 038 EmailNodeMsg + , "\x01\x6e\x0d\x0a\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x66\x6f\x72\x77\x61\x72\x64\x20\x6d\x61\x69\x6c\x2e\x0d\x0a" // 039 R_Forward + , "\x01\x6e\x01\x6d\x46\x6f\x72\x77\x61\x72\x64\x65\x64\x20\x62\x79\x20\x01\x68\x25\x73\x01\x6e\x01\x6d\x20\x6f\x6e\x20\x01\x68\x25" + "\x73\x01\x6e\x0d\x0a" // 040 ForwardedFrom + , "\x01\x6e\x01\x6d\x0d\x0a\x4d\x61\x69\x6c\x20\x66\x6f\x72\x77\x61\x72\x64\x65\x64\x20\x74\x6f\x20\x01\x68\x25\x73\x01\x6e\x0d\x0a" + "" // 041 Forwarded + , "\x01\x62\x01\x68\x41\x75\x74\x6f\x20\x6d\x65\x73\x73\x61\x67\x65\x20\x62\x79\x3a\x20\x01\x63\x25\x73\x01\x62\x20\x6f\x6e\x20\x25" + "\x73\x01\x6e\x0d\x0a\x0d\x0a" // 042 AutoMsgBy + , "\x0d\x0a\x41\x75\x74\x6f\x20\x4d\x65\x73\x73\x61\x67\x65\x01\x5c\x20\x7e\x52\x65\x61\x64\x2c\x20\x7e\x57\x72\x69\x74\x65\x2c\x20" + "\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 043 AutoMsg + , "\x01\x6e\x0d\x0a\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x77\x72\x69\x74\x65\x20\x74\x6f\x20\x74\x68\x65\x20\x61\x75\x74\x6f\x2d" + "\x6d\x65\x73\x73\x61\x67\x65\x2e\x0d\x0a" // 044 R_AutoMsg + , "\x01\x6e\x0d\x0a\x59\x6f\x75\x20\x68\x61\x76\x65\x20\x6e\x6f\x20\x25\x73\x2e\x0d\x0a" // 045 NoMailWaiting + , "\x01\x5f\x0d\x0a\x01\x71\x01\x67\x01\x68\x4d\x61\x69\x6c\x20\x57\x61\x69\x74\x69\x6e\x67\x20\x28\x25\x73\x20\x66\x69\x72\x73\x74" + "\x29\x3a\x0d\x0a\x0d\x0a" // 046 MailWaitingLstHdr + , "\x01\x67\x01\x68\x25\x34\x64\x20\x01\x6e\x01\x67\x25\x2d\x32\x35\x2e\x32\x35\x73\x20\x01\x68\x25\x63\x01\x6e\x01\x67\x20\x25\x73" + "\x0d\x0a" // 047 MailWaitingLstFmt + , "\x01\x5f\x0d\x0a\x01\x79\x01\x68\x53\x74\x61\x72\x74\x20\x77\x69\x74\x68\x20\x6e\x75\x6d\x62\x65\x72\x20\x5b\x01\x77\x25\x75\x01" + "\x79\x5d\x3a\x20\x01\x77" // 048 StartWithN + , "\x0d\x0a\x01\x6e\x01\x63\xfe\x20\x01\x62\x01\x68\x52\x65\x61\x64\x69\x6e\x67\x20\x45\x2d\x6d\x61\x69\x6c\x20\x01\x6e\x01\x63\xfe" + "\x20\x01\x62\x01\x68\x28\x01\x77\x01\x60\x3f\x01\x62\x3d\x4d\x65\x6e\x75\x29\x01\x5c\x20\x28\x01\x77\x25\x75\x01\x62\x20\x6f\x66" + "\x20\x01\x77\x25\x75\x01\x62\x29\x3a\x20\x01\x6e\x01\x7e" // 049 ReadingMail + , "\x01\x6e\x0d\x0a\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x72\x65\x70\x6c\x79\x20\x74\x6f\x20\x74\x68\x69\x73\x20\x6d\x65\x73\x73" + "\x61\x67\x65\x2e\x0d\x0a" // 050 CantReplyToMsg + , "\x20\x20\x01\x68\x01\x62\x52\x65\x01\x6e\x01\x62\x3a\x20\x01\x68\x01\x63\x40\x4d\x53\x47\x5f\x53\x55\x42\x4a\x45\x43\x54\x40\x01" + "\x6e\x0d\x0a\x0d\x0a" // 051 Regarding + , "\x20\x20\x01\x68\x01\x62\x52\x65\x01\x6e\x01\x62\x3a\x20\x01\x68\x01\x63\x40\x4d\x53\x47\x5f\x53\x55\x42\x4a\x45\x43\x54\x40\x0d" + "\x0a\x20\x20\x01\x62\x42\x79\x01\x6e\x01\x62\x3a\x20\x01\x68\x01\x63\x40\x4d\x53\x47\x5f\x46\x52\x4f\x4d\x5f\x4e\x41\x4d\x45\x40" + "\x20\x01\x62\x6f\x6e\x20\x01\x63\x40\x4d\x53\x47\x5f\x44\x41\x54\x45\x40\x01\x6e\x0d\x0a\x0d\x0a" // 052 RegardingByOn + , "\x20\x20\x01\x68\x01\x62\x52\x65\x01\x6e\x01\x62\x3a\x20\x01\x68\x01\x63\x40\x4d\x53\x47\x5f\x53\x55\x42\x4a\x45\x43\x54\x40\x0d" + "\x0a\x20\x20\x01\x62\x42\x79\x01\x6e\x01\x62\x3a\x20\x01\x68\x01\x63\x40\x4d\x53\x47\x5f\x46\x52\x4f\x4d\x5f\x4e\x41\x4d\x45\x40" + "\x20\x01\x62\x74\x6f\x20\x01\x63\x40\x4d\x53\x47\x5f\x54\x4f\x5f\x4e\x41\x4d\x45\x40\x20\x01\x62\x6f\x6e\x20\x01\x63\x40\x4d\x53" + "\x47\x5f\x44\x41\x54\x45\x40\x01\x6e\x0d\x0a\x0d\x0a" // 053 RegardingByToOn + , "\x44\x65\x6c\x65\x74\x65\x20\x6d\x61\x69\x6c\x20\x66\x72\x6f\x6d\x20\x25\x73" // 054 DeleteMailQ + , "\x4f\x4b" // 055 OK + , "\x0d\x0a\x01\x5f\x01\x62\x01\x68\x46\x6f\x72\x77\x61\x72\x64\x20\x6d\x61\x69\x6c\x20\x74\x6f\x01\x5c\x3a\x20\x01\x77" // 056 ForwardMailTo + , "\x53\x61\x76\x65\x2f\x41\x70\x70\x65\x6e\x64\x20\x6d\x65\x73\x73\x61\x67\x65\x20\x74\x6f\x20\x61\x6e\x6f\x74\x68\x65\x72\x20\x66" + "\x69\x6c\x65" // 057 SaveMsgToFile + , "\x01\x5f\x01\x79\x01\x68\x50\x61\x74\x68\x2f\x46\x69\x6c\x65\x6e\x61\x6d\x65\x20\x74\x6f\x20\x77\x72\x69\x74\x65\x20\x74\x6f\x01" + "\x5c\x3a\x20\x01\x6e" // 058 FileToWriteTo + , "\x01\x6e\x0d\x0a\x59\x6f\x75\x20\x68\x61\x76\x65\x20\x6e\x6f\x20\x73\x65\x6e\x74\x20\x6d\x65\x73\x73\x61\x67\x65\x73\x20\x70\x65" + "\x6e\x64\x69\x6e\x67\x2e\x0d\x0a" // 059 NoMailSent + , "\x0d\x0a\x01\x71\x01\x67\x01\x68\x4d\x61\x69\x6c\x20\x74\x68\x61\x74\x20\x79\x6f\x75\x27\x76\x65\x20\x73\x65\x6e\x74\x20\x73\x74" + "\x69\x6c\x6c\x20\x70\x65\x6e\x64\x69\x6e\x67\x01\x5c\x20\x28\x25\x73\x20\x66\x69\x72\x73\x74\x29\x3a\x0d\x0a\x0d\x0a\x01\x6e" // 060 MailSentLstHdr + , "\x01\x6e\x0d\x0a\x01\x63\xfe\x20\x01\x68\x01\x62\x52\x65\x61\x64\x69\x6e\x67\x20\x53\x65\x6e\x74\x20\x45\x2d\x6d\x61\x69\x6c\x20" + "\x01\x6e\x01\x63\xfe\x20\x01\x68\x01\x62\x28\x01\x77\x01\x60\x3f\x01\x62\x3d\x4d\x65\x6e\x75\x29\x01\x5c\x20\x28\x01\x77\x25\x75" + "\x01\x62\x20\x6f\x66\x20\x01\x77\x25\x75\x01\x62\x29\x3a\x20\x01\x6e\x01\x7e" // 061 ReadingSentMail + , "\x01\x68\x01\x3f\x01\x6d\x49\x6e\x74\x65\x72\x6e\x65\x74\x20\x4d\x61\x69\x6c\x20\x54\x6f\x3a\x20\x01\x77\x25\x73\x01\x6d\x0d\x0a" + "\x46\x72\x6f\x6d\x3a\x20\x01\x77\x25\x73\x0d\x0a" // 062 InternetMailing + , "\x01\x6e\x0d\x0a\x4e\x6f\x20\x6d\x61\x69\x6c\x20\x6f\x6e\x20\x73\x79\x73\x74\x65\x6d\x2e\x0d\x0a" // 063 NoMailOnSystem + , "\x01\x6e\x0d\x0a\x01\x63\xfe\x20\x01\x68\x01\x62\x52\x65\x61\x64\x69\x6e\x67\x20\x41\x6c\x6c\x20\x45\x2d\x6d\x61\x69\x6c\x20\x01" + "\x6e\x01\x63\xfe\x20\x01\x68\x01\x62\x28\x01\x77\x25\x75\x20\x01\x62\x6f\x66\x20\x01\x77\x25\x75\x01\x62\x29\x3a\x20\x01\x6e" // 064 ReadingAllMail + , "\x01\x5f\x0d\x0a\x01\x67\x01\x68\x20\x20\x20\x20\x20\x20\x46\x72\x6f\x6d\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20" + "\x20\x20\x20\x20\x20\x54\x6f\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x41\x20\x53\x75" + "\x62\x6a\x65\x63\x74\x0d\x0a\x01\x6e" // 065 MailOnSystemLstHdr + , "\x01\x67\x01\x68\x25\x35\x64\x01\x6e\x01\x67\x20\x25\x2d\x32\x32\x2e\x32\x32\x73\x20\x25\x2d\x32\x32\x2e\x32\x32\x73\x20\x01\x68" + "\x25\x63\x01\x6e\x01\x67\x20\x25\x73\x0d\x0a" // 066 MailOnSystemLstFmt + , "\x01\x2d\x0d\x0a\x01\x63\x25\x2d\x31\x35\x2e\x31\x35\x73\x20\x01\x79\x01\x68\x25\x2d\x34\x34\x2e\x34\x34\x73\x20\x01\x6e\x01\x63" + "\x4e\x65\x77\x3a\x01\x68\x25\x35\x75\x20\x01\x6e\x01\x63\x6f\x66\x01\x68\x20\x25\x2d\x75" // 067 NScanStatusFmt + , "\x01\x2d\x0d\x0a\x01\x63\x25\x2d\x32\x30\x73\x20\x01\x79\x01\x68\x25\x2d\x35\x30\x73\x20\x01\x77\x25\x36\x75" // 068 SearchSubFmt + , "\x0d\x0a\x4e\x6f\x20\x6d\x65\x73\x73\x61\x67\x65\x73\x20\x68\x61\x76\x65\x20\x62\x65\x65\x6e\x20\x70\x6f\x73\x74\x65\x64\x20\x6f" + "\x6e\x20\x25\x73\x20\x25\x73\x0d\x0a" // 069 NoMsgsOnSub + , "\x0d\x0a\x01\x6e\x01\x63\x50\x6f\x73\x74\x20\x3a\x20\x5b\x01\x68\x25\x75\x01\x6e\x01\x63\x5d\x5b\x01\x68\x25\x75\x01\x6e\x01\x63" + "\x5d\x20\x01\x68\x25\x75\x01\x6e\x01\x63\x2f\x01\x68\x25\x75" // 070 ZScanPostHdr + , "\x01\x6e\x0d\x0a\x01\x63\xfe\x20\x01\x68\x01\x62\x52\x65\x61\x64\x69\x6e\x67\x20\x01\x6e\x01\x63\xfe\x20\x25\x34\x75\x08\x08\x08" + "\x08\x25\x73\x01\x5c\x20\x25\x34\x75\x08\x08\x08\x08\x01\x68\x25\x73\x20\x01\x6e\x01\x63\x28\x01\x68\x01\x60\x3f\x01\x6e\x01\x63" + "\x3d\x4d\x65\x6e\x75\x29\x20\x28\x01\x68\x25\x75\x01\x6e\x01\x63\x20\x6f\x66\x20\x01\x68\x25\x75\x01\x6e\x01\x63\x29\x3a\x20\x01" + "\x6e\x01\x7e" // 071 ReadingSub + , "\x0d\x0a\x59\x6f\x75\x20\x64\x69\x64\x6e\x27\x74\x20\x70\x6f\x73\x74\x20\x6d\x65\x73\x73\x61\x67\x65\x20\x23\x25\x64\x0d\x0a" // 072 YouDidntPostMsgN + , "\x01\x3f\x44\x65\x6c\x65\x74\x65\x20\x6d\x65\x73\x73\x61\x67\x65\x20\x23\x25\x75\x20\x27\x25\x73\x27" // 073 DeletePostQ + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x49\x01\x6e\x01\x62\x5d\x20\x01\x68\x41\x75\x74\x6f\x4c\x6f\x67\x6f\x6e\x20\x76\x69\x61\x20" + "\x49\x50\x20\x61\x64\x64\x72\x65\x73\x73\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 074 UserDefaultsAutoLogon + , "\x01\x6e\x0d\x0a\x01\x6d\x25\x73\x20\x73\x65\x6e\x74\x20\x74\x6f\x20\x01\x68\x25\x73\x20\x23\x25\x75\x0d\x0a" // 075 MsgSentToUser + , "\x01\x5f\x0d\x0a\x01\x79\x01\x68\x54\x65\x78\x74\x20\x74\x6f\x20\x73\x65\x61\x72\x63\x68\x20\x66\x6f\x72\x01\x5c\x3a\x20" // 076 SearchStringPrompt + , "\x01\x77\x01\x68\xc4\xc4\xc4\xc4\xc4\x5b\x01\x69\x01\x72\x25\x63\x01\x6e\x01\x68\x5d\xc4\xc4\xc4\xc4\xb4\x20\x01\x79\x50\x72\x69" + "\x76\x61\x74\x65\x20\x43\x68\x61\x74\x20\x2d\x20\x01\x72\x43\x74\x72\x6c\x2d\x43\x20\x74\x6f\x20\x51\x75\x69\x74\x20\x01\x79\x2d" + "\x20\x54\x69\x6d\x65\x20\x4c\x65\x66\x74\x3a\x20\x01\x67\x25\x2d\x38\x73\x01\x77\x20\xc3\xc4\xc4\xc4\xc4\x5b\x01\x69\x01\x62\x25" + "\x63\x01\x6e\x01\x68\x5d\xc4\xc4\xc4\xc4\xc4" // 077 PrivateChatSeparator + , "\x01\x67\x01\x68\x25\x35\x75\x01\x6e\x01\x67\x20\x25\x2d\x32\x32\x2e\x32\x32\x73\x20\x25\x2d\x32\x32\x2e\x32\x32\x73\x20\x01\x68" + "\x25\x63\x01\x6e\x01\x67\x20\x25\x73\x0d\x0a" // 078 SubMsgLstFmt + , "\x01\x77\x01\x68\xc4\xc4\xc4\xc4\xc4\x5b\x01\x69\x01\x72\x25\x63\x01\x6e\x01\x68\x5d\xc4\xc4\xc4\xc4\xb4\x20\x01\x72\x53\x70\x6c" + "\x69\x74\x2d\x53\x63\x72\x65\x65\x6e\x20\x01\x63\x53\x79\x73\x6f\x70\x01\x72\x20\x43\x68\x61\x74\x20\x20\x20\x20\x20\x20\x20\x20" + "\x20\x20\x01\x79\x54\x69\x6d\x65\x20\x4c\x65\x66\x74\x3a\x20\x01\x67\x25\x2d\x38\x73\x01\x77\x20\xc3\xc4\xc4\xc4\xc4\x5b\x01\x69" + "\x01\x62\x25\x63\x01\x6e\x01\x68\x5d\xc4\xc4\xc4\xc4\xc4" // 079 SysopChatSeparator + , "\x0d\x0a\x0d\x0a\x4e\x6f\x20\x74\x65\x78\x74\x20\x66\x69\x6c\x65\x20\x73\x65\x63\x74\x69\x6f\x6e\x73\x20\x61\x76\x61\x69\x6c\x61" + "\x62\x6c\x65\x2e\x0d\x0a" // 080 NoTextSections + , "\x01\x6c\x01\x5f\x01\x63\x01\x68\x47\x65\x6e\x65\x72\x61\x6c\x20\x54\x65\x78\x74\x20\x46\x69\x6c\x65\x20\x53\x65\x63\x74\x69\x6f" + "\x6e\x73\x3a\x0d\x0a\x0d\x0a" // 081 TextSectionLstHdr + , "\x01\x6e\x01\x63\x3c\x01\x68\x25\x64\x01\x6e\x01\x63\x3e\x20\x25\x73\x0d\x0a" // 082 TextSectionLstFmt + , "\x0d\x0a\x40\x4d\x4e\x45\x3a\x43\x40\x40\x57\x68\x69\x63\x68\x40\x20\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 083 WhichTextSection + , "\x01\x6c\x01\x5f\x01\x63\x01\x68\x25\x73\x20\x46\x69\x6c\x65\x73\x3a\x0d\x0a\x0d\x0a" // 084 TextFilesLstHdr + , "\x01\x63\x01\x68\x25\x33\x64\x3a\x20\x01\x6e\x01\x63\x25\x73" // 085 TextFilesLstFmt + , "\x0d\x0a\x40\x4d\x4e\x45\x3a\x43\x40\x40\x57\x68\x69\x63\x68\x40\x2c\x20\x7e\x41\x64\x64\x2c\x20\x7e\x52\x65\x6d\x6f\x76\x65\x2c" + "\x20\x7e\x45\x64\x69\x74\x2c\x20\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 086 WhichTextFileSysop + , "\x0d\x0a\x40\x4d\x4e\x45\x3a\x43\x40\x40\x57\x68\x69\x63\x68\x40\x20\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 087 WhichTextFile + , "\x01\x5f\x0d\x0a\x01\x79\x01\x68\x42\x65\x66\x6f\x72\x65\x20\x77\x68\x69\x63\x68\x20\x66\x69\x6c\x65\x20\x5b\x6c\x61\x73\x74\x5d" + "\x3a\x20\x01\x6e" // 088 AddTextFileBeforeWhich + , "\x0d\x0a\x50\x61\x74\x68\x20\x61\x6e\x64\x20\x66\x69\x6c\x65\x6e\x61\x6d\x65\x20\x28\x6e\x6f\x20\x70\x61\x74\x68\x20\x69\x6e\x64" + "\x69\x63\x61\x74\x65\x73\x20\x25\x73\x74\x65\x78\x74\x2f\x25\x73\x2f\x66\x69\x6c\x65\x6e\x61\x6d\x65\x29\x3a\x0d\x0a" // 089 AddTextFilePath + , "\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3a\x0d\x0a" // 090 AddTextFileDesc + , "\x01\x5f\x0d\x0a\x01\x79\x01\x68\x52\x65\x6d\x6f\x76\x65\x20\x40\x57\x68\x69\x63\x68\x40\x3a\x20\x01\x6e" // 091 RemoveWhichTextFile + , "\x44\x65\x6c\x65\x74\x65\x20\x25\x73" // 092 DeleteTextFileQ + , "\x01\x5f\x0d\x0a\x01\x79\x01\x68\x45\x64\x69\x74\x20\x40\x57\x68\x69\x63\x68\x40\x3a\x20\x01\x6e" // 093 EditWhichTextFile + , "\x0d\x0a\x53\x65\x61\x72\x63\x68\x20\x61\x6c\x6c\x20\x67\x72\x6f\x75\x70\x73\x20\x66\x6f\x72\x20\x6e\x65\x77\x20\x6d\x65\x73\x73" + "\x61\x67\x65\x73" // 094 NScanAllGrpsQ + , "\x0d\x0a\x53\x65\x61\x72\x63\x68\x20\x61\x6c\x6c\x20\x67\x72\x6f\x75\x70\x73\x20\x66\x6f\x72\x20\x75\x6e\x2d\x72\x65\x61\x64\x20" + "\x6d\x65\x73\x73\x61\x67\x65\x73\x20\x74\x6f\x20\x79\x6f\x75" // 095 SScanAllGrpsQ + , "\x0d\x0a\x41\x72\x65\x20\x79\x6f\x75\x20\x73\x75\x72\x65" // 096 AreYouSureQ + , "\x0d\x0a\x0d\x0a\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x63\x68\x61\x74\x2e\x0d\x0a" // 097 R_Chat + , "\x52\x45\x3a\x20\x46\x65\x65\x64\x62\x61\x63\x6b\x0d\x0a\x0d\x0a" // 098 ReFeedback + , "\x0d\x0a\x01\x67\x01\x68\x53\x79\x73\x74\x65\x6d\x20\x49\x6e\x66\x6f\x72\x6d\x61\x74\x69\x6f\x6e\x3a\x0d\x0a\x0d\x0a\x01\x68" // 099 SiHdr + , "\x01\x62\x01\x68\x53\x79\x73\x74\x65\x6d\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 100 SiSysName + , "\x01\x62\x51\x57\x4b\x20\x49\x44\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 101 SiSysID + , "\x01\x62\x46\x69\x64\x6f\x4e\x65\x74\x20\x41\x64\x64\x72\x65\x73\x73\x20\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 102 SiSysFaddr + , "\x01\x62\x50\x6f\x73\x74\x4c\x69\x6e\x6b\x20\x53\x69\x74\x65\x20\x20\x20\x3a\x20\x01\x63\x25\x73\x20\x25\x75\x0d\x0a" // 103 SiSysPsite + , "\x01\x62\x4c\x6f\x63\x61\x74\x69\x6f\x6e\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 104 SiSysLocation + , "\x01\x62\x4f\x70\x65\x72\x61\x74\x6f\x72\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 105 SiSysop + , "\x01\x62\x4e\x6f\x64\x65\x73\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x75\x0d\x0a" // 106 SiSysNodes + , "\x01\x62\x4e\x6f\x64\x65\x20\x23\x01\x63\x25\x2d\x33\x64\x20\x20\x20\x20\x20\x20\x20\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 107 SiNodeNumberName + , "\x01\x62\x4e\x6f\x64\x65\x20\x50\x68\x6f\x6e\x65\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 108 SiNodePhone + , "\x01\x62\x54\x6f\x74\x61\x6c\x20\x4c\x6f\x67\x6f\x6e\x73\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 109 SiTotalLogons + , "\x01\x62\x4c\x6f\x67\x6f\x6e\x73\x20\x54\x6f\x64\x61\x79\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 110 SiLogonsToday + , "\x01\x62\x54\x6f\x74\x61\x6c\x20\x54\x69\x6d\x65\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x73\x20\x6d\x69\x6e\x75\x74\x65\x73" + "\x0d\x0a" // 111 SiTotalTime + , "\x01\x62\x54\x69\x6d\x65\x20\x54\x6f\x64\x61\x79\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x73\x20\x6d\x69\x6e\x75\x74\x65\x73" + "\x0d\x0a" // 112 SiTimeToday + , "\x0d\x0a\x56\x69\x65\x77\x20\x73\x79\x73\x74\x65\x6d\x20\x69\x6e\x66\x6f\x72\x6d\x61\x74\x69\x6f\x6e\x20\x66\x69\x6c\x65\x01\x5c" + "" // 113 ViewSysInfoFileQ + , "\x56\x69\x65\x77\x20\x6c\x6f\x67\x6f\x6e\x20\x6d\x65\x73\x73\x61\x67\x65" // 114 ViewLogonMsgQ + , "\x0d\x0a\x0d\x0a\x53\x6f\x72\x72\x79\x2c\x20\x79\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x72\x65\x61\x64\x20\x6d\x61\x69\x6c\x20\x79" + "\x6f\x75\x27\x76\x65\x20\x73\x65\x6e\x74\x2e\x0d\x0a" // 115 R_ReadSentMail + , "\x0d\x0a\x01\x77\x01\x68\x4d\x65\x73\x73\x61\x67\x65\x20\x53\x63\x61\x6e\x20" // 116 MessageScan + , "\x01\x6e\x01\x63\x28\x01\x68\x25\x75\x20\x01\x6e\x01\x63\x73\x75\x62\x2d\x62\x6f\x61\x72\x64\x73\x29\x01\x68\x01\x77\x20\x63\x6f" + "\x6d\x70\x6c\x65\x74\x65\x2e\x0d\x0a" // 117 MessageScanComplete + , "\x01\x72\x01\x69\x61\x62\x6f\x72\x74\x65\x64\x2e\x01\x6e\x0d\x0a" // 118 MessageScanAborted + , "\x0d\x0a\x4c\x6f\x67\x20\x6f\x66\x66" // 119 LogOffQ + , "\x0d\x0a\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x70\x6f\x73\x74\x20\x6f\x6e\x20\x74\x68\x69\x73\x20\x73\x75\x62\x2e\x0d\x0a" // 120 CantPostOnSub + , "\x01\x6e\x01\x3f\x01\x6d\x53\x65\x6e\x64\x69\x6e\x67\x20\x6d\x65\x73\x73\x61\x67\x65\x20\x74\x6f\x20\x01\x68\x25\x73\x0d\x0a" // 121 SendingMessageToUser + , "\x0d\x0a\x01\x72\x01\x68\x4e\x6f\x20\x6f\x74\x68\x65\x72\x20\x61\x63\x74\x69\x76\x65\x20\x6e\x6f\x64\x65\x73\x2e\x01\x6e\x0d\x0a" + "" // 122 NoOtherActiveNodes + , "\x01\x3f\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x75\x73\x65\x20\x74\x68\x65\x20\x65\x78\x74\x65\x72\x6e\x61\x6c\x20\x70\x72\x6f" + "\x67\x72\x61\x6d\x73\x2e\x0d\x0a" // 123 R_ExternalPrograms + , "\x0d\x0a\x01\x2d\x01\x67\x55\x73\x61\x67\x65\x20\x53\x74\x61\x74\x69\x73\x74\x69\x63\x73\x20\x66\x6f\x72\x20\x01\x68\x25\x73\x20" + "\x23\x25\x64\x01\x6e\x0d\x0a\x0d\x0a" // 124 UserStats + , "\x01\x2d\x01\x67\x53\x75\x62\x2d\x62\x6f\x61\x72\x64\x73\x20\x6f\x66\x20\x01\x68\x25\x2d\x34\x30\x73\x20\x20\x20\x20\x20\x20\x20" + "\x01\x6e\x01\x67\x50\x6f\x73\x74\x73\x0d\x0a\x0d\x0a\x01\x68" // 125 SubLstHdr + , "\x01\x6e\x01\x67\x5b\x01\x68\x25\x75\x01\x6e\x01\x67\x5d\x20\x25\x2d\x34\x30\x73\x20\x25\x31\x32\x73\x20\x01\x68\x25\x35\x75\x0d" + "\x0a" // 126 SubLstFmt + , "\x0d\x0a\x01\x71\x01\x5f\x01\x67\x01\x68\x4d\x65\x73\x73\x61\x67\x65\x20\x47\x72\x6f\x75\x70\x73\x01\x6e\x01\x67\x20\x20\x20\x20" + "\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20" + "\x20\x20\x20\x20\x20\x20\x20\x20\x53\x75\x62\x2d\x62\x6f\x61\x72\x64\x73\x0d\x0a\x0d\x0a\x01\x68" // 127 GrpLstHdr + , "\x01\x6e\x01\x67\x5b\x01\x68\x25\x75\x01\x6e\x01\x67\x5d\x20\x25\x2d\x34\x30\x73\x20\x25\x31\x32\x73\x20\x01\x68\x25\x34\x75\x0d" + "\x0a" // 128 GrpLstFmt + , "\x0d\x0a\x47\x72\x6f\x75\x70\x20\x74\x6f\x20\x63\x6f\x6e\x66\x69\x67\x75\x72\x65\x20\x6e\x65\x77\x20\x6d\x65\x73\x73\x61\x67\x65" + "\x20\x73\x63\x61\x6e\x20\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 129 NScanCfgWhichGrp + , "\x0d\x0a\x47\x72\x6f\x75\x70\x20\x74\x6f\x20\x63\x6f\x6e\x66\x69\x67\x75\x72\x65\x20\x79\x6f\x75\x72\x20\x6d\x65\x73\x73\x61\x67" + "\x65\x20\x73\x63\x61\x6e\x20\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 130 SScanCfgWhichGrp + , "\x01\x6c\x01\x2d\x01\x67\x53\x75\x62\x2d\x62\x6f\x61\x72\x64\x73\x20\x6f\x66\x20\x01\x68\x25\x73\x3a\x0d\x0a\x0d\x0a\x01\x68" // 131 CfgSubLstHdr + , "\x01\x6e\x01\x67\x5b\x01\x68\x25\x64\x01\x6e\x01\x67\x5d\x20\x25\x2d\x34\x30\x2e\x34\x30\x73\x20\x20\x01\x68\x25\x73\x0d\x0a" // 132 CfgSubLstFmt + , "\x01\x6c\x01\x5f\x01\x67\x01\x68\x4d\x65\x73\x73\x61\x67\x65\x20\x47\x72\x6f\x75\x70\x73\x3a\x0d\x0a\x0d\x0a" // 133 CfgGrpLstHdr + , "\x01\x6e\x01\x67\x5b\x01\x68\x25\x64\x01\x6e\x01\x67\x5d\x20\x25\x73\x01\x68\x0d\x0a" // 134 CfgGrpLstFmt + , "\x0d\x0a\x53\x75\x62\x2d\x62\x6f\x61\x72\x64\x20\x74\x6f\x20\x74\x6f\x67\x67\x6c\x65\x20\x6e\x65\x77\x20\x6d\x65\x73\x73\x61\x67" + "\x65\x20\x73\x63\x61\x6e\x2c\x20\x7e\x40\x41\x6c\x6c\x40\x2c\x20\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 135 NScanCfgWhichSub + , "\x0d\x0a\x53\x75\x62\x2d\x62\x6f\x61\x72\x64\x20\x74\x6f\x20\x74\x6f\x67\x67\x6c\x65\x20\x79\x6f\x75\x72\x20\x6d\x65\x73\x73\x61" + "\x67\x65\x20\x73\x63\x61\x6e\x2c\x20\x7e\x40\x41\x6c\x6c\x40\x2c\x20\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 136 SScanCfgWhichSub + , "\x01\x6e\x01\x67\x5b\x01\x68\x25\x64\x01\x6e\x01\x67\x5d\x20\x25\x2d\x34\x30\x2e\x34\x30\x73\x20\x20\x01\x68\x01\x63\x25\x73\x0d" + "\x0a" // 137 SubPtrLstFmt + , "\x0d\x0a\x53\x65\x74\x20\x6e\x65\x77\x2d\x73\x63\x61\x6e\x20\x70\x6f\x69\x6e\x74\x65\x72\x20\x66\x6f\x72\x01\x5c\x20\x40\x57\x68" + "\x69\x63\x68\x40\x2c\x20\x7e\x40\x41\x6c\x6c\x40\x2c\x20\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 138 WhichOrAll + , "\x0d\x0a\x52\x61\x77\x20\x49\x6e\x70\x75\x74\x2f\x4f\x75\x74\x70\x75\x74\x20\x4d\x6f\x64\x65\x20\x69\x73\x20\x6e\x6f\x77\x3a\x20" + "\x01\x68" // 139 RawMsgInputModeIsNow + , "\x4f\x46\x46" // 140 Unused140 + , "\x4f\x4e" // 141 Unused141 + , "\x0d\x0a\x01\x6e\x01\x6d\x50\x61\x67\x69\x6e\x67\x20\x01\x68\x25\x73\x20\x23\x25\x75\x01\x6e\x01\x6d\x20\x66\x6f\x72\x20\x70\x72" + "\x69\x76\x61\x74\x65\x20\x63\x68\x61\x74\x0d\x0a" // 142 PagingUser + , "\x0d\x0a\x01\x2d\x01\x67\x53\x79\x73\x74\x65\x6d\x20\x53\x74\x61\x74\x69\x73\x74\x69\x63\x73\x3a\x0d\x0a\x0d\x0a\x01\x6e" // 143 SystemStatsHdr + , "\x0d\x0a\x01\x2d\x01\x67\x4e\x6f\x64\x65\x20\x23\x25\x64\x20\x53\x74\x61\x74\x69\x73\x74\x69\x63\x73\x3a\x0d\x0a\x0d\x0a\x01\x6e" + "" // 144 NodeStatsHdr + , "\x54\x6f\x74\x61\x6c\x20\x4c\x6f\x67\x6f\x6e\x73\x20\x20\x20\x20\x3a\x20\x25\x73\x0d\x0a" // 145 StatsTotalLogons + , "\x4c\x6f\x67\x6f\x6e\x73\x20\x54\x6f\x64\x61\x79\x20\x20\x20\x20\x3a\x20\x25\x73\x0d\x0a" // 146 StatsLogonsToday + , "\x54\x6f\x74\x61\x6c\x20\x54\x69\x6d\x65\x20\x20\x20\x20\x20\x20\x3a\x20\x25\x73\x20\x6d\x69\x6e\x75\x74\x65\x73\x0d\x0a" // 147 StatsTotalTime + , "\x54\x69\x6d\x65\x20\x54\x6f\x64\x61\x79\x20\x20\x20\x20\x20\x20\x3a\x20\x25\x73\x20\x6d\x69\x6e\x75\x74\x65\x73\x0d\x0a" // 148 StatsTimeToday + , "\x55\x70\x6c\x6f\x61\x64\x73\x20\x54\x6f\x64\x61\x79\x20\x20\x20\x3a\x20\x25\x73\x20\x62\x79\x74\x65\x73\x20\x69\x6e\x20\x25\x75" + "\x20\x66\x69\x6c\x65\x73\x0d\x0a" // 149 StatsUploadsToday + , "\x44\x6f\x77\x6e\x6c\x6f\x61\x64\x73\x20\x54\x6f\x64\x61\x79\x20\x3a\x20\x25\x73\x20\x62\x79\x74\x65\x73\x20\x69\x6e\x20\x25\x75" + "\x20\x66\x69\x6c\x65\x73\x0d\x0a" // 150 StatsDownloadsToday + , "\x50\x6f\x73\x74\x73\x20\x54\x6f\x64\x61\x79\x20\x20\x20\x20\x20\x3a\x20\x25\x73\x0d\x0a" // 151 StatsPostsToday + , "\x45\x2d\x6d\x61\x69\x6c\x73\x20\x54\x6f\x64\x61\x79\x20\x20\x20\x3a\x20\x25\x73\x0d\x0a" // 152 StatsEmailsToday + , "\x46\x65\x65\x64\x62\x61\x63\x6b\x20\x54\x6f\x64\x61\x79\x20\x20\x3a\x20\x25\x73\x0d\x0a" // 153 StatsFeedbacksToday + , "\x01\x5f\x0d\x0a\x01\x79\x01\x68\x43\x68\x61\x6e\x67\x65\x20\x74\x6f\x20\x28\x55\x73\x65\x72\x20\x4e\x61\x6d\x65\x20\x6f\x72\x20" + "\x4e\x75\x6d\x62\x65\x72\x29\x01\x5c\x3a\x20\x01\x6e" // 154 ChUserPrompt + , "\x50\x57\x3a\x20" // 155 ChUserPwPrompt + , "\x0d\x0a\x59\x6f\x75\x20\x6d\x75\x73\x74\x20\x69\x6e\x63\x6c\x75\x64\x65\x20\x61\x20\x63\x6f\x6d\x6d\x61\x20\x69\x6e\x20\x79\x6f" + "\x75\x72\x20\x6c\x6f\x63\x61\x74\x69\x6f\x6e\x2e\x0d\x0a" // 156 CommaInLocationRequired + , "\x0d\x0a\x45\x72\x72\x6f\x72\x20\x6c\x6f\x67\x3a\x0d\x0a" // 157 ErrorLogHdr + , "\x44\x65\x6c\x65\x74\x65\x20\x65\x72\x72\x6f\x72\x20\x6c\x6f\x67" // 158 DeleteErrorLogQ + , "\x0d\x0a\x01\x6e\x01\x72\x01\x68\x44\x69\x72\x65\x63\x74\x6f\x72\x79\x20\x64\x6f\x65\x73\x20\x6e\x6f\x74\x20\x65\x78\x69\x73\x74" + "\x3a\x20\x01\x63\x25\x73\x01\x6e\x0d\x0a" // 159 DirectoryDoesNotExist + , "\x0d\x0a\x43\x6c\x65\x61\x72\x20\x63\x72\x69\x74\x69\x63\x61\x6c\x20\x65\x72\x72\x6f\x72\x20\x63\x6f\x75\x6e\x74\x65\x72\x73\x20" + "\x6f\x6e\x20\x61\x6c\x6c\x20\x6e\x6f\x64\x65\x73" // 160 ClearErrCounter + , "\x0d\x0a\x49\x6e\x76\x61\x6c\x69\x64\x20\x6e\x6f\x64\x65\x2e\x0d\x0a" // 161 InvalidNode + , "\x01\x6e\x01\x3f\x01\x6d\x53\x65\x6e\x64\x69\x6e\x67\x20\x74\x65\x6c\x65\x67\x72\x61\x6d\x20\x74\x6f\x20\x01\x68\x25\x73\x20\x23" + "\x25\x75\x01\x6e\x01\x6d\x0d\x0a\x28\x4d\x61\x78\x69\x6d\x75\x6d\x20\x6f\x66\x20\x35\x20\x6c\x69\x6e\x65\x73\x2c\x20\x42\x6c\x61" + "\x6e\x6b\x20\x6c\x69\x6e\x65\x20\x65\x6e\x64\x73\x2c\x20\x43\x74\x72\x6c\x2d\x43\x20\x74\x6f\x20\x61\x62\x6f\x72\x74\x29\x3a\x0d" + "\x0a\x01\x67\x01\x68" // 162 SendingTelegramToUser + , "\x44\x65\x6c\x65\x74\x65\x20\x47\x75\x72\x75\x20\x66\x69\x6c\x65" // 163 DeleteGuruLogQ + , "\x01\x6e\x01\x67\x07\x54\x65\x6c\x65\x67\x72\x61\x6d\x20\x66\x72\x6f\x6d\x20\x01\x6e\x01\x68\x25\x73\x01\x6e\x01\x67\x20\x6f\x6e" + "\x20\x25\x73\x3a\x0d\x0a\x01\x68" // 164 TelegramFmt + , "\x01\x3f\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x2e\x0d\x0a" // 165 R_Download + , "\x01\x2f\x01\x77\x01\x68\x53\x65\x61\x72\x63\x68\x69\x6e\x67\x20\x63\x75\x72\x72\x65\x6e\x74\x20\x6c\x69\x62\x72\x61\x72\x79\x20" + "\x40\x45\x4c\x4c\x49\x50\x53\x49\x53\x40\x0d\x0a\x01\x71" // 166 SearchingAllDirs + , "\x01\x77\x01\x68\x53\x65\x61\x72\x63\x68\x69\x6e\x67\x20\x61\x6c\x6c\x20\x6c\x69\x62\x72\x61\x72\x69\x65\x73\x20\x40\x45\x4c\x4c" + "\x49\x50\x53\x49\x53\x40\x0d\x0a\x01\x71" // 167 SearchingAllLibs + , "\x0d\x0a\x01\x77\x01\x68\x25\x75\x20\x46\x69\x6c\x65\x73\x20\x4c\x69\x73\x74\x65\x64\x2e\x0d\x0a" // 168 NFilesListed + , "\x01\x3f\x01\x77\x01\x68\x45\x6d\x70\x74\x79\x20\x64\x69\x72\x65\x63\x74\x6f\x72\x79\x2e\x0d\x0a" // 169 EmptyDir + , "\x01\x3f\x01\x63\x53\x65\x61\x72\x63\x68\x69\x6e\x67\x20\x66\x6f\x72\x20\x66\x69\x6c\x65\x73\x20\x75\x70\x6c\x6f\x61\x64\x65\x64" + "\x20\x61\x66\x74\x65\x72\x01\x5c\x20\x01\x68\x25\x73\x01\x6e\x0d\x0a" // 170 NScanHdr + , "\x01\x3f\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x72\x65\x6d\x6f\x76\x65\x20\x66\x69\x6c\x65\x73\x2e\x0d\x0a" // 171 R_RemoveFiles + , "\x01\x3f\x54\x68\x69\x73\x20\x64\x69\x72\x65\x63\x74\x6f\x72\x79\x20\x69\x73\x20\x66\x75\x6c\x6c\x2e\x0d\x0a" // 172 DirFull + , "\x01\x3f\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x75\x70\x6c\x6f\x61\x64\x2e\x0d\x0a" // 173 R_Upload + , "\x01\x3f\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x75\x70\x6c\x6f\x61\x64\x20\x68\x65\x72\x65\x2e\x0d\x0a" // 174 CantUploadHere + , "\x01\x5f\x01\x3f\x01\x79\x01\x68\x46\x69\x6c\x65\x73\x70\x65\x63\x3a\x20\x01\x6e\x01\x7e" // 175 FileSpec + , "\x53\x59\x3a\x20" // 176 SystemPassword + , "\x01\x3f\x4e\x6f\x20\x73\x79\x73\x6f\x70\x20\x64\x69\x72\x65\x63\x74\x6f\x72\x79\x20\x69\x73\x20\x63\x6f\x6e\x66\x69\x67\x75\x72" + "\x65\x64\x2e\x0d\x0a" // 177 NoSysopDir + , "\x01\x3f\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x75\x70\x6c\x6f\x61\x64\x20\x74\x6f\x20\x74\x68\x65\x20\x73\x79\x73\x6f\x70\x2e" + "\x0d\x0a" // 178 CantUploadToSysop + , "\x01\x2d\x01\x67\x44\x69\x72\x65\x63\x74\x6f\x72\x69\x65\x73\x20\x6f\x66\x20\x01\x68\x25\x2d\x34\x30\x2e\x34\x30\x73\x20\x20\x20" + "\x20\x20\x01\x6e\x01\x67\x46\x69\x6c\x65\x73\x0d\x0a\x0d\x0a\x01\x68" // 179 DirLstHdr + , "\x01\x6e\x01\x67\x28\x01\x68\x25\x75\x01\x6e\x01\x67\x29\x20\x25\x2d\x34\x30\x2e\x34\x30\x73\x20\x25\x31\x32\x2e\x31\x32\x73\x20" + "\x01\x68\x25\x34\x75\x0d\x0a" // 180 DirLstFmt + , "\x0d\x0a\x01\x71\x01\x5f\x01\x67\x01\x68\x46\x69\x6c\x65\x20\x4c\x69\x62\x72\x61\x72\x69\x65\x73\x20\x01\x6e\x01\x67\x20\x20\x20" + "\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20" + "\x20\x20\x20\x20\x20\x20\x20\x44\x69\x72\x65\x63\x74\x6f\x72\x69\x65\x73\x0d\x0a\x0d\x0a\x01\x68" // 181 LibLstHdr + , "\x01\x6e\x01\x67\x28\x01\x68\x25\x75\x01\x6e\x01\x67\x29\x20\x25\x2d\x34\x30\x2e\x34\x30\x73\x20\x25\x31\x32\x2e\x31\x32\x73\x20" + "\x01\x68\x25\x34\x75\x0d\x0a" // 182 LibLstFmt + , "\x01\x6e\x0d\x0a\x49\x6e\x76\x61\x6c\x69\x64\x20\x4e\x65\x74\x4d\x61\x69\x6c\x20\x61\x64\x64\x72\x65\x73\x73\x01\x5c\x3a\x20\x01" + "\x68\x25\x73\x01\x6e\x0d\x0a" // 183 InvalidNetMailAddr + , "\x01\x5f\x0d\x0a\x01\x67\x01\x68\x25\x73\x20\x01\x6e\x01\x67\x54\x72\x61\x6e\x73\x66\x65\x72\x20\x50\x6f\x6c\x69\x63\x79\x0d\x0a" + "\x0d\x0a\x01\x6e" // 184 TransferPolicyHdr + , "\x01\x6e\x01\x68\x5b\x01\x79\x01\x7e\x25\x63\x01\x77\x5d\x20\x01\x62\x25\x2d\x32\x35\x73\x20\x20" // 185 TransferProtLstFmt + , "\x49\x6e\x69\x74\x69\x61\x6c\x20\x75\x70\x6c\x6f\x61\x64\x73\x20\x61\x72\x65\x20\x72\x65\x77\x61\x72\x64\x65\x64\x20\x77\x69\x74" + "\x68\x20\x25\x64\x25\x25\x20\x6f\x66\x20\x74\x68\x65\x20\x63\x72\x65\x64\x69\x74\x20\x76\x61\x6c\x75\x65\x0d\x0a" // 186 TpUpload + , "\x41\x6c\x6c\x20\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x73\x20\x61\x72\x65\x20\x72\x65\x77\x61\x72\x64\x65\x64\x20\x77\x69\x74\x68\x20" + "\x25\x64\x25\x25\x20\x6f\x66\x20\x74\x68\x65\x20\x63\x72\x65\x64\x69\x74\x20\x76\x61\x6c\x75\x65\x0d\x0a" // 187 TpDownload + , "\x01\x3f\x4e\x6f\x20\x75\x73\x65\x72\x20\x64\x69\x72\x65\x63\x74\x6f\x72\x79\x20\x69\x73\x20\x63\x6f\x6e\x66\x69\x67\x75\x72\x65" + "\x64\x2e\x0d\x0a" // 188 NoUserDir + , "\x0d\x0a\x54\x68\x65\x72\x65\x20\x61\x72\x65\x20\x6e\x6f\x20\x66\x69\x6c\x65\x73\x20\x66\x6f\x72\x20\x79\x6f\x75\x2e\x0d\x0a" // 189 NoFilesForYou + , "\x01\x3f\x55\x73\x65\x72\x20\x74\x72\x61\x6e\x73\x66\x65\x72\x20\x64\x69\x72\x65\x63\x74\x6f\x72\x79\x20\x69\x73\x20\x66\x75\x6c" + "\x6c\x2e\x0d\x0a" // 190 UserDirFull + , "\x01\x3f\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x73\x65\x6e\x64\x20\x66\x69\x6c\x65\x73\x20\x74\x6f\x20\x75\x73\x65\x72\x73\x2e" + "\x0d\x0a" // 191 CantUploadToUser + , "\x01\x6e\x01\x63\x4c\x69\x62\x72\x61\x72\x79\x20\x20\x20\x3a\x20\x28\x25\x75\x29\x20\x25\x73\x01\x79\x01\x68" // 192 BoxHdrLib + , "\x01\x6e\x01\x63\x44\x69\x72\x65\x63\x74\x6f\x72\x79\x20\x3a\x20\x28\x25\x75\x29\x20\x25\x73\x01\x79\x01\x68" // 193 BoxHdrDir + , "\x01\x6e\x01\x63\x46\x69\x6c\x65\x73\x20\x20\x20\x20\x20\x3a\x20\x25\x75\x01\x79\x01\x68" // 194 BoxHdrFiles + , "\x01\x6e\x01\x63\x28\x01\x68\x25\x75\x01\x6e\x01\x63\x29\x20\x25\x73\x20" // 195 ShortHdrLib + , "\x01\x6e\x01\x63\x28\x01\x68\x25\x75\x01\x6e\x01\x63\x29\x20\x25\x73" // 196 ShortHdrDir + , "\x01\x72\x01\x68\x46\x69\x6c\x65\x6e\x61\x6d\x65\x73\x2c\x20\x73\x70\x65\x63\x73\x2c\x20\x6f\x72\x20\x66\x6c\x61\x67\x73\x20\x5b" + "\x4e\x6f\x6e\x65\x5d\x3a\x20\x01\x6d\x01\x68\x01\x7e" // 197 BatchDlFlags + , "\x0d\x0a\x07\x01\x72\x01\x68\x01\x69\x42\x61\x74\x63\x68\x20\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x71\x75\x65\x75\x65\x20\x69\x73" + "\x20\x66\x75\x6c\x6c\x2e\x01\x6e\x0d\x0a" // 198 BatchDlQueueIsFull + , "\x01\x5f\x01\x3f\x01\x79\x01\x68\x46\x69\x6c\x65\x73\x70\x65\x63\x20\x5b\x01\x77\x41\x6c\x6c\x20\x46\x69\x6c\x65\x73\x01\x79\x5d" + "\x3a\x20\x01\x6e" // 199 FileSpecStarDotStar + , "\x01\x3f\x01\x72\x01\x68\x01\x69\x4e\x6f\x74\x20\x65\x6e\x6f\x75\x67\x68\x20\x66\x72\x65\x65\x20\x64\x69\x73\x6b\x20\x73\x70\x61" + "\x63\x65\x2e\x01\x6e\x0d\x0a\x0d\x0a\x01\x68\x54\x68\x65\x20\x73\x79\x73\x6f\x70\x20\x68\x61\x73\x20\x62\x65\x65\x6e\x20\x6e\x6f" + "\x74\x69\x66\x69\x65\x64\x2e\x01\x6e\x0d\x0a" // 200 LowDiskSpace + , "\x0d\x0a\x25\x73\x20\x62\x79\x74\x65\x73\x20\x66\x72\x65\x65\x0d\x0a\x0d\x0a" // 201 DiskNBytesFree + , "\x01\x5f\x01\x79\x01\x68\x46\x69\x6c\x65\x6e\x61\x6d\x65\x3a\x20\x01\x6e" // 202 Filename + , "\x01\x2f\x01\x72\x01\x68\x42\x61\x64\x20\x66\x69\x6c\x65\x6e\x61\x6d\x65\x3a\x20\x27\x25\x73\x27\x0d\x0a" // 203 BadFilename + , "\x55\x70\x6c\x6f\x61\x64\x20\x27\x25\x73\x27\x20\x74\x6f\x20\x53\x79\x73\x6f\x70\x20\x64\x69\x72\x65\x63\x74\x6f\x72\x79" // 204 UploadToSysopDirQ + , "\x55\x70\x6c\x6f\x61\x64\x20\x27\x25\x73\x27\x20\x74\x6f\x20\x55\x73\x65\x72\x20\x64\x69\x72\x65\x63\x74\x6f\x72\x79" // 205 UploadToUserDirQ + , "\x55\x70\x6c\x6f\x61\x64\x20\x27\x25\x73\x27\x20\x74\x6f\x20\x25\x73\x01\x5c\x20\x25\x73" // 206 UploadToCurDirQ + , "\x0d\x0a\x01\x72\x01\x68\x01\x69\x54\x68\x61\x74\x20\x66\x69\x6c\x65\x20\x69\x73\x20\x61\x6c\x72\x65\x61\x64\x79\x20\x74\x68\x65" + "\x72\x65\x21\x01\x6e\x0d\x0a" // 207 FileAlreadyThere + , "\x54\x68\x61\x74\x20\x66\x69\x6c\x65\x20\x69\x73\x20\x61\x6c\x72\x65\x61\x64\x79\x20\x6f\x6e\x20\x64\x69\x73\x6b\x2e\x01\x5c\x20" + "\x41\x64\x64\x20\x74\x6f\x20\x64\x61\x74\x61\x20\x62\x61\x73\x65" // 208 FileOnDiskAddQ + , "\x0d\x0a\x01\x72\x01\x68\x01\x69\x54\x68\x61\x74\x20\x66\x69\x6c\x65\x20\x69\x73\x20\x6e\x6f\x74\x20\x6f\x6e\x20\x64\x69\x73\x6b" + "\x21\x01\x6e\x0d\x0a" // 209 FileNotOnDisk + , "\x0d\x0a\x01\x72\x01\x68\x01\x69\x50\x6c\x65\x61\x73\x65\x20\x75\x70\x6c\x6f\x61\x64\x20\x66\x69\x6c\x65\x73\x20\x77\x69\x74\x68" + "\x20\x74\x68\x65\x20\x66\x6f\x6c\x6c\x6f\x77\x69\x6e\x67\x20\x65\x78\x74\x65\x6e\x73\x69\x6f\x6e\x73\x20\x6f\x6e\x6c\x79\x3a\x01" + "\x6e\x0d\x0a\x01\x77\x01\x68" // 210 TheseFileExtsOnly + , "\x0d\x0a\x01\x6e\x01\x68\x25\x73\x01\x72\x01\x68\x01\x69\x20\x68\x61\x73\x20\x61\x6c\x72\x65\x61\x64\x79\x20\x62\x65\x65\x6e\x20" + "\x75\x70\x6c\x6f\x61\x64\x65\x64\x20\x74\x6f\x01\x6e\x01\x63\x20\x25\x73\x20\x01\x68\x25\x73\x01\x6e\x0d\x0a" // 211 FileAlreadyOnline + , "\x0d\x0a\x01\x77\x01\x68\x48\x69\x74\x20\x5b\x45\x4e\x54\x45\x52\x5d\x20\x61\x66\x74\x65\x72\x20\x6c\x61\x73\x74\x20\x64\x65\x73" + "\x74\x69\x6e\x61\x74\x69\x6f\x6e\x20\x75\x73\x65\x72\x2e\x0d\x0a\x0d\x0a" // 212 EnterAfterLastDestUser + , "\x01\x5f\x01\x79\x01\x68\x53\x65\x6e\x64\x20\x66\x69\x6c\x65\x20\x74\x6f\x20\x28\x55\x73\x65\x72\x20\x6e\x61\x6d\x65\x20\x6f\x72" + "\x20\x6e\x75\x6d\x62\x65\x72\x29\x01\x5c\x3a\x20\x01\x6e" // 213 SendFileToUser + , "\x0d\x0a\x01\x72\x01\x68\x01\x69\x44\x75\x70\x6c\x69\x63\x61\x74\x65\x20\x75\x73\x65\x72\x01\x6e\x0d\x0a\x0d\x0a" // 214 DuplicateUser + , "\x07\x0d\x0a\x01\x72\x01\x68\x01\x69\x25\x73\x20\x77\x6f\x75\x6c\x64\x6e\x27\x74\x20\x62\x65\x20\x61\x62\x6c\x65\x20\x74\x6f\x20" + "\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x69\x74\x21\x01\x6e\x0d\x0a\x0d\x0a" // 215 UserWontBeAbleToDl + , "\x07\x0d\x0a\x01\x72\x01\x68\x01\x69\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x73\x65\x6e\x64\x20\x79\x6f\x75\x72\x73\x65\x6c\x66" + "\x20\x66\x69\x6c\x65\x73\x2e\x01\x6e\x0d\x0a\x0d\x0a" // 216 CantSendYourselfFiles + , "\x0d\x0a\x01\x2d\x01\x67\x41\x64\x64\x65\x64\x20\x74\x6f\x20\x64\x65\x73\x74\x69\x6e\x61\x74\x69\x6f\x6e\x20\x75\x73\x65\x72\x20" + "\x6c\x69\x73\x74\x01\x5c\x3a\x20\x01\x77\x01\x68\x25\x73\x20\x23\x25\x73\x0d\x0a\x0d\x0a\x01\x6e" // 217 UserAddedToDestList + , "\x0d\x0a\x01\x2d\x01\x67\x48\x6f\x77\x20\x64\x6f\x20\x79\x6f\x75\x20\x72\x61\x74\x65\x20\x74\x68\x65\x20\x63\x6f\x6e\x74\x65\x6e" + "\x74\x20\x6f\x66\x20\x74\x68\x69\x73\x20\x66\x69\x6c\x65\x20\x28\x01\x68\x01\x77\x47\x01\x6e\x01\x67\x2c\x20\x01\x68\x01\x77\x52" + "\x01\x6e\x01\x67\x2c\x20\x6f\x72\x20\x01\x68\x01\x77\x58\x01\x6e\x01\x67\x29\x01\x5c\x3a\x20\x01\x6e" // 218 RateThisFile + , "\x5b\x25\x63\x5d\x20" // 219 Rated + , "\x49\x73\x20\x74\x68\x69\x73\x20\x75\x70\x6c\x6f\x61\x64\x20\x70\x61\x72\x74\x20\x6f\x66\x20\x61\x20\x73\x65\x74\x01\x5c\x20\x28" + "\x6d\x75\x6c\x74\x69\x70\x6c\x65\x20\x66\x69\x6c\x65\x73\x29" // 220 MultipleDiskQ + , "\x01\x5f\x01\x79\x01\x68\x48\x6f\x77\x20\x6d\x61\x6e\x79\x20\x66\x69\x6c\x65\x73\x20\x74\x6f\x74\x61\x6c\x3a\x20\x01\x6e" // 221 HowManyDisksTotal + , "\x01\x5f\x01\x79\x01\x68\x57\x68\x69\x63\x68\x20\x66\x69\x6c\x65\x20\x6e\x75\x6d\x62\x65\x72\x20\x69\x73\x20\x79\x6f\x75\x72\x20" + "\x75\x70\x6c\x6f\x61\x64\x3a\x20\x01\x6e" // 222 NumberOfFile + , "\x20\x5b\x25\x32\x2e\x32\x64\x2f\x25\x32\x2e\x32\x64\x5d" // 223 FileOneOfTen + , "\x20\x5b\x25\x64\x2f\x25\x64\x5d" // 224 FileOneOfTwo + , "\x0d\x0a\x01\x2d\x01\x67\x45\x6e\x74\x65\x72\x20\x61\x20\x64\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x6e\x6f\x77\x2e\x0d\x0a" + "\x3a\x20" // 225 EnterDescNow + , "\x4e\x6f\x20\x64\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x67\x69\x76\x65\x6e\x2e" // 226 NoDescription + , "\x0d\x0a\x50\x72\x6f\x74\x6f\x63\x6f\x6c\x20\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 227 ProtocolOrQuit + , "\x0d\x0a\x50\x72\x6f\x74\x6f\x63\x6f\x6c\x2c\x20\x7e\x42\x61\x74\x63\x68\x20\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 228 ProtocolBatchOrQuit + , "\x0d\x0a\x07\x01\x72\x01\x68\x01\x69\x42\x61\x74\x63\x68\x20\x75\x70\x6c\x6f\x61\x64\x20\x71\x75\x65\x75\x65\x20\x69\x73\x20\x66" + "\x75\x6c\x6c\x2e\x01\x6e\x0d\x0a" // 229 BatchUlQueueIsFull + , "\x0d\x0a\x01\x6e\x01\x6d\x01\x68\x25\x73\x20\x01\x6e\x01\x6d\x61\x64\x64\x65\x64\x20\x74\x6f\x20\x62\x61\x74\x63\x68\x20\x75\x70" + "\x6c\x6f\x61\x64\x20\x71\x75\x65\x75\x65\x01\x63\x01\x5c\x20\x2d\x20\x46\x69\x6c\x65\x73\x3a\x20\x01\x68\x25\x75\x20\x01\x6e\x01" + "\x63\x28\x01\x68\x25\x75\x01\x6e\x01\x63\x20\x4d\x61\x78\x29\x0d\x0a" // 230 FileAddedToUlQueue + , "\x01\x6e\x01\x3f\x01\x67\x01\x68\x25\x73\x01\x79\x3a\x20\x01\x77\x7e\x42\x01\x79\x61\x74\x63\x68\x20\x64\x6f\x77\x6e\x6c\x6f\x61" + "\x64\x2c\x20\x01\x77\x7e\x45\x01\x79\x64\x69\x74\x20\x69\x6e\x66\x6f\x2f\x01\x77\x7e\x44\x01\x79\x65\x73\x63\x2c\x20\x01\x77\x7e" + "\x56\x01\x79\x69\x65\x77\x20\x66\x69\x6c\x65\x2c\x20\x01\x77\x7e\x51\x01\x79\x75\x69\x74\x2c\x20\x01\x77\x7e\x50\x01\x79\x72\x65" + "\x76\x20\x6f\x72\x20\x5b\x7e\x4e\x65\x78\x74\x5d\x3a\x20\x01\x77" // 231 FileInfoEditPrompt + , "\x01\x6e\x01\x3f\x01\x67\x01\x68\x25\x73\x01\x79\x3a\x20\x01\x77\x7e\x42\x01\x79\x61\x74\x63\x68\x20\x64\x6f\x77\x6e\x6c\x6f\x61" + "\x64\x2c\x20\x01\x77\x7e\x45\x01\x79\x78\x74\x65\x6e\x64\x65\x64\x20\x69\x6e\x66\x6f\x2c\x20\x01\x77\x7e\x56\x01\x79\x69\x65\x77" + "\x20\x66\x69\x6c\x65\x2c\x20\x01\x77\x7e\x51\x01\x79\x75\x69\x74\x2c\x20\x01\x77\x7e\x50\x01\x79\x72\x65\x76\x20\x6f\x72\x20\x5b" + "\x7e\x4e\x65\x78\x74\x5d\x3a\x20\x01\x77" // 232 FileInfoPrompt + , "\x0d\x0a\x7e\x40\x51\x75\x69\x74\x40\x20\x6f\x72\x20\x5b\x7e\x4e\x65\x78\x74\x5d\x3a\x20" // 233 QuitOrNext + , "\x7e\x52\x65\x6d\x6f\x76\x65\x2c\x20\x7e\x4d\x6f\x76\x65\x2c\x20\x7e\x45\x64\x69\x74\x2c\x20\x7e\x44\x65\x73\x63\x2c\x20\x7e\x56" + "\x69\x65\x77\x2c\x20\x7e\x40\x51\x75\x69\x74\x40\x2c\x20\x7e\x50\x72\x65\x76\x20\x6f\x72\x20\x5b\x7e\x4e\x65\x78\x74\x5d\x3a\x20" + "" // 234 RExemptRemoveFilePrompt + , "\x01\x6e\x28\x25\x64\x29\x20\x25\x73\x0d\x0a" // 235 MoveToLibLstFmt + , "\x01\x5f\x0d\x0a\x01\x79\x01\x68\x4c\x69\x62\x72\x61\x72\x79\x20\x5b\x25\x64\x5d\x3a\x20\x01\x6e" // 236 MoveToLibPrompt + , "\x01\x6e\x28\x25\x64\x29\x20\x25\x73\x0d\x0a" // 237 MoveToDirLstFmt + , "\x01\x5f\x0d\x0a\x01\x79\x01\x68\x44\x69\x72\x65\x63\x74\x6f\x72\x79\x20\x5b\x25\x64\x5d\x3a\x20\x01\x6e" // 238 MoveToDirPrompt + , "\x25\x73\x20\x6d\x6f\x76\x65\x64\x20\x74\x6f\x20\x25\x73\x20\x25\x73\x2e\x0d\x0a" // 239 MovedFile + , "\x0d\x0a\x43\x6c\x6f\x73\x65\x20\x66\x69\x6c\x65\x20\x72\x65\x63\x6f\x72\x64" // 240 CloseFileRecordQ + , "\x7e\x52\x65\x6d\x6f\x76\x65\x2c\x20\x7e\x43\x72\x65\x64\x69\x74\x73\x2c\x20\x7e\x46\x69\x6c\x65\x20\x6f\x6e\x6c\x79\x2c\x20\x7e" + "\x4d\x6f\x76\x65\x2c\x20\x7e\x45\x64\x69\x74\x2c\x20\x7e\x44\x65\x73\x63\x2c\x20\x7e\x56\x69\x65\x77\x2c\x20\x7e\x40\x51\x75\x69" + "\x74\x40\x2c\x20\x7e\x50\x72\x65\x76\x20\x6f\x72\x20\x5b\x7e\x4e\x65\x78\x74\x5d\x3a\x20" // 241 SysopRemoveFilePrompt + , "\x7e\x52\x65\x6d\x6f\x76\x65\x2c\x20\x7e\x45\x64\x69\x74\x2c\x20\x7e\x44\x65\x73\x63\x2c\x20\x7e\x56\x69\x65\x77\x2c\x20\x7e\x40" + "\x51\x75\x69\x74\x40\x2c\x20\x7e\x50\x72\x65\x76\x20\x6f\x72\x20\x5b\x7e\x4e\x65\x78\x74\x5d\x3a\x20" // 242 UserRemoveFilePrompt + , "\x0d\x0a\x01\x6e\x01\x72\x01\x68\x46\x69\x6c\x65\x20\x64\x6f\x65\x73\x20\x6e\x6f\x74\x20\x65\x78\x69\x73\x74\x3a\x20\x01\x63\x25" + "\x73\x01\x6e\x0d\x0a" // 243 FileDoesNotExist + , "\x07\x0d\x0a\x01\x72\x01\x68\x01\x69\x43\x6f\x75\x6c\x64\x6e\x27\x74\x20\x72\x65\x6d\x6f\x76\x65\x20\x27\x25\x73\x27\x2e\x01\x6e" + "\x0d\x0a" // 244 CouldntRemoveFile + , "\x44\x65\x6c\x65\x74\x65\x20\x66\x69\x6c\x65" // 245 DeleteFileQ + , "\x41\x64\x64\x20\x25\x73\x20\x74\x6f\x20\x25\x73\x20\x25\x73" // 246 AddToOfflineDirQ + , "\x52\x65\x6d\x6f\x76\x65\x20\x63\x72\x65\x64\x69\x74\x73" // 247 RemoveCreditsQ + , "\x0d\x0a\x55\x73\x65\x72\x20\x6e\x6f\x74\x20\x61\x76\x61\x69\x6c\x61\x62\x6c\x65\x2e\x0d\x0a" // 248 UserNotFound + , "\x01\x5f\x01\x79\x01\x68\x43\x72\x65\x64\x69\x74\x73\x20\x74\x6f\x20\x72\x65\x6d\x6f\x76\x65\x20\x66\x72\x6f\x6d\x20\x75\x70\x6c" + "\x6f\x61\x64\x65\x72\x20\x28\x25\x73\x29\x3a\x20\x01\x6e" // 249 CreditsToRemove + , "\x01\x5f\x01\x77\x01\x68\x25\x73\x20\x77\x61\x73\x20\x72\x65\x6d\x6f\x76\x65\x64\x2e\x0d\x0a\x01\x6e\x01\x67\x59\x6f\x75\x20\x6c" + "\x6f\x73\x74\x20\x25\x73\x20\x63\x72\x65\x64\x69\x74\x73\x2e\x0d\x0a" // 250 FileRemovedUserMsg + , "\x01\x5f\x01\x3f\x01\x79\x01\x68\x46\x69\x6c\x65\x6e\x61\x6d\x65\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x6e" // 251 EditFilename + , "\x0d\x0a\x01\x72\x01\x68\x01\x69\x45\x72\x72\x6f\x72\x20\x72\x65\x6e\x61\x6d\x69\x6e\x67\x20\x25\x73\x20\x74\x6f\x20\x25\x73\x01" + "\x6e\x0d\x0a" // 252 CouldntRenameFile + , "\x25\x73\x20\x72\x65\x6e\x61\x6d\x65\x64\x20\x74\x6f\x20\x25\x73\x0d\x0a" // 253 FileRenamed + , "\x01\x5f\x01\x79\x01\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x6e" // 254 EditDescription + , "\x55\x4e\x55\x53\x45\x44\x32\x35\x35" // 255 Unused255 + , "\x01\x5f\x01\x79\x01\x68\x55\x70\x6c\x6f\x61\x64\x65\x72\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x6e" // 256 EditUploader + , "\x01\x5f\x01\x79\x01\x68\x43\x72\x65\x64\x69\x74\x20\x76\x61\x6c\x75\x65\x20\x20\x20\x20\x20\x3a\x20\x01\x6e" // 257 EditCreditValue + , "\x01\x5f\x01\x79\x01\x68\x54\x69\x6d\x65\x73\x20\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x65\x64\x20\x3a\x20\x01\x6e" // 258 EditTimesDownloaded + , "\x45\x64\x69\x74\x20\x65\x78\x74\x65\x6e\x64\x65\x64\x20\x64\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e" // 259 EditExtDescriptionQ + , "\x55\x4e\x55\x53\x45\x44\x32\x36\x30" // 260 Unused260 + , "\x0d\x0a\x01\x77\x01\x68\x59\x6f\x75\x20\x6f\x6e\x6c\x79\x20\x68\x61\x76\x65\x20\x25\x73\x20\x63\x72\x65\x64\x69\x74\x73\x2e\x0d" + "\x0a" // 261 YouOnlyHaveNCredits + , "\x0d\x0a\x59\x6f\x75\x20\x64\x6f\x6e\x27\x74\x20\x68\x61\x76\x65\x20\x65\x6e\x6f\x75\x67\x68\x20\x63\x72\x65\x64\x69\x74\x73\x2e" + "\x0d\x0a" // 262 NotEnoughCredits + , "\x0d\x0a\x01\x77\x01\x68\x4e\x6f\x74\x20\x65\x6e\x6f\x75\x67\x68\x20\x74\x69\x6d\x65\x20\x6c\x65\x66\x74\x20\x74\x6f\x20\x74\x72" + "\x61\x6e\x73\x66\x65\x72\x2e\x0d\x0a" // 263 NotEnoughTimeToDl + , "\x0d\x0a\x50\x72\x6f\x74\x6f\x63\x6f\x6c\x2c\x20\x7e\x42\x61\x74\x63\x68\x2c\x20\x7e\x40\x51\x75\x69\x74\x40\x2c\x20\x6f\x72\x20" + "\x5b\x7e\x4e\x65\x78\x74\x5d\x3a\x20" // 264 ProtocolBatchQuitOrNext + , "\x0d\x0a\x42\x75\x6c\x6b\x20\x55\x70\x6c\x6f\x61\x64\x20\x25\x73\x20\x25\x73\x20\x44\x69\x72\x65\x63\x74\x6f\x72\x79\x0d\x0a\x28" + "\x45\x6e\x74\x65\x72\x20\x27\x2d\x27\x20\x66\x6f\x72\x20\x64\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x74\x6f\x20\x73\x6b\x69" + "\x70\x20\x66\x69\x6c\x65\x29\x3a\x0d\x0a" // 265 BulkUpload + , "\x01\x5f\x01\x79\x01\x68\x25\x2d\x31\x32\x73\x01\x77\x25\x37\x73\x01\x62\x3a" // 266 BulkUploadDescPrompt + , "\x0d\x0a\x01\x72\x01\x68\x01\x69\x4e\x6f\x20\x66\x69\x6c\x65\x73\x20\x69\x6e\x20\x62\x61\x74\x63\x68\x20\x71\x75\x65\x75\x65\x2e" + "\x01\x6e\x0d\x0a\x0d\x0a\x01\x6d\x55\x73\x65\x20\x01\x68\x44\x01\x6e\x01\x6d\x20\x6f\x72\x20\x01\x68\x55\x01\x6e\x01\x6d\x20\x74" + "\x6f\x20\x61\x64\x64\x20\x66\x69\x6c\x65\x73\x20\x74\x6f\x20\x74\x68\x65\x20\x71\x75\x65\x75\x65\x2e\x0d\x0a" // 267 NoFilesInBatchQueue + , "\x01\x5f\x0d\x0a\x01\x79\x01\x68\x42\x61\x74\x63\x68\x3a\x20\x01\x6e" // 268 BatchMenuPrompt + , "\x0d\x0a\x43\x6c\x65\x61\x72\x20\x75\x70\x6c\x6f\x61\x64\x20\x71\x75\x65\x75\x65" // 269 ClearUploadQueueQ + , "\x0d\x0a\x55\x70\x6c\x6f\x61\x64\x20\x71\x75\x65\x75\x65\x20\x63\x6c\x65\x61\x72\x65\x64\x2e\x0d\x0a" // 270 UploadQueueCleared + , "\x0d\x0a\x43\x6c\x65\x61\x72\x20\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x71\x75\x65\x75\x65" // 271 ClearDownloadQueueQ + , "\x0d\x0a\x44\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x71\x75\x65\x75\x65\x20\x63\x6c\x65\x61\x72\x65\x64\x2e\x0d\x0a" // 272 DownloadQueueCleared + , "\x0d\x0a\x44\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x71\x75\x65\x75\x65\x20\x69\x73\x20\x65\x6d\x70\x74\x79\x2e\x0d\x0a" // 273 DownloadQueueIsEmpty + , "\x0d\x0a\x01\x2d\x01\x67\x01\x68\x55\x70\x6c\x6f\x61\x64\x20\x51\x75\x65\x75\x65\x3a\x01\x6e\x01\x67\x20\x20\x20\x20\x20\x20\x20" + "\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x44\x65\x73\x63\x72\x69\x70\x74" + "\x69\x6f\x6e\x0d\x0a\x0d\x0a\x01\x6e" // 274 UploadQueueLstHdr + , "\x01\x67\x01\x68\x25\x32\x64\x3a\x20\x01\x6e\x01\x67\x25\x2d\x33\x38\x73\x20\x20\x25\x73\x0d\x0a" // 275 UploadQueueLstFmt + , "\x0d\x0a\x01\x2d\x01\x67\x01\x68\x44\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x51\x75\x65\x75\x65\x3a\x01\x6e\x01\x67\x20\x20\x20\x20\x20" + "\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x43\x72\x65\x64\x69\x74\x73\x20" + "\x20\x20\x20\x20\x20\x42\x79\x74\x65\x73\x20\x20\x20\x20\x20\x20\x20\x20\x54\x69\x6d\x65\x0d\x0a\x0d\x0a\x01\x6e" // 276 DownloadQueueLstHdr + , "\x01\x67\x01\x68\x25\x32\x64\x3a\x20\x01\x6e\x01\x67\x25\x2d\x33\x35\x73\x20\x25\x31\x31\x2e\x31\x31\x73\x20\x25\x31\x31\x2e\x31" + "\x31\x73\x20\x20\x20\x20\x20\x25\x73\x0d\x0a" // 277 DownloadQueueLstFmt + , "\x0d\x0a\x01\x77\x01\x68\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20" + "\x20\x20\x20\x20\x20\x20\x54\x6f\x74\x61\x6c\x73\x3a\x20\x25\x31\x31\x2e\x31\x31\x73\x20\x25\x31\x31\x2e\x31\x31\x73\x20\x20\x20" + "\x20\x20\x25\x73\x0d\x0a" // 278 DownloadQueueTotals + , "\x0d\x0a\x01\x2d\x01\x67\x52\x65\x6d\x6f\x76\x65\x20\x77\x68\x69\x63\x68\x20\x66\x69\x6c\x65\x28\x73\x29\x20\x66\x72\x6f\x6d\x20" + "\x75\x70\x6c\x6f\x61\x64\x20\x71\x75\x65\x75\x65\x20\x28\x31\x2d\x25\x64\x29\x3a\x20\x01\x6e" // 279 RemoveWhichFromUlQueue + , "\x0d\x0a\x01\x2d\x01\x67\x52\x65\x6d\x6f\x76\x65\x20\x77\x68\x69\x63\x68\x20\x66\x69\x6c\x65\x28\x73\x29\x20\x66\x72\x6f\x6d\x20" + "\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x71\x75\x65\x75\x65\x20\x28\x31\x2d\x25\x64\x29\x3a\x20\x01\x6e" // 280 RemoveWhichFromDlQueue + , "\x0d\x0a\x55\x70\x6c\x6f\x61\x64\x20\x71\x75\x65\x75\x65\x20\x69\x73\x20\x65\x6d\x70\x74\x79\x2e\x0d\x0a" // 281 UploadQueueIsEmpty + , "\x0d\x0a\x48\x61\x6e\x67\x20\x75\x70\x20\x61\x66\x74\x65\x72\x20\x74\x72\x61\x6e\x73\x66\x65\x72" // 282 HangUpAfterXferQ + , "\x0d\x0a\x01\x77\x01\x68\x53\x74\x61\x72\x74\x20\x25\x73\x20\x74\x72\x61\x6e\x73\x66\x65\x72\x20\x6e\x6f\x77\x20\x28\x43\x74\x72" + "\x6c\x2d\x58\x20\x74\x6f\x20\x61\x62\x6f\x72\x74\x29\x3a\x0d\x0a\x01\x6e" // 283 StartXferNow + , "\x01\x5f\x0d\x0a\x01\x62\x01\x68\x44\x69\x73\x63\x6f\x6e\x6e\x65\x63\x74\x69\x6e\x67\x20\x40\x45\x4c\x4c\x49\x50\x53\x49\x53\x40" + "\x20\x01\x77\x48\x01\x62\x61\x6e\x67\x20\x75\x70\x20\x6f\x72\x20\x01\x77\x41\x01\x62\x62\x6f\x72\x74\x20" // 284 Disconnecting + , "\x01\x5b\x01\x77\x01\x68\x47\x6f\x6f\x64\x2d\x62\x79\x65\x21\x20\x20\x28\x54\x69\x6d\x65\x20\x55\x73\x65\x64\x3a\x20\x40\x54\x55" + "\x53\x45\x44\x40\x29\x01\x3e" // 285 Disconnected + , "\x01\x72\x01\x68\x01\x69\x25\x73\x20\x4e\x4f\x54\x20\x53\x45\x4e\x54\x21\x01\x6e\x0d\x0a" // 286 FileNotSent + , "\x44\x65\x6c\x65\x74\x69\x6e\x67\x20\x66\x69\x6c\x65\x73\x20\x69\x6e\x20\x74\x65\x6d\x70\x20\x64\x69\x72\x65\x63\x74\x6f\x72\x79" + "\x20\x40\x45\x4c\x4c\x49\x50\x53\x49\x53\x40\x0d\x0a" // 287 RemovingTempFiles + , "\x01\x5f\x01\x79\x01\x68\x45\x78\x74\x72\x61\x63\x74\x20\x66\x72\x6f\x6d\x3a\x20\x01\x6e" // 288 ExtractFrom + , "\x0d\x0a\x55\x6e\x65\x78\x74\x72\x61\x63\x74\x61\x62\x6c\x65\x20\x66\x69\x6c\x65\x20\x74\x79\x70\x65\x2e\x0d\x0a" // 289 UnextractableFile + , "\x0d\x0a\x46\x69\x6c\x65\x20\x6e\x6f\x74\x20\x66\x6f\x75\x6e\x64\x2e\x0d\x0a" // 290 FileNotFound + , "\x0d\x0a\x7e\x45\x78\x74\x72\x61\x63\x74\x20\x66\x69\x6c\x65\x28\x73\x29\x2c\x20\x7e\x56\x69\x65\x77\x20\x61\x72\x63\x68\x69\x76" + "\x65\x2c\x20\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 291 ExtractFilesPrompt + , "\x01\x5f\x01\x3f\x01\x79\x01\x68\x54\x65\x6d\x70\x20\x44\x69\x72\x65\x63\x74\x6f\x72\x79\x3a\x20\x01\x6e" // 292 TempDirPrompt + , "\x01\x6e\x0d\x0a\x25\x73\x20\x6e\x6f\x74\x20\x63\x72\x65\x61\x74\x65\x64\x20\x79\x65\x74\x2e\x0d\x0a\x0d\x0a\x55\x73\x65\x20\x74" + "\x68\x65\x20\x01\x68\x41\x01\x6e\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x20\x74\x6f\x20\x63\x72\x65\x61\x74\x65\x20\x69\x74\x2e\x0d\x0a" + "" // 293 TempFileNotCreatedYet + , "\x0d\x0a\x55\x70\x6c\x6f\x61\x64\x65\x72\x3a\x20\x25\x73\x0d\x0a\x46\x69\x6c\x65\x6e\x61\x6d\x65\x3a\x20\x25\x73\x0d\x0a" // 294 TempFileInfo + , "\x0d\x0a\x25\x73\x20\x62\x79\x74\x65\x73\x20\x69\x6e\x20\x25\x75\x20\x66\x69\x6c\x65\x73\x0d\x0a" // 295 TempDirTotal + , "\x0d\x0a\x25\x75\x20\x66\x69\x6c\x65\x73\x20\x72\x65\x6d\x6f\x76\x65\x64\x2e\x0d\x0a" // 296 NFilesRemoved + , "\x54\x61\x67\x20\x74\x68\x69\x73\x20\x66\x69\x6c\x65" // 297 TagFileQ + , "\x01\x68\x01\x79\x45\x6e\x74\x65\x72\x20\x28\x73\x70\x61\x63\x65\x2d\x73\x65\x70\x61\x72\x61\x74\x65\x64\x29\x20\x54\x61\x67\x73" + "\x01\x5c\x3a\x20" // 298 TagFilePrompt + , "\x55\x4e\x55\x53\x45\x44\x32\x39\x39" // 299 Unused299 + , "\x01\x5f\x01\x68\x01\x77\x25\x73\x01\x6e\x01\x63\x20\x77\x61\x73\x20\x25\x73\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x65\x64\x20\x62\x79" + "\x20\x01\x68\x25\x73\x0d\x0a" // 300 FreeDownloadUserMsg + , "\x0d\x0a\x01\x6e\x01\x67\x41\x75\x74\x68\x6f\x72\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 301 FiAuthor + , "\x0d\x0a\x01\x6e\x01\x67\x47\x72\x6f\x75\x70\x20\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 302 FiGroup + , "\x01\x77\x01\x68\x0d\x0a\x25\x73\x20\x69\x73\x20\x61\x6c\x72\x65\x61\x64\x79\x20\x69\x6e\x20\x74\x68\x65\x20\x71\x75\x65\x75\x65" + "\x2e\x0d\x0a" // 303 FileAlreadyInQueue + , "\x01\x77\x01\x68\x01\x2f\x46\x69\x6c\x65\x20\x69\x73\x20\x6e\x6f\x74\x20\x6f\x6e\x6c\x69\x6e\x65\x2e\x0d\x0a" // 304 FileIsNotOnline + , "\x01\x6e\x0d\x0a\x01\x6d\x01\x68\x25\x73\x20\x01\x6e\x01\x6d\x61\x64\x64\x65\x64\x20\x74\x6f\x20\x62\x61\x74\x63\x68\x20\x64\x6f" + "\x77\x6e\x6c\x6f\x61\x64\x20\x71\x75\x65\x75\x65\x01\x5c\x20\x2d\x0d\x0a\x01\x63\x46\x69\x6c\x65\x73\x3a\x20\x01\x68\x25\x75\x01" + "\x6e\x01\x63\x20\x28\x01\x68\x25\x75\x01\x6e\x01\x63\x20\x4d\x61\x78\x29\x20\x20\x43\x72\x65\x64\x69\x74\x73\x3a\x20\x01\x68\x25" + "\x73\x01\x6e\x01\x63\x20\x20\x42\x79\x74\x65\x73\x3a\x20\x01\x68\x25\x73\x01\x6e\x01\x63\x20\x20\x54\x69\x6d\x65\x3a\x20\x01\x68" + "\x25\x73\x0d\x0a" // 305 FileAddedToBatDlQueue + , "\x0d\x0a\x01\x6e\x01\x72\x01\x68\x54\x68\x65\x20\x73\x79\x73\x6f\x70\x20\x68\x61\x73\x20\x6e\x6f\x74\x20\x63\x6f\x6e\x66\x69\x67" + "\x75\x72\x65\x64\x20\x01\x77\x25\x73\x01\x72\x20\x61\x73\x20\x61\x20\x76\x69\x65\x77\x61\x62\x6c\x65\x20\x66\x69\x6c\x65\x20\x74" + "\x79\x70\x65\x2e\x0d\x0a" // 306 NonviewableFile + , "\x01\x72\x01\x68\x01\x69\x25\x73\x20\x4e\x4f\x54\x20\x52\x45\x43\x45\x49\x56\x45\x44\x21\x01\x6e\x0d\x0a" // 307 FileNotReceived + , "\x0d\x0a\x07\x01\x72\x01\x68\x01\x69\x25\x73\x20\x48\x41\x44\x20\x45\x52\x52\x4f\x52\x53\x20\x2d\x20\x4e\x4f\x54\x20\x55\x50\x4c" + "\x4f\x41\x44\x45\x44\x21\x01\x6e\x0d\x0a" // 308 FileHadErrors + , "\x01\x72\x01\x68\x01\x69\x25\x73\x20\x49\x53\x20\x5a\x45\x52\x4f\x20\x4c\x45\x4e\x47\x54\x48\x20\x2d\x20\x4e\x4f\x54\x20\x55\x50" + "\x4c\x4f\x41\x44\x45\x44\x21\x01\x6e\x0d\x0a" // 309 FileZeroLength + , "\x01\x5f\x01\x77\x01\x68\x25\x73\x20\x28\x25\x73\x20\x62\x79\x74\x65\x73\x29\x20\x72\x65\x63\x65\x69\x76\x65\x64\x2e\x0d\x0a" // 310 FileNBytesReceived + , "\x01\x5f\x01\x77\x01\x68\x25\x73\x20\x28\x25\x73\x20\x62\x79\x74\x65\x73\x29\x20\x73\x65\x6e\x74\x2e\x0d\x0a" // 311 FileNBytesSent + , "\x01\x5f\x01\x68\x01\x77\x25\x73\x01\x6e\x01\x63\x20\x77\x61\x73\x20\x25\x73\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x65\x64\x20\x62\x79" + "\x20\x01\x68\x25\x73\x0d\x0a\x01\x6e\x01\x67\x59\x6f\x75\x20\x77\x65\x72\x65\x20\x61\x77\x61\x72\x64\x65\x64\x20\x01\x68\x25\x73" + "\x01\x6e\x01\x67\x20\x63\x72\x65\x64\x69\x74\x73\x2e\x0d\x0a" // 312 DownloadUserMsg + , "\x70\x61\x72\x74\x69\x61\x6c\x6c\x79\x20" // 313 Partially + , "\x01\x6c\x01\x6e\x01\x67\x4c\x69\x62\x72\x61\x72\x79\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x28\x25\x75\x29\x20\x25\x73" // 314 FiLib + , "\x0d\x0a\x01\x6e\x01\x67\x44\x69\x72\x65\x63\x74\x6f\x72\x79\x20\x20\x20\x3a\x01\x68\x20\x28\x25\x75\x29\x20\x25\x73" // 315 FiDir + , "\x0d\x0a\x01\x6e\x01\x67\x46\x69\x6c\x65\x6e\x61\x6d\x65\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 316 FiFilename + , "\x0d\x0a\x01\x6e\x01\x67\x53\x69\x7a\x65\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73\x20\x28\x25\x73\x29\x20\x62\x79" + "\x74\x65\x73" // 317 FiFileSize + , "\x0d\x0a\x01\x6e\x01\x67\x43\x72\x65\x64\x69\x74\x20\x63\x6f\x73\x74\x20\x3a\x01\x68\x20\x25\x73" // 318 FiCredits + , "\x0d\x0a\x01\x6e\x01\x67\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x3a\x01\x68\x20\x25\x73" // 319 FiDescription + , "\x0d\x0a\x01\x6e\x01\x67\x55\x70\x6c\x6f\x61\x64\x65\x64\x20\x62\x79\x20\x3a\x01\x68\x20\x25\x73" // 320 FiUploadedBy + , "\x0d\x0a\x01\x6e\x01\x67\x46\x69\x6c\x65\x20\x64\x61\x74\x65\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 321 FiFileDate + , "\x0d\x0a\x01\x6e\x01\x67\x55\x70\x6c\x6f\x61\x64\x65\x64\x20\x6f\x6e\x20\x3a\x01\x68\x20\x25\x73" // 322 FiDateUled + , "\x0d\x0a\x01\x6e\x01\x67\x4c\x61\x73\x74\x20\x44\x2f\x4c\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 323 FiDateDled + , "\x0d\x0a\x01\x6e\x01\x67\x54\x69\x6d\x65\x73\x20\x44\x2f\x4c\x65\x64\x20\x3a\x01\x68\x20\x25\x75" // 324 FiTimesDled + , "\x0d\x0a\x01\x6e\x01\x67\x54\x69\x6d\x65\x20\x74\x6f\x20\x44\x2f\x4c\x20\x3a\x01\x68\x20\x25\x73\x20\x61\x74\x20\x25\x75\x20\x63" + "\x70\x73" // 325 FiTransferTime + , "\x0d\x0a\x01\x6e\x01\x67\x54\x61\x67\x73\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 326 FiTags + , "\x0d\x0a\x01\x6e\x01\x67\x55\x70\x6c\x6f\x61\x64\x65\x64\x20\x74\x6f\x20\x3a\x01\x68\x20\x25\x73" // 327 FiUploadedTo + , "\x0d\x0a\x01\x6e\x01\x67\x25\x2d\x36\x2e\x36\x73\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 328 FiChecksum + , "\x07\x07\x0d\x0a\x01\x68\x01\x72\x48\x01\x62\x61\x01\x67\x70\x01\x79\x70\x01\x63\x79\x20\x01\x6d\x42\x01\x77\x69\x01\x72\x72\x01" + "\x67\x74\x01\x62\x68\x01\x63\x64\x01\x6d\x61\x01\x79\x79\x20\x01\x77\x74\x01\x72\x6f\x20\x01\x67\x79\x01\x62\x6f\x01\x63\x75\x0d" + "\x0a\x07\x07\x01\x6d\x48\x01\x79\x61\x01\x77\x70\x01\x72\x70\x01\x67\x79\x20\x01\x62\x42\x01\x63\x69\x01\x6d\x72\x01\x79\x74\x01" + "\x77\x68\x01\x72\x64\x01\x67\x61\x01\x62\x79\x20\x01\x63\x74\x01\x6d\x6f\x20\x01\x79\x79\x01\x77\x6f\x01\x72\x75\x01\x67\x2e\x01" + "\x62\x2e\x01\x63\x2e\x0d\x0a\x0d\x0a" // 329 HappyBirthday + , "\x01\x77\x01\x68\x59\x6f\x75\x20\x68\x61\x76\x65\x6e\x27\x74\x20\x63\x68\x61\x6e\x67\x65\x64\x20\x79\x6f\x75\x72\x20\x70\x61\x73" + "\x73\x77\x6f\x72\x64\x20\x69\x6e\x20\x6d\x6f\x72\x65\x20\x74\x68\x61\x6e\x20\x25\x64\x20\x64\x61\x79\x73\x2e\x0d\x0a\x0d\x0a" // 330 TimeToChangePw + , "\x0d\x0a\x45\x6e\x74\x65\x72\x20\x61\x20\x64\x69\x66\x66\x65\x72\x65\x6e\x74\x20\x70\x61\x73\x73\x77\x6f\x72\x64\x01\x5c" // 331 NewPasswordQ + , "\x01\x5f\x01\x3f\x01\x79\x01\x68\x4e\x65\x77\x20\x70\x61\x73\x73\x77\x6f\x72\x64\x20\x28\x25\x75\x2d\x25\x75\x20\x63\x68\x61\x72" + "\x73\x29\x01\x5c\x3a\x20" // 332 NewPasswordPromptFmt + , "\x01\x5f\x01\x79\x01\x68\x56\x65\x72\x69\x66\x79\x20\x28\x65\x6e\x74\x65\x72\x20\x61\x67\x61\x69\x6e\x29\x01\x5c\x3a\x20\x01\x6e" + "" // 333 VerifyPassword + , "\x07\x01\x72\x01\x68\x57\x72\x6f\x6e\x67\x21" // 334 Wrong + , "\x01\x77\x01\x68\x50\x61\x73\x73\x77\x6f\x72\x64\x20\x63\x68\x61\x6e\x67\x65\x64\x2e\x0d\x0a" // 335 PasswordChanged + , "\x53\x6f\x72\x72\x79\x2c\x20\x79\x6f\x75\x20\x68\x61\x76\x65\x20\x6e\x6f\x20\x6d\x6f\x72\x65\x20\x6c\x6f\x67\x6f\x6e\x73\x20\x61" + "\x6c\x6c\x6f\x77\x65\x64\x20\x74\x6f\x64\x61\x79\x2e\x0d\x0a" // 336 NoMoreLogons + , "\x59\x6f\x75\x20\x63\x61\x6e\x20\x6f\x6e\x6c\x79\x20\x6c\x6f\x67\x6f\x6e\x20\x6f\x6e\x63\x65\x20\x61\x20\x64\x61\x79\x2e\x0d\x0a" + "" // 337 R_Logons + , "\x01\x5f\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x79\x45\x6e\x74\x65\x72\x20" + "\x79\x6f\x75\x72\x20\x66\x75\x6c\x6c\x20\x6e\x61\x6d\x65\x20\x6f\x72\x20\x61\x6c\x69\x61\x73\x01\x5c\x3a\x20\x01\x77" // 338 EnterYourAlias + , "\x01\x5f\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x79\x45\x6e\x74\x65\x72\x20" + "\x79\x6f\x75\x72\x20\x66\x75\x6c\x6c\x20\x72\x65\x61\x6c\x20\x6e\x61\x6d\x65\x01\x5c\x3a\x20\x01\x77" // 339 EnterYourRealName + , "\x01\x5f\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x79\x45\x6e\x74\x65\x72\x20" + "\x79\x6f\x75\x72\x20\x63\x6f\x6d\x70\x61\x6e\x79\x20\x6e\x61\x6d\x65\x01\x5c\x3a\x20\x01\x77" // 340 EnterYourCompany + , "\x01\x5f\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x79\x45\x6e\x74\x65\x72\x20" + "\x79\x6f\x75\x72\x20\x68\x61\x6e\x64\x6c\x65\x20\x6f\x72\x20\x63\x61\x6c\x6c\x2d\x73\x69\x67\x6e\x01\x5c\x3a\x20\x01\x77" // 341 EnterYourHandle + , "\x01\x5f\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x79\x45\x6e\x74\x65\x72\x20" + "\x79\x6f\x75\x72\x20\x67\x65\x6e\x64\x65\x72\x20\x28\x40\x47\x45\x4e\x44\x45\x52\x53\x40\x29\x01\x5c\x3a\x20\x01\x77" // 342 EnterYourGender + , "\x01\x5f\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x79\x45\x6e\x74\x65\x72\x20" + "\x79\x6f\x75\x72\x20\x73\x74\x72\x65\x65\x74\x20\x61\x64\x64\x72\x65\x73\x73\x01\x5c\x3a\x20\x01\x77" // 343 EnterYourAddress + , "\x01\x5f\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x79\x45\x6e\x74\x65\x72\x20" + "\x79\x6f\x75\x72\x20\x76\x6f\x69\x63\x65\x20\x70\x68\x6f\x6e\x65\x20\x6e\x75\x6d\x62\x65\x72\x01\x5c\x3a\x20\x01\x77" // 344 EnterYourPhoneNumber + , "\x01\x5f\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x79\x45\x6e\x74\x65\x72\x20" + "\x79\x6f\x75\x72\x20\x62\x69\x72\x74\x68\x64\x61\x79\x20\x28\x40\x42\x44\x41\x54\x45\x46\x4d\x54\x40\x29\x01\x5c\x3a\x20\x01\x77" + "" // 345 EnterYourBirthday + , "\x01\x5f\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x79\x45\x6e\x74\x65\x72\x20" + "\x79\x6f\x75\x72\x20\x6c\x6f\x63\x61\x74\x69\x6f\x6e\x01\x5c\x20\x28\x65\x2e\x67\x2e\x20\x63\x69\x74\x79\x2c\x20\x73\x74\x61\x74" + "\x65\x29\x01\x5c\x3a\x20\x01\x77" // 346 EnterYourCityState + , "\x01\x5f\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x79\x45\x6e\x74\x65\x72\x20" + "\x79\x6f\x75\x72\x20\x7a\x69\x70\x20\x28\x6f\x72\x20\x70\x6f\x73\x74\x61\x6c\x29\x20\x63\x6f\x64\x65\x01\x5c\x3a\x20\x01\x77" // 347 EnterYourZipCode + , "\x01\x5f\x01\x79\x01\x68\x43\x6c\x69\x65\x6e\x74\x20\x28\x4e\x61\x6d\x65\x20\x6f\x72\x20\x41\x64\x64\x72\x65\x73\x73\x29\x01\x5c" + "\x3a\x20\x01\x77" // 348 EnterYourComputer + , "\x41\x72\x65\x20\x79\x6f\x75\x20\x63\x6f\x6e\x6e\x65\x63\x74\x69\x6e\x67\x20\x66\x72\x6f\x6d\x20\x4e\x6f\x72\x74\x68\x20\x41\x6d" + "\x65\x72\x69\x63\x61" // 349 CallingFromNorthAmericaQ + , "\x49\x73\x20\x74\x68\x65\x20\x61\x62\x6f\x76\x65\x20\x69\x6e\x66\x6f\x72\x6d\x61\x74\x69\x6f\x6e\x20\x63\x6f\x72\x72\x65\x63\x74" + "\x01\x5c" // 350 UserInfoCorrectQ + , "\x01\x62\x55\x73\x65\x72\x20\x23\x01\x63\x25\x2d\x34\x64\x20\x20\x20\x20\x20\x20\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 351 LiUserNumberName + , "\x01\x62\x4c\x6f\x67\x6f\x6e\x73\x20\x54\x6f\x64\x61\x79\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x2d\x35\x75\x20\x01\x62\x28\x4d\x61" + "\x78\x20\x01\x63\x25\x75\x01\x62\x29\x0d\x0a" // 352 LiLogonsToday + , "\x01\x62\x54\x69\x6d\x65\x20\x6f\x6e\x20\x54\x6f\x64\x61\x79\x20\x20\x20\x3a\x20\x01\x63\x25\x2d\x35\x75\x20\x01\x62\x28\x4d\x61" + "\x78\x20\x01\x63\x25\x75\x01\x62\x29\x0d\x0a" // 353 LiTimeonToday + , "\x01\x62\x4d\x61\x69\x6c\x20\x57\x61\x69\x74\x69\x6e\x67\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x2d\x35\x75\x20\x01\x62\x28\x55\x6e" + "\x72\x65\x61\x64\x20\x01\x63\x25\x75\x01\x62\x29\x0d\x0a" // 354 LiMailWaiting + , "\x01\x62\x01\x68\x53\x79\x73\x6f\x70\x20\x69\x73\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 355 LiSysopIs + , "\x41\x76\x61\x69\x6c\x61\x62\x6c\x65" // 356 LiSysopAvailable + , "\x4e\x6f\x74\x20\x41\x76\x61\x69\x6c\x61\x62\x6c\x65" // 357 LiSysopNotAvailable + , "\x01\x72\x01\x68\x01\x69\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x70\x6f\x73\x73\x69\x62\x6c\x79\x20\x62\x65\x20\x69\x6e\x20\x74" + "\x77\x6f\x20\x70\x6c\x61\x63\x65\x73\x20\x61\x74\x20\x74\x68\x65\x20\x73\x61\x6d\x65\x20\x74\x69\x6d\x65\x2e\x01\x6e\x0d\x0a" // 358 UserOnTwoNodes + , "\x07\x01\x72\x01\x68\x01\x69\x25\x64\x20\x63\x72\x69\x74\x69\x63\x61\x6c\x20\x65\x72\x72\x6f\x72\x73\x20\x68\x61\x76\x65\x20\x6f" + "\x63\x63\x75\x72\x72\x65\x64\x2e\x20\x54\x79\x70\x65\x20\x3b\x45\x52\x52\x20\x61\x74\x20\x6d\x61\x69\x6e\x20\x6d\x65\x6e\x75\x2e" + "\x01\x6e\x0d\x0a" // 359 CriticalErrors + , "\x01\x5f\x01\x77\x01\x68\x59\x6f\x75\x20\x68\x61\x76\x65\x20\x25\x64\x20\x55\x73\x65\x72\x20\x74\x6f\x20\x55\x73\x65\x72\x20\x46" + "\x69\x6c\x65\x20\x54\x72\x61\x6e\x73\x66\x65\x72\x25\x73\x20\x77\x61\x69\x74\x69\x6e\x67\x20\x66\x6f\x72\x20\x79\x6f\x75\x0d\x0a" + "" // 360 UserXferForYou + , "\x01\x5f\x01\x77\x01\x68\x59\x6f\x75\x20\x68\x61\x76\x65\x20\x73\x65\x6e\x74\x20\x25\x64\x20\x75\x6e\x72\x65\x63\x65\x69\x76\x65" + "\x64\x20\x55\x73\x65\x72\x20\x74\x6f\x20\x55\x73\x65\x72\x20\x46\x69\x6c\x65\x20\x54\x72\x61\x6e\x73\x66\x65\x72\x25\x73\x0d\x0a" + "" // 361 UnreceivedUserXfer + , "\x52\x65\x61\x64\x20\x79\x6f\x75\x72\x20\x6d\x61\x69\x6c\x20\x6e\x6f\x77" // 362 ReadYourMailNowQ + , "\x53\x6f\x72\x72\x79\x2c\x20\x74\x68\x65\x20\x73\x79\x73\x74\x65\x6d\x20\x69\x73\x20\x63\x6c\x6f\x73\x65\x64\x20\x74\x6f\x20\x6e" + "\x65\x77\x20\x75\x73\x65\x72\x73\x2e\x0d\x0a" // 363 NoNewUsers + , "\x4e\x65\x77\x20\x55\x73\x65\x72\x20\x50\x61\x73\x73\x77\x6f\x72\x64\x01\x5c\x3a\x20" // 364 NewUserPasswordPrompt + , "\x55\x73\x65\x20\x61\x75\x74\x6f\x6d\x61\x74\x69\x63\x20\x74\x65\x72\x6d\x69\x6e\x61\x6c\x20\x74\x79\x70\x65\x20\x64\x65\x74\x65" + "\x63\x74\x69\x6f\x6e" // 365 AutoTerminalQ + , "\x44\x6f\x65\x73\x20\x79\x6f\x75\x72\x20\x74\x65\x72\x6d\x69\x6e\x61\x6c\x20\x73\x75\x70\x70\x6f\x72\x74\x20\x41\x4e\x53\x49" // 366 AnsiTerminalQ + , "\x44\x6f\x65\x73\x20\x79\x6f\x75\x72\x20\x74\x65\x72\x6d\x69\x6e\x61\x6c\x20\x64\x69\x73\x70\x6c\x61\x79\x20\x63\x6f\x6c\x6f\x72" + "\x73" // 367 ColorTerminalQ + , "\x01\x6e\x01\x67\x41\x72\x65\x20\x79\x6f\x75\x20\x75\x73\x69\x6e\x67\x20\x01\x68\x52\x49\x50\x74\x65\x72\x6d\x01\x6e\x01\x67\x20" + "\x6f\x72\x20\x61\x20\x01\x68\x52\x49\x50\x73\x63\x72\x69\x70\x20\x01\x6e\x01\x67\x63\x6f\x6d\x70\x61\x74\x69\x62\x6c\x65\x20\x74" + "\x65\x72\x6d\x69\x6e\x61\x6c\x20\x70\x72\x6f\x67\x72\x61\x6d\x3f\x0d\x0a\x01\x68\x01\x77\x49\x4d\x50\x4f\x52\x54\x41\x4e\x54\x3a" + "\x01\x6e\x01\x67\x20\x49\x66\x20\x79\x6f\x75\x20\x61\x72\x65\x20\x6e\x6f\x74\x20\x61\x62\x73\x6f\x6c\x75\x74\x65\x6c\x79\x20\x73" + "\x75\x72\x65\x2c\x20\x68\x69\x74\x20\x01\x68\x01\x77\x01\x69\x4e\x01\x6e\x01\x62\x01\x68" // 368 RipTerminalQ + , "\x44\x6f\x65\x73\x20\x79\x6f\x75\x72\x20\x74\x65\x72\x6d\x69\x6e\x61\x6c\x20\x73\x75\x70\x70\x6f\x72\x74\x20\x49\x42\x4d\x20\x65" + "\x78\x74\x65\x6e\x64\x65\x64\x20\x41\x53\x43\x49\x49\x20\x28\x43\x50\x34\x33\x37\x29" // 369 ExAsciiTerminalQ + , "\x01\x6e\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x75\x73\x65\x20\x74\x68\x61\x74\x20\x6e\x61\x6d\x65\x01\x5c\x20\x28\x64\x75\x70" + "\x6c\x69\x63\x61\x74\x65\x20\x6f\x72\x20\x69\x6e\x76\x61\x6c\x69\x64\x29\x2e\x0d\x0a" // 370 YouCantUseThatName + , "\x01\x6c\x01\x2d\x01\x67\x59\x6f\x75\x72\x20\x70\x61\x73\x73\x77\x6f\x72\x64\x20\x69\x73\x20\x01\x68\x25\x73\x0d\x0a" // 371 YourPasswordIs + , "\x0d\x0a\x01\x5f\x01\x77\x01\x68\x44\x6f\x6e\x27\x74\x20\x66\x6f\x72\x67\x65\x74\x20\x61\x6e\x64\x20\x6b\x65\x65\x70\x20\x69\x74" + "\x20\x63\x6f\x6e\x66\x69\x64\x65\x6e\x74\x69\x61\x6c\x2e\x0d\x0a\x0d\x0a\x01\x79\x01\x68\x45\x6e\x74\x65\x72\x20\x74\x68\x69\x73" + "\x20\x70\x61\x73\x73\x77\x6f\x72\x64\x20\x66\x6f\x72\x20\x76\x65\x72\x69\x66\x69\x63\x61\x74\x69\x6f\x6e\x01\x5c\x3a\x20\x01\x77" + "" // 372 NewUserPasswordVerify + , "\x07\x0d\x0a\x01\x72\x01\x68\x49\x6e\x63\x6f\x72\x72\x65\x63\x74\x2c\x20\x74\x72\x79\x20\x61\x67\x61\x69\x6e\x2e\x0d\x0a" // 373 IncorrectPassword + , "\x01\x5f\x0d\x0a\x01\x79\x01\x68\x4d\x61\x67\x69\x63\x20\x77\x6f\x72\x64\x3a\x20\x01\x77" // 374 MagicWordPrompt + , "\x0d\x0a\x53\x6f\x72\x72\x79\x2c\x20\x74\x68\x61\x74\x20\x77\x61\x73\x20\x6e\x6f\x74\x20\x74\x68\x65\x20\x6d\x61\x67\x69\x63\x20" + "\x77\x6f\x72\x64\x2e\x0d\x0a" // 375 FailedMagicWord + , "\x53\x6f\x72\x72\x79\x2c\x20\x74\x68\x65\x20\x73\x79\x73\x74\x65\x6d\x20\x69\x73\x20\x66\x75\x6c\x6c\x2e" // 376 SystemFull + , "\x2a\x4e\x45\x57\x20\x55\x53\x45\x52\x2a\x20\x20\x25\x2d\x33\x30\x2e\x33\x30\x73\x20\x20\x41\x67\x65\x2f\x53\x65\x78\x2f\x42\x44" + "\x61\x79\x20\x3a\x20\x25\x2d\x32\x64\x20\x25\x63\x20\x25\x73\x0d\x0a\x52\x65\x61\x6c\x20\x6e\x61\x6d\x65\x20\x3a\x20\x25\x2d\x33" + "\x30\x2e\x33\x30\x73\x20\x20\x50\x68\x6f\x6e\x65\x20\x6e\x75\x6d\x62\x65\x72\x20\x3a\x20\x25\x73\x0d\x0a\x43\x6f\x6d\x70\x75\x74" + "\x65\x72\x20\x20\x3a\x20\x25\x2d\x33\x30\x2e\x33\x30\x73\x20\x20\x43\x6f\x6e\x6e\x65\x63\x74\x69\x6f\x6e\x20\x20\x20\x3a\x20\x25" + "\x73\x0d\x0a\x0d\x0a" // 377 NewUserFeedbackHdr + , "\x07\x0d\x0a\x01\x72\x01\x68\x01\x69\x59\x6f\x75\x20\x6d\x75\x73\x74\x20\x6c\x65\x61\x76\x65\x20\x25\x73\x20\x6d\x61\x69\x6c\x20" + "\x69\x6e\x20\x6f\x72\x64\x65\x72\x20\x74\x6f\x20\x62\x65\x20\x76\x61\x6c\x69\x64\x61\x74\x65\x64\x21\x01\x6e\x0d\x0a" // 378 NoFeedbackWarning + , "\x0d\x0a\x0d\x0a\x4e\x6f\x20\x65\x78\x74\x65\x72\x6e\x61\x6c\x20\x70\x72\x6f\x67\x72\x61\x6d\x73\x20\x61\x76\x61\x69\x6c\x61\x62" + "\x6c\x65\x2e\x0d\x0a" // 379 NoXtrnPrograms + , "\x01\x6e\x01\x63\x01\x68\x25\x73\x20\x01\x6e\x01\x63\x45\x78\x74\x65\x72\x6e\x61\x6c\x20\x50\x72\x6f\x67\x72\x61\x6d\x73\x3a\x0d" + "\x0a\x0d\x0a" // 380 XtrnProgLstHdr + , "\x01\x6e\x01\x63\x4e\x75\x6d\x20\x01\x68\xb3\x01\x6e\x01\x63\x20\x4e\x61\x6d\x65\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20" + "\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20" // 381 XtrnProgLstTitles + , "\x01\x68\xc4\xc4\xc4\xc4\xc5\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4" + "\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\x20" // 382 XtrnProgLstUnderline + , "\x01\x68\x01\x63\x25\x33\x75\x20\xb3\x20\x01\x6e\x01\x63\x25\x2d\x33\x32\x2e\x33\x32\x73\x01\x68\x20" // 383 XtrnProgLstFmt + , "\x0d\x0a\x40\x4d\x4e\x45\x3a\x43\x40\x40\x57\x68\x69\x63\x68\x40\x20\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 384 WhichXtrnProg + , "\x0d\x0a\x25\x73\x20\x69\x73\x20\x63\x75\x72\x72\x65\x6e\x74\x6c\x79\x20\x72\x75\x6e\x6e\x69\x6e\x67\x20\x25\x73\x20\x6f\x6e\x20" + "\x6e\x6f\x64\x65\x20\x25\x64\x2e\x0d\x0a\x0d\x0a\x54\x72\x79\x20\x61\x67\x61\x69\x6e\x20\x6c\x61\x74\x65\x72\x2e\x0d\x0a\x0d\x0a" + "" // 385 UserRunningXtrn + , "\x52\x65\x6d\x6f\x76\x65\x20\x6e\x6f\x64\x65\x20\x6c\x6f\x63\x6b" // 386 RemoveNodeLockQ + , "\x01\x6e\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x75\x73\x65\x20\x74\x68\x61\x74\x20\x6d\x61\x69\x6c\x20\x61\x64\x64\x72\x65\x73" + "\x73\x20\x28\x64\x75\x70\x6c\x69\x63\x61\x74\x65\x20\x6f\x72\x20\x69\x6e\x76\x61\x6c\x69\x64\x29\x2e\x0d\x0a" // 387 YouCantUseThatNetmail + , "\x59\x6f\x75\x20\x64\x6f\x20\x6e\x6f\x74\x20\x68\x61\x76\x65\x20\x73\x75\x66\x66\x69\x63\x69\x65\x6e\x74\x20\x61\x63\x63\x65\x73" + "\x73\x20\x66\x6f\x72\x20\x74\x68\x69\x73\x20\x6e\x6f\x64\x65\x2e" // 388 NoNodeAccess + , "\x01\x6e\x01\x72\x01\x68\x0d\x0a\x53\x6f\x72\x72\x79\x2c\x20\x74\x68\x69\x73\x20\x6e\x6f\x64\x65\x20\x69\x73\x20\x74\x65\x6d\x70" + "\x6f\x72\x61\x72\x69\x6c\x79\x20\x63\x6c\x6f\x73\x65\x64\x20\x66\x6f\x72\x20\x6d\x61\x69\x6e\x74\x65\x6e\x61\x6e\x63\x65\x2e\x01" + "\x6e\x0d\x0a" // 389 NodeLocked + , "\x0d\x0a\x55\x6e\x6b\x6e\x6f\x77\x6e\x20\x75\x73\x65\x72\x0d\x0a" // 390 UnknownUser + , "\x07\x49\x6e\x76\x61\x6c\x69\x64\x20\x4c\x6f\x67\x6f\x6e\x0d\x0a" // 391 InvalidLogon + , "\x25\x32\x2e\x32\x64\x2f\x25\x32\x2e\x32\x64\x2f\x25\x32\x2e\x32\x64\x20\x54\x3a\x25\x35\x75\x20\x20\x20\x4c\x3a\x25\x33\x75\x20" + "\x20\x20\x50\x3a\x25\x33\x75\x20\x20\x20\x45\x3a\x25\x33\x75\x20\x20\x20\x46\x3a\x25\x33\x75\x20\x20\x20\x55\x3a\x25\x36\x75\x6b" + "\x20\x25\x33\x75\x20\x20\x44\x3a\x25\x36\x75\x6b\x20\x25\x33\x75\x0d\x0a" // 392 SlogFmt + , "\x4c\x6f\x63\x61\x6c\x6c\x79" // 393 Locally + , "\x0d\x0a\x53\x6f\x72\x74\x20\x61\x6c\x70\x68\x61\x62\x65\x74\x69\x63\x61\x6c\x6c\x79" // 394 SortAlphaQ + , "\x0d\x0a\x01\x6d\x01\x68\x43\x68\x65\x63\x6b\x69\x6e\x67\x20\x53\x6c\x6f\x74\x73\x20\x40\x45\x4c\x4c\x49\x50\x53\x49\x53\x40" // 395 CheckingSlots + , "\x01\x6e\x01\x68\x25\x2d\x33\x32\x2e\x33\x32\x73\x01\x6e\x01\x6d\x25\x2d\x33\x30\x2e\x33\x30\x73\x01\x68\x25\x2d\x38\x2e\x38\x73" + "\x20\x01\x6e\x01\x6d\x25\x2d\x38\x2e\x38\x73\x0d\x0a" // 396 UserListFmt + , "\x01\x5b\x01\x68\x01\x77\x25\x64\x01\x62\x20\x74\x6f\x74\x61\x6c\x20\x75\x73\x65\x72\x73\x2e\x20\x20\x20\x20\x20\x20\x20\x20\x0d" + "\x0a" // 397 NTotalUsers + , "\x01\x77\x25\x64\x20\x01\x62\x75\x73\x65\x72\x73\x20\x77\x69\x74\x68\x20\x61\x63\x63\x65\x73\x73\x20\x74\x6f\x20\x63\x75\x72\x72" + "\x65\x6e\x74\x20\x73\x75\x62\x2d\x62\x6f\x61\x72\x64\x2e\x0d\x0a" // 398 NUsersOnCurSub + , "\x01\x77\x25\x64\x20\x01\x62\x75\x73\x65\x72\x73\x20\x77\x69\x74\x68\x20\x61\x63\x63\x65\x73\x73\x20\x74\x6f\x20\x63\x75\x72\x72" + "\x65\x6e\x74\x20\x64\x69\x72\x65\x63\x74\x6f\x72\x79\x2e\x0d\x0a" // 399 NUsersOnCurDir + , "\x0d\x0a\x01\x2d\x01\x63\x43\x75\x72\x72\x65\x6e\x74\x20\x4e\x65\x77\x2d\x53\x63\x61\x6e\x20\x64\x61\x74\x65\x2f\x74\x69\x6d\x65" + "\x01\x5c\x3a\x20\x01\x68" // 400 NScanDate + , "\x01\x79\x01\x68\x59\x65\x61\x72\x3a\x20\x01\x77" // 401 NScanYear + , "\x20\x20\x01\x79\x4d\x6f\x6e\x74\x68\x3a\x20\x01\x77" // 402 NScanMonth + , "\x20\x20\x01\x79\x44\x61\x79\x3a\x20\x01\x77" // 403 NScanDay + , "\x20\x20\x01\x79\x48\x6f\x75\x72\x3a\x20\x01\x77" // 404 NScanHour + , "\x20\x20\x01\x79\x4d\x69\x6e\x75\x74\x65\x3a\x20\x01\x77" // 405 NScanMinute + , "\x20\x70\x6d" // 406 NScanPmQ + , "\x20\x61\x6d" // 407 NScanAmQ + , "\x01\x72\x01\x68\x01\x69\x4e\x6f\x74\x20\x6c\x6f\x6e\x67\x20\x65\x6e\x6f\x75\x67\x68\x21\x01\x6e" // 408 PasswordTooShort + , "\x01\x72\x01\x68\x01\x69\x54\x68\x61\x74\x27\x73\x20\x79\x6f\x75\x72\x20\x63\x75\x72\x72\x65\x6e\x74\x20\x70\x61\x73\x73\x77\x6f" + "\x72\x64\x21\x01\x6e" // 409 PasswordNotChanged + , "\x01\x72\x01\x68\x01\x69\x59\x6f\x75\x20\x63\x61\x6c\x6c\x20\x74\x68\x61\x74\x20\x61\x20\x70\x61\x73\x73\x77\x6f\x72\x64\x3f\x01" + "\x6e" // 410 PasswordInvalid + , "\x01\x72\x01\x68\x01\x69\x54\x68\x61\x74\x20\x70\x61\x73\x73\x77\x6f\x72\x64\x20\x69\x73\x20\x74\x6f\x6f\x20\x6f\x62\x76\x69\x6f" + "\x75\x73\x21\x01\x6e" // 411 PasswordObvious + , "\x55\x4e\x55\x53\x45\x44\x34\x31\x32" // 412 Unused412 + , "\x55\x4e\x55\x53\x45\x44\x34\x31\x33" // 413 Unused413 + , "\x55\x4e\x55\x53\x45\x44\x34\x31\x34" // 414 Unused414 + , "\x55\x4e\x55\x53\x45\x44\x34\x31\x35" // 415 Unused415 + , "\x55\x4e\x55\x53\x45\x44\x34\x31\x36" // 416 Unused416 + , "\x55\x4e\x55\x53\x45\x44\x34\x31\x37" // 417 Unused417 + , "\x07\x0d\x0a\x4e\x6f\x20\x75\x73\x65\x72\x20\x64\x61\x74\x61\x20\x64\x65\x66\x69\x6e\x65\x64\x2e\x0d\x0a" // 418 NoUserData + , "\x01\x72\x01\x68\xae\xae\xae\x20\x01\x69\x44\x45\x4c\x45\x54\x45\x44\x01\x6e\x01\x72\x01\x68\x20\xaf\xaf\xaf\x0d\x0a" // 419 DeletedUser + , "\x01\x62\x01\x68\xae\xae\xae\x20\x01\x69\x49\x4e\x41\x43\x54\x49\x56\x45\x01\x6e\x01\x62\x01\x68\x20\xaf\xaf\xaf\x0d\x0a" // 420 InactiveUser + , "\x01\x6e\x01\x63\x41\x6c\x69\x61\x73\x20\x20\x20\x20\x20\x3a\x20\x01\x68\x25\x2d\x33\x30\x2e\x33\x30\x73\x20\x20\x01\x6e\x01\x63" + "\x50\x61\x73\x73\x20\x01\x68\x25\x73\x01\x6e\x01\x63\x3a\x20\x01\x68\x25\x73\x0d\x0a" // 421 UeditAliasPassword + , "\x01\x6e\x01\x63\x52\x65\x61\x6c\x20\x4e\x61\x6d\x65\x20\x3a\x20\x01\x68\x25\x2d\x33\x30\x2e\x33\x30\x73\x20\x20\x01\x6e\x01\x63" + "\x50\x68\x6f\x6e\x65\x20\x6e\x75\x6d\x62\x65\x72\x20\x3a\x20\x01\x68\x25\x73\x0d\x0a" // 422 UeditRealNamePhone + , "\x01\x6e\x01\x63\x41\x64\x64\x72\x65\x73\x73\x20\x20\x20\x3a\x20\x01\x68\x25\x2d\x33\x30\x2e\x33\x30\x73\x20\x20\x01\x6e\x01\x63" + "\x41\x67\x65\x2f\x53\x65\x78\x2f\x42\x44\x61\x79\x20\x3a\x20\x01\x68\x25\x32\x64\x20\x25\x63\x20\x25\x73\x0d\x0a" // 423 UeditAddressBirthday + , "\x01\x6e\x01\x63\x4c\x6f\x63\x61\x74\x69\x6f\x6e\x20\x20\x3a\x20\x01\x68\x25\x2d\x33\x30\x2e\x33\x30\x73\x20\x20\x01\x6e\x01\x63" + "\x5a\x69\x70\x20\x43\x6f\x64\x65\x20\x20\x20\x20\x20\x3a\x20\x01\x68\x25\x73\x0d\x0a" // 424 UeditLocationZipcode + , "\x01\x6e\x01\x63\x4e\x6f\x74\x65\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x68\x25\x2d\x33\x30\x2e\x33\x30\x73\x20\x20\x01\x6e\x01\x63" + "\x48\x61\x6e\x64\x6c\x65\x20\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x68\x25\x73\x0d\x0a" // 425 UeditNoteHandle + , "\x01\x6e\x01\x63\x43\x6c\x69\x65\x6e\x74\x20\x20\x20\x20\x3a\x20\x01\x68\x25\x2d\x33\x30\x2e\x33\x30\x73\x20\x20\x01\x6e\x01\x63" + "\x50\x72\x6f\x74\x6f\x63\x6f\x6c\x20\x20\x20\x20\x20\x3a\x20\x01\x68\x25\x73\x0d\x0a" // 426 UeditComputerModem + , "\x01\x6e\x01\x63\x43\x6f\x6d\x6d\x65\x6e\x74\x20\x25\x63\x20\x3a\x20\x01\x68\x25\x73\x0d\x0a" // 427 UeditCommentLine + , "\x01\x6e\x01\x63\x46\x69\x72\x73\x74\x20\x6f\x6e\x20\x20\x3a\x20\x01\x68\x25\x2d\x38\x2e\x38\x73\x20\x20\x01\x6e\x01\x63\x45\x78" + "\x70\x69\x72\x65\x20\x20\x20\x20\x3a\x20\x01\x68\x25\x2d\x38\x2e\x38\x73\x20\x20\x01\x6e\x01\x63\x4c\x61\x73\x74\x20\x6f\x6e\x20" + "\x20\x20\x3a\x20\x01\x68\x25\x2d\x38\x2e\x38\x73\x20\x20\x25\x30\x32\x75\x3a\x25\x30\x32\x75\x0d\x0a" // 428 UserDates + , "\x01\x6e\x01\x63\x54\x69\x6d\x65\x20\x6f\x6e\x20\x20\x20\x3a\x20\x01\x68\x25\x2d\x35\x75\x20\x20\x20\x20\x20\x01\x6e\x01\x63\x54" + "\x6f\x64\x61\x79\x20\x20\x20\x20\x20\x3a\x20\x01\x68\x25\x2d\x35\x75\x25\x2d\x35\x75\x01\x6e\x01\x63\x4c\x61\x73\x74\x20\x63\x61" + "\x6c\x6c\x20\x3a\x20\x01\x68\x25\x2d\x35\x75\x25\x2d\x35\x75\x01\x6e\x01\x63\x45\x78\x74\x72\x61\x20\x3a\x20\x01\x68\x25\x75\x0d" + "\x0a" // 429 UserTimes + , "\x01\x6e\x01\x63\x4c\x6f\x67\x6f\x6e\x73\x20\x20\x20\x20\x3a\x20\x01\x68\x25\x2d\x35\x75\x20\x20\x20\x20\x20\x01\x6e\x01\x63\x54" + "\x6f\x64\x61\x79\x20\x20\x20\x20\x20\x3a\x20\x01\x68\x25\x2d\x35\x75\x25\x2d\x35\x75\x01\x6e\x01\x63\x50\x6f\x73\x74\x73\x20\x20" + "\x20\x20\x20\x3a\x20\x01\x68\x25\x2d\x35\x75\x25\x2d\x35\x75\x01\x6e\x01\x63\x54\x6f\x64\x61\x79\x20\x3a\x20\x01\x68\x25\x75\x0d" + "\x0a" // 430 UserLogons + , "\x01\x6e\x01\x63\x45\x2d\x6d\x61\x69\x6c\x73\x20\x20\x20\x3a\x20\x01\x68\x25\x2d\x35\x75\x20\x20\x20\x20\x20\x01\x6e\x01\x63\x54" + "\x6f\x20\x73\x79\x73\x6f\x70\x20\x20\x3a\x20\x01\x68\x25\x2d\x35\x75\x20\x20\x20\x20\x20\x01\x6e\x01\x63\x57\x61\x69\x74\x69\x6e" + "\x67\x20\x20\x20\x3a\x20\x01\x68\x25\x2d\x35\x75\x20\x20\x20\x20\x20\x01\x6e\x01\x63\x54\x6f\x64\x61\x79\x20\x3a\x20\x01\x68\x25" + "\x75\x0d\x0a" // 431 UserEmails + , "\x01\x6e\x01\x63\x4e\x65\x74\x4d\x61\x69\x6c\x20\x20\x20\x3a\x20\x01\x68\x25\x73\x0d\x0a" // 432 UserNetMail + , "\x01\x6e\x01\x63\x55\x70\x6c\x6f\x61\x64\x73\x20\x20\x20\x3a\x20\x01\x68\x25\x39\x2e\x39\x73\x20\x01\x6e\x01\x63\x62\x79\x74\x65" + "\x73\x20\x69\x6e\x20\x01\x68\x25\x75\x20\x01\x6e\x01\x63\x66\x69\x6c\x65\x73\x0d\x0a" // 433 UserUploads + , "\x01\x6e\x01\x63\x44\x6f\x77\x6e\x6c\x6f\x61\x64\x73\x20\x3a\x20\x01\x68\x25\x39\x2e\x39\x73\x20\x01\x6e\x01\x63\x62\x79\x74\x65" + "\x73\x20\x69\x6e\x20\x01\x68\x25\x75\x20\x01\x6e\x01\x63\x66\x69\x6c\x65\x73\x20\x25\x73\x0d\x0a" // 434 UserDownloads + , "\x2d\x20\x4c\x65\x65\x63\x68\x3a\x20\x01\x72\x01\x68\x01\x69\x25\x75\x01\x6e" // 435 UserLeech + , "\x01\x6e\x01\x63\x43\x72\x65\x64\x69\x74\x73\x20\x20\x20\x3a\x20\x01\x68\x25\x39\x2e\x39\x73\x20\x01\x6e\x01\x63\x66\x72\x65\x65" + "\x3a\x20\x01\x68\x25\x73\x20\x01\x6e\x01\x63\x28\x01\x68\x25\x73\x20\x01\x6e\x01\x63\x70\x65\x72\x20\x64\x61\x79\x29\x0d\x0a" // 436 UserCredits + , "\x01\x6e\x01\x63\x4d\x69\x6e\x75\x74\x65\x73\x20\x20\x20\x3a\x20\x01\x68\x25\x39\x2e\x39\x73\x0d\x0a" // 437 UserMinutes + , "\x0d\x0a\x01\x6e\x01\x63\x53\x65\x63\x20\x4c\x65\x76\x65\x6c\x20\x3a\x20\x01\x68\x25\x64\x0d\x0a" // 438 UeditSecLevel + , "\x01\x6e\x01\x63\x46\x6c\x61\x67\x73\x20\x23\x31\x20\x20\x3a\x20\x01\x68\x25\x2d\x32\x36\x73\x20\x20\x20\x01\x6e\x01\x63\x46\x6c" + "\x61\x67\x73\x20\x23\x33\x20\x20\x3a\x20\x01\x68\x25\x73\x0d\x0a\x01\x6e\x01\x63\x46\x6c\x61\x67\x73\x20\x23\x32\x20\x20\x3a\x20" + "\x01\x68\x25\x2d\x32\x36\x73\x20\x20\x20\x01\x6e\x01\x63\x46\x6c\x61\x67\x73\x20\x23\x34\x20\x20\x3a\x20\x01\x68\x25\x73\x0d\x0a" + "" // 439 UeditFlags + , "\x01\x6e\x01\x63\x45\x78\x65\x6d\x70\x74\x69\x6f\x6e\x20\x3a\x20\x01\x68\x25\x2d\x32\x36\x73\x20\x20\x20\x01\x6e\x01\x63\x52\x65" + "\x73\x74\x72\x69\x63\x74\x73\x20\x3a\x20\x01\x68\x25\x73\x0d\x0a" // 440 UeditExempts + , "\x01\x5f\x01\x79\x01\x68\x55\x73\x65\x72\x20\x65\x64\x69\x74\x20\x28\x01\x77\x01\x60\x3f\x01\x79\x3d\x4d\x65\x6e\x75\x29\x20\x28" + "\x01\x77\x25\x75\x01\x79\x20\x6f\x66\x20\x01\x77\x25\x75\x01\x79\x29\x3a\x20\x01\x6e" // 441 UeditPrompt + , "\x52\x65\x73\x74\x6f\x72\x65\x20\x55\x73\x65\x72" // 442 UeditRestoreQ + , "\x41\x63\x74\x69\x76\x61\x74\x65\x20\x55\x73\x65\x72" // 443 UeditActivateQ + , "\x44\x65\x6c\x65\x74\x65\x20\x55\x73\x65\x72" // 444 UeditDeleteQ + , "\x55\x73\x65\x72\x20\x68\x61\x73\x20\x6d\x61\x69\x6c\x20\x77\x61\x69\x74\x69\x6e\x67\x2e\x20\x52\x65\x61\x64\x2f\x44\x65\x6c\x65" + "\x74\x65\x20\x69\x74" // 445 UeditReadUserMailWQ + , "\x55\x73\x65\x72\x20\x68\x61\x73\x20\x73\x65\x6e\x74\x20\x6d\x61\x69\x6c\x2e\x20\x52\x65\x61\x64\x2f\x44\x65\x6c\x65\x74\x65\x20" + "\x69\x74" // 446 UeditReadUserMailSQ + , "\x44\x65\x61\x63\x74\x69\x76\x61\x74\x65\x20\x55\x73\x65\x72" // 447 UeditDeactivateUserQ + , "\x43\x68\x61\x6e\x67\x65\x20\x45\x78\x65\x6d\x70\x74\x69\x6f\x6e\x73" // 448 ChangeExemptionQ + , "\x20\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x25\x73\x0d\x0a\x54\x6f\x67\x67\x6c\x65\x3a\x20" // 449 FlagEditing + , "\x01\x5f\x01\x79\x01\x68\x47\x6f\x20\x74\x6f\x20\x4e\x61\x6d\x65\x20\x6f\x72\x20\x4e\x75\x6d\x62\x65\x72\x3a\x20\x01\x6e" // 450 GoToUser + , "\x01\x5f\x01\x79\x01\x68\x4c\x61\x73\x74\x20\x6f\x6e\x20\x28\x40\x44\x41\x54\x45\x46\x4d\x54\x40\x29\x3a\x20\x01\x77" // 451 UeditLastOn + , "\x01\x5f\x01\x79\x01\x68\x46\x69\x72\x73\x74\x20\x6f\x6e\x20\x28\x40\x44\x41\x54\x45\x46\x4d\x54\x40\x29\x3a\x20\x01\x77" // 452 UeditFirstOn + , "\x01\x5f\x01\x79\x01\x68\x45\x78\x70\x69\x72\x65\x20\x28\x40\x44\x41\x54\x45\x46\x4d\x54\x40\x29\x3a\x20\x01\x77" // 453 UeditExpire + , "\x01\x5f\x01\x79\x01\x68\x50\x61\x73\x73\x77\x6f\x72\x64\x20\x4c\x61\x73\x74\x20\x4d\x6f\x64\x69\x66\x69\x65\x64\x20\x28\x40\x44" + "\x41\x54\x45\x46\x4d\x54\x40\x29\x3a\x20\x01\x77" // 454 UeditPwModDate + , "\x01\x5f\x01\x79\x01\x68\x4c\x65\x76\x65\x6c\x3a\x20\x01\x77" // 455 UeditML + , "\x01\x5f\x01\x79\x01\x68\x4e\x6f\x74\x65\x3a\x20\x01\x77" // 456 UeditNote + , "\x01\x5f\x01\x79\x01\x68\x43\x6f\x6d\x6d\x65\x6e\x74\x3a\x20\x01\x77" // 457 UeditComment + , "\x01\x5f\x01\x79\x01\x68\x55\x70\x6c\x6f\x61\x64\x20\x42\x79\x74\x65\x73\x3a\x20\x01\x77" // 458 UeditUlBytes + , "\x01\x5f\x01\x79\x01\x68\x54\x6f\x74\x61\x6c\x20\x55\x70\x6c\x6f\x61\x64\x73\x3a\x20\x01\x77" // 459 UeditUploads + , "\x01\x5f\x01\x79\x01\x68\x44\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x42\x79\x74\x65\x73\x3a\x20\x01\x77" // 460 UeditDlBytes + , "\x01\x5f\x01\x79\x01\x68\x54\x6f\x74\x61\x6c\x20\x44\x6f\x77\x6e\x6c\x6f\x61\x64\x73\x3a\x20\x01\x77" // 461 UeditDownloads + , "\x01\x5f\x01\x79\x01\x68\x4c\x65\x65\x63\x68\x20\x44\x6f\x77\x6e\x6c\x6f\x61\x64\x73\x3a\x20\x01\x77" // 462 UeditLeech + , "\x25\x64\x3a\x20\x4c\x3a\x20\x25\x32\x64\x20\x20\x46\x3a\x20\x25\x73\x20\x20\x45\x58\x3a\x20\x25\x73\x0d\x0a\x20\x20\x52\x45\x3a" + "\x20\x25\x73\x0d\x0a" // 463 QuickValidateFmt + , "\x0d\x0a\x01\x5f\x01\x79\x01\x68\x56\x61\x6c\x69\x64\x61\x74\x65\x3a\x20\x01\x6e" // 464 QuickValidatePrompt + , "\x01\x5f\x01\x79\x01\x68\x50\x61\x73\x73\x77\x6f\x72\x64\x3a\x20\x01\x77" // 465 UeditPassword + , "\x01\x5f\x01\x79\x01\x68\x43\x72\x65\x64\x69\x74\x73\x3a\x20\x01\x77" // 466 UeditCredits + , "\x01\x5f\x01\x79\x01\x68\x4d\x69\x6e\x75\x74\x65\x73\x3a\x20\x01\x77" // 467 UeditMinutes + , "\x43\x6f\x70\x79\x20\x75\x73\x65\x72" // 468 UeditCopyUserQ + , "\x01\x5f\x01\x79\x01\x68\x54\x6f\x20\x73\x6c\x6f\x74\x20\x23\x3a\x20\x01\x6e" // 469 UeditCopyUserToSlot + , "\x43\x68\x61\x6e\x67\x65\x20\x52\x65\x73\x74\x72\x69\x63\x74\x69\x6f\x6e\x73" // 470 ChangeRestrictsQ + , "\x01\x5f\x01\x79\x01\x68\x41\x64\x6a\x75\x73\x74\x20\x43\x72\x65\x64\x69\x74\x73\x20\x28\x2d\x20\x74\x6f\x20\x73\x75\x62\x74\x72" + "\x61\x63\x74\x2c\x20\x4d\x20\x6f\x72\x20\x4b\x20\x3d\x20\x4d\x65\x67\x61\x2f\x4b\x69\x6c\x6f\x62\x79\x74\x65\x73\x2c\x20\x6f\x72" + "\x20\x24\x29\x01\x5c\x3a\x20\x01\x6e" // 471 ModifyCredits + , "\x01\x5f\x01\x79\x01\x68\x41\x64\x6a\x75\x73\x74\x20\x4d\x69\x6e\x75\x74\x65\x73\x20\x28\x2d\x20\x74\x6f\x20\x73\x75\x62\x74\x72" + "\x61\x63\x74\x2c\x20\x48\x20\x3d\x20\x48\x6f\x75\x72\x73\x29\x01\x5c\x3a\x20\x01\x6e" // 472 ModifyMinutes + , "\x0d\x0a\x44\x65\x6c\x65\x74\x65\x20\x51\x75\x65\x73\x74\x69\x6f\x6e\x6e\x61\x69\x72\x65" // 473 DeleteQuestionaireQ + , "\x01\x68\x01\x62\x55\x73\x65\x72\x20\x53\x65\x74\x74\x69\x6e\x67\x73\x20\x66\x6f\x72\x20\x01\x77\x25\x73\x20\x23\x25\x64\x01\x62" + "\x3a\x0d\x0a\x0d\x0a" // 474 UserDefaultsHdr + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x54\x01\x6e\x01\x62\x5d\x20\x01\x68\x54\x65\x72\x6d\x69\x6e\x61\x6c\x20\x4d\x6f\x64\x65\x20" + "\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x01\x5c\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 475 UserDefaultsTerminal + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x45\x01\x6e\x01\x62\x5d\x20\x01\x68\x45\x78\x74\x65\x72\x6e\x61\x6c\x20\x45\x64\x69\x74\x6f" + "\x72\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x01\x5c\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 476 UserDefaultsXeditor + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x4c\x01\x6e\x01\x62\x5d\x20\x01\x68\x54\x65\x72\x6d\x69\x6e\x61\x6c\x20\x44\x69\x6d\x65\x6e" + "\x73\x69\x6f\x6e\x73\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x01\x5c\x3a\x20\x01\x63\x25\x73\x2c\x20\x25\x73\x0d" + "\x0a" // 477 UserDefaultsRows + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x58\x01\x6e\x01\x62\x5d\x20\x01\x68\x45\x78\x70\x65\x72\x74\x20\x4d\x65\x6e\x75\x20\x4d\x6f" + "\x64\x65\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 478 UserDefaultsMenuMode + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x50\x01\x6e\x01\x62\x5d\x20\x01\x68\x53\x63\x72\x65\x65\x6e\x20\x50\x61\x75\x73\x65\x20\x20" + "\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 479 UserDefaultsPause + , "" // 480 UserDefaultsHotKey + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x53\x01\x6e\x01\x62\x5d\x20\x01\x68\x53\x70\x69\x6e\x6e\x69\x6e\x67\x20\x43\x75\x72\x73\x6f" + "\x72\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x01\x5c\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 481 UserDefaultsCursor + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x43\x01\x6e\x01\x62\x5d\x20\x01\x68\x43\x6c\x65\x61\x72\x20\x53\x63\x72\x65\x65\x6e\x20\x42" + "\x65\x74\x77\x65\x65\x6e\x20\x4d\x65\x73\x73\x61\x67\x65\x73\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 482 UserDefaultsCLS + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x4e\x01\x6e\x01\x62\x5d\x20\x01\x68\x41\x73\x6b\x20\x46\x6f\x72\x20\x4e\x65\x77\x20\x4d\x65" + "\x73\x73\x61\x67\x65\x2f\x46\x69\x6c\x65\x20\x53\x63\x61\x6e\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 483 UserDefaultsAskNScan + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x59\x01\x6e\x01\x62\x5d\x20\x01\x68\x41\x73\x6b\x20\x46\x6f\x72\x20\x59\x6f\x75\x72\x20\x55" + "\x6e\x2d\x72\x65\x61\x64\x20\x4d\x73\x67\x20\x53\x63\x61\x6e\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 484 UserDefaultsAskSScan + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x46\x01\x6e\x01\x62\x5d\x20\x01\x68\x41\x75\x74\x6f\x6d\x61\x74\x69\x63\x20\x4e\x65\x77\x20" + "\x46\x69\x6c\x65\x20\x53\x63\x61\x6e\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 485 UserDefaultsANFS + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x52\x01\x6e\x01\x62\x5d\x20\x01\x68\x52\x65\x6d\x65\x6d\x62\x65\x72\x20\x43\x75\x72\x72\x65" + "\x6e\x74\x20\x53\x75\x62\x2d\x62\x6f\x61\x72\x64\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 486 UserDefaultsRemember + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x42\x01\x6e\x01\x62\x5d\x20\x01\x68\x42\x61\x74\x63\x68\x20\x44\x6f\x77\x6e\x6c\x6f\x61\x64" + "\x20\x46\x69\x6c\x65\x20\x46\x6c\x61\x67\x67\x69\x6e\x67\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 487 UserDefaultsBatFlag + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x4d\x01\x6e\x01\x62\x5d\x20\x01\x68\x46\x6f\x72\x77\x61\x72\x64\x20\x45\x2d\x6d\x61\x69\x6c" + "\x20\x74\x6f\x20\x4e\x65\x74\x4d\x61\x69\x6c\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x01\x5c\x20\x01\x62\x28\x01" + "\x63\x25\x2e\x33\x37\x73\x01\x62\x29\x0d\x0a" // 488 UserDefaultsNetMail + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x4b\x01\x6e\x01\x62\x5d\x20\x01\x68\x43\x6f\x6d\x6d\x61\x6e\x64\x20\x53\x68\x65\x6c\x6c\x20" + "\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x01\x5c\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 489 UserDefaultsCommandSet + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x44\x01\x6e\x01\x62\x5d\x20\x01\x68\x44\x65\x66\x61\x75\x6c\x74\x20\x74\x6f\x20\x51\x75\x69" + "\x65\x74\x20\x4d\x6f\x64\x65\x20\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 490 UserDefaultsQuiet + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x57\x01\x6e\x01\x62\x5d\x20\x01\x68\x43\x68\x61\x6e\x67\x65\x20\x50\x61\x73\x73\x77\x6f\x72" + "\x64\x20\x6f\x72\x20\x53\x69\x67\x6e\x61\x74\x75\x72\x65\x0d\x0a" // 491 UserDefaultsPassword + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x41\x01\x6e\x01\x62\x5d\x20\x01\x68\x54\x65\x6d\x70\x6f\x72\x61\x72\x79\x2f\x51\x57\x4b\x20" + "\x41\x72\x63\x68\x69\x76\x65\x20\x54\x79\x70\x65\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 492 UserDefaultsArcType + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x5a\x01\x6e\x01\x62\x5d\x20\x01\x68\x44\x65\x66\x61\x75\x6c\x74\x20\x44\x6f\x77\x6e\x6c\x6f" + "\x61\x64\x20\x50\x72\x6f\x74\x6f\x63\x6f\x6c\x20\x20\x20\x20\x01\x6e\x01\x62\x01\x5c\x3a\x20\x01\x63\x25\x73\x20\x01\x62\x25\x73" + "\x0d\x0a" // 493 UserDefaultsProtocol + , "\x0d\x0a\x01\x6e\x01\x68\x01\x62\x40\x57\x68\x69\x63\x68\x40\x20\x6f\x72\x20\x5b\x01\x77\x51\x01\x62\x5d\x20\x74\x6f\x20\x40\x51" + "\x75\x69\x74\x40\x3a\x20\x01\x63" // 494 UserDefaultsWhich + , "\x4f\x6e" // 495 On + , "\x4f\x66\x66" // 496 Off + , "\x01\x5f\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x79\x54\x65\x72\x6d\x69\x6e" + "\x61\x6c\x20\x72\x6f\x77\x73\x20\x5b\x01\x77\x41\x75\x74\x6f\x01\x79\x5d\x3a\x20\x01\x6e" // 497 HowManyRows + , "\x0d\x0a\x01\x5f\x01\x79\x01\x68\x43\x75\x72\x72\x65\x6e\x74\x20\x50\x61\x73\x73\x77\x6f\x72\x64\x3a\x20\x01\x77" // 498 CurrentPassword + , "\x46\x6f\x72\x77\x61\x72\x64\x20\x70\x65\x72\x73\x6f\x6e\x61\x6c\x20\x65\x2d\x6d\x61\x69\x6c\x20\x74\x6f\x20\x6e\x65\x74\x77\x6f" + "\x72\x6b\x20\x6d\x61\x69\x6c\x20\x61\x64\x64\x72\x65\x73\x73" // 499 ForwardMailQ + , "\x01\x5f\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x79\x4e\x65\x74\x77\x6f\x72" + "\x6b\x20\x6d\x61\x69\x6c\x20\x61\x64\x64\x72\x65\x73\x73\x01\x5c\x20\x28\x45\x78\x61\x6d\x70\x6c\x65\x3a\x20\x75\x73\x65\x72\x40" + "\x64\x6f\x6d\x61\x69\x6e\x29\x0d\x0a\x20\x3a\x20" // 500 EnterNetMailAddress + , "\x01\x6e\x01\x6c\x01\x67\x53\x65\x6c\x65\x63\x74\x20\x01\x68\x25\x73\x01\x6e\x01\x67\x3a\x0d\x0a\x0d\x0a" // 501 SelectItemHdr + , "\x01\x67\x01\x68\x25\x33\x64\x3a\x20\x01\x6e\x01\x67\x25\x73\x0d\x0a" // 502 SelectItemFmt + , "\x0d\x0a\x40\x57\x68\x69\x63\x68\x40\x2c\x20\x7e\x40\x51\x75\x69\x74\x40\x20\x6f\x72\x20\x5b\x25\x75\x5d\x3a\x20" // 503 SelectItemWhich + , "\x01\x5f\x01\x77\x01\x68\x0d\x0a\x0d\x0a\x25\x73\x20\x69\x73\x20\x68\x65\x72\x65\x2e\x2e\x2e\x0d\x0a\x0d\x0a\x01\x6e" // 504 SysopIsHere + , "\x0d\x0a\x01\x5f\x01\x77\x01\x68\x45\x6e\x64\x20\x6f\x66\x20\x63\x68\x61\x74\x2e\x0d\x0a\x0d\x0a\x01\x6e" // 505 EndOfChat + , "\x0d\x0a\x01\x5f\x01\x79\x01\x68\x43\x68\x61\x74\x3a\x20\x01\x6e" // 506 ChatPrompt + , "\x3f\x3f\x3f\x3f" // 507 AnonUserChatHandle + , "\x0d\x0a\x01\x6e\x01\x2d\x01\x67\x4d\x75\x6c\x74\x69\x6e\x6f\x64\x65\x20\x43\x68\x61\x74\x20\x2d\x20\x54\x79\x70\x65\x20\x01\x68" + "\x2f\x3f\x01\x6e\x01\x67\x20\x66\x6f\x72\x20\x6d\x65\x6e\x75\x2e\x0d\x0a" // 508 WelcomeToMultiChat + , "\x0d\x0a\x01\x77\x01\x68\x57\x65\x6c\x63\x6f\x6d\x65\x20\x74\x6f\x20\x43\x68\x61\x6e\x6e\x65\x6c\x20\x25\x64\x20\x28\x01\x63\x25" + "\x73\x01\x77\x29\x0d\x0a\x0d\x0a\x01\x6e" // 509 WelcomeToChannelN + , "\x01\x5f\x01\x77\x01\x68\x25\x33\x64\x20\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x69\x6e\x20\x6d\x75\x6c\x74\x69\x6e\x6f\x64\x65" + "\x20\x63\x68\x61\x74\x20\x63\x68\x61\x6e\x6e\x65\x6c\x20\x25\x64\x20\x6c\x6f\x63\x61\x6c\x6c\x79\x2e\x0d\x0a" // 510 NodeInMultiChatLocally + , "\x0d\x0a\x01\x6e\x01\x6d\x01\x68\x59\x6f\x75\x27\x72\x65\x20\x6f\x6e\x20\x74\x68\x65\x20\x41\x69\x72\x21\x0d\x0a\x0d\x0a\x01\x6e" + "" // 511 YoureOnTheAir + , "\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x32\x64\x3a\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x6a\x6f\x69\x6e\x65\x64\x20" + "\x6d\x75\x6c\x74\x69\x6e\x6f\x64\x65\x20\x63\x68\x61\x74\x20\x63\x68\x61\x6e\x6e\x65\x6c\x20\x25\x75\x2e\x0d\x0a\x01\x6e" // 512 NodeJoinedMultiChat + , "\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x32\x64\x3a\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x6c\x65\x66\x74\x20\x6d\x75" + "\x6c\x74\x69\x6e\x6f\x64\x65\x20\x63\x68\x61\x74\x20\x63\x68\x61\x6e\x6e\x65\x6c\x20\x25\x75\x2e\x0d\x0a" // 513 NodeLeftMultiChat + , "\x01\x5f\x01\x79\x01\x68\x43\x6f\x6d\x6d\x61\x6e\x64\x3a\x20\x01\x6e" // 514 MultiChatCommandPrompt + , "\x25\x73\x20\x68\x61\x73\x20\x70\x61\x73\x73\x77\x6f\x72\x64\x20\x70\x72\x6f\x74\x65\x63\x74\x65\x64\x20\x74\x68\x69\x73\x20\x63" + "\x68\x61\x6e\x6e\x65\x6c\x0d\x0a\x50\x61\x73\x73\x77\x6f\x72\x64\x3a\x20" // 515 PasswordProtected + , "\x0d\x0a\x43\x6f\x72\x72\x65\x63\x74\x2e\x0d\x0a" // 516 CorrectPassword + , "\x01\x72\x01\x68\x0d\x0a\x57\x72\x6f\x6e\x67\x20\x70\x61\x73\x73\x77\x6f\x72\x64\x2e\x0d\x0a" // 517 WrongPassword + , "\x50\x61\x73\x73\x77\x6f\x72\x64\x20\x70\x72\x6f\x74\x65\x63\x74\x20\x74\x68\x69\x73\x20\x63\x68\x61\x6e\x6e\x65\x6c" // 518 PasswordProtectChanQ + , "\x0d\x0a\x01\x5f\x01\x79\x01\x68\x50\x61\x73\x73\x77\x6f\x72\x64\x3a\x20" // 519 PasswordPrompt + , "\x01\x5f\x01\x67\x01\x68\x25\x2d\x38\x2e\x38\x73\x20\x01\x77\x25\x32\x64\x25\x63\x20\x01\x6e\x01\x67\x25\x73" // 520 ChatLineFmt + , "\x0d\x0a\x53\x79\x73\x6f\x70\x20\x70\x61\x67\x65\x20\x69\x73\x20\x6e\x6f\x77\x20\x25\x73\x0d\x0a" // 521 SysopPageIsNow + , "\x0d\x0a\x25\x73\x20\x69\x73\x20\x6e\x6f\x74\x20\x61\x76\x61\x69\x6c\x61\x62\x6c\x65\x2e\x0d\x0a" // 522 SysopIsNotAvailable + , "\x43\x68\x61\x74\x20\x77\x69\x74\x68\x20\x25\x73\x20\x69\x6e\x73\x74\x65\x61\x64" // 523 ChatWithGuruInsteadQ + , "\x0d\x0a\x01\x62\x01\x68\x50\x72\x69\x76\x61\x74\x65\x3a\x20\x01\x67\x7e\x54\x01\x6e\x01\x67\x65\x6c\x65\x67\x72\x61\x6d\x2c\x20" + "\x01\x68\x7e\x4d\x01\x6e\x01\x67\x65\x73\x73\x61\x67\x65\x2c\x20\x01\x68\x7e\x43\x01\x6e\x01\x67\x68\x61\x74\x2c\x20\x6f\x72\x20" + "\x01\x68\x7e\x51\x01\x6e\x01\x67\x75\x69\x74\x3a\x20\x01\x63\x01\x68" // 524 PrivateMsgPrompt + , "\x0d\x0a\x01\x68\x01\x79\x4e\x6f\x64\x65\x2c\x20\x55\x73\x65\x72\x20\x6e\x61\x6d\x65\x2c\x20\x01\x77\x23\x01\x79\x4e\x75\x6d\x62" + "\x65\x72\x2c\x20\x01\x77\x27\x01\x79\x48\x61\x6e\x64\x6c\x65\x2c\x01\x5c\x20\x6f\x72\x20\x01\x77\x5e\x55\x01\x79\x73\x65\x72\x20" + "\x6c\x69\x73\x74\x3a\x20\x01\x77\x01\x68" // 525 NodeToPrivateChat + , "\x0d\x0a\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x64\x20\x69\x73\x20\x69\x6e\x20\x70\x72\x69\x76\x61\x74\x65\x20\x63\x68" + "\x61\x74\x20\x77\x69\x74\x68\x20\x61\x6e\x6f\x74\x68\x65\x72\x20\x6e\x6f\x64\x65\x2e\x0d\x0a" // 526 NodeNAlreadyInPChat + , "\x0d\x0a\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x64\x20\x69\x73\x20\x6e\x6f\x74\x20\x69\x6e\x20\x75\x73\x65\x2e\x0d\x0a" + "" // 527 NodeNIsNotInUse + , "\x0d\x0a\x54\x68\x65\x72\x65\x27\x73\x20\x6e\x6f\x20\x6e\x65\x65\x64\x20\x74\x6f\x20\x70\x61\x67\x65\x20\x79\x6f\x75\x72\x73\x65" + "\x6c\x66\x2e\x0d\x0a" // 528 NoNeedToPageSelf + , "\x0d\x0a\x01\x72\x01\x68\x01\x69\x44\x6f\x6e\x27\x74\x20\x62\x75\x67\x20\x25\x73\x2e\x01\x6e\x0d\x0a" // 529 CantPageNode + , "\x07\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x32\x64\x3a\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x69\x73\x20\x70\x61\x67" + "\x69\x6e\x67\x20\x79\x6f\x75\x20\x74\x6f\x20\x63\x68\x61\x74\x2e\x0d\x0a" // 530 NodePageMsg + , "\x07\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x32\x64\x3a\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x69\x73\x20\x70\x61\x67" + "\x69\x6e\x67\x20\x61\x6c\x6c\x20\x6e\x6f\x64\x65\x73\x20\x74\x6f\x20\x63\x68\x61\x74\x2e\x0d\x0a" // 531 AllNodePageMsg + , "\x07\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x32\x64\x3a\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x69\x73\x20\x70\x61\x67" + "\x69\x6e\x67\x20\x79\x6f\x75\x20\x66\x6f\x72\x20\x70\x72\x69\x76\x61\x74\x65\x20\x63\x68\x61\x74\x2e\x0d\x0a" // 532 NodePChatPageMsg + , "\x0d\x0a\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x73\x65\x6e\x64\x20\x6d\x65\x73\x73\x61\x67\x65\x73\x2e\x0d\x0a" // 533 R_SendMessages + , "\x0d\x0a\x01\x68\x01\x79\x4e\x6f\x64\x65\x2c\x20\x4e\x61\x6d\x65\x2c\x20\x01\x77\x23\x01\x79\x4e\x75\x6d\x62\x65\x72\x2c\x20\x01" + "\x77\x27\x01\x79\x48\x61\x6e\x64\x6c\x65\x2c\x01\x5c\x20\x01\x77\x5e\x55\x01\x79\x73\x65\x72\x20\x6c\x69\x73\x74\x2c\x20\x6f\x72" + "\x20\x01\x77\x41\x6c\x6c\x01\x79\x3a\x20\x01\x77\x01\x68" // 534 NodeToSendMsgTo + , "\x0d\x0a\x54\x68\x65\x72\x65\x27\x73\x20\x6e\x6f\x20\x6e\x65\x65\x64\x20\x74\x6f\x20\x73\x65\x6e\x64\x20\x61\x20\x6d\x65\x73\x73" + "\x61\x67\x65\x20\x74\x6f\x20\x79\x6f\x75\x72\x73\x65\x6c\x66\x2e\x0d\x0a" // 535 NoNeedToSendMsgToSelf + , "\x01\x5f\x01\x79\x01\x68\x0d\x0a\x4d\x65\x73\x73\x61\x67\x65\x01\x5c\x3a\x20" // 536 NodeMsgPrompt + , "\x07\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x32\x64\x3a\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x73\x65\x6e\x74\x20\x79" + "\x6f\x75\x20\x61\x20\x6d\x65\x73\x73\x61\x67\x65\x3a\x0d\x0a\x01\x77\x01\x68\x01\x34\x25\x73\x01\x6e\x0d\x0a" // 537 NodeMsgFmt + , "\x07\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x32\x64\x3a\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x73\x65\x6e\x74\x20\x61" + "\x6c\x6c\x20\x6e\x6f\x64\x65\x73\x20\x61\x20\x6d\x65\x73\x73\x61\x67\x65\x3a\x0d\x0a\x01\x77\x01\x68\x01\x34\x25\x73\x01\x6e\x0d" + "\x0a" // 538 AllNodeMsgFmt + , "\x0d\x0a\x50\x61\x67\x69\x6e\x67\x20\x25\x73\x2e\x2e\x2e" // 539 PagingGuru + , "\x01\x6e\x0d\x0a\x01\x63\x57\x61\x69\x74\x69\x6e\x67\x20\x66\x6f\x72\x20\x01\x68\x4e\x6f\x64\x65\x20\x25\x64\x20\x01\x6e\x01\x63" + "\x74\x6f\x20\x6a\x6f\x69\x6e\x20\x70\x72\x69\x76\x61\x74\x65\x20\x63\x68\x61\x74\x2e\x20\x48\x69\x74\x20\x01\x68\x01\x69\x43\x74" + "\x72\x6c\x2d\x43\x01\x6e\x01\x63\x20\x74\x6f\x20\x61\x62\x6f\x72\x74\x2e\x01\x6e\x0d\x0a\x0d\x0a" // 540 WaitingForNodeInPChat + , "\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x32\x64\x3a\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x6a\x6f\x69\x6e\x65\x64\x20" + "\x70\x72\x69\x76\x61\x74\x65\x20\x63\x68\x61\x74\x2e\x01\x6e\x0d\x0a" // 541 NodeJoinedPrivateChat + , "\x0d\x0a\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x32\x64\x3a\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x6c\x65\x66\x74\x20" + "\x70\x72\x69\x76\x61\x74\x65\x20\x63\x68\x61\x74\x2e\x01\x6e\x0d\x0a" // 542 NodeLeftPrivateChat + , "\x4e\x6f\x20\x6f\x6e\x65\x20\x68\x61\x73\x20\x6c\x6f\x67\x67\x65\x64\x20\x6f\x6e\x20\x74\x6f\x64\x61\x79\x2e\x0d\x0a" // 543 NoOneHasLoggedOnToday + , "\x55\x4e\x55\x53\x45\x44\x35\x34\x34" // 544 Unused544 + , "\x0d\x0a\x01\x6e\x01\x68\x01\x6d\x25\x2d\x32\x64\x20\x01\x6e\x01\x6d\x25\x2d\x36\x75\x20\x01\x77\x01\x68\x25\x2d\x32\x35\x2e\x32" + "\x35\x73\x20\x01\x6d\x25\x2d\x32\x35\x2e\x32\x35\x73\x01\x6e\x01\x6d\x25\x30\x32\x75\x3a\x25\x30\x32\x75\x20\x01\x68\x25\x2d\x38" + "\x2e\x38\x73\x20\x01\x6e\x01\x6d\x25\x33\x64" // 545 LastFewCallersFmt + , "\x0d\x0a\x01\x67\x01\x68\x4c\x6f\x67\x6f\x6e\x73\x20\x54\x6f\x64\x61\x79\x3a\x01\x6e\x01\x67" // 546 CallersToday + , "\x44\x6f\x20\x79\x6f\x75\x20\x6d\x65\x61\x6e\x20\x25\x73\x20\x23\x25\x75\x20\x28\x7e\x40\x59\x65\x73\x40\x2c\x20\x7e\x40\x4e\x6f" + "\x40\x2c\x20\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x29\x20\x3f\x20" // 547 DoYouMeanThisUserQ + , "\x55\x4e\x4b\x4e\x4f\x57\x4e\x20\x55\x53\x45\x52" // 548 UNKNOWN_USER + , "\x0d\x0a\x54\x69\x6d\x65\x27\x73\x20\x75\x70\x2e\x0d\x0a" // 549 TimesUp + , "\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x32\x64\x3a\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x6c\x6f\x67\x67\x65\x64\x20" + "\x6f\x66\x66\x0d\x0a\x01\x6e" // 550 NodeLoggedOff + , "\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x32\x64\x3a\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x6c\x6f\x67\x67\x65\x64\x20" + "\x6f\x6e\x20\x25\x73\x0d\x0a\x01\x6e" // 551 NodeLoggedOnAtNbps + , "\x01\x6e\x01\x62\x01\x68\x0d\x0a\x0d\x0a\x4c\x6f\x67\x6f\x6e\x20\x54\x69\x6d\x65\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x73" + "\x0d\x0a" // 552 TiLogon + , "\x01\x62\x4c\x6f\x63\x61\x6c\x20\x54\x69\x6d\x65\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x73\x20\x25\x73\x0d\x0a" // 553 TiNow + , "\x01\x62\x54\x69\x6d\x65\x20\x55\x73\x65\x64\x20\x20\x20\x20\x20\x20\x20\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 554 TiTimeon + , "\x01\x62\x54\x69\x6d\x65\x20\x52\x65\x6d\x61\x69\x6e\x69\x6e\x67\x20\x20\x3a\x20\x01\x63\x25\x73\x0d\x0a\x0d\x0a" // 555 TiTimeLeft + , "\x0d\x0a\x0d\x0a\x01\x6e\x43\x74\x72\x6c\x2d\x4b\x65\x79\x20\x43\x6f\x6d\x6d\x61\x6e\x64\x73\x20\x28\x66\x72\x6f\x6d\x20\x6d\x6f" + "\x73\x74\x20\x61\x6e\x79\x77\x68\x65\x72\x65\x29\x0d\x0a\x0d\x0a\x01\x68\x5e\x4b\x20\x20\x01\x6e\x54\x68\x69\x73\x20\x4d\x65\x6e" + "\x75\x0d\x0a\x01\x68\x5e\x43\x20\x20\x01\x6e\x41\x62\x6f\x72\x74\x20\x43\x75\x72\x72\x65\x6e\x74\x20\x50\x72\x6f\x63\x65\x73\x73" + "\x0d\x0a\x01\x68\x5e\x4f\x20\x20\x01\x6e\x54\x6f\x67\x67\x6c\x65\x20\x50\x61\x75\x73\x65\x20\x50\x72\x6f\x6d\x70\x74\x20\x54\x65" + "\x6d\x70\x6f\x72\x61\x72\x69\x6c\x79\x0d\x0a\x01\x68\x5e\x5a\x20\x20\x01\x6e\x54\x6f\x67\x67\x6c\x65\x20\x52\x61\x77\x20\x49\x6e" + "\x70\x75\x74\x2f\x4f\x75\x74\x70\x75\x74\x20\x4d\x6f\x64\x65\x01\x5c\x20\x28\x65\x2e\x67\x2e\x20\x66\x6f\x72\x20\x41\x53\x43\x49" + "\x49\x2d\x75\x70\x6c\x6f\x61\x64\x69\x6e\x67\x20\x6d\x73\x67\x20\x74\x65\x78\x74\x29\x0d\x0a\x01\x68\x5e\x55\x20\x20\x01\x6e\x4c" + "\x69\x73\x74\x20\x55\x73\x65\x72\x73\x20\x4f\x6e\x6c\x69\x6e\x65\x0d\x0a\x01\x68\x5e\x50\x20\x20\x01\x6e\x53\x65\x6e\x64\x20\x49" + "\x6e\x73\x74\x61\x6e\x74\x2d\x4d\x65\x73\x73\x61\x67\x65\x73\x20\x61\x6e\x64\x20\x54\x65\x6c\x65\x67\x72\x61\x6d\x73\x0d\x0a\x01" + "\x68\x5e\x54\x20\x20\x01\x6e\x54\x69\x6d\x65\x20\x49\x6e\x66\x6f\x72\x6d\x61\x74\x69\x6f\x6e\x0d\x0a\x0d\x0a" // 556 ControlKeyMenu + , "\x0d\x0a\x01\x6e\x59\x6f\x75\x27\x76\x65\x20\x74\x61\x6b\x65\x6e\x20\x74\x6f\x6f\x20\x6c\x6f\x6e\x67\x20\x74\x6f\x20\x6c\x6f\x67" + "\x20\x6f\x6e\x2e\x0d\x0a" // 557 TakenTooLongToLogon + , "\x0d\x0a\x01\x6e\x59\x6f\x75\x27\x76\x65\x20\x62\x65\x65\x6e\x20\x69\x6e\x61\x63\x74\x69\x76\x65\x20\x74\x6f\x6f\x20\x6c\x6f\x6e" + "\x67\x2e\x0d\x0a" // 558 CallBackWhenYoureThere + , "\x40\x45\x58\x45\x43\x3a\x79\x65\x73\x6e\x6f\x62\x61\x72\x40" // 559 YesNoQuestion + , "\x59\x65\x73" // 560 Yes + , "\x4e\x6f" // 561 No + , "\x40\x45\x58\x45\x43\x3a\x6e\x6f\x79\x65\x73\x62\x61\x72\x40" // 562 NoYesQuestion + , "\x01\x5f\x01\x72\x01\x68\x5b\x48\x69\x74\x20\x61\x20\x6b\x65\x79\x5d\x20" // 563 Pause + , "\x43\x6f\x6e\x74\x69\x6e\x75\x65" // 564 ContinueQ + , "\x01\x2d\x01\x67\x0d\x0a\x53\x79\x73\x74\x65\x6d\x20\x53\x74\x61\x74\x69\x73\x74\x69\x63\x73\x20\x4c\x6f\x67\x3a\x0d\x0a\x0d\x0a" + "\x01\x6e" // 565 SysStatsLogHdr + , "\x01\x2d\x01\x67\x0d\x0a\x4e\x6f\x64\x65\x20\x23\x25\x64\x20\x53\x74\x61\x74\x69\x73\x74\x69\x63\x73\x20\x4c\x6f\x67\x3a\x0d\x0a" + "\x0d\x0a\x01\x6e" // 566 NodeStatsLogHdr + , "\x01\x5f\x01\x72\x01\x68\x59\x6f\x75\x72\x20\x74\x69\x6d\x65\x20\x68\x61\x73\x20\x62\x65\x65\x6e\x20\x72\x65\x64\x75\x63\x65\x64" + "\x20\x64\x75\x65\x20\x74\x6f\x20\x61\x6e\x20\x75\x70\x63\x6f\x6d\x69\x6e\x67\x20\x65\x76\x65\x6e\x74\x20\x6f\x6e\x20\x01\x77\x25" + "\x73\x0d\x0a\x0d\x0a" // 567 ReducedTime + , "\x01\x6e\x0d\x0a\x54\x69\x6d\x65\x64\x20\x45\x76\x65\x6e\x74\x20\x2d\x20\x4e\x6f\x64\x65\x3a\x20\x25\x64\x20\x20\x20\x54\x69\x6d" + "\x65\x3a\x20\x25\x30\x32\x64\x3a\x25\x30\x32\x64\x20\x20\x20\x4c\x61\x73\x74\x20\x52\x61\x6e\x3a\x20\x25\x73\x0d\x0a" // 568 EventInfo + , "\x01\x5f\x01\x72\x01\x68\x01\x69\x01\x3f\x43\x6f\x6e\x6e\x65\x63\x74\x69\x6f\x6e\x20\x77\x69\x6c\x6c\x20\x62\x65\x20\x64\x72\x6f" + "\x70\x70\x65\x64\x20\x69\x6e\x20\x25\x64\x20\x6d\x69\x6e\x75\x74\x65\x73\x20\x64\x75\x65\x20\x74\x6f\x20\x75\x70\x63\x6f\x6d\x69" + "\x6e\x67\x20\x65\x76\x65\x6e\x74\x2e\x01\x6e" // 569 UploadBeforeEvent + , "\x01\x5f\x01\x79\x01\x68\x0d\x0a\x51\x57\x4b\x3a\x20\x01\x6e" // 570 QWKPrompt + , "\x0d\x0a\x43\x74\x72\x6c\x2d\x41\x20\x63\x6f\x64\x65\x73\x3a\x20\x7e\x45\x78\x70\x61\x6e\x64\x20\x74\x6f\x20\x41\x4e\x53\x49\x2c" + "\x20\x7e\x4c\x65\x61\x76\x65\x20\x69\x6e\x2c\x20\x6f\x72\x20\x5b\x53\x74\x72\x69\x70\x5d\x3a\x20" // 571 QWKCtrlACodes + , "\x0d\x0a\x01\x5f\x01\x68\x01\x77\x50\x61\x63\x6b\x69\x6e\x67\x20\x53\x75\x62\x2d\x62\x6f\x61\x72\x64\x2e\x2e\x2e\x20\x20\x20\x20" + "\x20\x20" // 572 QWKPackingSubboard + , "\x01\x5b\x01\x62\x50\x61\x63\x6b\x65\x64\x3a\x01\x77\x25\x34\x75\x20\x01\x62\x6f\x66\x01\x77\x20\x25\x75\x01\x3e" // 573 QWKPackedSubboard + , "\x0d\x0a\x01\x5f\x01\x68\x01\x77\x50\x61\x63\x6b\x69\x6e\x67\x20\x45\x2d\x6d\x61\x69\x6c\x2e\x2e\x2e\x20\x20\x20\x20\x20\x20\x20" + "\x20\x20\x20\x20\x20" // 574 QWKPackingEmail + , "\x01\x5b\x01\x62\x50\x61\x63\x6b\x65\x64\x20\x01\x77\x25\x75\x01\x62\x20\x45\x2d\x6d\x61\x69\x6c\x20\x6d\x65\x73\x73\x61\x67\x65" + "\x73\x2e\x01\x3e" // 575 QWKPackedEmail + , "\x0d\x0a\x01\x5f\x01\x68\x01\x77\x55\x6e\x70\x61\x63\x6b\x69\x6e\x67\x20\x40\x45\x4c\x4c\x49\x50\x53\x49\x53\x40" // 576 QWKUnpacking + , "\x01\x5b\x01\x5f\x01\x68\x01\x62\x55\x6e\x70\x61\x63\x6b\x65\x64\x2e\x01\x3e" // 577 QWKUnpacked + , "\x01\x5f\x01\x77\x01\x68\x4e\x6f\x20\x6e\x65\x77\x20\x6d\x65\x73\x73\x61\x67\x65\x73\x2e\x0d\x0a" // 578 QWKNoNewMessages + , "\x0d\x0a\x01\x72\x01\x68\x01\x69\x50\x61\x63\x6b\x65\x74\x20\x43\x6f\x6d\x70\x72\x65\x73\x73\x69\x6f\x6e\x20\x46\x61\x69\x6c\x65" + "\x64\x21\x01\x6e\x0d\x0a" // 579 QWKCompressionFailed + , "\x0d\x0a\x01\x72\x01\x68\x01\x69\x43\x61\x6e\x27\x74\x20\x45\x78\x74\x72\x61\x63\x74\x21\x01\x6e\x0d\x0a" // 580 QWKExtractionFailed + , "\x0d\x0a\x01\x72\x01\x68\x01\x69\x52\x65\x70\x6c\x79\x20\x6e\x6f\x74\x20\x72\x65\x63\x65\x69\x76\x65\x64\x21\x01\x6e\x0d\x0a" // 581 QWKReplyNotReceived + , "\x01\x5f\x01\x77\x01\x68\x49\x6e\x76\x61\x6c\x69\x64\x20\x43\x6f\x6e\x66\x65\x72\x65\x6e\x63\x65\x20\x25\x64\x0d\x0a" // 582 QWKInvalidConferenceN + , "\x0d\x0a\x01\x5f\x01\x68\x01\x77\x43\x72\x65\x61\x74\x69\x6e\x67\x20\x25\x73\x2e\x2e\x2e" // 583 CreatingFileList + , "\x01\x5b\x01\x62\x43\x72\x65\x61\x74\x65\x64\x20\x25\x73\x01\x3e" // 584 CreatedFileList + , "\x01\x5b\x01\x62\x4e\x6f\x20\x46\x69\x6c\x65\x73\x2e\x01\x3e" // 585 NoFiles + , "\x0d\x0a\x4d\x65\x73\x73\x61\x67\x65\x20\x70\x6f\x69\x6e\x74\x65\x72\x73\x20\x72\x65\x73\x65\x74\x20\x74\x6f\x20\x69\x6e\x69\x74" + "\x69\x61\x6c\x20\x76\x61\x6c\x75\x65\x73\x2e\x0d\x0a" // 586 MsgPtrsInitialized + , "\x01\x2d\x0d\x0a\x01\x67\x54\x68\x65\x20\x63\x75\x72\x72\x65\x6e\x74\x20\x63\x6f\x6e\x76\x65\x72\x73\x69\x6f\x6e\x20\x72\x61\x74" + "\x65\x20\x69\x73\x20\x01\x68\x25\x75\x20\x01\x6e\x01\x67\x6d\x69\x6e\x75\x74\x65\x73\x20\x66\x6f\x72\x20\x01\x68\x31\x30\x30\x6b" + "\x01\x6e\x01\x67\x20\x63\x72\x65\x64\x69\x74\x73\x2e\x0d\x0a\x0d\x0a\x01\x6e" // 587 ConversionRate + , "\x0d\x0a\x01\x5f\x01\x62\x01\x68\x48\x6f\x77\x20\x6d\x61\x6e\x79\x20\x01\x77\x31\x30\x30\x6b\x20\x01\x62\x63\x72\x65\x64\x69\x74" + "\x20\x62\x6c\x6f\x63\x6b\x73\x20\x74\x6f\x20\x63\x6f\x6e\x76\x65\x72\x74\x01\x5c\x20\x74\x6f\x20\x6d\x69\x6e\x75\x74\x65\x73\x20" + "\x28\x01\x77\x25\x75\x20\x4d\x61\x78\x01\x62\x29\x3a\x20\x01\x6e" // 588 CreditsToMin + , "\x01\x2d\x01\x72\x01\x68\x01\x69\x59\x6f\x75\x20\x68\x61\x76\x65\x20\x74\x6f\x6f\x20\x6d\x61\x6e\x79\x20\x6d\x69\x6e\x75\x74\x65" + "\x73\x2e\x01\x6e\x0d\x0a" // 589 YouHaveTooManyMinutes + , "\x0d\x0a\x59\x6f\x75\x20\x61\x72\x65\x20\x63\x6f\x6e\x6e\x65\x63\x74\x65\x64\x20\x74\x6f\x20\x61\x20\x62\x69\x6c\x6c\x69\x6e\x67" + "\x20\x6e\x6f\x64\x65\x20\x66\x6f\x72\x20\x25\x73\x20\x42\x42\x53\x2e\x0d\x0a\x59\x6f\x75\x72\x20\x70\x68\x6f\x6e\x65\x20\x6e\x75" + "\x6d\x62\x65\x72\x20\x77\x69\x6c\x6c\x20\x62\x65\x20\x63\x68\x61\x72\x67\x65\x64\x20\x24\x25\x64\x20\x69\x66\x20\x79\x6f\x75\x20" + "\x64\x6f\x20\x6e\x6f\x74\x20\x68\x61\x6e\x67\x20\x75\x70\x20\x77\x69\x74\x68\x69\x6e\x20\x33\x30\x20\x73\x65\x63\x6f\x6e\x64\x73" + "\x2e\x0d\x0a\x0d\x0a\x50\x6c\x65\x61\x73\x65\x20\x77\x61\x69\x74\x2c\x20\x6f\x72\x20\x68\x69\x74\x20\x61\x6e\x79\x20\x6b\x65\x79" + "\x20\x74\x6f\x20\x68\x61\x6e\x67\x20\x75\x70\x20\x6e\x6f\x77\x2e\x2e\x2e" // 590 BillingNodeMsg + , "\x43\x6f\x6e\x76\x65\x72\x74\x20\x31\x30\x30\x6b\x20\x63\x72\x65\x64\x69\x74\x73\x20\x74\x6f\x20\x25\x75\x20\x6d\x69\x6e\x75\x74" + "\x65\x73" // 591 Convert100ktoNminQ + , "\x0d\x0a\x25\x75\x20\x63\x72\x65\x64\x69\x74\x73\x20\x68\x61\x76\x65\x20\x62\x65\x65\x6e\x20\x61\x64\x64\x65\x64\x20\x74\x6f\x20" + "\x79\x6f\x75\x72\x20\x61\x63\x63\x6f\x75\x6e\x74\x2e\x0d\x0a" // 592 CreditedAccount + , "\x0d\x0a\x41\x4e\x53\x49\x20\x43\x61\x70\x74\x75\x72\x65\x20\x69\x73\x20\x6e\x6f\x77\x20\x25\x73\x0d\x0a" // 593 ANSICaptureIsNow + , "\x01\x6e\x01\x6d\x0d\x0a\x52\x65\x74\x72\x69\x65\x76\x69\x6e\x67\x20\x01\x68\x25\x73\x01\x6e\x01\x6d\x2e\x2e\x2e" // 594 RetrievingFile + , "\x55\x4e\x55\x53\x45\x44\x35\x39\x35" // 595 Unused595 + , "\x0d\x0a\x50\x72\x69\x76\x61\x74\x65" // 596 PrivatePostQ + , "\x0d\x0a\x01\x5f\x01\x79\x01\x68\x50\x6f\x73\x74\x20\x74\x6f\x3a\x20" // 597 PostTo + , "\x0d\x0a\x50\x72\x69\x76\x61\x74\x65\x20\x70\x6f\x73\x74\x73\x20\x72\x65\x71\x75\x69\x72\x65\x20\x61\x20\x64\x65\x73\x74\x69\x6e" + "\x61\x74\x69\x6f\x6e\x20\x75\x73\x65\x72\x20\x6e\x61\x6d\x65\x2e\x0d\x0a" // 598 NoToUser + , "\x0d\x0a\x01\x5f\x01\x77\x01\x68\x55\x73\x69\x6e\x67\x20\x79\x6f\x75\x72\x20\x72\x65\x61\x6c\x20\x6e\x61\x6d\x65\x20\x40\x45\x4c" + "\x4c\x49\x50\x53\x49\x53\x40\x0d\x0a" // 599 UsingRealName + , "\x0d\x0a\x01\x5f\x01\x77\x01\x68\x50\x6f\x73\x74\x69\x6e\x67\x20\x50\x72\x69\x76\x61\x74\x65\x6c\x79\x20\x40\x45\x4c\x4c\x49\x50" + "\x53\x49\x53\x40\x0d\x0a" // 600 PostingPrivately + , "\x0d\x0a\x01\x5f\x01\x77\x01\x68\x50\x6f\x73\x74\x69\x6e\x67\x20\x61\x6e\x6f\x6e\x79\x6d\x6f\x75\x73\x6c\x79\x20\x40\x45\x4c\x4c" + "\x49\x50\x53\x49\x53\x40\x0d\x0a" // 601 PostingAnonymously + , "\x0d\x0a\x43\x61\x6e\x27\x74\x20\x64\x65\x6c\x65\x74\x65\x20\x70\x6f\x73\x74\x73\x20\x6f\x6e\x20\x74\x68\x69\x73\x20\x73\x75\x62" + "\x2d\x62\x6f\x61\x72\x64\x2e\x0d\x0a" // 602 CantDeletePosts + , "\x0d\x0a\x01\x68\x01\x67\x53\x75\x62\x2d\x62\x6f\x61\x72\x64\x20\x49\x6e\x66\x6f\x72\x6d\x61\x74\x69\x6f\x6e\x3a\x0d\x0a\x0d\x0a" + "\x01\x6e" // 603 SubInfoHdr + , "\x01\x6e\x01\x68\x01\x62\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20" + "\x01\x63\x25\x73\x0d\x0a" // 604 SubInfoLongName + , "\x01\x6e\x01\x68\x01\x62\x4e\x61\x6d\x65\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20" + "\x01\x63\x25\x73\x0d\x0a" // 605 SubInfoShortName + , "\x01\x6e\x01\x68\x01\x62\x51\x57\x4b\x20\x4e\x61\x6d\x65\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20" + "\x01\x63\x25\x73\x0d\x0a" // 606 SubInfoQWKName + , "\x01\x6e\x01\x68\x01\x62\x4d\x65\x73\x73\x61\x67\x65\x73\x20\x52\x65\x74\x61\x69\x6e\x65\x64\x20\x20\x20\x20\x20\x20\x20\x3a\x20" + "\x01\x63\x25\x75\x0d\x0a" // 607 SubInfoMaxMsgs + , "\x01\x6e\x01\x68\x01\x62\x0d\x0a\x51\x57\x4b\x20\x70\x61\x63\x6b\x65\x74\x20\x6e\x65\x74\x77\x6f\x72\x6b\x20\x63\x6f\x6e\x66\x65" + "\x72\x65\x6e\x63\x65\x20\x75\x73\x69\x6e\x67\x20\x74\x68\x65\x20\x74\x61\x67\x6c\x69\x6e\x65\x3a\x01\x6e\x0d\x0a\x20\xfe\x20\x25" + "\x73\x01\x6e\x0d\x0a" // 608 SubInfoTagLine + , "\x01\x6e\x01\x68\x01\x62\x0d\x0a\x46\x69\x64\x6f\x4e\x65\x74\x20\x45\x63\x68\x6f\x4d\x61\x69\x6c\x20\x63\x6f\x6e\x66\x65\x72\x65" + "\x6e\x63\x65\x20\x75\x73\x69\x6e\x67\x20\x74\x68\x65\x20\x6f\x72\x69\x67\x69\x6e\x20\x6c\x69\x6e\x65\x3a\x01\x6e\x0d\x0a\x20\x2a" + "\x20\x4f\x72\x69\x67\x69\x6e\x3a\x20\x25\x73\x20\x28\x25\x73\x29\x0d\x0a" // 609 SubInfoFidoNet + , "" // 610 SubInfoViewFileQ + , "\x0d\x0a\x01\x67\x01\x68\x44\x69\x72\x65\x63\x74\x6f\x72\x79\x20\x49\x6e\x66\x6f\x72\x6d\x61\x74\x69\x6f\x6e\x3a\x0d\x0a\x0d\x0a" + "\x01\x6e" // 611 DirInfoHdr + , "\x01\x6e\x01\x68\x01\x62\x4c\x6f\x6e\x67\x20\x4e\x61\x6d\x65\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20" + "\x01\x63\x25\x73\x0d\x0a" // 612 DirInfoLongName + , "\x01\x6e\x01\x68\x01\x62\x53\x68\x6f\x72\x74\x20\x4e\x61\x6d\x65\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20" + "\x01\x63\x25\x73\x0d\x0a" // 613 DirInfoShortName + , "\x01\x6e\x01\x68\x01\x62\x41\x6c\x6c\x6f\x77\x65\x64\x20\x46\x69\x6c\x65\x20\x45\x78\x74\x65\x6e\x73\x69\x6f\x6e\x73\x20\x3a\x20" + "\x01\x63\x25\x73\x0d\x0a" // 614 DirInfoAllowedExts + , "\x01\x6e\x01\x68\x01\x62\x4d\x61\x78\x69\x6d\x75\x6d\x20\x46\x69\x6c\x65\x73\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x20" + "\x01\x63\x25\x75\x0d\x0a" // 615 DirInfoMaxFiles + , "" // 616 DirInfoViewFileQ + , "\x01\x6e\x0d\x0a\x4e\x6f\x20\x4e\x65\x74\x4d\x61\x69\x6c\x20\x61\x6c\x6c\x6f\x77\x65\x64\x2e\x0d\x0a" // 617 NoNetMailAllowed + , "\x0d\x0a\x49\x74\x20\x77\x69\x6c\x6c\x20\x63\x6f\x73\x74\x20\x79\x6f\x75\x20\x25\x75\x20\x63\x72\x65\x64\x69\x74\x73\x20\x74\x6f" + "\x20\x73\x65\x6e\x64\x20\x4e\x65\x74\x4d\x61\x69\x6c\x2e\x20\x43\x6f\x6e\x74\x69\x6e\x75\x65" // 618 NetMailCostContinueQ + , "\x01\x6e\x01\x3f\x01\x6d\x4e\x65\x74\x4d\x61\x69\x6c\x20\x54\x6f\x3a\x20\x01\x68\x25\x73\x01\x6e\x01\x6d\x20\x28\x01\x68\x25\x73" + "\x01\x6e\x01\x6d\x29\x0d\x0a\x46\x72\x6f\x6d\x3a\x20\x01\x68\x25\x73\x01\x6e\x01\x6d\x20\x28\x01\x68\x25\x73\x01\x6e\x01\x6d\x29" + "\x0d\x0a" // 619 NetMailing + , "\x52\x65\x6d\x6f\x76\x65\x20\x74\x68\x69\x73\x20\x73\x75\x62\x2d\x62\x6f\x61\x72\x64\x20\x66\x72\x6f\x6d\x20\x79\x6f\x75\x72\x20" + "\x6e\x65\x77\x2d\x73\x63\x61\x6e\x20\x6c\x69\x73\x74" // 620 RemoveFromNewScanQ + , "\x0d\x0a\x7e\x53\x75\x62\x2d\x62\x6f\x61\x72\x64\x3a\x20\x40\x53\x55\x42\x40\x2c\x01\x5c\x20\x7e\x47\x72\x6f\x75\x70\x3a\x20\x40" + "\x47\x52\x50\x40\x2c\x20\x6f\x72\x20\x7e\x40\x41\x6c\x6c\x40\x3a\x20" // 621 SubGroupOrAll + , "\x0d\x0a\x7e\x44\x69\x72\x65\x63\x74\x6f\x72\x79\x3a\x20\x40\x44\x49\x52\x40\x2c\x01\x5c\x20\x7e\x4c\x69\x62\x72\x61\x72\x79\x3a" + "\x20\x40\x4c\x49\x42\x40\x2c\x20\x6f\x72\x20\x7e\x40\x41\x6c\x6c\x40\x3a\x20" // 622 DirLibOrAll + , "\x0d\x0a\x01\x5f\x01\x79\x01\x68\x45\x6e\x74\x65\x72\x20\x70\x61\x74\x68\x01\x5c\x3a\x20" // 623 EnterPath + , "\x01\x3f\x44\x69\x73\x70\x6c\x61\x79\x20\x65\x78\x74\x65\x6e\x64\x65\x64\x20\x66\x69\x6c\x65\x20\x69\x6e\x66\x6f\x72\x6d\x61\x74" + "\x69\x6f\x6e" // 624 DisplayExtendedFileInfoQ + , "\x0d\x0a\x44\x69\x73\x70\x6c\x61\x79\x20\x53\x75\x62\x6a\x65\x63\x74\x73\x20\x4f\x6e\x6c\x79" // 625 DisplaySubjectsOnlyQ + , "\x0d\x0a\x45\x63\x68\x6f\x20\x69\x73\x20\x6e\x6f\x77\x20\x25\x73\x20\x0d\x0a" // 626 EchoIsNow + , "\x0d\x0a\x01\x6e\x01\x79\x01\x68\x50\x72\x69\x76\x61\x74\x65\x20\x43\x68\x61\x74\x20\x2d\x20\x01\x62\x43\x74\x72\x6c\x2d\x43\x20" + "\x74\x6f\x20\x51\x75\x69\x74\x01\x6e\x0d\x0a\x0d\x0a" // 627 WelcomeToPrivateChat + , "\x0d\x0a\x01\x6e\x01\x67\x55\x70\x6c\x6f\x61\x64\x69\x6e\x67\x20\x01\x68\x25\x73\x2e\x52\x45\x50\x0d\x0a" // 628 UploadingREP + , "\x01\x6e\x01\x67\x52\x65\x63\x65\x69\x76\x65\x64\x20\x01\x6e\x01\x68\x25\x73\x01\x6e\x01\x67\x20\x66\x72\x6f\x6d\x20\x01\x68\x25" + "\x73\x01\x6e\x01\x67\x20\x76\x69\x61\x20\x51\x57\x4b\x2e\x0d\x0a" // 629 ReceivedFileViaQWK + , "\x01\x72\x01\x68\x01\x69\x0d\x51\x57\x4b\x20\x70\x61\x63\x6b\x65\x74\x20\x6d\x65\x73\x73\x61\x67\x65\x20\x6c\x69\x6d\x69\x74\x20" + "\x72\x65\x61\x63\x68\x65\x64\x2e\x01\x6e\x01\x68\x0d\x0a" // 630 QWKmsgLimitReached + , "\x0d\x0a\x01\x6e\x50\x72\x69\x76\x61\x74\x65\x20\x70\x6f\x73\x74\x73\x20\x6e\x6f\x74\x20\x61\x6c\x6c\x6f\x77\x65\x64\x20\x6f\x6e" + "\x20\x74\x68\x69\x73\x20\x73\x75\x62\x2e\x0d\x0a" // 631 PrivatePostsNotAllowed + , "\x01\x5f\x01\x77\x01\x68\x4c\x6f\x61\x64\x69\x6e\x67\x20\x6d\x65\x73\x73\x61\x67\x65\x20\x70\x6f\x69\x6e\x74\x65\x72\x73\x2e\x2e" + "\x01\x69\x2e\x01\x6e\x20" // 632 LoadingMsgPtrs + , "\x01\x5b\x01\x3e" // 633 LoadedMsgPtrs + , "\x0d\x0a\x51\x75\x6f\x74\x65\x20\x6f\x72\x69\x67\x69\x6e\x61\x6c\x20\x6d\x65\x73\x73\x61\x67\x65" // 634 QuoteMessageQ + , "\x0d\x0a\x01\x62\x01\x68\x4c\x69\x6e\x65\x20\x6e\x75\x6d\x62\x65\x72\x73\x20\x28\x23\x2c\x23\x29\x2c\x20\x52\x61\x6e\x67\x65\x20" + "\x28\x23\x2d\x23\x29\x2c\x01\x5c\x20\x01\x77\x7e\x4c\x01\x62\x69\x73\x74\x20\x6f\x72\x20\x5b\x25\x73\x5d\x3a\x20\x01\x77" // 635 QuoteLinesPrompt + , "\x0d\x0a\x01\x5f\x01\x63\x01\x68\x4d\x75\x6c\x74\x69\x6e\x6f\x64\x65\x20\x43\x68\x61\x74\x20\x43\x68\x61\x6e\x6e\x65\x6c\x73\x3a" + "\x0d\x0a\x0d\x0a" // 636 ChatChanLstHdr + , "\x01\x6e\x01\x63\x4e\x75\x6d\x20\x4e\x61\x6d\x65\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20" + "\x20\x20\x20\x20\x20\x43\x6f\x73\x74" // 637 ChatChanLstTitles + , "\x01\x68\xc4\xc4\xc4\x20\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\x20" + "\x20\x20\x20\xc4\xc4\xc4\xc4" // 638 ChatChanLstUnderline + , "\x01\x68\x01\x63\x25\x33\x75\x20\x01\x6e\x01\x63\x25\x2d\x32\x35\x2e\x32\x35\x73\x01\x68\x25\x38\x75" // 639 ChatChanLstFmt + , "\x0d\x0a\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x61\x63\x63\x65\x73\x73\x20\x74\x68\x61\x74\x20\x63\x68\x61\x6e\x6e\x65\x6c\x2e" + "\x0d\x0a" // 640 CantAccessThatChannel + , "\x0d\x0a\x59\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x66\x72\x6f\x6d\x20\x74\x68\x69\x73\x20\x64" + "\x69\x72\x65\x63\x74\x6f\x72\x79\x2e\x0d\x0a" // 641 CantDownloadFromDir + , "\x01\x5f\x01\x77\x01\x68\x53\x65\x61\x72\x63\x68\x69\x6e\x67\x20\x66\x6f\x72\x20\x64\x75\x70\x6c\x69\x63\x61\x74\x65\x73\x2e\x2e" + "\x01\x69\x2e\x01\x6e\x20" // 642 SearchingForDupes + , "\x01\x5b\x01\x3e" // 643 SearchedForDupes + , "\x01\x6e\x01\x68\x59\x6f\x75\x72\x20\x61\x63\x63\x6f\x75\x6e\x74\x20\x77\x69\x6c\x6c\x20\x65\x78\x70\x69\x72\x65\x20\x69\x6e\x20" + "\x01\x72\x01\x69\x25\x64\x01\x6e\x01\x68\x20\x64\x61\x79\x73\x2e\x0d\x0a" // 644 AccountWillExpireInNDays + , "\x01\x6e\x01\x72\x01\x68\x01\x69\x59\x6f\x75\x72\x20\x61\x63\x63\x6f\x75\x6e\x74\x20\x68\x61\x73\x20\x65\x78\x70\x69\x72\x65\x64" + "\x21\x01\x6e\x0d\x0a" // 645 AccountHasExpired + , "\x0d\x0a\x44\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x66\x69\x6c\x65\x73\x20\x69\x6e\x20\x62\x61\x74\x63\x68\x20\x71\x75\x65\x75\x65\x20" + "\x6e\x6f\x77" // 646 DownloadBatchQ + , "\x01\x5f\x01\x72\x01\x68\x0d\x0a\x57\x61\x69\x74\x69\x6e\x67\x20\x66\x6f\x72\x20\x53\x6c\x6f\x77\x20\x4d\x65\x64\x69\x61\x20\x44" + "\x65\x76\x69\x63\x65\x20\x23\x25\x75\x2e\x2e\x2e" // 647 WaitingForDeviceN + , "\x01\x6e\x01\x79\x01\x68\x25\x73\x01\x6e\x01\x63\x20\x73\x65\x6e\x74\x20\x79\x6f\x75\x20\x45\x2d\x6d\x61\x69\x6c\x2e\x0d\x0a" // 648 UserSentYouMail + , "\x01\x6e\x01\x79\x01\x68\x25\x73\x01\x6e\x01\x63\x20\x73\x65\x6e\x74\x20\x79\x6f\x75\x20\x61\x20\x66\x69\x6c\x65\x2e\x0d\x0a" // 649 UserSentYouFile + , "\x01\x6e\x01\x79\x01\x68\x25\x73\x01\x6e\x01\x63\x20\x72\x65\x61\x64\x20\x79\x6f\x75\x72\x20\x45\x2d\x6d\x61\x69\x6c\x20\x6f\x6e" + "\x20\x25\x73\x2e\x0d\x0a" // 650 UserReadYourMail + , "\x01\x5f\x01\x77\x01\x68\x4e\x6f\x64\x65\x20\x25\x32\x64\x3a\x20\x01\x67\x25\x73\x01\x6e\x01\x67\x20\x72\x65\x61\x64\x20\x79\x6f" + "\x75\x72\x20\x45\x2d\x6d\x61\x69\x6c\x2e\x0d\x0a" // 651 UserReadYourMailNodeMsg + , "\x0d\x0a\x40\x57\x68\x69\x63\x68\x40\x2c\x20\x7e\x40\x51\x75\x69\x74\x40\x2c\x20\x6f\x72\x20\x5b\x25\x75\x5d\x3a\x20" // 652 JoinWhichGrp + , "\x0d\x0a\x40\x57\x68\x69\x63\x68\x40\x2c\x20\x7e\x40\x51\x75\x69\x74\x40\x2c\x20\x6f\x72\x20\x5b\x25\x75\x5d\x3a\x20" // 653 JoinWhichSub + , "\x0d\x0a\x40\x57\x68\x69\x63\x68\x40\x2c\x20\x7e\x40\x51\x75\x69\x74\x40\x2c\x20\x6f\x72\x20\x5b\x25\x75\x5d\x3a\x20" // 654 JoinWhichLib + , "\x0d\x0a\x40\x57\x68\x69\x63\x68\x40\x2c\x20\x7e\x40\x51\x75\x69\x74\x40\x2c\x20\x6f\x72\x20\x5b\x25\x75\x5d\x3a\x20" // 655 JoinWhichDir + , "\x01\x6c\x01\x2d\x01\x67\x44\x69\x72\x65\x63\x74\x6f\x72\x69\x65\x73\x20\x6f\x66\x20\x01\x68\x25\x73\x3a\x0d\x0a\x0d\x0a\x01\x68" + "" // 656 CfgDirLstHdr + , "\x20\x01\x6e\x01\x67\x28\x01\x68\x25\x64\x01\x6e\x01\x67\x29\x20\x25\x73\x01\x68\x0d\x0a" // 657 CfgDirLstFmt + , "\x01\x6c\x01\x5f\x01\x67\x01\x68\x46\x69\x6c\x65\x20\x4c\x69\x62\x72\x61\x72\x69\x65\x73\x3a\x0d\x0a\x0d\x0a" // 658 CfgLibLstHdr + , "\x01\x6e\x01\x67\x28\x01\x68\x25\x64\x01\x6e\x01\x67\x29\x20\x25\x73\x01\x68\x0d\x0a" // 659 CfgLibLstFmt + , "\x01\x5f\x01\x63\x01\x68\x4c\x69\x73\x74\x69\x6e\x67\x20\x01\x6e\x01\x63\x28\x01\x68\x25\x75\x01\x6e\x01\x63\x29\x20\x25\x73\x20" + "\x28\x01\x68\x25\x75\x01\x6e\x01\x63\x29\x20\x25\x73\x20\x28\x01\x68\x01\x60\x3f\x01\x6e\x01\x63\x3d\x4d\x65\x6e\x75\x29\x20\x28" + "\x25\x35\x75\x08\x08\x08\x08\x08\x01\x68\x25\x75\x01\x6e\x01\x63\x20\x46\x69\x6c\x65\x73\x01\x6e\x01\x63\x29\x3a\x20\x01\x6e\x01" + "\x7e" // 660 BatchFlagPrompt + , "\x01\x6e\x01\x3e\x01\x71\x01\x6c\x01\x34\x20\x01\x68\x01\x79\x5b\x01\x77\x01\x7e\x44\x01\x79\x5d\x6f\x77\x6e\x6c\x6f\x61\x64\x20" + "\x20\x01\x68\x01\x79\x5b\x01\x77\x01\x7e\x42\x01\x79\x5d\x61\x74\x63\x68\x20\x20\x5b\x01\x77\x01\x7e\x56\x01\x79\x5d\x69\x65\x77" + "\x20\x43\x6f\x6e\x74\x65\x6e\x74\x20\x20\x5b\x01\x77\x01\x7e\x45\x01\x79\x5d\x78\x74\x65\x6e\x64\x65\x64\x20\x49\x6e\x66\x6f\x20" + "\x20\x5b\x01\x77\x01\x7e\x50\x01\x79\x5d\x72\x65\x76\x69\x6f\x75\x73\x20\x50\x61\x67\x65\x20\x20\x5b\x01\x77\x01\x7e\x51\x01\x79" + "\x5d\x75\x69\x74\x01\x3e\x01\x6e\x0d\x0a" // 661 FileListBatchCommands + , "\x01\x3f\x44\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x61\x74\x74\x61\x63\x68\x65\x64\x20\x66\x69\x6c\x65\x01\x5c\x3a\x20\x01\x77\x25\x73" + "\x01\x62\x20\x28\x25\x73\x20\x62\x79\x74\x65\x73\x29" // 662 DownloadAttachedFileQ + , "\x0d\x0a\x0d\x0a\x01\x6e\x54\x69\x6d\x65\x20\x6c\x65\x66\x74\x20\x3a\x20\x25\x31\x33\x75\x0d\x0a" // 663 FreeMinLeft + , "\x01\x62\x01\x68\x0d\x0a\x54\x69\x6d\x65\x20\x6c\x65\x66\x74\x20\x74\x6f\x20\x64\x65\x70\x6f\x73\x69\x74\x20\x69\x6e\x20\x6d\x69" + "\x6e\x75\x74\x65\x20\x62\x61\x6e\x6b\x01\x5c\x20\x28\x01\x77\x25\x75\x20\x4d\x61\x78\x01\x62\x29\x3a\x20\x01\x6e" // 664 FreeMinToDeposit + , "\x0d\x0a\x45\x2d\x6d\x61\x69\x6c\x20\x66\x69\x6c\x65\x20\x61\x74\x74\x61\x63\x68\x6d\x65\x6e\x74\x73\x20\x6e\x6f\x74\x20\x61\x6c" + "\x6c\x6f\x77\x65\x64\x2e\x0d\x0a" // 665 EmailFilesNotAllowed + , "\x0d\x0a\x01\x6e\x53\x6f\x72\x72\x79\x2c\x20\x79\x6f\x75\x20\x68\x61\x76\x65\x20\x69\x6e\x73\x75\x66\x66\x69\x63\x69\x65\x6e\x74" + "\x20\x61\x63\x63\x65\x73\x73\x20\x74\x6f\x20\x72\x75\x6e\x20\x74\x68\x61\x74\x20\x70\x72\x6f\x67\x72\x61\x6d\x2e\x0d\x0a\x0d\x0a" + "\x01\x70" // 666 CantRunThatProgram + , "\x01\x6e\x01\x68\x0d\x0a\x07\x0d\x0a\x59\x6f\x75\x20\x6f\x6e\x6c\x79\x20\x68\x61\x76\x65\x20\x01\x72\x01\x69\x25\x75\x01\x6e\x01" + "\x68\x20\x6d\x69\x6e\x75\x74\x65\x25\x73\x20\x6c\x65\x66\x74\x2e\x0d\x0a\x0d\x0a" // 667 OnlyXminutesLeft + , "\x01\x5b\x01\x6e\x01\x72\x01\x68\x01\x69\x07\x07\x40\x4e\x41\x4d\x45\x40\x21\x20\x01\x6e\x01\x68\x41\x72\x65\x20\x79\x6f\x75\x20" + "\x72\x65\x61\x6c\x6c\x79\x20\x74\x68\x65\x72\x65\x3f\x20\x01\x6e\x01\x3e" // 668 AreYouThere + , "\x4c\x65\x76\x65\x6c\x20\x25\x75" // 669 NoAccessLevel + , "\x41\x67\x65\x20\x25\x75" // 670 NoAccessAge + , "\x42\x50\x53\x20\x25\x75" // 671 NoAccessBPS + , "\x43\x72\x65\x64\x69\x74\x73\x20\x25\x75" // 672 NoAccessCredit + , "\x4e\x6f\x64\x65\x20\x25\x75" // 673 NoAccessNode + , "\x55\x73\x65\x72\x20\x25\x75" // 674 NoAccessUser + , "\x44\x61\x79\x73\x20\x74\x69\x6c\x6c\x20\x65\x78\x70\x69\x72\x65\x20\x25\x75" // 675 NoAccessExpire + , "\x54\x69\x6d\x65\x20\x4c\x65\x66\x74\x20\x25\x75" // 676 NoAccessTimeLeft + , "\x54\x69\x6d\x65\x20\x55\x73\x65\x64\x20\x25\x75" // 677 NoAccessTimeUsed + , "\x54\x69\x6d\x65\x20\x6f\x66\x20\x64\x61\x79\x20\x25\x30\x32\x64\x3a\x25\x30\x32\x64" // 678 NoAccessTime + , "\x50\x6f\x73\x74\x2f\x43\x61\x6c\x6c\x20\x52\x61\x74\x69\x6f\x20\x25\x75" // 679 NoAccessPCR + , "\x55\x70\x6c\x6f\x61\x64\x2f\x44\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x52\x61\x74\x69\x6f\x20\x25\x75" // 680 NoAccessUDR + , "\x55\x70\x6c\x6f\x61\x64\x2f\x44\x6f\x77\x6e\x6c\x6f\x61\x64\x20\x46\x69\x6c\x65\x20\x52\x61\x74\x69\x6f\x20\x25\x75" // 681 NoAccessUDFR + , "\x46\x6c\x61\x67\x20\x31\x20\x25\x63" // 682 NoAccessFlag1 + , "\x46\x6c\x61\x67\x20\x32\x20\x25\x63" // 683 NoAccessFlag2 + , "\x46\x6c\x61\x67\x20\x33\x20\x25\x63" // 684 NoAccessFlag3 + , "\x46\x6c\x61\x67\x20\x34\x20\x25\x63" // 685 NoAccessFlag4 + , "\x53\x65\x78\x20\x25\x63" // 686 NoAccessSex + , "\x45\x78\x65\x6d\x70\x74\x69\x6f\x6e\x20\x25\x63" // 687 NoAccessExempt + , "\x52\x65\x73\x74\x72\x69\x63\x74\x69\x6f\x6e\x20\x25\x63" // 688 NoAccessRest + , "\x44\x61\x79\x20\x6f\x66\x20\x77\x65\x65\x6b\x20\x25\x73" // 689 NoAccessDay + , "\x47\x72\x6f\x75\x70\x20\x25\x75" // 690 NoAccessGroup + , "\x53\x75\x62\x2d\x62\x6f\x61\x72\x64\x20\x25\x75" // 691 NoAccessSub + , "\x4c\x69\x62\x72\x61\x72\x79\x20\x25\x75" // 692 NoAccessLib + , "\x44\x69\x72\x65\x63\x74\x6f\x72\x79\x20\x25\x75" // 693 NoAccessDir + , "\x01\x6e\x01\x68\x4e\x6f\x64\x65\x20\x53\x74\x61\x74\x75\x73\x0d\x0a\x01\x63\xc4\xc4\xc4\xc4\x20\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4" + "\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\x0d\x0a" // 694 NodeLstHdr + , "" // 695 NodeActionMainMenu + , "" // 696 NodeActionReadingMsgs + , "" // 697 NodeActionReadingMail + , "" // 698 NodeActionSendingMail + , "" // 699 NodeActionReadingTextFiles + , "" // 700 NodeActionReadingSentMail + , "" // 701 NodeActionPostingMsg + , "" // 702 NodeActionAutoMsg + , "" // 703 NodeActionXtrnMenu + , "" // 704 NodeActionSettings + , "" // 705 NodeActionFileMenu + , "" // 706 NodeActionDownloadingFile + , "" // 707 NodeActionUploadingFile + , "" // 708 NodeActionBiXferFile + , "" // 709 NodeActionListingFiles + , "" // 710 NodeActionLoggingOn + , "" // 711 NodeActionLocalChat + , "" // 712 NodeActionMultiChat + , "" // 713 NodeActionGuruChat + , "" // 714 NodeActionChatMenu + , "" // 715 NodeActionSysop + , "" // 716 NodeActionQWKmenu + , "" // 717 NodeActionPrivateChat + , "" // 718 NodeActionPagingNode + , "" // 719 NodeActionRetrievingFile + , "" // 720 NodeActionCustom + , "\x56\x69\x65\x77\x20\x73\x69\x67\x6e\x61\x74\x75\x72\x65" // 721 ViewSignatureQ + , "\x44\x65\x6c\x65\x74\x65\x20\x73\x69\x67\x6e\x61\x74\x75\x72\x65" // 722 DeleteSignatureQ + , "\x43\x72\x65\x61\x74\x65\x2f\x45\x64\x69\x74\x20\x73\x69\x67\x6e\x61\x74\x75\x72\x65" // 723 CreateEditSignatureQ + , "\x53\x70\x69\x6e\x6e\x69\x6e\x67\x20\x63\x75\x72\x73\x6f\x72\x20\x6f\x6e\x20\x70\x61\x75\x73\x65\x20\x70\x72\x6f\x6d\x70\x74\x73" + "" // 724 SpinningCursorOnPauseQ + , "\x55\x73\x65\x20\x61\x6e\x20\x65\x78\x74\x65\x72\x6e\x61\x6c\x20\x65\x64\x69\x74\x6f\x72" // 725 UseExternalEditorQ + , "\x45\x78\x74\x65\x72\x6e\x61\x6c\x20\x45\x64\x69\x74\x6f\x72" // 726 ExternalEditorHeading + , "\x43\x6f\x6d\x6d\x61\x6e\x64\x20\x53\x68\x65\x6c\x6c" // 727 CommandShellHeading + , "\x41\x72\x63\x68\x69\x76\x65\x20\x54\x79\x70\x65" // 728 ArchiveTypeHeading + , "\x56\x61\x6c\x69\x64\x61\x74\x65\x20\x6d\x65\x73\x73\x61\x67\x65\x20\x23\x25\x75\x20\x27\x25\x73\x27" // 729 ValidatePostQ + , "\x57\x61\x69\x74\x69\x6e\x67\x20\x66\x6f\x72\x20\x63\x6f\x6e\x6e\x65\x63\x74\x69\x6f\x6e" // 730 NodeStatusWaitingForCall + , "\x41\x74\x20\x6c\x6f\x67\x69\x6e\x20\x70\x72\x6f\x6d\x70\x74" // 731 NodeStatusLogon + , "\x4e\x65\x77\x20\x75\x73\x65\x72\x20\x61\x70\x70\x6c\x79\x69\x6e\x67\x20\x66\x6f\x72\x20\x61\x63\x63\x65\x73\x73" // 732 NodeStatusNewUser + , "\x4f\x66\x66\x6c\x69\x6e\x65" // 733 NodeStatusOffline + , "\x57\x61\x69\x74\x69\x6e\x67\x20\x66\x6f\x72\x20\x61\x6c\x6c\x20\x6e\x6f\x64\x65\x73\x20\x74\x6f\x20\x62\x65\x63\x6f\x6d\x65\x20" + "\x69\x6e\x61\x63\x74\x69\x76\x65" // 734 NodeStatusEventWaiting + , "\x52\x75\x6e\x6e\x69\x6e\x67\x20\x65\x78\x74\x65\x72\x6e\x61\x6c\x20\x65\x76\x65\x6e\x74" // 735 NodeStatusEventRunning + , "\x57\x61\x69\x74\x69\x6e\x67\x20\x66\x6f\x72\x20\x6e\x6f\x64\x65\x20\x25\x75\x20\x74\x6f\x20\x66\x69\x6e\x69\x73\x68\x20\x65\x78" + "\x74\x65\x72\x6e\x61\x6c\x20\x65\x76\x65\x6e\x74" // 736 NodeStatusEventLimbo + , "\x20\x76\x69\x61\x20\x74\x65\x6c\x6e\x65\x74" // 737 NodeConnectionTelnet + , "\x20\x76\x69\x61\x20\x72\x6c\x6f\x67\x69\x6e" // 738 NodeConnectionRLogin + , "\x20\x76\x69\x61\x20\x73\x73\x68" // 739 NodeConnectionSSH + , "\x20\x61\x74\x20\x25\x75\x62\x70\x73" // 740 NodeConnectionModem + , "\x01\x68\x01\x62\x51\x57\x4b\x20\x53\x65\x74\x74\x69\x6e\x67\x73\x20\x66\x6f\x72\x20\x01\x77\x25\x73\x20\x23\x25\x75\x01\x62\x3a" + "\x01\x6e\x0d\x0a\x0d\x0a" // 741 QWKSettingsHdr + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x41\x01\x6e\x01\x62\x5d\x20\x01\x68\x43\x74\x72\x6c\x2d\x41\x20\x43\x6f\x6c\x6f\x72\x20\x43" + "\x6f\x64\x65\x73\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 742 QWKSettingsCtrlA + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x54\x01\x6e\x01\x62\x5d\x20\x01\x68\x41\x72\x63\x68\x69\x76\x65\x20\x54\x79\x70\x65\x20\x20" + "\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 743 QWKSettingsArchive + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x45\x01\x6e\x01\x62\x5d\x20\x01\x68\x49\x6e\x63\x6c\x75\x64\x65\x20\x45\x2d\x6d\x61\x69\x6c" + "\x20\x4d\x65\x73\x73\x61\x67\x65\x73\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 744 QWKSettingsEmail + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x49\x01\x6e\x01\x62\x5d\x20\x01\x68\x49\x6e\x63\x6c\x75\x64\x65\x20\x46\x69\x6c\x65\x20\x41" + "\x74\x74\x61\x63\x68\x6d\x65\x6e\x74\x73\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 745 QWKSettingsAttach + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x44\x01\x6e\x01\x62\x5d\x20\x01\x68\x44\x65\x6c\x65\x74\x65\x20\x20\x45\x2d\x6d\x61\x69\x6c" + "\x20\x41\x75\x74\x6f\x6d\x61\x74\x69\x63\x61\x6c\x6c\x79\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 746 QWKSettingsDeleteEmail + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x46\x01\x6e\x01\x62\x5d\x20\x01\x68\x49\x6e\x63\x6c\x75\x64\x65\x20\x4e\x65\x77\x20\x46\x69" + "\x6c\x65\x73\x20\x4c\x69\x73\x74\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 747 QWKSettingsNewFilesList + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x4e\x01\x6e\x01\x62\x5d\x20\x01\x68\x49\x6e\x63\x6c\x75\x64\x65\x20\x49\x6e\x64\x65\x78\x20" + "\x46\x69\x6c\x65\x73\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 748 QWKSettingsIndex + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x43\x01\x6e\x01\x62\x5d\x20\x01\x68\x49\x6e\x63\x6c\x75\x64\x65\x20\x43\x6f\x6e\x74\x72\x6f" + "\x6c\x20\x46\x69\x6c\x65\x73\x20\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 749 QWKSettingsControl + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x48\x01\x6e\x01\x62\x5d\x20\x01\x68\x49\x6e\x63\x6c\x75\x64\x65\x20\x48\x45\x41\x44\x45\x52" + "\x53\x2e\x44\x41\x54\x20\x46\x69\x6c\x65\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 750 QWKSettingsHeaders + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x59\x01\x6e\x01\x62\x5d\x20\x01\x68\x49\x6e\x63\x6c\x75\x64\x65\x20\x4d\x65\x73\x73\x61\x67" + "\x65\x73\x20\x66\x72\x6f\x6d\x20\x59\x6f\x75\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 751 QWKSettingsBySelf + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x5a\x01\x6e\x01\x62\x5d\x20\x01\x68\x49\x6e\x63\x6c\x75\x64\x65\x20\x54\x69\x6d\x65\x20\x5a" + "\x6f\x6e\x65\x20\x28\x40\x54\x5a\x29\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 752 QWKSettingsTimeZone + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x50\x01\x6e\x01\x62\x5d\x20\x01\x68\x49\x6e\x63\x6c\x75\x64\x65\x20\x4d\x65\x73\x73\x61\x67" + "\x65\x20\x50\x61\x74\x68\x20\x28\x40\x56\x49\x41\x29\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 753 QWKSettingsVIA + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x4d\x01\x6e\x01\x62\x5d\x20\x01\x68\x49\x6e\x63\x6c\x75\x64\x65\x20\x4d\x65\x73\x73\x61\x67" + "\x65\x2f\x52\x65\x70\x6c\x79\x20\x49\x44\x73\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 754 QWKSettingsMsgID + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x58\x01\x6e\x01\x62\x5d\x20\x01\x68\x45\x78\x74\x65\x6e\x64\x65\x64\x20\x28\x51\x57\x4b\x45" + "\x29\x20\x50\x61\x63\x6b\x65\x74\x20\x46\x6f\x72\x6d\x61\x74\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 755 QWKSettingsExtended + , "\x0d\x0a\x01\x6e\x01\x68\x01\x62\x40\x57\x68\x69\x63\x68\x40\x20\x6f\x72\x20\x5b\x01\x77\x51\x01\x62\x5d\x75\x69\x74\x3a\x20\x01" + "\x63" // 756 QWKSettingsWhich + , "\x01\x6e\x0d\x0a\x53\x6f\x72\x72\x79\x2c\x20\x79\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x65\x64\x69\x74\x20\x74\x68\x69\x73\x20\x6d" + "\x65\x73\x73\x61\x67\x65\x2e\x0d\x0a" // 757 CantEditMsg + , "\x01\x6e\x0d\x0a\x53\x6f\x72\x72\x79\x2c\x20\x79\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x64\x65\x6c\x65\x74\x65\x20\x6d\x65\x73\x73" + "\x61\x67\x65\x20\x23\x25\x75\x2e\x0d\x0a" // 758 CantDeleteMsg + , "\x01\x6e\x0d\x0a\x53\x6f\x72\x72\x79\x2c\x20\x79\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x72\x65\x61\x64\x20\x6d\x65\x73\x73\x61\x67" + "\x65\x73\x20\x6f\x6e\x20\x25\x73\x20\x25\x73\x0d\x0a" // 759 CantReadSub + , "\x0d\x53\x6f\x72\x72\x79\x2c\x20\x79\x6f\x75\x20\x63\x61\x6e\x27\x74\x20\x70\x6f\x73\x74\x20\x74\x68\x61\x74\x20\x6d\x65\x73\x73" + "\x61\x67\x65\x2e\x01\x5c\x20\x52\x65\x61\x73\x6f\x6e\x3a\x20\x25\x73\x0d\x0a" // 760 CantPostMsg + , "\x0d\x0a\x01\x79\x01\x68\x4f\x70\x65\x72\x61\x74\x6f\x72\x3a\x20\x01\x77" // 761 OperatorPrompt + , "\x41\x64\x64\x20\x74\x68\x69\x73\x20\x73\x75\x62\x2d\x62\x6f\x61\x72\x64\x20\x74\x6f\x20\x79\x6f\x75\x72\x20\x6e\x65\x77\x2d\x73" + "\x63\x61\x6e\x20\x6c\x69\x73\x74" // 762 AddSubToNewScanQ + , "\x01\x6e\x01\x72\x01\x69\x57\x41\x52\x4e\x49\x4e\x47\x3a\x20\x59\x6f\x75\x20\x61\x72\x65\x20\x72\x65\x61\x64\x69\x6e\x67\x20\x6d" + "\x65\x73\x73\x61\x67\x65\x73\x01\x5c\x20\x70\x61\x73\x74\x20\x74\x68\x65\x20\x6c\x61\x73\x74\x20\x75\x6e\x76\x61\x6c\x69\x64\x61" + "\x74\x65\x64\x20\x6d\x65\x73\x73\x61\x67\x65\x20\x28\x25\x75\x29" // 763 UnvalidatedWarning + , "\x01\x6e\x01\x68\x53\x74\x61\x72\x74\x69\x6e\x67\x20\x6e\x65\x77\x20\x75\x73\x65\x72\x20\x72\x65\x67\x69\x73\x74\x72\x61\x74\x69" + "\x6f\x6e\x20\x40\x45\x4c\x4c\x49\x50\x53\x49\x53\x40\x0d\x0a" // 764 StartingNewUserRegistration + , "\x0d\x0a\x0d\x0a\x01\x6e\x43\x74\x72\x6c\x2d\x4b\x65\x79\x20\x43\x6f\x6d\x6d\x61\x6e\x64\x73\x20\x28\x64\x75\x72\x69\x6e\x67\x20" + "\x6c\x69\x6e\x65\x20\x69\x6e\x70\x75\x74\x29\x0d\x0a\x0d\x0a\x01\x68\x5e\x4b\x20\x20\x01\x6e\x54\x68\x69\x73\x20\x4d\x65\x6e\x75" + "\x0d\x0a\x01\x68\x5e\x43\x20\x20\x01\x6e\x41\x62\x6f\x72\x74\x20\x43\x75\x72\x72\x65\x6e\x74\x20\x4c\x69\x6e\x65\x20\x49\x6e\x70" + "\x75\x74\x0d\x0a\x01\x68\x5e\x42\x20\x20\x01\x6e\x4d\x6f\x76\x65\x20\x74\x6f\x20\x42\x65\x67\x69\x6e\x6e\x69\x6e\x67\x20\x6f\x66" + "\x20\x4c\x69\x6e\x65\x0d\x0a\x01\x68\x5e\x45\x20\x20\x01\x6e\x4d\x6f\x76\x65\x20\x74\x6f\x20\x45\x6e\x64\x20\x6f\x66\x20\x4c\x69" + "\x6e\x65\x0d\x0a\x01\x68\x5e\x46\x20\x20\x01\x6e\x4d\x6f\x76\x65\x20\x43\x75\x72\x73\x6f\x72\x20\x46\x6f\x72\x77\x61\x72\x64\x20" + "\x28\x74\x6f\x20\x74\x68\x65\x20\x72\x69\x67\x68\x74\x29\x0d\x0a\x01\x68\x5e\x4e\x20\x20\x01\x6e\x4d\x6f\x76\x65\x20\x74\x6f\x20" + "\x4e\x65\x78\x74\x20\x57\x6f\x72\x64\x20\x69\x6e\x20\x4c\x69\x6e\x65\x0d\x0a\x01\x68\x5e\x5c\x20\x20\x01\x6e\x4d\x6f\x76\x65\x20" + "\x74\x6f\x20\x50\x72\x65\x76\x69\x6f\x75\x73\x20\x57\x6f\x72\x64\x20\x69\x6e\x20\x4c\x69\x6e\x65\x0d\x0a\x01\x68\x5e\x44\x20\x20" + "\x01\x6e\x44\x65\x6c\x65\x74\x65\x20\x57\x6f\x72\x64\x20\x74\x6f\x20\x74\x68\x65\x20\x52\x69\x67\x68\x74\x0d\x0a\x01\x68\x5e\x57" + "\x20\x20\x01\x6e\x44\x65\x6c\x65\x74\x65\x20\x57\x6f\x72\x64\x20\x74\x6f\x20\x74\x68\x65\x20\x4c\x65\x66\x74\x0d\x0a\x01\x68\x5e" + "\x48\x20\x20\x01\x6e\x44\x65\x6c\x65\x74\x65\x20\x43\x68\x61\x72\x61\x63\x74\x65\x72\x20\x74\x6f\x20\x74\x68\x65\x20\x4c\x65\x66" + "\x74\x0d\x0a\x01\x68\x5e\x59\x20\x20\x01\x6e\x44\x65\x6c\x65\x74\x65\x20\x74\x6f\x20\x45\x6e\x64\x20\x6f\x66\x20\x4c\x69\x6e\x65" + "\x0d\x0a\x01\x68\x5e\x58\x20\x20\x01\x6e\x44\x65\x6c\x65\x74\x65\x20\x45\x6e\x74\x69\x72\x65\x20\x4c\x69\x6e\x65\x0d\x0a\x01\x68" + "\x5e\x4c\x20\x20\x01\x6e\x43\x65\x6e\x74\x65\x72\x20\x4c\x69\x6e\x65\x20\x28\x61\x6e\x64\x20\x63\x6f\x6d\x70\x6c\x65\x74\x65\x20" + "\x69\x6e\x70\x75\x74\x29\x0d\x0a\x01\x68\x5e\x5a\x20\x20\x01\x6e\x55\x6e\x64\x6f\x20\x28\x72\x65\x76\x65\x72\x74\x20\x65\x64\x69" + "\x74\x65\x64\x20\x4c\x69\x6e\x65\x29\x0d\x0a\x01\x68\x5e\x56\x20\x20\x01\x6e\x54\x6f\x67\x67\x6c\x65\x20\x49\x6e\x73\x65\x72\x74" + "\x2f\x4f\x76\x65\x72\x77\x72\x69\x74\x65\x20\x4d\x6f\x64\x65\x0d\x0a\x01\x68\x5e\x52\x20\x20\x01\x6e\x52\x65\x64\x72\x61\x77\x20" + "\x4c\x69\x6e\x65\x0d\x0a\x01\x68\x5e\x41\x20\x20\x01\x6e\x49\x6e\x73\x65\x72\x74\x20\x41\x74\x74\x72\x69\x62\x75\x74\x65\x20\x43" + "\x6f\x64\x65\x20\x28\x69\x66\x20\x61\x6c\x6c\x6f\x77\x65\x64\x29\x0d\x0a\x01\x68\x5e\x47\x20\x20\x01\x6e\x49\x6e\x73\x65\x72\x74" + "\x20\x42\x65\x65\x70\x20\x28\x69\x66\x20\x61\x6c\x6c\x6f\x77\x65\x64\x29\x0d\x0a\x01\x68\x5e\x55\x20\x20\x01\x6e\x4c\x69\x73\x74" + "\x20\x55\x73\x65\x72\x73\x20\x4f\x6e\x6c\x69\x6e\x65\x0d\x0a\x01\x68\x5e\x50\x20\x20\x01\x6e\x53\x65\x6e\x64\x20\x49\x6e\x73\x74" + "\x61\x6e\x74\x2d\x4d\x65\x73\x73\x61\x67\x65\x73\x20\x61\x6e\x64\x20\x54\x65\x6c\x65\x67\x72\x61\x6d\x73\x0d\x0a\x01\x68\x5e\x54" + "\x20\x20\x01\x6e\x54\x69\x6d\x65\x20\x49\x6e\x66\x6f\x72\x6d\x61\x74\x69\x6f\x6e\x0d\x0a\x0d\x0a" // 765 GetStrMenu + , "\x44\x69\x73\x70\x6c\x61\x79\x20\x55\x6e\x72\x65\x61\x64\x20\x4d\x65\x73\x73\x61\x67\x65\x73\x20\x4f\x6e\x6c\x79" // 766 DisplayUnreadMessagesOnlyQ + , "\x4e\x6f\x20\x6d\x65\x73\x73\x61\x67\x65\x73\x20\x66\x6f\x75\x6e\x64\x2e" // 767 NoMessagesFound + , "\x01\x6e\x01\x63\x49\x50\x20\x41\x64\x64\x72\x20\x20\x20\x3a\x20\x01\x68\x25\x73\x0d\x0a" // 768 UserIpAddr + , "\x73\x65\x63\x6f\x6e\x64\x73" // 769 Seconds + , "\x6d\x69\x6e\x75\x74\x65\x73" // 770 Minutes + , "\x68\x6f\x75\x72\x73" // 771 Hours + , "\x64\x61\x79\x73" // 772 Days + , "\x6d\x6f\x6e\x74\x68\x73" // 773 Months + , "\x79\x65\x61\x72\x73" // 774 Years + , "\x61\x67\x6f" // 775 InThePast + , "\x66\x72\x6f\x6d\x20\x6e\x6f\x77" // 776 InTheFuture + , "\x25\x73\x20\x25\x73\x20\x25\x73" // 777 AgeOfPostedItem + , "\x4c\x6f\x67\x67\x69\x6e\x67\x20\x6f\x75\x74\x20\x01\x68\x25\x73" // 778 NodeStatusLogout + , "\x0d\x0a\x01\x68\x01\x72\x53\x6f\x72\x72\x79\x2c\x20\x76\x6f\x74\x69\x6e\x67\x20\x69\x73\x20\x6e\x6f\x74\x20\x61\x6c\x6c\x6f\x77" + "\x65\x64\x20\x68\x65\x72\x65\x2e\x0d\x0a" // 779 VotingNotAllowed + , "\x0d\x0a\x01\x68\x01\x72\x53\x6f\x72\x72\x79\x2c\x20\x79\x6f\x75\x27\x76\x65\x20\x61\x6c\x72\x65\x61\x64\x79\x20\x76\x6f\x74\x65" + "\x64\x20\x6f\x6e\x20\x74\x68\x69\x73\x2e\x0d\x0a" // 780 VotedAlready + , "\x0d\x0a\x01\x68\x01\x72\x53\x6f\x72\x72\x79\x2c\x20\x79\x6f\x75\x27\x72\x65\x20\x6e\x6f\x74\x20\x61\x6c\x6c\x6f\x77\x65\x64\x20" + "\x74\x6f\x20\x76\x6f\x74\x65\x2e\x0d\x0a" // 781 R_Voting + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x56\x01\x6e\x01\x62\x5d\x20\x01\x68\x49\x6e\x63\x6c\x75\x64\x65\x20\x56\x4f\x54\x49\x4e\x47" + "\x2e\x44\x41\x54\x20\x46\x69\x6c\x65\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 782 QWKSettingsVoting + , "\x0d\x0a\x56\x6f\x74\x65\x20\x66\x6f\x72\x20\x6d\x65\x73\x73\x61\x67\x65\x3a\x20\x7e\x55\x70\x2c\x20\x7e\x44\x6f\x77\x6e\x2c\x20" + "\x6f\x72\x20\x7e\x40\x51\x75\x69\x74\x40\x3a\x20" // 783 VoteMsgUpDownOrQuit + , "\x0d\x0a\xb3\x20\x01\x62\x4d\x73\x67\x20\x01\x6e\x01\x62\x3a\x20\x01\x68\x01\x63\x56\x6f\x74\x65\x64\x20\x55\x70\x20\x25\x75\x20" + "\x74\x69\x6d\x65\x73\x25\x73\x20\x61\x6e\x64\x20\x44\x6f\x77\x6e\x20\x25\x75\x20\x74\x69\x6d\x65\x73\x25\x73\x20\x28\x53\x63\x6f" + "\x72\x65\x3a\x20\x25\x64\x29" // 784 MsgVotes + , "\x01\x6e\x01\x68\x4f\x6e\x20\x25\x73\x2c\x20\x69\x6e\x20\x01\x63\x25\x73\x20\x01\x6e\x01\x63\x25\x73\x0d\x0a\x01\x68\x01\x6d\x25" + "\x73\x20\x01\x63\x55\x70\x01\x6e\x01\x6d\x2d\x76\x6f\x74\x65\x64\x20\x79\x6f\x75\x72\x20\x6d\x65\x73\x73\x61\x67\x65\x3a\x20\x01" + "\x6e\x01\x68\x25\x73\x0d\x0a" // 785 MsgUpVoteNotice + , "\x01\x6e\x01\x68\x4f\x6e\x20\x25\x73\x2c\x20\x69\x6e\x20\x01\x63\x25\x73\x20\x01\x6e\x01\x63\x25\x73\x0d\x0a\x01\x68\x01\x6d\x25" + "\x73\x20\x01\x72\x44\x6f\x77\x6e\x01\x6e\x01\x6d\x2d\x76\x6f\x74\x65\x64\x20\x79\x6f\x75\x72\x20\x6d\x65\x73\x73\x61\x67\x65\x3a" + "\x20\x01\x6e\x01\x68\x25\x73\x0d\x0a" // 786 MsgDownVoteNotice + , "\x01\x6e\x01\x68\x4f\x6e\x20\x25\x73\x2c\x20\x69\x6e\x20\x01\x63\x25\x73\x20\x01\x6e\x01\x63\x25\x73\x0d\x0a\x01\x68\x01\x6d\x25" + "\x73\x20\x76\x6f\x74\x65\x64\x20\x69\x6e\x20\x79\x6f\x75\x72\x20\x70\x6f\x6c\x6c\x3a\x20\x01\x6e\x01\x68\x25\x73\x0d\x0a" // 787 PollVoteNotice + , "\x01\x6e\x01\x63\x01\x68\x25\x32\x75\x01\x6e\x01\x63\x3a\x20" // 788 PollAnswerNumber + , "\x25\x2d\x2a\x2e\x2a\x73\x20\x5b\x25\x2d\x34\x75\x20\x25\x33\x2e\x30\x66\x25\x25\x5d" // 789 PollAnswerFmt + , "\x20\xfb" // 790 PollAnswerChecked + , "\x01\x6e\x01\x6c\x01\x67\x42\x61\x6c\x6c\x6f\x74\x20\x66\x6f\x72\x20\x01\x68\x25\x73\x0d\x0a\x0d\x0a" // 791 BallotHdr + , "\x01\x6e\x01\x63\x01\x68\x25\x32\x75\x01\x6e\x01\x63\x3a\x20\x25\x2d\x2a\x2e\x2a\x73\x20\x01\x68\x25\x73\x0d\x0a" // 792 BallotAnswerFmt + , "\x0d\x0a\x54\x6f\x67\x67\x6c\x65\x20\x40\x57\x68\x69\x63\x68\x40\x20\x76\x6f\x74\x65\x20\x28\x75\x70\x20\x74\x6f\x20\x25\x75\x29" + "\x2c\x20\x7e\x40\x51\x75\x69\x74\x40\x20\x6f\x72\x20\x5b\x43\x61\x73\x74\x5d\x3a\x20" // 793 BallotVoteWhich + , "\x4f\x6e\x6c\x79" // 794 Only + , "\x01\x6e\x01\x68\x01\x63\x0d\x0a\x53\x50\x41\x4d\x20\x56\x69\x73\x69\x62\x69\x6c\x69\x74\x79\x20\x69\x73\x20\x6e\x6f\x77\x3a\x20" + "\x01\x77" // 795 SPAMVisibilityIsNow + , "\x0d\x0a\x54\x6f\x20\x76\x6f\x74\x65\x20\x69\x6e\x20\x74\x68\x69\x73\x20\x70\x6f\x6c\x6c\x2c\x20\x68\x69\x74\x20\x7e\x56\x20\x6e" + "\x6f\x77\x2e\x0d\x0a" // 796 VoteInThisPollNow + , "\x01\x6e\x01\x6d\x4d\x49\x4d\x45\x2d\x64\x65\x63\x6f\x64\x65\x64\x20\x25\x73\x20\x25\x73\x2d\x74\x65\x78\x74\x3a\x01\x6e\x0d\x0a" + "" // 797 MIMEDecodedPlainTextFmt + , "\x01\x2f\x40\x45\x58\x45\x43\x3a\x53\x48\x4f\x57\x4d\x53\x47\x41\x56\x41\x54\x41\x52\x40\x0d\x0a" // 798 MsgHdrBodySeparator + , "\x01\x2f\x0d\x0a\x40\x45\x58\x45\x43\x3a\x53\x48\x4f\x57\x46\x49\x4c\x45\x41\x56\x41\x54\x41\x52\x40" // 799 FileHdrDescSeparator + , "\x52\x65\x6d\x6f\x76\x65\x20\x66\x69\x6c\x65\x20\x66\x72\x6f\x6d\x20\x64\x61\x74\x61\x62\x61\x73\x65" // 800 RemoveFileQ + , "\x4f\x72\x69\x67\x69\x6e\x61\x74\x69\x6e\x67\x20\x41\x64\x64\x72\x65\x73\x73" // 801 OriginFidoAddr + , "\x01\x6e\x01\x68\xfb\x20\x01\x6d\x25\x2e\x37\x37\x73\x0d\x0a" // 802 VoteNoticeFmt + , "\x0d\x0a\x54\x61\x67\x20\x74\x68\x69\x73\x20\x6d\x65\x73\x73\x61\x67\x65" // 803 TagMessageQ + , "\x0d\x0a\x01\x68\x01\x79\x45\x6e\x74\x65\x72\x20\x28\x73\x70\x61\x63\x65\x2d\x73\x65\x70\x61\x72\x61\x74\x65\x64\x29\x20\x54\x61" + "\x67\x73\x01\x5c\x3a\x20" // 804 TagMessagePrompt + , "\x0d\x0a\xb3\x20\x01\x62\x54\x61\x67\x73\x01\x6e\x01\x62\x3a\x20\x01\x68\x01\x63\x25\x2e\x37\x30\x73" // 805 MsgTags + , "\x54\x65\x72\x6d\x69\x6e\x61\x6c\x20\x74\x79\x70\x65" // 806 NoAccessTerminal + , "\x0d\x0a" // 807 LongLineContinuationPrefix + , "\x53\x63\x61\x6e\x6e\x69\x6e\x67" // 808 Scanning + , "\x44\x6f\x6e\x65" // 809 Done + , "\x01\x5b\x01\x3e" // 810 Scanned + , "\x01\x6e\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x68\x01\x79\x48\x49\x54\x20" + "\x79\x6f\x75\x72\x20\x01\x77\x42\x41\x43\x4b\x53\x50\x41\x43\x45\x01\x79\x20\x6f\x72\x20\x44\x45\x4c\x45\x54\x45\x2d\x4c\x45\x46" + "\x54\x20\x6b\x65\x79\x3a\x20" // 811 HitYourBackspaceKey + , "\x01\x5c\x01\x6e\x01\x63\x43\x68\x61\x72\x61\x63\x74\x65\x72\x20\x01\x68\x25\x75\x20\x28\x25\x30\x32\x58\x68\x29\x20\x01\x6e\x01" + "\x63\x72\x65\x63\x65\x69\x76\x65\x64\x2e\x0d\x0a" // 812 CharacterReceivedFmt + , "\x01\x72\x01\x68\x21\x55\x6e\x73\x75\x70\x70\x6f\x72\x74\x65\x64\x20\x62\x61\x63\x6b\x73\x70\x61\x63\x65\x20\x6b\x65\x79\x3a\x20" + "\x01\x77\x25\x30\x32\x58\x68\x0d\x0a" // 813 InvalidBackspaceKeyFmt + , "" // 814 SwapDeleteKeyQ + , "\x01\x6e\x01\x68\x43\x42\x4d\x2f\x01\x79\x50\x45\x54\x53\x43\x49\x49\x01\x77\x20\x74\x65\x72\x6d\x69\x6e\x61\x6c\x20\x64\x65\x74" + "\x65\x63\x74\x65\x64\x2e\x0d\x0a" // 815 PetTerminalDetected + , "\x41\x72\x65\x20\x79\x6f\x75\x20\x75\x73\x69\x6e\x67\x20\x61\x20\x43\x42\x4d\x2f\x50\x45\x54\x53\x43\x49\x49\x20\x74\x65\x72\x6d" + "\x69\x6e\x61\x6c" // 816 PetTerminalQ + , "\x41\x75\x74\x6f\x20" // 817 TerminalAutoDetect + , "\x63\x6f\x6c\x75\x6d\x6e\x73" // 818 TerminalColumns + , "\x72\x6f\x77\x73" // 819 TerminalRows + , "\x28\x6d\x6f\x6e\x6f\x29\x20" // 820 TerminalMonochrome + , "\x28\x63\x6f\x6c\x6f\x72\x29\x20" // 821 TerminalColor + , "\x28\x69\x43\x45\x20\x63\x6f\x6c\x6f\x72\x29\x20" // 822 TerminalIceColor + , "\x44\x6f\x65\x73\x20\x79\x6f\x75\x72\x20\x74\x65\x72\x6d\x69\x6e\x61\x6c\x20\x64\x69\x73\x70\x6c\x61\x79\x20\x62\x72\x69\x67\x68" + "\x74\x20\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x20\x28\x69\x43\x45\x29\x20\x63\x6f\x6c\x6f\x72\x73\x0d\x0a\x20\x20\x20\x20\x01" + "\x6e\x28\x69\x2e\x65\x2e\x20\x01\x69\x01\x6b\x01\x33\x74\x68\x69\x73\x20\x74\x65\x78\x74\x01\x6e\x20\x69\x73\x20\x62\x6c\x61\x63" + "\x6b\x20\x6f\x6e\x20\x79\x65\x6c\x6c\x6f\x77\x20\x61\x6e\x64\x20\x4e\x4f\x54\x20\x42\x4c\x49\x4e\x4b\x49\x4e\x47\x29" // 823 IceColorTerminalQ + , "\x44\x6f\x65\x73\x20\x79\x6f\x75\x72\x20\x74\x65\x72\x6d\x69\x6e\x61\x6c\x20\x73\x75\x70\x70\x6f\x72\x74\x20\x55\x54\x46\x2d\x38" + "" // 824 Utf8TerminalQ + , "\x0d\x0a\xb3\x20\x01\x62\x43\x43\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x68\x01\x63\x25\x2e\x37\x30\x73" // 825 MsgCarbonCopyList + , "\x01\x6e\x01\x68\x4c\x6f\x67\x67\x69\x6e\x67\x20\x6f\x6e\x20\x74\x6f\x20\x40\x42\x42\x53\x40\x01\x5c\x20\x61\x73\x20\x40\x41\x4c" + "\x49\x41\x53\x40\x20\x40\x45\x4c\x4c\x49\x50\x53\x49\x53\x40\x01\x6e\x0d\x0a\x40\x52\x45\x53\x45\x54\x50\x41\x55\x53\x45\x40" // 826 LoggingOn + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x55\x01\x6e\x01\x62\x5d\x20\x01\x68\x49\x6e\x63\x6c\x75\x64\x65\x20\x55\x54\x46\x2d\x38\x20" + "\x43\x68\x61\x72\x61\x63\x74\x65\x72\x73\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 827 QWKSettingsUtf8 + , "\x01\x6e\x01\x6d\x01\x68\x25\x73\x01\x6e\x01\x6d\x25\x2e\x30\x73\x20\x70\x6f\x73\x74\x65\x64\x20\x74\x6f\x20\x79\x6f\x75\x20\x6f" + "\x6e\x20\x01\x68\x25\x73\x20\x01\x6e\x01\x6d\x25\x73\x0d\x0a" // 828 MsgPostedToYouVia + , "\x75\x6e\x6c\x69\x6d\x69\x74\x65\x64" // 829 Unlimited + , "\x20\x76\x69\x61\x20\x72\x61\x77" // 830 NodeConnectionRaw + , "\x44\x6f\x65\x73\x20\x79\x6f\x75\x72\x20\x74\x65\x72\x6d\x69\x6e\x61\x6c\x20\x73\x75\x70\x70\x6f\x72\x74\x20\x6d\x6f\x75\x73\x65" + "\x20\x72\x65\x70\x6f\x72\x74\x69\x6e\x67" // 831 MouseTerminalQ + , "\x28\x6d\x6f\x75\x73\x65\x29\x20" // 832 TerminalMouse + , "\x2d\x3e\x29\xb3\x28\x3c\x2d\x3c\x28\xb3\x29\x3e" // 833 SpinningCursor0 + , "\xb3\x2f\xc4\x5c" // 834 SpinningCursor1 + , "\xb3\x5c\xc4\x2f" // 835 SpinningCursor2 + , "\xb0\xb1\xb2\xdb\xb2\xb1" // 836 SpinningCursor3 + , "\x2d\x3d\xf0\x3d" // 837 SpinningCursor4 + , "\xda\xc0\xd9\xbf" // 838 SpinningCursor5 + , "\xda\xbf\xd9\xc0" // 839 SpinningCursor6 + , "\xdc\xde\xdf\xdd" // 840 SpinningCursor7 + , "\xdc\xdd\xdf\xde" // 841 SpinningCursor8 + , "\xfa\xf9\xfe\xf9" // 842 SpinningCursor9 + , "\x01\x5f\x01\x62\x01\x68\x5b\x01\x63\x40\x43\x48\x45\x43\x4b\x4d\x41\x52\x4b\x40\x01\x62\x5d\x20\x01\x79\x54\x65\x72\x6d\x69\x6e" + "\x61\x6c\x20\x63\x6f\x6c\x75\x6d\x6e\x73\x20\x5b\x01\x77\x41\x75\x74\x6f\x01\x79\x5d\x3a\x20\x01\x6e" // 843 HowManyColumns + , "\x01\x5b\x01\x6e\x01\x6d\x49\x6e\x74\x65\x72\x6e\x65\x74\x20\x6d\x61\x69\x6c\x20\x73\x65\x6e\x74\x20\x74\x6f\x20\x01\x68\x25\x73" + "\x01\x6e\x0d\x0a" // 844 InternetMailSent + , "\x01\x5b\x01\x6e\x01\x6d\x46\x69\x64\x6f\x20\x4e\x65\x74\x4d\x61\x69\x6c\x20\x73\x65\x6e\x74\x20\x74\x6f\x20\x01\x68\x25\x73\x20" + "\x40\x25\x73\x01\x6e\x0d\x0a" // 845 FidoNetMailSent + , "\x01\x5b\x01\x6e\x01\x6d\x51\x57\x4b\x20\x4e\x65\x74\x4d\x61\x69\x6c\x20\x73\x65\x6e\x74\x20\x74\x6f\x20\x01\x68\x25\x73\x20\x28" + "\x25\x73\x29\x01\x6e\x0d\x0a" // 846 QWKNetMailSent + , "\x4d\x65\x73\x73\x61\x67\x65\x73\x20\x74\x6f\x20\x79\x6f\x75\x20\x6f\x6e\x6c\x79" // 847 MsgsToYouOnlyQ + , "\x54\x6f\x20\x59\x6f\x75\x20\x4f\x6e\x6c\x79" // 848 ToYouOnly + , "\x0d\x0a\x45\x6e\x74\x65\x72\x20\x6e\x75\x6d\x62\x65\x72\x20\x6f\x66\x20\x6d\x65\x73\x73\x61\x67\x65\x73\x20\x66\x72\x6f\x6d\x20" + "\x65\x6e\x64\x2c\x01\x5c\x20\x7e\x44\x61\x74\x65\x2c\x20\x7e\x40\x51\x75\x69\x74\x40\x2c\x20\x6f\x72\x20\x5b\x4c\x61\x73\x74\x20" + "\x4d\x65\x73\x73\x61\x67\x65\x5d\x3a\x20" // 849 SetMsgPtrPrompt + , "\x44\x4c" // 850 DateLastKeys + , "\x44\x4c" // 851 DirLibKeys + , "\x53\x47" // 852 SubGroupKeys + , "\x41" // 853 Unused853 + , "\x41\x6c\x6c" // 854 All + , "\x4c\x69\x73\x74" // 855 List + , "\x25\x2e\x30\x73\x01\x6e\x01\x6d\x4e\x65\x77\x20\x65\x2d\x6d\x61\x69\x6c\x20\x66\x72\x6f\x6d\x20\x01\x68\x25\x73\x20\x01\x6e\x3c" + "\x01\x68\x25\x73\x01\x6e\x3e\x0d\x0a" // 856 InternetMailReceived + , "\x01\x6e\x01\x6d\x61\x6e\x64\x20\x69\x74\x20\x77\x61\x73\x20\x61\x75\x74\x6f\x6d\x61\x74\x69\x63\x61\x6c\x6c\x79\x20\x66\x6f\x72" + "\x77\x61\x72\x64\x65\x64\x20\x74\x6f\x01\x5c\x3a\x20\x01\x68\x25\x73\x01\x6e\x0d\x0a" // 857 InternetMailForwarded + , "\x25\x2e\x30\x73\x01\x6e\x01\x68\x01\x6d\x25\x73\x20\x01\x6e\x01\x6d\x73\x65\x6e\x74\x20\x79\x6f\x75\x20\x4e\x65\x74\x4d\x61\x69" + "\x6c\x25\x73\x01\x5c\x20\x66\x72\x6f\x6d\x20\x01\x68\x25\x73\x01\x6e\x0d\x0a" // 858 FidoNetMailReceived + , "\x20\x77\x69\x74\x68\x20\x61\x74\x74\x61\x63\x68\x6d\x65\x6e\x74" // 859 WithAttachment + , "\x25\x2e\x30\x73\x01\x6e\x01\x68\x01\x6d\x25\x73\x20\x01\x6e\x01\x6d\x73\x65\x6e\x74\x20\x79\x6f\x75\x20\x45\x63\x68\x6f\x4d\x61" + "\x69\x6c\x20\x6f\x6e\x20\x01\x68\x25\x73\x20\x01\x6e\x01\x6d\x25\x73\x01\x6e\x0d\x0a" // 860 FidoEchoMailReceived + , "\x01\x5f\x01\x77\x01\x68\x43\x61\x6c\x63\x75\x6c\x61\x74\x69\x6e\x67\x20\x66\x69\x6c\x65\x27\x73\x20\x68\x61\x73\x68\x20\x76\x61" + "\x6c\x75\x65\x73\x20\x40\x45\x4c\x4c\x49\x50\x53\x49\x53\x40\x01\x6e" // 861 HashingFile + , "\x01\x5b\x01\x3e" // 862 HashedFile + , "\x4e\x65\x77\x20\x55\x73\x65\x72\x20\x56\x61\x6c\x69\x64\x61\x74\x69\x6f\x6e" // 863 NewUserValEmailSubj + , "\x07\x07\x07" // 864 InactivityAlert + , "\x4e\x6f\x6e\x65" // 865 None + , "\x57\x68\x69\x63\x68" // 866 Which + , "\x4e\x65\x78\x74" // 867 Next + , "\x50\x72\x65\x76" // 868 Previous + , "\x51\x75\x69\x74" // 869 Quit + , "\x4c\x61\x6e\x67\x75\x61\x67\x65" // 870 Language + , "\x45\x6e\x67\x6c\x69\x73\x68" // 871 LANG + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x49\x01\x6e\x01\x62\x5d\x20\x01\x68\x25\x2d\x32\x39\x73\x01\x6e\x01\x62\x01\x5c\x3a\x20\x01" + "\x63\x25\x73\x0d\x0a" // 872 UserDefaultsLanguage + , "\x2a" // 873 PasswordChar + , "\x20\x76\x69\x61\x20\x73\x66\x74\x70" // 874 NodeConnectionSFTP + , "\x01\x6e\x01\x62\x5b\x01\x68\x01\x77\x57\x01\x6e\x01\x62\x5d\x20\x01\x68\x57\x6f\x72\x64\x2d\x77\x72\x61\x70\x20\x4d\x65\x73\x73" + "\x61\x67\x65\x20\x54\x65\x78\x74\x20\x20\x20\x20\x20\x20\x20\x01\x6e\x01\x62\x3a\x20\x01\x63\x25\x73\x0d\x0a" // 875 QWKSettingsWrapText + , "\x01\x2f\x55\x6e\x6b\x6e\x6f\x77\x6e\x20\x75\x70\x6c\x6f\x61\x64\x65\x72\x20\x28\x25\x73\x29\x20\x6f\x66\x20\x66\x69\x6c\x65\x01" + "\x5c\x3a\x20\x25\x73" // 876 UnknownUploader + , "\x46\x52\x45\x45" // 877 FREE + , "\x53\x75\x6e" // 878 Sun + , "\x4d\x6f\x6e" // 879 Mon + , "\x54\x75\x65" // 880 Tue + , "\x57\x65\x64" // 881 Wed + , "\x54\x68\x75" // 882 Thu + , "\x46\x72\x69" // 883 Fri + , "\x53\x61\x74" // 884 Sat + , "\x4a\x61\x6e" // 885 Jan + , "\x46\x65\x62" // 886 Feb + , "\x4d\x61\x72" // 887 Mar + , "\x41\x70\x72" // 888 Apr + , "\x4d\x61\x79" // 889 May + , "\x4a\x75\x6e" // 890 Jun + , "\x4a\x75\x6c" // 891 Jul + , "\x41\x75\x67" // 892 Aug + , "\x53\x65\x70" // 893 Sep + , "\x4f\x63\x74" // 894 Oct + , "\x4e\x6f\x76" // 895 Nov + , "\x44\x65\x63" // 896 Dec + , "\x07\x40\x41\x4c\x49\x41\x53\x40\x20\x70\x61\x67\x65\x64\x20\x79\x6f\x75\x20\x74\x6f\x20\x63\x68\x61\x74\x20\x66\x72\x6f\x6d\x20" + "\x6e\x6f\x64\x65\x20\x40\x4e\x4f\x44\x45\x40\x07" // 897 SysopPageNotification + , "\x61\x74\x20\x6d\x61\x69\x6e\x20\x6d\x65\x6e\x75" // 898 NodeActivityMainMenu + , "\x72\x65\x61\x64\x69\x6e\x67\x20\x6d\x65\x73\x73\x61\x67\x65\x73" // 899 NodeActivityReadingMsgs + , "\x72\x65\x61\x64\x69\x6e\x67\x20\x6d\x61\x69\x6c" // 900 NodeActivityReadingMail + , "\x73\x65\x6e\x64\x69\x6e\x67\x20\x6d\x61\x69\x6c" // 901 NodeActivitySendingMail + , "\x72\x65\x61\x64\x69\x6e\x67\x20\x74\x65\x78\x74\x20\x66\x69\x6c\x65\x73" // 902 NodeActivityReadingTextFiles + , "\x72\x65\x61\x64\x69\x6e\x67\x20\x73\x65\x6e\x74\x20\x6d\x61\x69\x6c" // 903 NodeActivityReadingSentMail + , "\x70\x6f\x73\x74\x69\x6e\x67\x20\x6d\x65\x73\x73\x61\x67\x65" // 904 NodeActivityPostingMsg + , "\x70\x6f\x73\x74\x69\x6e\x67\x20\x61\x75\x74\x6f\x2d\x6d\x65\x73\x73\x61\x67\x65" // 905 NodeActivityAutoMsg + , "\x61\x74\x20\x65\x78\x74\x65\x72\x6e\x61\x6c\x20\x70\x72\x6f\x67\x72\x61\x6d\x20\x6d\x65\x6e\x75" // 906 NodeActivityXtrnMenu + , "\x72\x75\x6e\x6e\x69\x6e\x67" // 907 NodeActivityRunningXtrn + , "\x63\x68\x61\x6e\x67\x69\x6e\x67\x20\x73\x65\x74\x74\x69\x6e\x67\x73" // 908 NodeActivitySettings + , "\x61\x74\x20\x66\x69\x6c\x65\x20\x6d\x65\x6e\x75" // 909 NodeActivityFileMenu + , "\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x69\x6e\x67\x20\x66\x69\x6c\x65\x73" // 910 NodeActivityDownloadingFile + , "\x75\x70\x6c\x6f\x61\x64\x69\x6e\x67\x20\x66\x69\x6c\x65\x73" // 911 NodeActivityUploadingFile + , "\x74\x72\x61\x6e\x73\x66\x65\x72\x72\x69\x6e\x67\x20\x66\x69\x6c\x65\x73\x20\x62\x69\x64\x69\x72\x65\x63\x74\x69\x6f\x6e\x61\x6c" + "" // 912 NodeActivityBiXferFile + , "\x6c\x69\x73\x74\x69\x6e\x67\x20\x66\x69\x6c\x65\x73" // 913 NodeActivityListingFiles + , "\x6c\x6f\x67\x67\x69\x6e\x67\x20\x6f\x6e" // 914 NodeActivityLoggingOn + , "\x63\x68\x61\x74\x74\x69\x6e\x67\x20\x77\x69\x74\x68\x20\x25\x73" // 915 NodeActivityLocalChat + , "\x69\x6e\x20\x6d\x75\x6c\x74\x69\x6e\x6f\x64\x65\x20\x63\x68\x61\x74\x20\x63\x68\x61\x6e\x6e\x65\x6c\x20\x25\x64" // 916 NodeActivityChatChannel + , "\x69\x6e\x20\x6d\x75\x6c\x74\x69\x6e\x6f\x64\x65\x20\x67\x6c\x6f\x62\x61\x6c\x20\x63\x68\x61\x74\x20\x63\x68\x61\x6e\x6e\x65\x6c" + "" // 917 NodeActivityGlobalChat + , "\x69\x6e\x20\x63\x68\x61\x74\x20\x73\x65\x63\x74\x69\x6f\x6e" // 918 NodeActivityChatMenu + , "\x70\x65\x72\x66\x6f\x72\x6d\x69\x6e\x67\x20\x73\x79\x73\x6f\x70\x20\x61\x63\x74\x69\x76\x69\x74\x79" // 919 NodeActivitySysop + , "\x74\x72\x61\x6e\x73\x66\x65\x72\x72\x69\x6e\x67\x20\x51\x57\x4b\x20\x70\x61\x63\x6b\x65\x74" // 920 NodeActivityQWKmenu + , "\x63\x68\x61\x74\x74\x69\x6e\x67\x20\x77\x69\x74\x68\x20\x6e\x6f\x64\x65\x20\x25\x75" // 921 NodeActivityNodeChat + , "\x70\x61\x67\x69\x6e\x67\x20\x6e\x6f\x64\x65\x20\x25\x75\x20\x66\x6f\x72\x20\x70\x72\x69\x76\x61\x74\x65\x20\x63\x68\x61\x74" // 922 NodeActivityPagingNode + , "\x72\x65\x74\x72\x69\x65\x76\x69\x6e\x67\x20\x66\x69\x6c\x65\x20\x66\x72\x6f\x6d\x20\x64\x65\x76\x69\x63\x65\x20\x23\x25\x64" // 923 NodeActivityRetrievingFile + , "\x70\x65\x72\x66\x6f\x72\x6d\x69\x6e\x67\x20\x63\x75\x73\x74\x6f\x6d\x20\x61\x63\x74\x69\x76\x69\x74\x79" // 924 NodeActivityCustom + , "\x6e\x65\x76\x65\x72" // 925 Never + , "\x44\x65\x6c\x65\x74\x69\x6e\x67" // 926 Deleting + , "\x01\x5b\x01\x3e" // 927 DoneDeleting + , "\x44\x65\x6c\x65\x74\x65\x64" // 928 Deleted + , "\x40\x44\x65\x6c\x65\x74\x65\x64\x40\x20\x25\x64\x20\x25\x73" // 929 DeletedNumberItems + , "\x45\x2d\x4d\x61\x69\x6c" // 930 E_Mail + , "\x45\x2d\x4d\x61\x69\x6c\x73" // 931 E_Mails }; diff --git a/src/sbbs3/text_id.c b/src/sbbs3/text_id.c index e397e235041ecfdb18bad974e7bcc516f4974d1c..d02ce05cf43d9e42bfaf824879fb55622a23721a 100644 --- a/src/sbbs3/text_id.c +++ b/src/sbbs3/text_id.c @@ -1,935 +1,935 @@ // Synchronet text.dat string identifiers -const char* const text_id[]={ - "MsgSubj" - ,"MsgAttr" - ,"MsgTo" - ,"MsgToExt" - ,"MsgToNet" - ,"MsgFrom" - ,"MsgFromExt" - ,"MsgFromNet" - ,"MsgDate" - ,"Email" - ,"Post" - ,"TooManyEmailsToday" - ,"TooManyPostsToday" - ,"CantAddToQueue" - ,"R_Email" - ,"R_Post" - ,"R_Feedback" - ,"Emailing" - ,"Posting" - ,"NewFile" - ,"SubjectPrompt" - ,"EnterMsgNow" - ,"EnterMsgNowRaw" - ,"NoMoreLines" - ,"OnlyNLinesLeft" - ,"OutOfBytes" - ,"InvalidLineNumber" - ,"MsgCleared" - ,"WithLineNumbersQ" - ,"Aborted" - ,"AnonymousQ" - ,"Anonymous" - ,"Saving" - ,"SavedNBytes" - ,"WritingIndx" - ,"Emailed" - ,"Posted" - ,"EmailNodeMsg" - ,"R_Forward" - ,"ForwardedFrom" - ,"Forwarded" - ,"AutoMsgBy" - ,"AutoMsg" - ,"R_AutoMsg" - ,"NoMailWaiting" - ,"MailWaitingLstHdr" - ,"MailWaitingLstFmt" - ,"StartWithN" - ,"ReadingMail" - ,"CantReplyToMsg" - ,"Regarding" - ,"RegardingByOn" - ,"RegardingByToOn" - ,"DeleteMailQ" - ,"OK" - ,"ForwardMailTo" - ,"SaveMsgToFile" - ,"FileToWriteTo" - ,"NoMailSent" - ,"MailSentLstHdr" - ,"ReadingSentMail" - ,"InternetMailing" - ,"NoMailOnSystem" - ,"ReadingAllMail" - ,"MailOnSystemLstHdr" - ,"MailOnSystemLstFmt" - ,"NScanStatusFmt" - ,"SearchSubFmt" - ,"NoMsgsOnSub" - ,"ZScanPostHdr" - ,"ReadingSub" - ,"YouDidntPostMsgN" - ,"DeletePostQ" - ,"UserDefaultsAutoLogon" - ,"MsgSentToUser" - ,"SearchStringPrompt" - ,"PrivateChatSeparator" - ,"SubMsgLstFmt" - ,"SysopChatSeparator" - ,"NoTextSections" - ,"TextSectionLstHdr" - ,"TextSectionLstFmt" - ,"WhichTextSection" - ,"TextFilesLstHdr" - ,"TextFilesLstFmt" - ,"WhichTextFileSysop" - ,"WhichTextFile" - ,"AddTextFileBeforeWhich" - ,"AddTextFilePath" - ,"AddTextFileDesc" - ,"RemoveWhichTextFile" - ,"DeleteTextFileQ" - ,"EditWhichTextFile" - ,"NScanAllGrpsQ" - ,"SScanAllGrpsQ" - ,"AreYouSureQ" - ,"R_Chat" - ,"ReFeedback" - ,"SiHdr" - ,"SiSysName" - ,"SiSysID" - ,"SiSysFaddr" - ,"SiSysPsite" - ,"SiSysLocation" - ,"SiSysop" - ,"SiSysNodes" - ,"SiNodeNumberName" - ,"SiNodePhone" - ,"SiTotalLogons" - ,"SiLogonsToday" - ,"SiTotalTime" - ,"SiTimeToday" - ,"ViewSysInfoFileQ" - ,"ViewLogonMsgQ" - ,"R_ReadSentMail" - ,"MessageScan" - ,"MessageScanComplete" - ,"MessageScanAborted" - ,"LogOffQ" - ,"CantPostOnSub" - ,"SendingMessageToUser" - ,"NoOtherActiveNodes" - ,"R_ExternalPrograms" - ,"UserStats" - ,"SubLstHdr" - ,"SubLstFmt" - ,"GrpLstHdr" - ,"GrpLstFmt" - ,"NScanCfgWhichGrp" - ,"SScanCfgWhichGrp" - ,"CfgSubLstHdr" - ,"CfgSubLstFmt" - ,"CfgGrpLstHdr" - ,"CfgGrpLstFmt" - ,"NScanCfgWhichSub" - ,"SScanCfgWhichSub" - ,"SubPtrLstFmt" - ,"WhichOrAll" - ,"RawMsgInputModeIsNow" - ,"Unused140" - ,"Unused141" - ,"PagingUser" - ,"SystemStatsHdr" - ,"NodeStatsHdr" - ,"StatsTotalLogons" - ,"StatsLogonsToday" - ,"StatsTotalTime" - ,"StatsTimeToday" - ,"StatsUploadsToday" - ,"StatsDownloadsToday" - ,"StatsPostsToday" - ,"StatsEmailsToday" - ,"StatsFeedbacksToday" - ,"ChUserPrompt" - ,"ChUserPwPrompt" - ,"CommaInLocationRequired" - ,"ErrorLogHdr" - ,"DeleteErrorLogQ" - ,"DirectoryDoesNotExist" - ,"ClearErrCounter" - ,"InvalidNode" - ,"SendingTelegramToUser" - ,"DeleteGuruLogQ" - ,"TelegramFmt" - ,"R_Download" - ,"SearchingAllDirs" - ,"SearchingAllLibs" - ,"NFilesListed" - ,"EmptyDir" - ,"NScanHdr" - ,"R_RemoveFiles" - ,"DirFull" - ,"R_Upload" - ,"CantUploadHere" - ,"FileSpec" - ,"SystemPassword" - ,"NoSysopDir" - ,"CantUploadToSysop" - ,"DirLstHdr" - ,"DirLstFmt" - ,"LibLstHdr" - ,"LibLstFmt" - ,"InvalidNetMailAddr" - ,"TransferPolicyHdr" - ,"TransferProtLstFmt" - ,"TpUpload" - ,"TpDownload" - ,"NoUserDir" - ,"NoFilesForYou" - ,"UserDirFull" - ,"CantUploadToUser" - ,"BoxHdrLib" - ,"BoxHdrDir" - ,"BoxHdrFiles" - ,"ShortHdrLib" - ,"ShortHdrDir" - ,"BatchDlFlags" - ,"BatchDlQueueIsFull" - ,"FileSpecStarDotStar" - ,"LowDiskSpace" - ,"DiskNBytesFree" - ,"Filename" - ,"BadFilename" - ,"UploadToSysopDirQ" - ,"UploadToUserDirQ" - ,"UploadToCurDirQ" - ,"FileAlreadyThere" - ,"FileOnDiskAddQ" - ,"FileNotOnDisk" - ,"TheseFileExtsOnly" - ,"FileAlreadyOnline" - ,"EnterAfterLastDestUser" - ,"SendFileToUser" - ,"DuplicateUser" - ,"UserWontBeAbleToDl" - ,"CantSendYourselfFiles" - ,"UserAddedToDestList" - ,"RateThisFile" - ,"Rated" - ,"MultipleDiskQ" - ,"HowManyDisksTotal" - ,"NumberOfFile" - ,"FileOneOfTen" - ,"FileOneOfTwo" - ,"EnterDescNow" - ,"NoDescription" - ,"ProtocolOrQuit" - ,"ProtocolBatchOrQuit" - ,"BatchUlQueueIsFull" - ,"FileAddedToUlQueue" - ,"FileInfoEditPrompt" - ,"FileInfoPrompt" - ,"QuitOrNext" - ,"RExemptRemoveFilePrompt" - ,"MoveToLibLstFmt" - ,"MoveToLibPrompt" - ,"MoveToDirLstFmt" - ,"MoveToDirPrompt" - ,"MovedFile" - ,"CloseFileRecordQ" - ,"SysopRemoveFilePrompt" - ,"UserRemoveFilePrompt" - ,"FileDoesNotExist" - ,"CouldntRemoveFile" - ,"DeleteFileQ" - ,"AddToOfflineDirQ" - ,"RemoveCreditsQ" - ,"UserNotFound" - ,"CreditsToRemove" - ,"FileRemovedUserMsg" - ,"EditFilename" - ,"CouldntRenameFile" - ,"FileRenamed" - ,"EditDescription" - ,"Unused255" - ,"EditUploader" - ,"EditCreditValue" - ,"EditTimesDownloaded" - ,"EditExtDescriptionQ" - ,"Unused260" - ,"YouOnlyHaveNCredits" - ,"NotEnoughCredits" - ,"NotEnoughTimeToDl" - ,"ProtocolBatchQuitOrNext" - ,"BulkUpload" - ,"BulkUploadDescPrompt" - ,"NoFilesInBatchQueue" - ,"BatchMenuPrompt" - ,"ClearUploadQueueQ" - ,"UploadQueueCleared" - ,"ClearDownloadQueueQ" - ,"DownloadQueueCleared" - ,"DownloadQueueIsEmpty" - ,"UploadQueueLstHdr" - ,"UploadQueueLstFmt" - ,"DownloadQueueLstHdr" - ,"DownloadQueueLstFmt" - ,"DownloadQueueTotals" - ,"RemoveWhichFromUlQueue" - ,"RemoveWhichFromDlQueue" - ,"UploadQueueIsEmpty" - ,"HangUpAfterXferQ" - ,"StartXferNow" - ,"Disconnecting" - ,"Disconnected" - ,"FileNotSent" - ,"RemovingTempFiles" - ,"ExtractFrom" - ,"UnextractableFile" - ,"FileNotFound" - ,"ExtractFilesPrompt" - ,"TempDirPrompt" - ,"TempFileNotCreatedYet" - ,"TempFileInfo" - ,"TempDirTotal" - ,"NFilesRemoved" - ,"TagFileQ" - ,"TagFilePrompt" - ,"Unused299" - ,"FreeDownloadUserMsg" - ,"FiAuthor" - ,"FiGroup" - ,"FileAlreadyInQueue" - ,"FileIsNotOnline" - ,"FileAddedToBatDlQueue" - ,"NonviewableFile" - ,"FileNotReceived" - ,"FileHadErrors" - ,"FileZeroLength" - ,"FileNBytesReceived" - ,"FileNBytesSent" - ,"DownloadUserMsg" - ,"Partially" - ,"FiLib" - ,"FiDir" - ,"FiFilename" - ,"FiFileSize" - ,"FiCredits" - ,"FiDescription" - ,"FiUploadedBy" - ,"FiFileDate" - ,"FiDateUled" - ,"FiDateDled" - ,"FiTimesDled" - ,"FiTransferTime" - ,"FiTags" - ,"FiUploadedTo" - ,"FiChecksum" - ,"HappyBirthday" - ,"TimeToChangePw" - ,"NewPasswordQ" - ,"NewPasswordPromptFmt" - ,"VerifyPassword" - ,"Wrong" - ,"PasswordChanged" - ,"NoMoreLogons" - ,"R_Logons" - ,"EnterYourAlias" - ,"EnterYourRealName" - ,"EnterYourCompany" - ,"EnterYourHandle" - ,"EnterYourGender" - ,"EnterYourAddress" - ,"EnterYourPhoneNumber" - ,"EnterYourBirthday" - ,"EnterYourCityState" - ,"EnterYourZipCode" - ,"EnterYourComputer" - ,"CallingFromNorthAmericaQ" - ,"UserInfoCorrectQ" - ,"LiUserNumberName" - ,"LiLogonsToday" - ,"LiTimeonToday" - ,"LiMailWaiting" - ,"LiSysopIs" - ,"LiSysopAvailable" - ,"LiSysopNotAvailable" - ,"UserOnTwoNodes" - ,"CriticalErrors" - ,"UserXferForYou" - ,"UnreceivedUserXfer" - ,"ReadYourMailNowQ" - ,"NoNewUsers" - ,"NewUserPasswordPrompt" - ,"AutoTerminalQ" - ,"AnsiTerminalQ" - ,"ColorTerminalQ" - ,"RipTerminalQ" - ,"ExAsciiTerminalQ" - ,"YouCantUseThatName" - ,"YourPasswordIs" - ,"NewUserPasswordVerify" - ,"IncorrectPassword" - ,"MagicWordPrompt" - ,"FailedMagicWord" - ,"SystemFull" - ,"NewUserFeedbackHdr" - ,"NoFeedbackWarning" - ,"NoXtrnPrograms" - ,"XtrnProgLstHdr" - ,"XtrnProgLstTitles" - ,"XtrnProgLstUnderline" - ,"XtrnProgLstFmt" - ,"WhichXtrnProg" - ,"UserRunningXtrn" - ,"RemoveNodeLockQ" - ,"YouCantUseThatNetmail" - ,"NoNodeAccess" - ,"NodeLocked" - ,"UnknownUser" - ,"InvalidLogon" - ,"SlogFmt" - ,"Locally" - ,"SortAlphaQ" - ,"CheckingSlots" - ,"UserListFmt" - ,"NTotalUsers" - ,"NUsersOnCurSub" - ,"NUsersOnCurDir" - ,"NScanDate" - ,"NScanYear" - ,"NScanMonth" - ,"NScanDay" - ,"NScanHour" - ,"NScanMinute" - ,"NScanPmQ" - ,"NScanAmQ" - ,"PasswordTooShort" - ,"PasswordNotChanged" - ,"PasswordInvalid" - ,"PasswordObvious" - ,"Unused412" - ,"Unused413" - ,"Unused414" - ,"Unused415" - ,"Unused416" - ,"Unused417" - ,"NoUserData" - ,"DeletedUser" - ,"InactiveUser" - ,"UeditAliasPassword" - ,"UeditRealNamePhone" - ,"UeditAddressBirthday" - ,"UeditLocationZipcode" - ,"UeditNoteHandle" - ,"UeditComputerModem" - ,"UeditCommentLine" - ,"UserDates" - ,"UserTimes" - ,"UserLogons" - ,"UserEmails" - ,"UserNetMail" - ,"UserUploads" - ,"UserDownloads" - ,"UserLeech" - ,"UserCredits" - ,"UserMinutes" - ,"UeditSecLevel" - ,"UeditFlags" - ,"UeditExempts" - ,"UeditPrompt" - ,"UeditRestoreQ" - ,"UeditActivateQ" - ,"UeditDeleteQ" - ,"UeditReadUserMailWQ" - ,"UeditReadUserMailSQ" - ,"UeditDeactivateUserQ" - ,"ChangeExemptionQ" - ,"FlagEditing" - ,"GoToUser" - ,"UeditLastOn" - ,"UeditFirstOn" - ,"UeditExpire" - ,"UeditPwModDate" - ,"UeditML" - ,"UeditNote" - ,"UeditComment" - ,"UeditUlBytes" - ,"UeditUploads" - ,"UeditDlBytes" - ,"UeditDownloads" - ,"UeditLeech" - ,"QuickValidateFmt" - ,"QuickValidatePrompt" - ,"UeditPassword" - ,"UeditCredits" - ,"UeditMinutes" - ,"UeditCopyUserQ" - ,"UeditCopyUserToSlot" - ,"ChangeRestrictsQ" - ,"ModifyCredits" - ,"ModifyMinutes" - ,"DeleteQuestionaireQ" - ,"UserDefaultsHdr" - ,"UserDefaultsTerminal" - ,"UserDefaultsXeditor" - ,"UserDefaultsRows" - ,"UserDefaultsMenuMode" - ,"UserDefaultsPause" - ,"UserDefaultsHotKey" - ,"UserDefaultsCursor" - ,"UserDefaultsCLS" - ,"UserDefaultsAskNScan" - ,"UserDefaultsAskSScan" - ,"UserDefaultsANFS" - ,"UserDefaultsRemember" - ,"UserDefaultsBatFlag" - ,"UserDefaultsNetMail" - ,"UserDefaultsCommandSet" - ,"UserDefaultsQuiet" - ,"UserDefaultsPassword" - ,"UserDefaultsArcType" - ,"UserDefaultsProtocol" - ,"UserDefaultsWhich" - ,"On" - ,"Off" - ,"HowManyRows" - ,"CurrentPassword" - ,"ForwardMailQ" - ,"EnterNetMailAddress" - ,"SelectItemHdr" - ,"SelectItemFmt" - ,"SelectItemWhich" - ,"SysopIsHere" - ,"EndOfChat" - ,"ChatPrompt" - ,"AnonUserChatHandle" - ,"WelcomeToMultiChat" - ,"WelcomeToChannelN" - ,"NodeInMultiChatLocally" - ,"YoureOnTheAir" - ,"NodeJoinedMultiChat" - ,"NodeLeftMultiChat" - ,"MultiChatCommandPrompt" - ,"PasswordProtected" - ,"CorrectPassword" - ,"WrongPassword" - ,"PasswordProtectChanQ" - ,"PasswordPrompt" - ,"ChatLineFmt" - ,"SysopPageIsNow" - ,"SysopIsNotAvailable" - ,"ChatWithGuruInsteadQ" - ,"PrivateMsgPrompt" - ,"NodeToPrivateChat" - ,"NodeNAlreadyInPChat" - ,"NodeNIsNotInUse" - ,"NoNeedToPageSelf" - ,"CantPageNode" - ,"NodePageMsg" - ,"AllNodePageMsg" - ,"NodePChatPageMsg" - ,"R_SendMessages" - ,"NodeToSendMsgTo" - ,"NoNeedToSendMsgToSelf" - ,"NodeMsgPrompt" - ,"NodeMsgFmt" - ,"AllNodeMsgFmt" - ,"PagingGuru" - ,"WaitingForNodeInPChat" - ,"NodeJoinedPrivateChat" - ,"NodeLeftPrivateChat" - ,"NoOneHasLoggedOnToday" - ,"Unused544" - ,"LastFewCallersFmt" - ,"CallersToday" - ,"DoYouMeanThisUserQ" - ,"UNKNOWN_USER" - ,"TimesUp" - ,"NodeLoggedOff" - ,"NodeLoggedOnAtNbps" - ,"TiLogon" - ,"TiNow" - ,"TiTimeon" - ,"TiTimeLeft" - ,"ControlKeyMenu" - ,"TakenTooLongToLogon" - ,"CallBackWhenYoureThere" - ,"YesNoQuestion" - ,"Yes" - ,"No" - ,"NoYesQuestion" - ,"Pause" - ,"ContinueQ" - ,"SysStatsLogHdr" - ,"NodeStatsLogHdr" - ,"ReducedTime" - ,"EventInfo" - ,"UploadBeforeEvent" - ,"QWKPrompt" - ,"QWKCtrlACodes" - ,"QWKPackingSubboard" - ,"QWKPackedSubboard" - ,"QWKPackingEmail" - ,"QWKPackedEmail" - ,"QWKUnpacking" - ,"QWKUnpacked" - ,"QWKNoNewMessages" - ,"QWKCompressionFailed" - ,"QWKExtractionFailed" - ,"QWKReplyNotReceived" - ,"QWKInvalidConferenceN" - ,"CreatingFileList" - ,"CreatedFileList" - ,"NoFiles" - ,"MsgPtrsInitialized" - ,"ConversionRate" - ,"CreditsToMin" - ,"YouHaveTooManyMinutes" - ,"BillingNodeMsg" - ,"Convert100ktoNminQ" - ,"CreditedAccount" - ,"ANSICaptureIsNow" - ,"RetrievingFile" - ,"Unused595" - ,"PrivatePostQ" - ,"PostTo" - ,"NoToUser" - ,"UsingRealName" - ,"PostingPrivately" - ,"PostingAnonymously" - ,"CantDeletePosts" - ,"SubInfoHdr" - ,"SubInfoLongName" - ,"SubInfoShortName" - ,"SubInfoQWKName" - ,"SubInfoMaxMsgs" - ,"SubInfoTagLine" - ,"SubInfoFidoNet" - ,"SubInfoViewFileQ" - ,"DirInfoHdr" - ,"DirInfoLongName" - ,"DirInfoShortName" - ,"DirInfoAllowedExts" - ,"DirInfoMaxFiles" - ,"DirInfoViewFileQ" - ,"NoNetMailAllowed" - ,"NetMailCostContinueQ" - ,"NetMailing" - ,"RemoveFromNewScanQ" - ,"SubGroupOrAll" - ,"DirLibOrAll" - ,"EnterPath" - ,"DisplayExtendedFileInfoQ" - ,"DisplaySubjectsOnlyQ" - ,"EchoIsNow" - ,"WelcomeToPrivateChat" - ,"UploadingREP" - ,"ReceivedFileViaQWK" - ,"QWKmsgLimitReached" - ,"PrivatePostsNotAllowed" - ,"LoadingMsgPtrs" - ,"LoadedMsgPtrs" - ,"QuoteMessageQ" - ,"QuoteLinesPrompt" - ,"ChatChanLstHdr" - ,"ChatChanLstTitles" - ,"ChatChanLstUnderline" - ,"ChatChanLstFmt" - ,"CantAccessThatChannel" - ,"CantDownloadFromDir" - ,"SearchingForDupes" - ,"SearchedForDupes" - ,"AccountWillExpireInNDays" - ,"AccountHasExpired" - ,"DownloadBatchQ" - ,"WaitingForDeviceN" - ,"UserSentYouMail" - ,"UserSentYouFile" - ,"UserReadYourMail" - ,"UserReadYourMailNodeMsg" - ,"JoinWhichGrp" - ,"JoinWhichSub" - ,"JoinWhichLib" - ,"JoinWhichDir" - ,"CfgDirLstHdr" - ,"CfgDirLstFmt" - ,"CfgLibLstHdr" - ,"CfgLibLstFmt" - ,"BatchFlagPrompt" - ,"FileListBatchCommands" - ,"DownloadAttachedFileQ" - ,"FreeMinLeft" - ,"FreeMinToDeposit" - ,"EmailFilesNotAllowed" - ,"CantRunThatProgram" - ,"OnlyXminutesLeft" - ,"AreYouThere" - ,"NoAccessLevel" - ,"NoAccessAge" - ,"NoAccessBPS" - ,"NoAccessCredit" - ,"NoAccessNode" - ,"NoAccessUser" - ,"NoAccessExpire" - ,"NoAccessTimeLeft" - ,"NoAccessTimeUsed" - ,"NoAccessTime" - ,"NoAccessPCR" - ,"NoAccessUDR" - ,"NoAccessUDFR" - ,"NoAccessFlag1" - ,"NoAccessFlag2" - ,"NoAccessFlag3" - ,"NoAccessFlag4" - ,"NoAccessSex" - ,"NoAccessExempt" - ,"NoAccessRest" - ,"NoAccessDay" - ,"NoAccessGroup" - ,"NoAccessSub" - ,"NoAccessLib" - ,"NoAccessDir" - ,"NodeLstHdr" - ,"NodeActionMainMenu" - ,"NodeActionReadingMsgs" - ,"NodeActionReadingMail" - ,"NodeActionSendingMail" - ,"NodeActionReadingTextFiles" - ,"NodeActionReadingSentMail" - ,"NodeActionPostingMsg" - ,"NodeActionAutoMsg" - ,"NodeActionXtrnMenu" - ,"NodeActionSettings" - ,"NodeActionFileMenu" - ,"NodeActionDownloadingFile" - ,"NodeActionUploadingFile" - ,"NodeActionBiXferFile" - ,"NodeActionListingFiles" - ,"NodeActionLoggingOn" - ,"NodeActionLocalChat" - ,"NodeActionMultiChat" - ,"NodeActionGuruChat" - ,"NodeActionChatMenu" - ,"NodeActionSysop" - ,"NodeActionQWKmenu" - ,"NodeActionPrivateChat" - ,"NodeActionPagingNode" - ,"NodeActionRetrievingFile" - ,"NodeActionCustom" - ,"ViewSignatureQ" - ,"DeleteSignatureQ" - ,"CreateEditSignatureQ" - ,"SpinningCursorOnPauseQ" - ,"UseExternalEditorQ" - ,"ExternalEditorHeading" - ,"CommandShellHeading" - ,"ArchiveTypeHeading" - ,"ValidatePostQ" - ,"NodeStatusWaitingForCall" - ,"NodeStatusLogon" - ,"NodeStatusNewUser" - ,"NodeStatusOffline" - ,"NodeStatusEventWaiting" - ,"NodeStatusEventRunning" - ,"NodeStatusEventLimbo" - ,"NodeConnectionTelnet" - ,"NodeConnectionRLogin" - ,"NodeConnectionSSH" - ,"NodeConnectionModem" - ,"QWKSettingsHdr" - ,"QWKSettingsCtrlA" - ,"QWKSettingsArchive" - ,"QWKSettingsEmail" - ,"QWKSettingsAttach" - ,"QWKSettingsDeleteEmail" - ,"QWKSettingsNewFilesList" - ,"QWKSettingsIndex" - ,"QWKSettingsControl" - ,"QWKSettingsHeaders" - ,"QWKSettingsBySelf" - ,"QWKSettingsTimeZone" - ,"QWKSettingsVIA" - ,"QWKSettingsMsgID" - ,"QWKSettingsExtended" - ,"QWKSettingsWhich" - ,"CantEditMsg" - ,"CantDeleteMsg" - ,"CantReadSub" - ,"CantPostMsg" - ,"OperatorPrompt" - ,"AddSubToNewScanQ" - ,"UnvalidatedWarning" - ,"StartingNewUserRegistration" - ,"GetStrMenu" - ,"DisplayUnreadMessagesOnlyQ" - ,"NoMessagesFound" - ,"UserIpAddr" - ,"Seconds" - ,"Minutes" - ,"Hours" - ,"Days" - ,"Months" - ,"Years" - ,"InThePast" - ,"InTheFuture" - ,"AgeOfPostedItem" - ,"NodeStatusLogout" - ,"VotingNotAllowed" - ,"VotedAlready" - ,"R_Voting" - ,"QWKSettingsVoting" - ,"VoteMsgUpDownOrQuit" - ,"MsgVotes" - ,"MsgUpVoteNotice" - ,"MsgDownVoteNotice" - ,"PollVoteNotice" - ,"PollAnswerNumber" - ,"PollAnswerFmt" - ,"PollAnswerChecked" - ,"BallotHdr" - ,"BallotAnswerFmt" - ,"BallotVoteWhich" - ,"Only" - ,"SPAMVisibilityIsNow" - ,"VoteInThisPollNow" - ,"MIMEDecodedPlainTextFmt" - ,"MsgHdrBodySeparator" - ,"FileHdrDescSeparator" - ,"RemoveFileQ" - ,"OriginFidoAddr" - ,"VoteNoticeFmt" - ,"TagMessageQ" - ,"TagMessagePrompt" - ,"MsgTags" - ,"NoAccessTerminal" - ,"LongLineContinuationPrefix" - ,"Scanning" - ,"Done" - ,"Scanned" - ,"HitYourBackspaceKey" - ,"CharacterReceivedFmt" - ,"InvalidBackspaceKeyFmt" - ,"SwapDeleteKeyQ" - ,"PetTerminalDetected" - ,"PetTerminalQ" - ,"TerminalAutoDetect" - ,"TerminalColumns" - ,"TerminalRows" - ,"TerminalMonochrome" - ,"TerminalColor" - ,"TerminalIceColor" - ,"IceColorTerminalQ" - ,"Utf8TerminalQ" - ,"MsgCarbonCopyList" - ,"LoggingOn" - ,"QWKSettingsUtf8" - ,"MsgPostedToYouVia" - ,"Unlimited" - ,"NodeConnectionRaw" - ,"MouseTerminalQ" - ,"TerminalMouse" - ,"SpinningCursor0" - ,"SpinningCursor1" - ,"SpinningCursor2" - ,"SpinningCursor3" - ,"SpinningCursor4" - ,"SpinningCursor5" - ,"SpinningCursor6" - ,"SpinningCursor7" - ,"SpinningCursor8" - ,"SpinningCursor9" - ,"HowManyColumns" - ,"InternetMailSent" - ,"FidoNetMailSent" - ,"QWKNetMailSent" - ,"MsgsToYouOnlyQ" - ,"ToYouOnly" - ,"SetMsgPtrPrompt" - ,"DateLastKeys" - ,"DirLibKeys" - ,"SubGroupKeys" - ,"Unused853" - ,"All" - ,"List" - ,"InternetMailReceived" - ,"InternetMailForwarded" - ,"FidoNetMailReceived" - ,"WithAttachment" - ,"FidoEchoMailReceived" - ,"HashingFile" - ,"HashedFile" - ,"NewUserValEmailSubj" - ,"InactivityAlert" - ,"None" - ,"Which" - ,"Next" - ,"Previous" - ,"Quit" - ,"Language" - ,"LANG" - ,"UserDefaultsLanguage" - ,"PasswordChar" - ,"NodeConnectionSFTP" - ,"QWKSettingsWrapText" - ,"UnknownUploader" - ,"FREE" - ,"Sun" - ,"Mon" - ,"Tue" - ,"Wed" - ,"Thu" - ,"Fri" - ,"Sat" - ,"Jan" - ,"Feb" - ,"Mar" - ,"Apr" - ,"May" - ,"Jun" - ,"Jul" - ,"Aug" - ,"Sep" - ,"Oct" - ,"Nov" - ,"Dec" - ,"SysopPageNotification" - ,"NodeActivityMainMenu" - ,"NodeActivityReadingMsgs" - ,"NodeActivityReadingMail" - ,"NodeActivitySendingMail" - ,"NodeActivityReadingTextFiles" - ,"NodeActivityReadingSentMail" - ,"NodeActivityPostingMsg" - ,"NodeActivityAutoMsg" - ,"NodeActivityXtrnMenu" - ,"NodeActivityRunningXtrn" - ,"NodeActivitySettings" - ,"NodeActivityFileMenu" - ,"NodeActivityDownloadingFile" - ,"NodeActivityUploadingFile" - ,"NodeActivityBiXferFile" - ,"NodeActivityListingFiles" - ,"NodeActivityLoggingOn" - ,"NodeActivityLocalChat" - ,"NodeActivityChatChannel" - ,"NodeActivityGlobalChat" - ,"NodeActivityChatMenu" - ,"NodeActivitySysop" - ,"NodeActivityQWKmenu" - ,"NodeActivityNodeChat" - ,"NodeActivityPagingNode" - ,"NodeActivityRetrievingFile" - ,"NodeActivityCustom" - ,"Never" - ,"Deleting" - ,"DoneDeleting" - ,"Deleted" - ,"DeletedNumberItems" - ,"E_Mail" - ,"E_Mails" +const char* const text_id[] = { + "MsgSubj" + , "MsgAttr" + , "MsgTo" + , "MsgToExt" + , "MsgToNet" + , "MsgFrom" + , "MsgFromExt" + , "MsgFromNet" + , "MsgDate" + , "Email" + , "Post" + , "TooManyEmailsToday" + , "TooManyPostsToday" + , "CantAddToQueue" + , "R_Email" + , "R_Post" + , "R_Feedback" + , "Emailing" + , "Posting" + , "NewFile" + , "SubjectPrompt" + , "EnterMsgNow" + , "EnterMsgNowRaw" + , "NoMoreLines" + , "OnlyNLinesLeft" + , "OutOfBytes" + , "InvalidLineNumber" + , "MsgCleared" + , "WithLineNumbersQ" + , "Aborted" + , "AnonymousQ" + , "Anonymous" + , "Saving" + , "SavedNBytes" + , "WritingIndx" + , "Emailed" + , "Posted" + , "EmailNodeMsg" + , "R_Forward" + , "ForwardedFrom" + , "Forwarded" + , "AutoMsgBy" + , "AutoMsg" + , "R_AutoMsg" + , "NoMailWaiting" + , "MailWaitingLstHdr" + , "MailWaitingLstFmt" + , "StartWithN" + , "ReadingMail" + , "CantReplyToMsg" + , "Regarding" + , "RegardingByOn" + , "RegardingByToOn" + , "DeleteMailQ" + , "OK" + , "ForwardMailTo" + , "SaveMsgToFile" + , "FileToWriteTo" + , "NoMailSent" + , "MailSentLstHdr" + , "ReadingSentMail" + , "InternetMailing" + , "NoMailOnSystem" + , "ReadingAllMail" + , "MailOnSystemLstHdr" + , "MailOnSystemLstFmt" + , "NScanStatusFmt" + , "SearchSubFmt" + , "NoMsgsOnSub" + , "ZScanPostHdr" + , "ReadingSub" + , "YouDidntPostMsgN" + , "DeletePostQ" + , "UserDefaultsAutoLogon" + , "MsgSentToUser" + , "SearchStringPrompt" + , "PrivateChatSeparator" + , "SubMsgLstFmt" + , "SysopChatSeparator" + , "NoTextSections" + , "TextSectionLstHdr" + , "TextSectionLstFmt" + , "WhichTextSection" + , "TextFilesLstHdr" + , "TextFilesLstFmt" + , "WhichTextFileSysop" + , "WhichTextFile" + , "AddTextFileBeforeWhich" + , "AddTextFilePath" + , "AddTextFileDesc" + , "RemoveWhichTextFile" + , "DeleteTextFileQ" + , "EditWhichTextFile" + , "NScanAllGrpsQ" + , "SScanAllGrpsQ" + , "AreYouSureQ" + , "R_Chat" + , "ReFeedback" + , "SiHdr" + , "SiSysName" + , "SiSysID" + , "SiSysFaddr" + , "SiSysPsite" + , "SiSysLocation" + , "SiSysop" + , "SiSysNodes" + , "SiNodeNumberName" + , "SiNodePhone" + , "SiTotalLogons" + , "SiLogonsToday" + , "SiTotalTime" + , "SiTimeToday" + , "ViewSysInfoFileQ" + , "ViewLogonMsgQ" + , "R_ReadSentMail" + , "MessageScan" + , "MessageScanComplete" + , "MessageScanAborted" + , "LogOffQ" + , "CantPostOnSub" + , "SendingMessageToUser" + , "NoOtherActiveNodes" + , "R_ExternalPrograms" + , "UserStats" + , "SubLstHdr" + , "SubLstFmt" + , "GrpLstHdr" + , "GrpLstFmt" + , "NScanCfgWhichGrp" + , "SScanCfgWhichGrp" + , "CfgSubLstHdr" + , "CfgSubLstFmt" + , "CfgGrpLstHdr" + , "CfgGrpLstFmt" + , "NScanCfgWhichSub" + , "SScanCfgWhichSub" + , "SubPtrLstFmt" + , "WhichOrAll" + , "RawMsgInputModeIsNow" + , "Unused140" + , "Unused141" + , "PagingUser" + , "SystemStatsHdr" + , "NodeStatsHdr" + , "StatsTotalLogons" + , "StatsLogonsToday" + , "StatsTotalTime" + , "StatsTimeToday" + , "StatsUploadsToday" + , "StatsDownloadsToday" + , "StatsPostsToday" + , "StatsEmailsToday" + , "StatsFeedbacksToday" + , "ChUserPrompt" + , "ChUserPwPrompt" + , "CommaInLocationRequired" + , "ErrorLogHdr" + , "DeleteErrorLogQ" + , "DirectoryDoesNotExist" + , "ClearErrCounter" + , "InvalidNode" + , "SendingTelegramToUser" + , "DeleteGuruLogQ" + , "TelegramFmt" + , "R_Download" + , "SearchingAllDirs" + , "SearchingAllLibs" + , "NFilesListed" + , "EmptyDir" + , "NScanHdr" + , "R_RemoveFiles" + , "DirFull" + , "R_Upload" + , "CantUploadHere" + , "FileSpec" + , "SystemPassword" + , "NoSysopDir" + , "CantUploadToSysop" + , "DirLstHdr" + , "DirLstFmt" + , "LibLstHdr" + , "LibLstFmt" + , "InvalidNetMailAddr" + , "TransferPolicyHdr" + , "TransferProtLstFmt" + , "TpUpload" + , "TpDownload" + , "NoUserDir" + , "NoFilesForYou" + , "UserDirFull" + , "CantUploadToUser" + , "BoxHdrLib" + , "BoxHdrDir" + , "BoxHdrFiles" + , "ShortHdrLib" + , "ShortHdrDir" + , "BatchDlFlags" + , "BatchDlQueueIsFull" + , "FileSpecStarDotStar" + , "LowDiskSpace" + , "DiskNBytesFree" + , "Filename" + , "BadFilename" + , "UploadToSysopDirQ" + , "UploadToUserDirQ" + , "UploadToCurDirQ" + , "FileAlreadyThere" + , "FileOnDiskAddQ" + , "FileNotOnDisk" + , "TheseFileExtsOnly" + , "FileAlreadyOnline" + , "EnterAfterLastDestUser" + , "SendFileToUser" + , "DuplicateUser" + , "UserWontBeAbleToDl" + , "CantSendYourselfFiles" + , "UserAddedToDestList" + , "RateThisFile" + , "Rated" + , "MultipleDiskQ" + , "HowManyDisksTotal" + , "NumberOfFile" + , "FileOneOfTen" + , "FileOneOfTwo" + , "EnterDescNow" + , "NoDescription" + , "ProtocolOrQuit" + , "ProtocolBatchOrQuit" + , "BatchUlQueueIsFull" + , "FileAddedToUlQueue" + , "FileInfoEditPrompt" + , "FileInfoPrompt" + , "QuitOrNext" + , "RExemptRemoveFilePrompt" + , "MoveToLibLstFmt" + , "MoveToLibPrompt" + , "MoveToDirLstFmt" + , "MoveToDirPrompt" + , "MovedFile" + , "CloseFileRecordQ" + , "SysopRemoveFilePrompt" + , "UserRemoveFilePrompt" + , "FileDoesNotExist" + , "CouldntRemoveFile" + , "DeleteFileQ" + , "AddToOfflineDirQ" + , "RemoveCreditsQ" + , "UserNotFound" + , "CreditsToRemove" + , "FileRemovedUserMsg" + , "EditFilename" + , "CouldntRenameFile" + , "FileRenamed" + , "EditDescription" + , "Unused255" + , "EditUploader" + , "EditCreditValue" + , "EditTimesDownloaded" + , "EditExtDescriptionQ" + , "Unused260" + , "YouOnlyHaveNCredits" + , "NotEnoughCredits" + , "NotEnoughTimeToDl" + , "ProtocolBatchQuitOrNext" + , "BulkUpload" + , "BulkUploadDescPrompt" + , "NoFilesInBatchQueue" + , "BatchMenuPrompt" + , "ClearUploadQueueQ" + , "UploadQueueCleared" + , "ClearDownloadQueueQ" + , "DownloadQueueCleared" + , "DownloadQueueIsEmpty" + , "UploadQueueLstHdr" + , "UploadQueueLstFmt" + , "DownloadQueueLstHdr" + , "DownloadQueueLstFmt" + , "DownloadQueueTotals" + , "RemoveWhichFromUlQueue" + , "RemoveWhichFromDlQueue" + , "UploadQueueIsEmpty" + , "HangUpAfterXferQ" + , "StartXferNow" + , "Disconnecting" + , "Disconnected" + , "FileNotSent" + , "RemovingTempFiles" + , "ExtractFrom" + , "UnextractableFile" + , "FileNotFound" + , "ExtractFilesPrompt" + , "TempDirPrompt" + , "TempFileNotCreatedYet" + , "TempFileInfo" + , "TempDirTotal" + , "NFilesRemoved" + , "TagFileQ" + , "TagFilePrompt" + , "Unused299" + , "FreeDownloadUserMsg" + , "FiAuthor" + , "FiGroup" + , "FileAlreadyInQueue" + , "FileIsNotOnline" + , "FileAddedToBatDlQueue" + , "NonviewableFile" + , "FileNotReceived" + , "FileHadErrors" + , "FileZeroLength" + , "FileNBytesReceived" + , "FileNBytesSent" + , "DownloadUserMsg" + , "Partially" + , "FiLib" + , "FiDir" + , "FiFilename" + , "FiFileSize" + , "FiCredits" + , "FiDescription" + , "FiUploadedBy" + , "FiFileDate" + , "FiDateUled" + , "FiDateDled" + , "FiTimesDled" + , "FiTransferTime" + , "FiTags" + , "FiUploadedTo" + , "FiChecksum" + , "HappyBirthday" + , "TimeToChangePw" + , "NewPasswordQ" + , "NewPasswordPromptFmt" + , "VerifyPassword" + , "Wrong" + , "PasswordChanged" + , "NoMoreLogons" + , "R_Logons" + , "EnterYourAlias" + , "EnterYourRealName" + , "EnterYourCompany" + , "EnterYourHandle" + , "EnterYourGender" + , "EnterYourAddress" + , "EnterYourPhoneNumber" + , "EnterYourBirthday" + , "EnterYourCityState" + , "EnterYourZipCode" + , "EnterYourComputer" + , "CallingFromNorthAmericaQ" + , "UserInfoCorrectQ" + , "LiUserNumberName" + , "LiLogonsToday" + , "LiTimeonToday" + , "LiMailWaiting" + , "LiSysopIs" + , "LiSysopAvailable" + , "LiSysopNotAvailable" + , "UserOnTwoNodes" + , "CriticalErrors" + , "UserXferForYou" + , "UnreceivedUserXfer" + , "ReadYourMailNowQ" + , "NoNewUsers" + , "NewUserPasswordPrompt" + , "AutoTerminalQ" + , "AnsiTerminalQ" + , "ColorTerminalQ" + , "RipTerminalQ" + , "ExAsciiTerminalQ" + , "YouCantUseThatName" + , "YourPasswordIs" + , "NewUserPasswordVerify" + , "IncorrectPassword" + , "MagicWordPrompt" + , "FailedMagicWord" + , "SystemFull" + , "NewUserFeedbackHdr" + , "NoFeedbackWarning" + , "NoXtrnPrograms" + , "XtrnProgLstHdr" + , "XtrnProgLstTitles" + , "XtrnProgLstUnderline" + , "XtrnProgLstFmt" + , "WhichXtrnProg" + , "UserRunningXtrn" + , "RemoveNodeLockQ" + , "YouCantUseThatNetmail" + , "NoNodeAccess" + , "NodeLocked" + , "UnknownUser" + , "InvalidLogon" + , "SlogFmt" + , "Locally" + , "SortAlphaQ" + , "CheckingSlots" + , "UserListFmt" + , "NTotalUsers" + , "NUsersOnCurSub" + , "NUsersOnCurDir" + , "NScanDate" + , "NScanYear" + , "NScanMonth" + , "NScanDay" + , "NScanHour" + , "NScanMinute" + , "NScanPmQ" + , "NScanAmQ" + , "PasswordTooShort" + , "PasswordNotChanged" + , "PasswordInvalid" + , "PasswordObvious" + , "Unused412" + , "Unused413" + , "Unused414" + , "Unused415" + , "Unused416" + , "Unused417" + , "NoUserData" + , "DeletedUser" + , "InactiveUser" + , "UeditAliasPassword" + , "UeditRealNamePhone" + , "UeditAddressBirthday" + , "UeditLocationZipcode" + , "UeditNoteHandle" + , "UeditComputerModem" + , "UeditCommentLine" + , "UserDates" + , "UserTimes" + , "UserLogons" + , "UserEmails" + , "UserNetMail" + , "UserUploads" + , "UserDownloads" + , "UserLeech" + , "UserCredits" + , "UserMinutes" + , "UeditSecLevel" + , "UeditFlags" + , "UeditExempts" + , "UeditPrompt" + , "UeditRestoreQ" + , "UeditActivateQ" + , "UeditDeleteQ" + , "UeditReadUserMailWQ" + , "UeditReadUserMailSQ" + , "UeditDeactivateUserQ" + , "ChangeExemptionQ" + , "FlagEditing" + , "GoToUser" + , "UeditLastOn" + , "UeditFirstOn" + , "UeditExpire" + , "UeditPwModDate" + , "UeditML" + , "UeditNote" + , "UeditComment" + , "UeditUlBytes" + , "UeditUploads" + , "UeditDlBytes" + , "UeditDownloads" + , "UeditLeech" + , "QuickValidateFmt" + , "QuickValidatePrompt" + , "UeditPassword" + , "UeditCredits" + , "UeditMinutes" + , "UeditCopyUserQ" + , "UeditCopyUserToSlot" + , "ChangeRestrictsQ" + , "ModifyCredits" + , "ModifyMinutes" + , "DeleteQuestionaireQ" + , "UserDefaultsHdr" + , "UserDefaultsTerminal" + , "UserDefaultsXeditor" + , "UserDefaultsRows" + , "UserDefaultsMenuMode" + , "UserDefaultsPause" + , "UserDefaultsHotKey" + , "UserDefaultsCursor" + , "UserDefaultsCLS" + , "UserDefaultsAskNScan" + , "UserDefaultsAskSScan" + , "UserDefaultsANFS" + , "UserDefaultsRemember" + , "UserDefaultsBatFlag" + , "UserDefaultsNetMail" + , "UserDefaultsCommandSet" + , "UserDefaultsQuiet" + , "UserDefaultsPassword" + , "UserDefaultsArcType" + , "UserDefaultsProtocol" + , "UserDefaultsWhich" + , "On" + , "Off" + , "HowManyRows" + , "CurrentPassword" + , "ForwardMailQ" + , "EnterNetMailAddress" + , "SelectItemHdr" + , "SelectItemFmt" + , "SelectItemWhich" + , "SysopIsHere" + , "EndOfChat" + , "ChatPrompt" + , "AnonUserChatHandle" + , "WelcomeToMultiChat" + , "WelcomeToChannelN" + , "NodeInMultiChatLocally" + , "YoureOnTheAir" + , "NodeJoinedMultiChat" + , "NodeLeftMultiChat" + , "MultiChatCommandPrompt" + , "PasswordProtected" + , "CorrectPassword" + , "WrongPassword" + , "PasswordProtectChanQ" + , "PasswordPrompt" + , "ChatLineFmt" + , "SysopPageIsNow" + , "SysopIsNotAvailable" + , "ChatWithGuruInsteadQ" + , "PrivateMsgPrompt" + , "NodeToPrivateChat" + , "NodeNAlreadyInPChat" + , "NodeNIsNotInUse" + , "NoNeedToPageSelf" + , "CantPageNode" + , "NodePageMsg" + , "AllNodePageMsg" + , "NodePChatPageMsg" + , "R_SendMessages" + , "NodeToSendMsgTo" + , "NoNeedToSendMsgToSelf" + , "NodeMsgPrompt" + , "NodeMsgFmt" + , "AllNodeMsgFmt" + , "PagingGuru" + , "WaitingForNodeInPChat" + , "NodeJoinedPrivateChat" + , "NodeLeftPrivateChat" + , "NoOneHasLoggedOnToday" + , "Unused544" + , "LastFewCallersFmt" + , "CallersToday" + , "DoYouMeanThisUserQ" + , "UNKNOWN_USER" + , "TimesUp" + , "NodeLoggedOff" + , "NodeLoggedOnAtNbps" + , "TiLogon" + , "TiNow" + , "TiTimeon" + , "TiTimeLeft" + , "ControlKeyMenu" + , "TakenTooLongToLogon" + , "CallBackWhenYoureThere" + , "YesNoQuestion" + , "Yes" + , "No" + , "NoYesQuestion" + , "Pause" + , "ContinueQ" + , "SysStatsLogHdr" + , "NodeStatsLogHdr" + , "ReducedTime" + , "EventInfo" + , "UploadBeforeEvent" + , "QWKPrompt" + , "QWKCtrlACodes" + , "QWKPackingSubboard" + , "QWKPackedSubboard" + , "QWKPackingEmail" + , "QWKPackedEmail" + , "QWKUnpacking" + , "QWKUnpacked" + , "QWKNoNewMessages" + , "QWKCompressionFailed" + , "QWKExtractionFailed" + , "QWKReplyNotReceived" + , "QWKInvalidConferenceN" + , "CreatingFileList" + , "CreatedFileList" + , "NoFiles" + , "MsgPtrsInitialized" + , "ConversionRate" + , "CreditsToMin" + , "YouHaveTooManyMinutes" + , "BillingNodeMsg" + , "Convert100ktoNminQ" + , "CreditedAccount" + , "ANSICaptureIsNow" + , "RetrievingFile" + , "Unused595" + , "PrivatePostQ" + , "PostTo" + , "NoToUser" + , "UsingRealName" + , "PostingPrivately" + , "PostingAnonymously" + , "CantDeletePosts" + , "SubInfoHdr" + , "SubInfoLongName" + , "SubInfoShortName" + , "SubInfoQWKName" + , "SubInfoMaxMsgs" + , "SubInfoTagLine" + , "SubInfoFidoNet" + , "SubInfoViewFileQ" + , "DirInfoHdr" + , "DirInfoLongName" + , "DirInfoShortName" + , "DirInfoAllowedExts" + , "DirInfoMaxFiles" + , "DirInfoViewFileQ" + , "NoNetMailAllowed" + , "NetMailCostContinueQ" + , "NetMailing" + , "RemoveFromNewScanQ" + , "SubGroupOrAll" + , "DirLibOrAll" + , "EnterPath" + , "DisplayExtendedFileInfoQ" + , "DisplaySubjectsOnlyQ" + , "EchoIsNow" + , "WelcomeToPrivateChat" + , "UploadingREP" + , "ReceivedFileViaQWK" + , "QWKmsgLimitReached" + , "PrivatePostsNotAllowed" + , "LoadingMsgPtrs" + , "LoadedMsgPtrs" + , "QuoteMessageQ" + , "QuoteLinesPrompt" + , "ChatChanLstHdr" + , "ChatChanLstTitles" + , "ChatChanLstUnderline" + , "ChatChanLstFmt" + , "CantAccessThatChannel" + , "CantDownloadFromDir" + , "SearchingForDupes" + , "SearchedForDupes" + , "AccountWillExpireInNDays" + , "AccountHasExpired" + , "DownloadBatchQ" + , "WaitingForDeviceN" + , "UserSentYouMail" + , "UserSentYouFile" + , "UserReadYourMail" + , "UserReadYourMailNodeMsg" + , "JoinWhichGrp" + , "JoinWhichSub" + , "JoinWhichLib" + , "JoinWhichDir" + , "CfgDirLstHdr" + , "CfgDirLstFmt" + , "CfgLibLstHdr" + , "CfgLibLstFmt" + , "BatchFlagPrompt" + , "FileListBatchCommands" + , "DownloadAttachedFileQ" + , "FreeMinLeft" + , "FreeMinToDeposit" + , "EmailFilesNotAllowed" + , "CantRunThatProgram" + , "OnlyXminutesLeft" + , "AreYouThere" + , "NoAccessLevel" + , "NoAccessAge" + , "NoAccessBPS" + , "NoAccessCredit" + , "NoAccessNode" + , "NoAccessUser" + , "NoAccessExpire" + , "NoAccessTimeLeft" + , "NoAccessTimeUsed" + , "NoAccessTime" + , "NoAccessPCR" + , "NoAccessUDR" + , "NoAccessUDFR" + , "NoAccessFlag1" + , "NoAccessFlag2" + , "NoAccessFlag3" + , "NoAccessFlag4" + , "NoAccessSex" + , "NoAccessExempt" + , "NoAccessRest" + , "NoAccessDay" + , "NoAccessGroup" + , "NoAccessSub" + , "NoAccessLib" + , "NoAccessDir" + , "NodeLstHdr" + , "NodeActionMainMenu" + , "NodeActionReadingMsgs" + , "NodeActionReadingMail" + , "NodeActionSendingMail" + , "NodeActionReadingTextFiles" + , "NodeActionReadingSentMail" + , "NodeActionPostingMsg" + , "NodeActionAutoMsg" + , "NodeActionXtrnMenu" + , "NodeActionSettings" + , "NodeActionFileMenu" + , "NodeActionDownloadingFile" + , "NodeActionUploadingFile" + , "NodeActionBiXferFile" + , "NodeActionListingFiles" + , "NodeActionLoggingOn" + , "NodeActionLocalChat" + , "NodeActionMultiChat" + , "NodeActionGuruChat" + , "NodeActionChatMenu" + , "NodeActionSysop" + , "NodeActionQWKmenu" + , "NodeActionPrivateChat" + , "NodeActionPagingNode" + , "NodeActionRetrievingFile" + , "NodeActionCustom" + , "ViewSignatureQ" + , "DeleteSignatureQ" + , "CreateEditSignatureQ" + , "SpinningCursorOnPauseQ" + , "UseExternalEditorQ" + , "ExternalEditorHeading" + , "CommandShellHeading" + , "ArchiveTypeHeading" + , "ValidatePostQ" + , "NodeStatusWaitingForCall" + , "NodeStatusLogon" + , "NodeStatusNewUser" + , "NodeStatusOffline" + , "NodeStatusEventWaiting" + , "NodeStatusEventRunning" + , "NodeStatusEventLimbo" + , "NodeConnectionTelnet" + , "NodeConnectionRLogin" + , "NodeConnectionSSH" + , "NodeConnectionModem" + , "QWKSettingsHdr" + , "QWKSettingsCtrlA" + , "QWKSettingsArchive" + , "QWKSettingsEmail" + , "QWKSettingsAttach" + , "QWKSettingsDeleteEmail" + , "QWKSettingsNewFilesList" + , "QWKSettingsIndex" + , "QWKSettingsControl" + , "QWKSettingsHeaders" + , "QWKSettingsBySelf" + , "QWKSettingsTimeZone" + , "QWKSettingsVIA" + , "QWKSettingsMsgID" + , "QWKSettingsExtended" + , "QWKSettingsWhich" + , "CantEditMsg" + , "CantDeleteMsg" + , "CantReadSub" + , "CantPostMsg" + , "OperatorPrompt" + , "AddSubToNewScanQ" + , "UnvalidatedWarning" + , "StartingNewUserRegistration" + , "GetStrMenu" + , "DisplayUnreadMessagesOnlyQ" + , "NoMessagesFound" + , "UserIpAddr" + , "Seconds" + , "Minutes" + , "Hours" + , "Days" + , "Months" + , "Years" + , "InThePast" + , "InTheFuture" + , "AgeOfPostedItem" + , "NodeStatusLogout" + , "VotingNotAllowed" + , "VotedAlready" + , "R_Voting" + , "QWKSettingsVoting" + , "VoteMsgUpDownOrQuit" + , "MsgVotes" + , "MsgUpVoteNotice" + , "MsgDownVoteNotice" + , "PollVoteNotice" + , "PollAnswerNumber" + , "PollAnswerFmt" + , "PollAnswerChecked" + , "BallotHdr" + , "BallotAnswerFmt" + , "BallotVoteWhich" + , "Only" + , "SPAMVisibilityIsNow" + , "VoteInThisPollNow" + , "MIMEDecodedPlainTextFmt" + , "MsgHdrBodySeparator" + , "FileHdrDescSeparator" + , "RemoveFileQ" + , "OriginFidoAddr" + , "VoteNoticeFmt" + , "TagMessageQ" + , "TagMessagePrompt" + , "MsgTags" + , "NoAccessTerminal" + , "LongLineContinuationPrefix" + , "Scanning" + , "Done" + , "Scanned" + , "HitYourBackspaceKey" + , "CharacterReceivedFmt" + , "InvalidBackspaceKeyFmt" + , "SwapDeleteKeyQ" + , "PetTerminalDetected" + , "PetTerminalQ" + , "TerminalAutoDetect" + , "TerminalColumns" + , "TerminalRows" + , "TerminalMonochrome" + , "TerminalColor" + , "TerminalIceColor" + , "IceColorTerminalQ" + , "Utf8TerminalQ" + , "MsgCarbonCopyList" + , "LoggingOn" + , "QWKSettingsUtf8" + , "MsgPostedToYouVia" + , "Unlimited" + , "NodeConnectionRaw" + , "MouseTerminalQ" + , "TerminalMouse" + , "SpinningCursor0" + , "SpinningCursor1" + , "SpinningCursor2" + , "SpinningCursor3" + , "SpinningCursor4" + , "SpinningCursor5" + , "SpinningCursor6" + , "SpinningCursor7" + , "SpinningCursor8" + , "SpinningCursor9" + , "HowManyColumns" + , "InternetMailSent" + , "FidoNetMailSent" + , "QWKNetMailSent" + , "MsgsToYouOnlyQ" + , "ToYouOnly" + , "SetMsgPtrPrompt" + , "DateLastKeys" + , "DirLibKeys" + , "SubGroupKeys" + , "Unused853" + , "All" + , "List" + , "InternetMailReceived" + , "InternetMailForwarded" + , "FidoNetMailReceived" + , "WithAttachment" + , "FidoEchoMailReceived" + , "HashingFile" + , "HashedFile" + , "NewUserValEmailSubj" + , "InactivityAlert" + , "None" + , "Which" + , "Next" + , "Previous" + , "Quit" + , "Language" + , "LANG" + , "UserDefaultsLanguage" + , "PasswordChar" + , "NodeConnectionSFTP" + , "QWKSettingsWrapText" + , "UnknownUploader" + , "FREE" + , "Sun" + , "Mon" + , "Tue" + , "Wed" + , "Thu" + , "Fri" + , "Sat" + , "Jan" + , "Feb" + , "Mar" + , "Apr" + , "May" + , "Jun" + , "Jul" + , "Aug" + , "Sep" + , "Oct" + , "Nov" + , "Dec" + , "SysopPageNotification" + , "NodeActivityMainMenu" + , "NodeActivityReadingMsgs" + , "NodeActivityReadingMail" + , "NodeActivitySendingMail" + , "NodeActivityReadingTextFiles" + , "NodeActivityReadingSentMail" + , "NodeActivityPostingMsg" + , "NodeActivityAutoMsg" + , "NodeActivityXtrnMenu" + , "NodeActivityRunningXtrn" + , "NodeActivitySettings" + , "NodeActivityFileMenu" + , "NodeActivityDownloadingFile" + , "NodeActivityUploadingFile" + , "NodeActivityBiXferFile" + , "NodeActivityListingFiles" + , "NodeActivityLoggingOn" + , "NodeActivityLocalChat" + , "NodeActivityChatChannel" + , "NodeActivityGlobalChat" + , "NodeActivityChatMenu" + , "NodeActivitySysop" + , "NodeActivityQWKmenu" + , "NodeActivityNodeChat" + , "NodeActivityPagingNode" + , "NodeActivityRetrievingFile" + , "NodeActivityCustom" + , "Never" + , "Deleting" + , "DoneDeleting" + , "Deleted" + , "DeletedNumberItems" + , "E_Mail" + , "E_Mails" }; diff --git a/src/sbbs3/text_sec.cpp b/src/sbbs3/text_sec.cpp index 021c9811adecdf65d507552037df12f06d7f4e36..4e407f0604f41ff88be594b9238bfb06cf642a2d 100644 --- a/src/sbbs3/text_sec.cpp +++ b/src/sbbs3/text_sec.cpp @@ -29,7 +29,7 @@ int sbbs_t::text_sec() { if (!cfg.textsec_mod[0]) { bputs(text[NoTextSections]); - return(1); + return 1; } return exec_bin(cfg.textsec_mod, &main_csi); } diff --git a/src/sbbs3/textgen.c b/src/sbbs3/textgen.c index be78a78b901768c32483b5681f03d8d48e41e99b..d1429de81bd575267c64bd6a0527280d67d9dc19 100644 --- a/src/sbbs3/textgen.c +++ b/src/sbbs3/textgen.c @@ -20,12 +20,12 @@ char *readtext(FILE *stream, char **comment_ret) int i, j, k; if (!fgets(buf, 256, stream)) - return(NULL); + return NULL; if (buf[0] == '#') - return(NULL); + return NULL; p = strrchr(buf, '"'); if (!p) { - return(NULL); + return NULL; } comment[0] = 0; if (*(p + 1) == '\\') { /* merge multiple lines */ @@ -34,7 +34,7 @@ char *readtext(FILE *stream, char **comment_ret) SAFECAT(comment, cp); while (strlen(buf) < 2000) { if (!fgets(str, 255, stream)) - return(NULL); + return NULL; p2 = strchr(str, '"'); if (!p2) continue; @@ -120,12 +120,12 @@ char *readtext(FILE *stream, char **comment_ret) str[j] = 0; if ((p = (char *)calloc(1, j + 2)) == NULL) { /* +1 for terminator, +1 for YNQX line */ fprintf(stderr, "Error allocating %u bytes of memory from text.dat", j); - return(NULL); + return NULL; } strcpy(p, str); if (comment_ret) *comment_ret = strdup(comment); - return(p); + return p; } char *format_as_cstr(const char *orig) @@ -143,7 +143,7 @@ char *format_as_cstr(const char *orig) ret = (char *)malloc(len); if (ret == NULL) - return(ret); + return ret; strcpy(ret, "\""); for (in = orig; *in; in++) { sprintf(hex, "\\x%02x", (unsigned char)*in); @@ -152,7 +152,7 @@ char *format_as_cstr(const char *orig) strcat(ret, "\"\n\t\t\""); } strcat(ret, "\""); - return(ret); + return ret; } int main(int argc, char **argv) diff --git a/src/sbbs3/tmp_xfer.cpp b/src/sbbs3/tmp_xfer.cpp index 29a70a2bfd620f9faf6e251cd0872f03844bf7c8..ebe67088d1596cddaec3b52c31d7d8094cb3814d 100644 --- a/src/sbbs3/tmp_xfer.cpp +++ b/src/sbbs3/tmp_xfer.cpp @@ -50,7 +50,7 @@ uint sbbs_t::create_filelist(const char *name, int mode) SAFEPRINTF2(str, "%s%s", cfg.temp_dir, name); if ((fp = fopen(str, "ab")) == NULL) { errormsg(WHERE, ERR_OPEN, str, O_CREAT | O_WRONLY | O_APPEND); - return(0); + return 0; } k = 0; if (mode & FL_ULTIME) { @@ -87,7 +87,7 @@ uint sbbs_t::create_filelist(const char *name, int mode) SAFEPRINTF2(str, "%s%s", cfg.temp_dir, name); remove(str); } - return(k); + return k; } /****************************************************************************/ @@ -100,14 +100,14 @@ const char* sbbs_t::temp_cmd(int& ex_mode) if (!cfg.total_fcomps) { errormsg(WHERE, ERR_CHK, "compressible file types", 0); - return(nulstr); + return nulstr; } for (i = 0; i < cfg.total_fcomps; i++) if (!stricmp(useron.tmpext, cfg.fcomp[i]->ext) && chk_ar(cfg.fcomp[i]->ar, &useron, &client)) { ex_mode |= cfg.fcomp[i]->ex_mode; - return(cfg.fcomp[i]->cmd); + return cfg.fcomp[i]->cmd; } ex_mode |= cfg.fcomp[0]->ex_mode; - return(cfg.fcomp[0]->cmd); + return cfg.fcomp[0]->cmd; } diff --git a/src/sbbs3/trash.c b/src/sbbs3/trash.c index 7bc784e43714979e6d4531e3feb86ff4d26ef335..993831c44bfb79ab0fa27bd7983305d000dfba48 100644 --- a/src/sbbs3/trash.c +++ b/src/sbbs3/trash.c @@ -163,21 +163,21 @@ bool filter_ip(scfg_t* cfg, const char* prot, const char* reason, const char* ho time_t now = time(NULL); if (ip_addr == NULL) - return(false); + return false; SAFEPRINTF2(exempt, "%s%s", cfg->ctrl_dir, strIpFilterExemptConfigFile); if (find2strs(ip_addr, host, exempt, NULL)) - return(false); + return false; SAFEPRINTF(ip_can, "%sip.can", cfg->text_dir); if (fname == NULL) fname = ip_can; if (findstr(ip_addr, fname)) /* Already filtered? */ - return(true); + return true; if ((fp = fnopen(NULL, fname, O_CREAT | O_APPEND | O_WRONLY)) == NULL) - return(false); + return false; fprintf(fp, "%s\tt=%s" , ip_addr @@ -195,7 +195,7 @@ bool filter_ip(scfg_t* cfg, const char* prot, const char* reason, const char* ho fputc('\n', fp); fclose(fp); - return(true); + return true; } bool is_twit(scfg_t* cfg, const char* name) diff --git a/src/sbbs3/un_qwk.cpp b/src/sbbs3/un_qwk.cpp index c058102d9445b7e1a19c5c52b6be9e44d4e7b9e8..37db8cc5721c227b66a96d47d522b682bb155864 100644 --- a/src/sbbs3/un_qwk.cpp +++ b/src/sbbs3/un_qwk.cpp @@ -71,7 +71,7 @@ bool sbbs_t::unpack_qwk(char *packet, uint hubnum) start = time(NULL); if ((l = (long)flength(packet)) < 1) { errormsg(WHERE, ERR_LEN, packet, l); - return(false); + return false; } delfiles(cfg.temp_dir, ALLFILES); long file_count = extract_files_from_archive(packet @@ -92,13 +92,13 @@ bool sbbs_t::unpack_qwk(char *packet, uint hubnum) i = external(cmdstr(cfg.qhub[hubnum]->unpack, packet, ALLFILES, NULL), EX_OFFLINE); if (i) { errormsg(WHERE, ERR_EXEC, cmdstr(cfg.qhub[hubnum]->unpack, packet, ALLFILES, NULL), i); - return(false); + return false; } } SAFEPRINTF(msg_fname, "%sMESSAGES.DAT", cfg.temp_dir); if (!fexistcase(msg_fname)) { lprintf(LOG_WARNING, "%s doesn't contain MESSAGES.DAT (%s)", packet, msg_fname); - return(false); + return false; } size = (long)flength(msg_fname); if (size < QWK_BLOCK_LEN || (size % QWK_BLOCK_LEN) != 0) { @@ -107,7 +107,7 @@ bool sbbs_t::unpack_qwk(char *packet, uint hubnum) } if ((qwk = fnopen(&file, msg_fname, O_RDONLY)) == NULL) { errormsg(WHERE, ERR_OPEN, msg_fname, O_RDONLY); - return(false); + return false; } size = (long)filelength(file); diff --git a/src/sbbs3/un_rep.cpp b/src/sbbs3/un_rep.cpp index ac1312a8371eda4f5c597c3b4714a4b6ecd69012..2d6759f0464f1d5d8e5789ca7c26f1dfce6fcda1 100644 --- a/src/sbbs3/un_rep.cpp +++ b/src/sbbs3/un_rep.cpp @@ -102,7 +102,7 @@ bool sbbs_t::unpack_rep(char* repfile) bputs(text[QWKExtractionFailed]); logline(LOG_NOTICE, "U!", AttemptedToUploadREPpacket); logline(LOG_NOTICE, nulstr, "Extraction failed"); - return(false); + return false; } } SAFEPRINTF2(msg_fname, "%s%s.msg", cfg.temp_dir, cfg.sys_id); @@ -110,7 +110,7 @@ bool sbbs_t::unpack_rep(char* repfile) bputs(text[QWKReplyNotReceived]); logline(LOG_NOTICE, "U!", AttemptedToUploadREPpacket); logline(LOG_NOTICE, nulstr, "MSG file not received"); - return(false); + return false; } size = (long)flength(msg_fname); if (size < QWK_BLOCK_LEN || (size % QWK_BLOCK_LEN) != 0) { @@ -119,7 +119,7 @@ bool sbbs_t::unpack_rep(char* repfile) } if ((rep = fnopen(&file, msg_fname, O_RDONLY)) == NULL) { errormsg(WHERE, ERR_OPEN, msg_fname, O_RDONLY); - return(false); + return false; } size = (long)filelength(file); @@ -168,7 +168,7 @@ bool sbbs_t::unpack_rep(char* repfile) bputs(text[QWKReplyNotReceived]); logline(LOG_NOTICE, "U!", AttemptedToUploadREPpacket); logline(LOG_NOTICE, nulstr, "Incorrect QWK BBS ID"); - return(false); + return false; } /********************/ /* Process messages */ diff --git a/src/sbbs3/unbaja.c b/src/sbbs3/unbaja.c index 359c11e4834072a1fdf1ca5a9d7f1ac97e1bf3cf..680f4ccab41d0449ab4af27e810a58a591794f6a 100644 --- a/src/sbbs3/unbaja.c +++ b/src/sbbs3/unbaja.c @@ -223,10 +223,10 @@ int check_bruted(long name, unsigned char *val) for (i = 0; i < bruted_len; i++) { if (*(int32_t *)bruted[i] == name) { if (!strcmp((char*)val, bruted[i] + 5)) - return(*(bruted[i] + 4)); + return *(bruted[i] + 4); } } - return(2); + return 2; } char *find_bruted(long name) @@ -235,9 +235,9 @@ char *find_bruted(long name) for (i = 0; i < bruted_len; i++) { if (*(int32_t *)bruted[i] == name && *(bruted[i] + 4)) - return(bruted[i] + 5); + return bruted[i] + 5; } - return(NULL); + return NULL; } char* bruteforce(unsigned long name) @@ -250,11 +250,11 @@ char* bruteforce(unsigned long name) size_t i; if (!brute_len) - return(NULL); + return NULL; if ((ret = find_bruted(name)) != NULL) { if (!(*ret)) - return(NULL); - return(ret); + return NULL; + return ret; } memset(brute_buf, 0, brute_len + 1); memset(brute_crc_buf, 0, brute_len * sizeof(int32_t)); @@ -284,7 +284,7 @@ char* bruteforce(unsigned long name) if (l == brute_len) { printf("\r%s Not found.\n", brute_buf); add_bruted(name, 1, "", 0); - return(NULL); + return NULL; } /* Set string to '_' with one extra at end */ memset(brute_buf, '_', ++l); @@ -320,7 +320,7 @@ LOOP_END: BRUTE_DONE: printf("\r%s Found!\n", brute_buf); - return((char*)brute_buf); + return (char*)brute_buf; } /* comparison function for var_table */ @@ -349,7 +349,7 @@ char *getvar(long name) sprintf(varname, "var_%08lx", name); } - return(varname); + return varname; } size_t my_fread(void* buf, size_t size, size_t n, FILE* fp) @@ -442,7 +442,7 @@ int write_key(FILE *bin, char *src, int keyset) uchar uch; my_fread(&uch, 1, 1, bin); if (uch == 0 && keyset) - return(uch); + return uch; if (uch == CS_DIGIT) strcat(src, "DIGIT"); else if (uch == CS_EDIGIT) @@ -477,7 +477,7 @@ int write_key(FILE *bin, char *src, int keyset) sprintf(strchr(src, 0), "%c", uch); if (!keyset) strcat(src, " "); - return(uch);; + return uch;; } void write_keys(FILE *bin, char *src) @@ -1223,7 +1223,7 @@ char *decompile_ars(uchar *ars, int len) break; default: printf("Error decoding AR: %02Xh, offset: %ld\n", *in, (long)(in - ars)); - return("Unknown ARS String"); + return "Unknown ARS String"; } switch (*in) { case AR_TIME: @@ -1322,7 +1322,7 @@ char *decompile_ars(uchar *ars, int len) } } *out = 0; - return(buf); + return buf; } void decompile(FILE *bin, FILE *srcfile) @@ -2398,6 +2398,6 @@ int main(int argc, char **argv) } } - return(0); + return 0; } diff --git a/src/sbbs3/upgrade_to_v319.c b/src/sbbs3/upgrade_to_v319.c index 42a367fcd2dc9cc135c8d6d64f5c4ead9615d68f..4c58fdc9baa144158eace291467c967f5c3543ba 100644 --- a/src/sbbs3/upgrade_to_v319.c +++ b/src/sbbs3/upgrade_to_v319.c @@ -56,10 +56,10 @@ BOOL overwrite(const char* path) if (fgets(str, sizeof(str), stdin) == NULL) *str = '\0'; if (toupper(*str) != 'Y') - return(FALSE); + return FALSE; } - return(TRUE); + return TRUE; } int lprintf(int level, const char *fmt, ...) @@ -71,7 +71,7 @@ int lprintf(int level, const char *fmt, ...) vsnprintf(sbuf, sizeof(sbuf), fmt, argptr); sbuf[sizeof(sbuf) - 1] = 0; va_end(argptr); - return(puts(sbuf)); + return puts(sbuf); } /****************************************************************************/ @@ -85,7 +85,7 @@ long dstrtodate(scfg_t* cfg, char *instr) struct tm tm; if (!instr[0] || !strncmp(instr, "00/00/00", 8)) - return(0); + return 0; if (isdigit(instr[0]) && isdigit(instr[1]) && isdigit(instr[3]) && isdigit(instr[4]) @@ -95,12 +95,12 @@ long dstrtodate(scfg_t* cfg, char *instr) p = instr; /* incorrectly formatted */ while (*p && isdigit(*p)) p++; if (*p == 0) - return(0); + return 0; p++; day = p; while (*p && isdigit(*p)) p++; if (*p == 0) - return(0); + return 0; p++; sprintf(str, "%02u/%02u/%02u" , atoi(instr) % 100, atoi(day) % 100, atoi(p) % 100); @@ -118,7 +118,7 @@ long dstrtodate(scfg_t* cfg, char *instr) tm.tm_mday = ((p[3] & 0xf) * 10) + (p[4] & 0xf); } - return(((tm.tm_year + 1900) * 10000) + (tm.tm_mon * 100) + tm.tm_mday); + return ((tm.tm_year + 1900) * 10000) + (tm.tm_mon * 100) + tm.tm_mday; } /*****************************/ @@ -191,7 +191,7 @@ char* padfname(const char *filename, char *str) while (d < 12) str[d++] = ' '; str[d] = 0; - return(str); + return str; } /****************************************************************************/ @@ -204,7 +204,7 @@ char* unpadfname(const char *filename, char *str) for (c = 0, d = 0; filename[c]; c++) if (filename[c] != ' ') str[d++] = filename[c]; str[d] = 0; - return(str); + return str; } /****************************************************************************/ @@ -225,7 +225,7 @@ char* getoldfilepath(scfg_t* cfg, oldfile_t* f, char* path) if (fexistcase(tmp)) strcpy(path, tmp); } - return(path); + return path; } int file_uldate_compare(const void* v1, const void* v2) @@ -249,21 +249,21 @@ BOOL getfiledat(scfg_t* cfg, oldfile_t* f) SAFEPRINTF2(str, "%s%s.dat", cfg->dir[f->dir]->data_dir, cfg->dir[f->dir]->code); if ((file = sopen(str, O_RDONLY | O_BINARY, SH_DENYWR)) == -1) { - return(FALSE); + return FALSE; } length = (long)filelength(file); if (f->datoffset > length) { close(file); - return(FALSE); + return FALSE; } if (length % F_LEN) { close(file); - return(FALSE); + return FALSE; } lseek(file, f->datoffset, SEEK_SET); if (read(file, buf, F_LEN) != F_LEN) { close(file); - return(FALSE); + return FALSE; } close(file); getrec(buf, F_ALTPATH, 2, str); @@ -297,7 +297,7 @@ BOOL getfiledat(scfg_t* cfg, oldfile_t* f) f->misc = buf[F_MISC] - ' '; else f->misc = 0; - return(TRUE); + return TRUE; } /****************************************************************************/ @@ -324,28 +324,28 @@ BOOL putfiledat(scfg_t* cfg, oldfile_t* f) putrec(buf, F_ALTPATH + 2, 2, "\r\n"); SAFEPRINTF2(str, "%s%s.dat", cfg->dir[f->dir]->data_dir, cfg->dir[f->dir]->code); if ((file = sopen(str, O_WRONLY | O_BINARY, SH_DENYRW)) == -1) { - return(FALSE); + return FALSE; } length = (long)filelength(file); if (length % F_LEN) { close(file); - return(FALSE); + return FALSE; } if (f->datoffset > length) { close(file); - return(FALSE); + return FALSE; } lseek(file, f->datoffset, SEEK_SET); if (write(file, buf, F_LEN) != F_LEN) { close(file); - return(FALSE); + return FALSE; } length = (long)filelength(file); close(file); if (length % F_LEN) { - return(FALSE); + return FALSE; } - return(TRUE); + return TRUE; } /****************************************************************************/ @@ -362,21 +362,21 @@ BOOL getfileixb(scfg_t* cfg, oldfile_t* f) SAFEPRINTF2(str, "%s%s.ixb", cfg->dir[f->dir]->data_dir, cfg->dir[f->dir]->code); if ((file = sopen(str, O_RDONLY | O_BINARY, SH_DENYWR)) == -1) { - return(FALSE); + return FALSE; } length = (long)filelength(file); if (length % F_IXBSIZE) { close(file); - return(FALSE); + return FALSE; } if ((ixbbuf = (uchar *)malloc(length)) == NULL) { close(file); - return(FALSE); + return FALSE; } if (read(file, ixbbuf, length) != length) { close(file); free(ixbbuf); - return(FALSE); + return FALSE; } close(file); SAFECOPY(fname, f->name); @@ -389,7 +389,7 @@ BOOL getfileixb(scfg_t* cfg, oldfile_t* f) } if (l >= length) { free(ixbbuf); - return(FALSE); + return FALSE; } l += 11; f->datoffset = ixbbuf[l] | ((long)ixbbuf[l + 1] << 8) | ((long)ixbbuf[l + 2] << 16); @@ -398,7 +398,7 @@ BOOL getfileixb(scfg_t* cfg, oldfile_t* f) f->datedled = ixbbuf[l + 7] | ((long)ixbbuf[l + 8] << 8) | ((long)ixbbuf[l + 9] << 16) | ((long)ixbbuf[l + 10] << 24); free(ixbbuf); - return(TRUE); + return TRUE; } /****************************************************************************/ @@ -413,21 +413,21 @@ BOOL putfileixb(scfg_t* cfg, oldfile_t* f) SAFEPRINTF2(str, "%s%s.ixb", cfg->dir[f->dir]->data_dir, cfg->dir[f->dir]->code); if ((file = sopen(str, O_RDWR | O_BINARY, SH_DENYRW)) == -1) { - return(FALSE); + return FALSE; } length = (long)filelength(file); if (length % F_IXBSIZE) { close(file); - return(FALSE); + return FALSE; } if ((ixbbuf = (uchar *)malloc(length)) == NULL) { close(file); - return(FALSE); + return FALSE; } if (read(file, ixbbuf, length) != length) { close(file); free(ixbbuf); - return(FALSE); + return FALSE; } SAFECOPY(fname, f->name); for (l = 8; l < 12; l++) /* Turn FILENAME.EXT into FILENAMEEXT */ @@ -441,7 +441,7 @@ BOOL putfileixb(scfg_t* cfg, oldfile_t* f) if (l >= length) { close(file); - return(FALSE); + return FALSE; } lseek(file, l + 11 + 3, SEEK_SET); @@ -451,7 +451,7 @@ BOOL putfileixb(scfg_t* cfg, oldfile_t* f) close(file); - return(TRUE); + return TRUE; } int openextdesc(scfg_t* cfg, uint dirnum) @@ -519,11 +519,11 @@ int update_uldate(scfg_t* cfg, oldfile_t* f) /*******************/ SAFEPRINTF2(str, "%s%s.ixb", cfg->dir[f->dir]->data_dir, cfg->dir[f->dir]->code); if ((file = nopen(str, O_RDWR)) == -1) - return(errno); + return errno; length = (long)filelength(file); if (length % F_IXBSIZE) { close(file); - return(-1); + return -1; } SAFECOPY(fname, f->name); for (i = 8; i < 12; i++) /* Turn FILENAME.EXT into FILENAMEEXT */ @@ -535,7 +535,7 @@ int update_uldate(scfg_t* cfg, oldfile_t* f) } if (l >= length) { close(file); - return(-2); + return -2; } lseek(file, l + 14, SEEK_SET); my_write(file, &f->dateuled, 4); @@ -546,11 +546,11 @@ int update_uldate(scfg_t* cfg, oldfile_t* f) /*******************************************/ SAFEPRINTF2(str, "%s%s.dab", cfg->dir[f->dir]->data_dir, cfg->dir[f->dir]->code); if ((file = nopen(str, O_WRONLY | O_CREAT)) == -1) - return(errno); + return errno; my_write(file, &f->dateuled, 4); close(file); - return(0); + return 0; } bool upgrade_file_bases(bool hash) diff --git a/src/sbbs3/upgrade_to_v320.c b/src/sbbs3/upgrade_to_v320.c index 5c766bd17f935541d5c040940c9bb62014b6eb84..2b0faedf9cf2eb663a3fe313106eeba1ad2035a0 100644 --- a/src/sbbs3/upgrade_to_v320.c +++ b/src/sbbs3/upgrade_to_v320.c @@ -48,7 +48,7 @@ int lprintf(int level, const char *fmt, ...) vsnprintf(sbuf, sizeof(sbuf), fmt, argptr); sbuf[sizeof(sbuf) - 1] = 0; va_end(argptr); - return(puts(sbuf)); + return puts(sbuf); } /* String lengths */ @@ -166,12 +166,12 @@ static uint v31x_lastuser(scfg_t* cfg) long length; if (!VALID_CFG(cfg)) - return(0); + return 0; SAFEPRINTF(str, "%suser/user.dat", cfg->data_dir); if ((length = (long)flength(str)) > 0) - return((uint)(length / U_LEN)); - return(0); + return (uint)(length / U_LEN); + return 0; } /****************************************************************************/ @@ -182,7 +182,7 @@ static int v31x_openuserdat(scfg_t* cfg, BOOL for_modify) char path[MAX_PATH + 1]; if (!VALID_CFG(cfg)) - return(-1); + return -1; SAFEPRINTF(path, "%suser/user.dat", cfg->data_dir); return nopen(path, for_modify ? (O_RDWR | O_CREAT | O_DENYNONE) : (O_RDONLY | O_DENYNONE)); @@ -205,7 +205,7 @@ static int v31x_readuserdat(scfg_t* cfg, unsigned user_number, char* userdat, in int i, file; if (!VALID_CFG(cfg) || user_number < 1) - return(-1); + return -1; if (infile >= 0) file = infile; @@ -217,7 +217,7 @@ static int v31x_readuserdat(scfg_t* cfg, unsigned user_number, char* userdat, in if (user_number > (unsigned)(filelength(file) / U_LEN)) { if (file != infile) close(file); - return(-1); /* no such user record */ + return -1; /* no such user record */ } (void)lseek(file, (long)((long)(user_number - 1) * U_LEN), SEEK_SET); @@ -231,14 +231,14 @@ static int v31x_readuserdat(scfg_t* cfg, unsigned user_number, char* userdat, in if (i >= LOOP_NODEDAB) { if (file != infile) close(file); - return(-2); + return -2; } if (read(file, userdat, U_LEN) != U_LEN) { unlock(file, (long)((long)(user_number - 1) * U_LEN), U_LEN); if (file != infile) close(file); - return(-3); + return -3; } unlock(file, (long)((long)(user_number - 1) * U_LEN), U_LEN); if (file != infile) @@ -257,13 +257,13 @@ static int v31x_parseuserdat(scfg_t* cfg, char *userdat, user_t *user) unsigned user_number; if (user == NULL) - return(-1); + return -1; user_number = user->number; memset(user, 0, sizeof(user_t)); if (!VALID_CFG(cfg) || user_number < 1) - return(-1); + return -1; /* The user number needs to be set here before calling chk_ar() below for user-number comparisons in AR strings to function correctly */ @@ -401,7 +401,7 @@ static int v31x_parseuserdat(scfg_t* cfg, char *userdat, user_t *user) resetdailyuserdat(cfg, user, /* write: */ FALSE); } } - return(0); + return 0; } /* Fast getuserdat() (leaves user.dat file open) */ @@ -411,7 +411,7 @@ static int v31x_fgetuserdat(scfg_t* cfg, user_t *user, int file) char userdat[U_LEN + 1]; if (!VALID_CFG(cfg) || user == NULL || user->number < 1) - return(-1); + return -1; memset(userdat, 0, sizeof(userdat)); if ((retval = v31x_readuserdat(cfg, user->number, userdat, file)) != 0) { diff --git a/src/sbbs3/upload.cpp b/src/sbbs3/upload.cpp index 57bbe8a6efa2847d3b30896a90e69785cb1b6040..a7053d1907d1779a516848174b97b87324c26bd9 100644 --- a/src/sbbs3/upload.cpp +++ b/src/sbbs3/upload.cpp @@ -132,7 +132,7 @@ bool sbbs_t::uploadfile(file_t* f) , f->name , cfg.lib[cfg.dir[f->dir]->lib]->sname, cfg.dir[f->dir]->sname); logline(LOG_NOTICE, "U!", str); - return(false); /* File is in database for another dir */ + return false; /* File is in database for another dir */ } } } @@ -214,7 +214,7 @@ bool sbbs_t::okay_to_upload(int dirnum) if (!isdir(path)) { bprintf(text[DirectoryDoesNotExist], path); lprintf(LOG_ERR, "File directory does not exist: %s", path); - return(false); + return false; } /* get free disk space */ @@ -224,7 +224,7 @@ bool sbbs_t::okay_to_upload(int dirnum) bputs(text[LowDiskSpace]); lprintf(LOG_ERR, "Disk space is low: %s (%s bytes)", path, str); if (!dir_op(dirnum)) - return(false); + return false; } bprintf(text[DiskNBytesFree], str); return true; @@ -248,21 +248,21 @@ bool sbbs_t::upload(int dirnum, const char* fname) /* Security Checks */ if (useron.rest & FLAG('U')) { bputs(text[R_Upload]); - return(false); + return false; } if (dirnum == INVALID_DIR) { bputs(text[CantUploadHere]); - return(false); + return false; } if (!(useron.exempt & FLAG('U')) && !dir_op(dirnum)) { if (!chk_ar(cfg.dir[dirnum]->ul_ar, &useron, &client) || !chk_ar(cfg.lib[cfg.dir[dirnum]->lib]->ul_ar, &useron, &client)) { bputs(dirnum == cfg.user_dir ? text[CantUploadToUser] : dirnum == cfg.sysop_dir ? text[CantUploadToSysop] : text[CantUploadHere]); - return(false); + return false; } if (cfg.dir[dirnum]->maxfiles && getfiles(&cfg, dirnum) >= cfg.dir[dirnum]->maxfiles) { bputs(dirnum == cfg.user_dir ? text[UserDirFull] : text[DirFull]); - return(false); + return false; } } @@ -290,17 +290,17 @@ bool sbbs_t::upload(int dirnum, const char* fname) else SAFEPRINTF3(str, text[UploadToCurDirQ], fname, cfg.lib[cfg.dir[dirnum]->lib]->sname , cfg.dir[dirnum]->sname); - if (!yesno(str)) return(false); + if (!yesno(str)) return false; action = NODE_ULNG; SAFECOPY(f.file_idx.name, fname); getfilepath(&cfg, &f, path); if (fexistcase(path)) { /* File is on disk */ if (!dir_op(dirnum) && online != ON_LOCAL) { /* local users or sysops */ bprintf(text[FileAlreadyThere], fname); - return(false); + return false; } if (!yesno(text[FileOnDiskAddQ])) - return(false); + return false; } char* ext = getfext(fname); SAFECOPY(str, cfg.dir[dirnum]->exts); @@ -317,14 +317,14 @@ bool sbbs_t::upload(int dirnum, const char* fname) bputs(text[TheseFileExtsOnly]); bputs(cfg.dir[dirnum]->exts); CRLF; - if (!dir_op(dirnum)) return(false); + if (!dir_op(dirnum)) return false; } bputs(text[SearchingForDupes]); bool found = findfile(&cfg, dirnum, fname, NULL); bputs(text[SearchedForDupes]); if (found) { bprintf(text[FileAlreadyOnline], fname, lib_name(dirnum), dir_name(dirnum)); - return(false); /* File is already in database */ + return false; /* File is already in database */ } for (i = k = 0; i < usrlibs; i++) { progress(text[SearchingForDupes], i, usrlibs); @@ -336,7 +336,7 @@ bool sbbs_t::upload(int dirnum, const char* fname) bputs(text[SearchedForDupes]); bprintf(text[FileAlreadyOnline], fname, lib_name(usrdir[i][j]), dir_name(usrdir[i][j])); if (!dir_op(dirnum)) - return(false); /* File is in database for another dir */ + return false; /* File is in database for another dir */ } if (msgabort(true)) { bputs(text[SearchedForDupes]); @@ -350,7 +350,7 @@ bool sbbs_t::upload(int dirnum, const char* fname) bputs(text[RateThisFile]); ch = getkey(K_ALPHA); if (!IS_ALPHA(ch) || sys_status & SS_ABORT) - return(false); + return false; CRLF; SAFEPRINTF(descbeg, text[Rated], toupper(ch)); } @@ -366,10 +366,10 @@ bool sbbs_t::upload(int dirnum, const char* fname) if (!noyes(text[MultipleDiskQ])) { bputs(text[HowManyDisksTotal]); if ((int)(i = getnum(99)) < 2) - return(false); + return false; bputs(text[NumberOfFile]); if ((int)(j = getnum(i)) < 1) - return(false); + return false; if (j == 1) upload_lastdesc[0] = 0; if (i > 9) @@ -421,7 +421,7 @@ bool sbbs_t::upload(int dirnum, const char* fname) getstr(upload_lastdesc, i, K_LINE | K_EDIT | K_AUTODEL | K_TRIM); if (sys_status & SS_ABORT) { strListFree(&dest_user_list); - return(false); + return false; } if (descend[0]) /* end of desc specified, so pad desc with spaces */ safe_snprintf(fdesc, sizeof(fdesc), "%s%-*s%s", descbeg, i, upload_lastdesc, descend); @@ -553,8 +553,8 @@ bool sbbs_t::bulkupload(int dirnum) strListFree(&list); smb_freemsgmem(&f); if (sys_status & SS_ABORT) - return(true); - return(false); + return true; + return false; } bool sbbs_t::recvfile(char *fname, char prot, bool autohang) @@ -574,7 +574,7 @@ bool sbbs_t::recvfile(char *fname, char prot, bool autohang) ch = (char)getkeys(keys, 0); if (ch == quit_key() || sys_status & SS_ABORT) - return(false); + return false; } i = protnum(ch, XFER_UPLOAD); if (i < cfg.total_prots) { @@ -583,5 +583,5 @@ bool sbbs_t::recvfile(char *fname, char prot, bool autohang) autohangup(); } - return(result); + return result; } diff --git a/src/sbbs3/userdat.c b/src/sbbs3/userdat.c index 752aab703b893c81b2c24574212d876271263f4d..dce17da990ca8d0d28657e5d9be16cf08bf9078b 100644 --- a/src/sbbs3/userdat.c +++ b/src/sbbs3/userdat.c @@ -89,15 +89,15 @@ uint matchuser(scfg_t* cfg, const char *name, bool sysop_alias) FILE* stream; if (!VALID_CFG(cfg) || name == NULL || *name == '\0') - return(0); + return 0; if (sysop_alias && (!stricmp(name, "SYSOP") || !stricmp(name, "POSTMASTER") || !stricmp(name, cfg->sys_id))) - return(1); + return 1; SAFEPRINTF(str, "%suser/name.dat", cfg->data_dir); if ((stream = fnopen(&file, str, O_RDONLY)) == NULL) - return(0); + return 0; length = filelength(file); if (length < sizeof(dat)) { fclose(stream); @@ -117,7 +117,7 @@ uint matchuser(scfg_t* cfg, const char *name, bool sysop_alias) fclose(stream); if (l < length) return (uint)((l / (LEN_ALIAS + 2)) + 1); - return(0); + return 0; } /****************************************************************************/ @@ -186,7 +186,7 @@ int total_users(scfg_t* cfg) bool success = true; if (!VALID_CFG(cfg)) - return(0); + return 0; if ((file = openuserdat(cfg, /* for_modify: */ false)) < 0) return 0; @@ -215,7 +215,7 @@ int lastuser(scfg_t* cfg) off_t length; if (!VALID_CFG(cfg)) - return(0); + return 0; if ((length = flength(userdat_filename(cfg, path, sizeof(path)))) > 0) return (int)(length / USER_RECORD_LINE_LEN); @@ -231,14 +231,14 @@ bool del_lastuser(scfg_t* cfg) off_t length; if (!VALID_CFG(cfg)) - return(false); + return false; if ((file = openuserdat(cfg, /* for_modify: */ true)) < 0) - return(false); + return false; length = filelength(file); if (length < USER_RECORD_LINE_LEN) { close(file); - return(false); + return false; } int result = chsize(file, (long)length - USER_RECORD_LINE_LEN); close(file); @@ -812,25 +812,25 @@ char* username(scfg_t* cfg, int usernumber, char *name) int file; if (name == NULL) - return(NULL); + return NULL; if (!VALID_CFG(cfg) || !VALID_USER_NUMBER(usernumber)) { name[0] = 0; - return(name); + return name; } SAFEPRINTF(str, "%suser/name.dat", cfg->data_dir); if (flength(str) < 1L) { name[0] = 0; - return(name); + return name; } if ((file = nopen(str, O_RDONLY)) == -1) { name[0] = 0; - return(name); + return name; } if (filelength(file) < (long)((long)usernumber * (LEN_ALIAS + 2))) { close(file); name[0] = 0; - return(name); + return name; } (void)lseek(file, (long)((long)(usernumber - 1) * (LEN_ALIAS + 2)), SEEK_SET); if (read(file, name, LEN_ALIAS) != LEN_ALIAS) @@ -841,7 +841,7 @@ char* username(scfg_t* cfg, int usernumber, char *name) name[c] = 0; if (!c) strcpy(name, "DELETED USER"); - return(name); + return name; } /****************************************************************************/ @@ -1004,14 +1004,14 @@ int getage(scfg_t* cfg, const char *birth) time_t now; if (!VALID_CFG(cfg) || birth == NULL) - return(0); + return 0; if (!atoi(birth) || !atoi(birth + 3)) /* Invalid */ - return(0); + return 0; now = time(NULL); if (localtime_r(&now, &tm) == NULL) - return(0); + return 0; tm.tm_mon++; /* convert to 1 based */ int year = getbirthyear(cfg, birth); @@ -1360,7 +1360,7 @@ char* unpackchatpass(char *pass, node_t* node) int i; if (pass == NULL || node == NULL) - return(NULL); + return NULL; pass[0] = (node->aux & 0x1f00) >> 8; pass[1] = (char)(((node->aux & 0xe000) >> 13) | ((node->extaux & 0x3) << 3)); @@ -1373,7 +1373,7 @@ char* unpackchatpass(char *pass, node_t* node) for (i = 0; i < 8; i++) if (pass[i]) pass[i] += 64; - return(pass); + return pass; } static char* node_connection_desc(ushort conn, char* str) @@ -1576,7 +1576,7 @@ char* nodestatus(scfg_t* cfg, node_t* node, char* buf, size_t buflen, int num) if (node == NULL) { strncpy(buf, "(null)", buflen); - return(buf); + return buf; } str[0] = 0; @@ -1665,7 +1665,7 @@ char* nodestatus(scfg_t* cfg, node_t* node, char* buf, size_t buflen, int num) strip_ctrl(str, str); strlcpy(buf, str, buflen); - return(buf); + return buf; } /****************************************************************************/ @@ -1687,10 +1687,10 @@ uint finduserstr(scfg_t* cfg, uint usernumber, enum user_field fnum uint found = 0; if (!VALID_CFG(cfg) || str == NULL) - return(0); + return 0; if ((file = openuserdat(cfg, /* for_modify: */ false)) < 0) - return(0); + return 0; int last = (int)filelength(file) / USER_RECORD_LINE_LEN; if (usernumber && next) unum = usernumber; @@ -1770,7 +1770,7 @@ char* getsmsg(scfg_t* cfg, int usernumber) node_t node; if (!VALID_CFG(cfg) || !VALID_USER_NUMBER(usernumber)) - return(NULL); + return NULL; for (i = 1; i <= cfg->sys_nodes; i++) { /* clear msg waiting flag */ getnodedat(cfg, i, &node, /* lockit: */ false, &file); @@ -1798,22 +1798,22 @@ char* readsmsg(scfg_t* cfg, int usernumber) long length; if (!VALID_CFG(cfg) || !VALID_USER_NUMBER(usernumber)) - return(NULL); + return NULL; SAFEPRINTF2(str, "%smsgs/%4.4u.msg", cfg->data_dir, usernumber); if (flength(str) < 1L) - return(NULL); + return NULL; if ((file = nopen(str, O_RDWR)) == -1) - return(NULL); + return NULL; length = (long)filelength(file); if (length < 0 || (buf = (char *)malloc(length + 1)) == NULL) { close(file); - return(NULL); + return NULL; } if (read(file, buf, length) != length || chsize(file, 0) != 0) { close(file); free(buf); - return(NULL); + return NULL; } close(file); buf[length] = 0; @@ -1830,7 +1830,7 @@ char* readsmsg(scfg_t* cfg, int usernumber) } } - return(buf); /* caller must free */ + return buf; /* caller must free */ } char* getnmsg(scfg_t* cfg, int node_num) @@ -1842,7 +1842,7 @@ char* getnmsg(scfg_t* cfg, int node_num) node_t node; if (!VALID_CFG(cfg) || node_num < 1) - return(NULL); + return NULL; if (getnodedat(cfg, node_num, &node, /* lockit: */ true, &file) == 0) { node.misc &= ~NODE_NMSG; /* clear the NMSG flag */ @@ -1851,27 +1851,27 @@ char* getnmsg(scfg_t* cfg, int node_num) SAFEPRINTF2(str, "%smsgs/n%3.3u.msg", cfg->data_dir, node_num); if (flength(str) < 1L) - return(NULL); + return NULL; if ((file = nopen(str, O_RDWR)) == -1) - return(NULL); + return NULL; length = (long)filelength(file); if (length < 1) { close(file); - return(NULL); + return NULL; } if ((buf = (char *)malloc(length + 1)) == NULL) { close(file); - return(NULL); + return NULL; } if (read(file, buf, length) != length || chsize(file, 0) != 0) { close(file); free(buf); - return(NULL); + return NULL; } close(file); buf[length] = 0; - return(buf); /* caller must free */ + return buf; /* caller must free */ } /****************************************************************************/ @@ -2489,7 +2489,7 @@ static bool ar_exp(scfg_t* cfg, uchar **ptrptr, user_t* user, client_t* client) break; } } - return(result); + return result; } bool chk_ar(scfg_t* cfg, uchar *ar, user_t* user, client_t* client) @@ -2497,11 +2497,11 @@ bool chk_ar(scfg_t* cfg, uchar *ar, user_t* user, client_t* client) uchar *p; if (ar == NULL) - return(true); + return true; if (!VALID_CFG(cfg)) - return(false); + return false; p = ar; - return(ar_exp(cfg, &p, user, client)); + return ar_exp(cfg, &p, user, client); } /****************************************************************************/ @@ -2812,7 +2812,7 @@ void subtract_cdt(scfg_t* cfg, user_t* user, uint64_t amt) bool user_posted_msg(scfg_t* cfg, user_t* user, int count) { if (user == NULL) - return(false); + return false; user->posts = (ushort)adjustuserval(cfg, user->number, USER_POSTS, count); user->ptoday = (ushort)adjustuserval(cfg, user->number, USER_PTODAY, count); @@ -2826,7 +2826,7 @@ bool user_posted_msg(scfg_t* cfg, user_t* user, int count) bool user_sent_email(scfg_t* cfg, user_t* user, int count, bool feedback) { if (user == NULL) - return(false); + return false; if (feedback) user->fbacks = (ushort)adjustuserval(cfg, user->number, USER_FBACKS, count); @@ -2840,12 +2840,12 @@ bool user_sent_email(scfg_t* cfg, user_t* user, int count, bool feedback) bool user_downloaded(scfg_t* cfg, user_t* user, int files, off_t bytes) { if (user == NULL) - return(false); + return false; user->dls = (ushort)adjustuserval(cfg, user->number, USER_DLS, files); user->dlb = adjustuserval(cfg, user->number, USER_DLB, bytes); - return(true); + return true; } #ifdef SBBS @@ -2955,35 +2955,35 @@ bool user_downloaded_file(scfg_t* cfg, user_t* user, client_t* client, bool user_uploaded(scfg_t* cfg, user_t* user, int files, off_t bytes) { if (user == NULL) - return(false); + return false; user->uls = (ushort)adjustuserval(cfg, user->number, USER_ULS, files); user->ulb = adjustuserval(cfg, user->number, USER_ULB, bytes); - return(true); + return true; } bool user_adjust_credits(scfg_t* cfg, user_t* user, int64_t amount) { if (user == NULL) - return(false); + return false; if (amount < 0) /* subtract */ subtract_cdt(cfg, user, -amount); else /* add */ user->cdt = adjustuserval(cfg, user->number, USER_CDT, amount); - return(true); + return true; } bool user_adjust_minutes(scfg_t* cfg, user_t* user, long amount) { if (user == NULL) - return(false); + return false; user->min = (uint32_t)adjustuserval(cfg, user->number, USER_MIN, amount); - return(true); + return true; } /****************************************************************************/ @@ -2995,7 +2995,7 @@ bool logoutuserdat(scfg_t* cfg, user_t* user, time_t now, time_t logontime) struct tm tm, tm_now; if (user == NULL) - return(false); + return false; if (now == 0) now = time(NULL); @@ -3010,16 +3010,16 @@ bool logoutuserdat(scfg_t* cfg, user_t* user, time_t now, time_t logontime) /* Convert time_t to struct tm */ if (localtime_r(&now, &tm_now) == NULL) - return(false); + return false; if (localtime_r(&logontime, &tm) == NULL) - return(false); + return false; /* Reset daily stats if new day */ if (tm.tm_mday != tm_now.tm_mday) resetdailyuserdat(cfg, user, /* write: */ true); - return(true); + return true; } /****************************************************************************/ @@ -3059,11 +3059,11 @@ char* usermailaddr(scfg_t* cfg, char* addr, const char* name) int i; if (addr == NULL || name == NULL) - return(NULL); + return NULL; if (strchr(name, '@') != NULL) { /* Avoid double-@ */ strcpy(addr, name); - return(addr); + return addr; } if (strchr(name, '.') && strchr(name, ' ')) { /* convert "Dr. Seuss" to "Dr.Seuss" */ @@ -3081,7 +3081,7 @@ char* usermailaddr(scfg_t* cfg, char* addr, const char* name) strcat(addr, "@"); strcat(addr, cfg->sys_inetaddr); } - return(addr); + return addr; } /****************************************************************************/ @@ -3129,13 +3129,13 @@ char* alias(scfg_t* cfg, const char* name, char* buf) FILE* fp; if (!VALID_CFG(cfg) || name == NULL || buf == NULL) - return(NULL); + return NULL; p = (char*)name; SAFEPRINTF(fname, "%salias.cfg", cfg->ctrl_dir); if ((fp = fnopen(NULL, fname, O_RDONLY)) == NULL) - return((char*)name); + return (char*)name; while (!feof(fp)) { if (!fgets(line, sizeof(line), fp)) @@ -3179,7 +3179,7 @@ char* alias(scfg_t* cfg, const char* name, char* buf) } } fclose(fp); - return(p); + return p; } int newuserdefaults(scfg_t* cfg, user_t* user) @@ -3289,10 +3289,10 @@ int newuserdat(scfg_t* cfg, user_t* user) user->number = unum; /* store the new user number */ if ((err = putusername(cfg, user->number, user->alias)) != USER_SUCCESS) - return(err); + return err; if ((err = putuserdat(cfg, user)) != USER_SUCCESS) - return(err); + return err; SAFEPRINTF2(str, "%sfile/%04u.in", cfg->data_dir, user->number); /* delete any files */ delfiles(str, ALLFILES, /* keep: */ 0); /* waiting for user */ @@ -3670,28 +3670,28 @@ bool user_is_dirop(scfg_t* cfg, int dirnum, user_t* user, client_t* client) bool download_is_free(scfg_t* cfg, int dirnum, user_t* user, client_t* client) { if (!VALID_CFG(cfg)) - return(false); + return false; if (!dirnum_is_valid(cfg, dirnum)) - return(false); + return false; if (cfg->dir[dirnum]->misc & DIR_FREE) - return(true); + return true; if (user == NULL) - return(false); + return false; if (user->exempt & FLAG('D')) - return(true); + return true; if (cfg->lib[cfg->dir[dirnum]->lib]->ex_ar[0] != 0 && chk_ar(cfg, cfg->lib[cfg->dir[dirnum]->lib]->ex_ar, user, client)) return true; if (cfg->dir[dirnum]->ex_ar[0] == 0) - return(false); + return false; - return(chk_ar(cfg, cfg->dir[dirnum]->ex_ar, user, client)); + return chk_ar(cfg, cfg->dir[dirnum]->ex_ar, user, client); } /****************************************************************************/ @@ -3728,7 +3728,7 @@ time_t gettimeleft(scfg_t* cfg, user_t* user, time_t starttime) timeleft = tleft; } - return(timeleft); + return timeleft; } /*************************************************************************/ @@ -4033,7 +4033,7 @@ bool getmsgptrs(scfg_t* cfg, user_t* user, subscan_t* subscan, void (*progress)( SAFEPRINTF2(path, "%suser/ptrs/%4.4u.ixb", cfg->data_dir, user->number); if ((stream = fnopen(&file, path, O_RDONLY)) == NULL) { if (fexist(path)) - return(false); /* file exists, but couldn't be opened? */ + return false; /* file exists, but couldn't be opened? */ return initmsgptrs(cfg, subscan, cfg->new_msgscan_init, progress, cbdata); } @@ -4057,7 +4057,7 @@ bool getmsgptrs(scfg_t* cfg, user_t* user, subscan_t* subscan, void (*progress)( if (progress != NULL) progress(cbdata, i, cfg->total_subs); fclose(stream); - return(true); + return true; } /****************************************************************************/ @@ -4090,7 +4090,7 @@ bool putmsgptrs_fp(scfg_t* cfg, user_t* user, subscan_t* subscan, FILE* fp) bool result = true; if (user->number == 0 || (user->rest & FLAG('G'))) /* Guest */ - return(true); + return true; fixmsgptrs(cfg, subscan); str_list_t new = strListInit(); diff --git a/src/sbbs3/useredit.cpp b/src/sbbs3/useredit.cpp index ef58222b1a983bcd51d5bf3a813afc006862e985..e237ed44765f3db363a959b11c84ab0482b85313 100644 --- a/src/sbbs3/useredit.cpp +++ b/src/sbbs3/useredit.cpp @@ -669,20 +669,20 @@ int sbbs_t::searchup(char *search, int usernum) uint i = usernum + 1; if (!search[0]) - return(usernum); + return usernum; if ((file = openuserdat(&cfg, /* for_modify: */ FALSE)) < 0) - return(usernum); + return usernum; while (readuserdat(&cfg, i, userdat, sizeof(userdat), file, /* leave_locked: */ FALSE) == 0) { strupr(userdat); if (strstr(userdat, search)) { close(file); - return(i); + return i; } i++; } close(file); - return(usernum); + return usernum; } /****************************************************************************/ @@ -699,20 +699,20 @@ int sbbs_t::searchdn(char *search, int usernum) uint i = usernum - 1; if (!search[0]) - return(usernum); + return usernum; if ((file = openuserdat(&cfg, /* for_modify: */ FALSE)) < 0) - return(usernum); + return usernum; while (i > 0 && readuserdat(&cfg, i, userdat, sizeof(userdat), file, /* leave_locked: */ FALSE) == 0) { strupr(userdat); if (strstr(userdat, search)) { close(file); - return(i); + return i; } i--; } close(file); - return(usernum); + return usernum; } /****************************************************************************/ diff --git a/src/sbbs3/ver.cpp b/src/sbbs3/ver.cpp index e6736985ea5d03ad3280abe0966adae603c78941..e24b46dccd6ebcb57a58c2fa027a776b59b0588f 100644 --- a/src/sbbs3/ver.cpp +++ b/src/sbbs3/ver.cpp @@ -68,7 +68,7 @@ char* socklib_version(char* str, size_t size, char* winsock_ver) #endif - return(str); + return str; } #if defined(SBBS) && !defined(JSDOOR) diff --git a/src/sbbs3/viewfile.cpp b/src/sbbs3/viewfile.cpp index ca4d2c68d95226bca1670e374375eeed9927fd5d..680025da192cc91bdc8a0116dcfa54c7496e2490 100644 --- a/src/sbbs3/viewfile.cpp +++ b/src/sbbs3/viewfile.cpp @@ -52,12 +52,12 @@ int sbbs_t::viewfile(file_t* f, bool ext) SAFECAT(str, "D"); ch = (char)getkeys(str, 0); if (ch == 'Q' || sys_status & SS_ABORT) - return(0); + return 0; switch (ch) { case 'B': addtobatdl(f); CRLF; - return(-1); + return -1; case 'D': editfiledesc(f); continue; @@ -78,10 +78,10 @@ int sbbs_t::viewfile(file_t* f, bool ext) return -2; case 'N': case CR: - return(1); + return 1; } } - return(0); + return 0; } /*****************************************************************************/ diff --git a/src/sbbs3/websrvr.c b/src/sbbs3/websrvr.c index d471d277ddda63a5533ada38e4759879eb14ef36..22edb4776bacbb01b19497dd0f8419d4556a89df 100644 --- a/src/sbbs3/websrvr.c +++ b/src/sbbs3/websrvr.c @@ -470,7 +470,7 @@ sub_mkgmt(struct tm *tm) moff[tm->tm_mon] + tm->tm_mday - 1 + nleapdays) * 24 + tm->tm_hour) * 60 + tm->tm_min) * 60 + tm->tm_sec; - return (t < 0 ? (time_t) -1 : t); + return t < 0 ? (time_t) -1 : t; } time_t @@ -540,7 +540,7 @@ time_gm(struct tm *tm) } } - return (t < 0 ? (time_t) -1 : t); + return t < 0 ? (time_t) -1 : t; } static int lputs(int level, const char* str) @@ -606,7 +606,7 @@ static int writebuf(http_session_t *session, const char *buf, size_t len) size_t avail; if (session->req.sent_headers && session->req.send_content == false) - return (0); + return 0; while (sent < len) { ResetEvent(session->outbuf.empty_event); avail = RingBufFree(&session->outbuf); @@ -618,7 +618,7 @@ static int writebuf(http_session_t *session, const char *buf, size_t len) avail = len - sent; sent += RingBufWrite(&(session->outbuf), ((const BYTE *)buf) + sent, avail); } - return(sent); + return sent; } #define HANDLE_CRYPT_CALL(status, session, action) handle_crypt_call_except2(status, session, action, CRYPT_OK, CRYPT_OK, __FILE__, __LINE__) @@ -716,14 +716,14 @@ static int sess_sendbuf(http_session_t *session, const char *buf, size_t len, vo else if (session->socket != INVALID_SOCKET) lprintf(LOG_WARNING, "%04d !ERROR %d sending on socket", session->socket, SOCKET_ERRNO); *failed = true; - return(sent); + return sent; } } } else { lprintf(LOG_WARNING, "%04d Timeout waiting for socket to become writable", session->socket); *failed = true; - return(sent); + return sent; } sent += result; } @@ -731,7 +731,7 @@ static int sess_sendbuf(http_session_t *session, const char *buf, size_t len, vo *failed = true; if (session->is_tls) HANDLE_CRYPT_CALL(cryptFlushData(session->tls_sess), session, "flushing data"); - return(sent); + return sent; } #ifdef _WINSOCKAPI_ @@ -747,11 +747,11 @@ static bool winsock_startup(void) if ((status = WSAStartup(MAKEWORD(1, 1), &WSAData)) == 0) { lprintf(LOG_DEBUG, "%s %s", WSAData.szDescription, WSAData.szSystemStatus); WSAInitialized = true; - return (true); + return true; } errprintf(LOG_CRIT, WHERE, "!WinSock startup ERROR %d", status); - return (false); + return false; } #else /* No WINSOCK */ @@ -875,7 +875,7 @@ static int bufprint(http_session_t *session, const char *str) int len; len = strlen(str); - return(writebuf(session, str, len)); + return writebuf(session, str, len); } /**********************************************************/ @@ -887,7 +887,7 @@ static int getmonth(char *mon) int i; for (i = 0; i < 12; i++) if (!stricmp(mon, months[i])) - return(i); + return i; return 0; } @@ -912,71 +912,71 @@ static time_t decode_date(char *date) token = strtok_r(date, ",", &last); if (token == NULL) - return(0); + return 0; /* This probobly only needs to be 9, but the extra one is for luck. */ if (strlen(date) > 15) { /* asctime() */ /* Toss away week day */ token = strtok_r(date, " ", &last); if (token == NULL) - return(0); + return 0; token = strtok_r(NULL, " ", &last); if (token == NULL) - return(0); + return 0; ti.tm_mon = getmonth(token); token = strtok_r(NULL, " ", &last); if (token == NULL) - return(0); + return 0; ti.tm_mday = atoi(token); token = strtok_r(NULL, ":", &last); if (token == NULL) - return(0); + return 0; ti.tm_hour = atoi(token); token = strtok_r(NULL, ":", &last); if (token == NULL) - return(0); + return 0; ti.tm_min = atoi(token); token = strtok_r(NULL, " ", &last); if (token == NULL) - return(0); + return 0; ti.tm_sec = atoi(token); token = strtok_r(NULL, "", &last); if (token == NULL) - return(0); + return 0; ti.tm_year = atoi(token) - 1900; } else { /* RFC 1123 or RFC 850 */ token = strtok_r(NULL, " -", &last); if (token == NULL) - return(0); + return 0; ti.tm_mday = atoi(token); token = strtok_r(NULL, " -", &last); if (token == NULL) - return(0); + return 0; ti.tm_mon = getmonth(token); token = strtok_r(NULL, " ", &last); if (token == NULL) - return(0); + return 0; ti.tm_year = atoi(token); token = strtok_r(NULL, ":", &last); if (token == NULL) - return(0); + return 0; ti.tm_hour = atoi(token); token = strtok_r(NULL, ":", &last); if (token == NULL) - return(0); + return 0; ti.tm_min = atoi(token); token = strtok_r(NULL, " ", &last); if (token == NULL) - return(0); + return 0; ti.tm_sec = atoi(token); if (ti.tm_year > 1900) ti.tm_year -= 1900; } t = time_gm(&ti); - return(t); + return t; } static void open_socket(SOCKET sock, void *cbdata) @@ -1036,7 +1036,7 @@ static int close_socket(SOCKET *sock) lprintf(LOG_WARNING, "%04d !ERROR %d closing socket", *sock, SOCKET_ERRNO); } - return(result); + return result; } static int close_session_socket(http_session_t *session) @@ -1045,7 +1045,7 @@ static int close_session_socket(http_session_t *session) int len; if (session == NULL || session->socket == INVALID_SOCKET) - return(-1); + return -1; if (session->is_tls) { // First, wait for the ringbuffer to drain... @@ -1209,10 +1209,10 @@ static int get_header_type(char *header) int i; for (i = 0; headers[i].text != NULL; i++) { if (!stricmp(header, headers[i].text)) { - return(headers[i].id); + return headers[i].id; } } - return(-1); + return -1; } /* Opposite of get_header_type() */ @@ -1220,14 +1220,14 @@ static char *get_header(int id) { int i; if (headers[id].id == id) - return(headers[id].text); + return headers[id].text; for (i = 0; headers[i].text != NULL; i++) { if (headers[i].id == id) { - return(headers[i].text); + return headers[i].text; } } - return(NULL); + return NULL; } static const char* unknown_mime_type = "application/octet-stream"; @@ -1237,13 +1237,13 @@ static const char* get_mime_type(char *ext) uint i; if (ext == NULL || mime_types == NULL) - return(unknown_mime_type); + return unknown_mime_type; for (i = 0; mime_types[i] != NULL; i++) if (stricmp(ext + 1, mime_types[i]->name) == 0) - return(mime_types[i]->value); + return mime_types[i]->value; - return(unknown_mime_type); + return unknown_mime_type; } static char* get_cgi_handler(const char* fname) @@ -1252,12 +1252,12 @@ static char* get_cgi_handler(const char* fname) size_t i; if (cgi_handlers == NULL || (ext = getfext(fname)) == NULL) - return(NULL); + return NULL; for (i = 0; cgi_handlers[i] != NULL; i++) { if (stricmp(cgi_handlers[i]->name, ext + 1) == 0) - return(cgi_handlers[i]->value); + return cgi_handlers[i]->value; } - return(NULL); + return NULL; } static bool get_xjs_handler(char* ext, http_session_t* session) @@ -1265,7 +1265,7 @@ static bool get_xjs_handler(char* ext, http_session_t* session) size_t i; if (ext == NULL || xjs_handlers == NULL || ext[0] == 0) - return(false); + return false; for (i = 0; xjs_handlers[i] != NULL; i++) { if (stricmp(xjs_handlers[i]->name, ext + 1) == 0) { @@ -1273,10 +1273,10 @@ static bool get_xjs_handler(char* ext, http_session_t* session) SAFEPRINTF2(session->req.xjs_handler, "%s%s", scfg.exec_dir, xjs_handlers[i]->value); else SAFECOPY(session->req.xjs_handler, xjs_handlers[i]->value); - return(true); + return true; } } - return(false); + return false; } /* This function appends append plus a newline IF the final dst string would have a length less than maxlen */ @@ -1309,7 +1309,7 @@ static bool send_headers(http_session_t *session, const char *status, int chunke if (session->socket == INVALID_SOCKET) { session->req.sent_headers = true; - return(false); + return false; } lprintf(LOG_DEBUG, "%04d %s [%s] Request resolved to: %s" , session->socket, session->client.protocol, session->host_ip, session->req.physical_path); @@ -1317,13 +1317,13 @@ static bool send_headers(http_session_t *session, const char *status, int chunke session->req.sent_headers = true; if (session->req.ld != NULL) session->req.ld->status = atoi(status); - return(true); + return true; } headers = malloc(MAX_HEADERS_SIZE); if (headers == NULL) { errprintf(LOG_CRIT, WHERE, "Could not allocate memory for response headers."); session->req.sent_headers = true; - return(false); + return false; } *headers = 0; /* send_headers() is called a second time when using chunked @@ -1507,7 +1507,7 @@ static bool send_headers(http_session_t *session, const char *status, int chunke drain_outbuf(session); session->req.write_chunked = chunked; free(headers); - return (ret); + return ret; } static off_t sock_sendfile(http_session_t *session, char *path, off_t start, off_t end) @@ -1533,7 +1533,7 @@ static off_t sock_sendfile(http_session_t *session, char *path, off_t start, off if (lseek(file, start, SEEK_SET) == -1) { lprintf(LOG_WARNING, "%04d !ERROR %d seeking to position %" PRIuOFF " in %s", session->socket, SOCKET_ERRNO, start, path); close(file); - return(0); + return 0; } remain = end - start + 1; } @@ -1544,14 +1544,14 @@ static off_t sock_sendfile(http_session_t *session, char *path, off_t start, off if (writebuf(session, buf, i) != i) { lprintf(LOG_WARNING, "%04d !ERROR sending %s", session->socket, path); close(file); - return(0); + return 0; } ret += i; remain -= i; } close(file); } - return(ret); + return ret; } /********************************************************/ @@ -1725,7 +1725,7 @@ bool http_checkuser(http_session_t * session) { if (session->req.dynamic == IS_SSJS) { if (session->last_js_user_num == session->user.number) - return(true); + return true; lprintf(LOG_DEBUG, "%04d JavaScript: Initializing User Objects", session->socket); JS_BEGINREQUEST(session->js_cx); if (session->user.number > 0) { @@ -1734,7 +1734,7 @@ bool http_checkuser(http_session_t * session) JS_ENDREQUEST(session->js_cx); errprintf(LOG_ERR, WHERE, "%04d !JavaScript ERROR creating user objects", session->socket); send_error(session, __LINE__, "500 Error initializing JavaScript User Objects"); - return(false); + return false; } } else { @@ -1743,13 +1743,13 @@ bool http_checkuser(http_session_t * session) JS_ENDREQUEST(session->js_cx); errprintf(LOG_ERR, WHERE, "%04d !ERROR initializing JavaScript User Objects", session->socket); send_error(session, __LINE__, "500 Error initializing JavaScript User Objects"); - return(false); + return false; } } JS_ENDREQUEST(session->js_cx); session->last_js_user_num = session->user.number; } - return(true); + return true; } static void calculate_digest(http_session_t * session, char *ha1, char *ha2, unsigned char digest[MD5_DIGEST_SIZE]) @@ -1799,36 +1799,36 @@ static bool digest_authentication(http_session_t* session, int auth_allowed, use if ((auth_allowed & (1 << AUTHENTICATION_DIGEST)) == 0) { *reason = "digest auth not allowed"; - return(false); + return false; } if (session->req.auth.qop_value == QOP_UNKNOWN) { *reason = "QOP unknown"; - return(false); + return false; } if (session->req.auth.algorithm == ALGORITHM_UNKNOWN) { *reason = "algorithm unknown"; - return(false); + return false; } /* Validate rules from RFC-2617 */ if (session->req.auth.qop_value == QOP_AUTH || session->req.auth.qop_value == QOP_AUTH_INT) { if (session->req.auth.cnonce == NULL) { *reason = "no cnonce"; - return(false); + return false; } if (session->req.auth.nonce_count == NULL) { *reason = "no nonce count"; - return(false); + return false; } } else { if (session->req.auth.cnonce != NULL) { *reason = "unexpected cnonce present"; - return(false); + return false; } if (session->req.auth.nonce_count != NULL) { *reason = "unexpected nonce count present"; - return(false); + return false; } } @@ -1875,7 +1875,7 @@ static bool digest_authentication(http_session_t* session, int auth_allowed, use /* TODO QOP==AUTH_INT */ if (session->req.auth.qop_value == QOP_AUTH_INT) { *reason = "QOP value"; - return(false); + return false; } MD5_close(&ctx, digest); MD5_hex(ha2, digest); @@ -1891,7 +1891,7 @@ static bool digest_authentication(http_session_t* session, int auth_allowed, use calculate_digest(session, ha1u, ha2, digest); if (memcmp(digest, session->req.auth.digest, sizeof(digest))) { *reason = "digest mismatch"; - return(false); + return false; } } } @@ -1902,13 +1902,13 @@ static bool digest_authentication(http_session_t* session, int auth_allowed, use if (p == NULL) { session->req.auth.stale = true; *reason = "nonce lacks @"; - return(false); + return false; } *p = 0; if (strcmp(session->req.auth.nonce, session->client.addr)) { session->req.auth.stale = true; *reason = "nonce doesn't match client IP address"; - return(false); + return false; } *p = '@'; p++; @@ -1916,21 +1916,21 @@ static bool digest_authentication(http_session_t* session, int auth_allowed, use if (*p) { session->req.auth.stale = true; *reason = "unexpected data after nonce time"; - return(false); + return false; } now = (time32_t)time(NULL); if (nonce_time > now) { session->req.auth.stale = true; *reason = "nonce time in the future"; - return(false); + return false; } if (nonce_time < now - 1800) { session->req.auth.stale = true; *reason = "stale nonce time"; - return(false); + return false; } - return(true); + return true; } static void badlogin(SOCKET sock, const char* user, const char* passwd, client_t* client, union xp_sockaddr* addr) @@ -1989,12 +1989,12 @@ static bool check_ars(http_session_t * session) http_logon(session, NULL); } if (!http_checkuser(session)) - return(false); + return false; if (session->req.ars[0]) { /* There *IS* an ARS string ie: Auth is required */ if (startup->options & WEB_OPT_DEBUG_RX) lprintf(LOG_NOTICE, "%04d !No authentication information", session->socket); - return(false); + return false; } if (session->user.number == 0) { switch (session->parsed_vpath) { @@ -2011,7 +2011,7 @@ static bool check_ars(http_session_t * session) } } /* No auth required, allow */ - return(true); + return true; } /* Require a password */ i = find_login_id(&scfg, session->req.auth.username); @@ -2023,21 +2023,21 @@ static bool check_ars(http_session_t * session) http_logon(session, NULL); } if (!http_checkuser(session)) - return(false); + return false; if (scfg.sys_misc & SM_ECHO_PW && session->req.auth.type == AUTHENTICATION_BASIC) lprintf(LOG_NOTICE, "%04d !UNKNOWN USER: '%s' (password: %s)" , session->socket, session->req.auth.username, session->req.auth.password); else lprintf(LOG_NOTICE, "%04d !UNKNOWN USER: '%s'" , session->socket, session->req.auth.username); - return(false); + return false; } thisuser.number = i; getuserdat(&scfg, &thisuser); switch (session->req.auth.type) { case AUTHENTICATION_TLS_PSK: if ((auth_allowed & (1 << AUTHENTICATION_TLS_PSK)) == 0) - return(false); + return false; if (session->last_user_num != 0) { if (session->last_user_num > 0) http_logoff(session, session->socket, __LINE__); @@ -2045,11 +2045,11 @@ static bool check_ars(http_session_t * session) http_logon(session, NULL); } if (!http_checkuser(session)) - return(false); + return false; break; case AUTHENTICATION_BASIC: if ((auth_allowed & (1 << AUTHENTICATION_BASIC)) == 0) - return(false); + return false; if (thisuser.pass[0] && stricmp(thisuser.pass, session->req.auth.password)) { if (session->last_user_num != 0) { if (session->last_user_num > 0) @@ -2058,7 +2058,7 @@ static bool check_ars(http_session_t * session) http_logon(session, NULL); } if (!http_checkuser(session)) - return(false); + return false; if (scfg.sys_misc & SM_ECHO_PW) lprintf(LOG_WARNING, "%04d <%s> !BASIC AUTHENTICATION FAILURE (password: %s)" , session->socket, session->req.auth.username, session->req.auth.password); @@ -2066,7 +2066,7 @@ static bool check_ars(http_session_t * session) lprintf(LOG_WARNING, "%04d <%s> !BASIC AUTHENTICATION FAILURE" , session->socket, session->req.auth.username); badlogin(session->socket, session->req.auth.username, session->req.auth.password, &session->client, &session->addr); - return(false); + return false; } break; case AUTHENTICATION_DIGEST: @@ -2076,7 +2076,7 @@ static bool check_ars(http_session_t * session) lprintf(LOG_NOTICE, "%04d <%s> !DIGEST AUTHENTICATION FAILURE (reason: %s)" , session->socket, session->req.auth.username, reason); badlogin(session->socket, session->req.auth.username, "<digest>", &session->client, &session->addr); - return(false); + return false; } break; } @@ -2110,7 +2110,7 @@ static bool check_ars(http_session_t * session) http_logon(session, &thisuser); } if (!http_checkuser(session)) - return(false); + return false; if (session->req.ld != NULL) { FREE_AND_NULL(session->req.ld->user); @@ -2150,7 +2150,7 @@ static bool check_ars(http_session_t * session) if (thisuser.pass[0]) loginSuccess(startup->login_attempt_list, &session->addr); - return(true); + return true; } /* Should go to the hack log? */ @@ -2162,7 +2162,7 @@ static bool check_ars(http_session_t * session) PlaySound(startup->sound.hack, NULL, SND_ASYNC | SND_FILENAME); #endif - return(false); + return false; } static named_string_t** read_ini_list(char* path, char* section, char* desc @@ -2182,7 +2182,7 @@ static named_string_t** read_ini_list(char* path, char* section, char* desc , (ulong)i, desc, section == NULL ? "root":section, path); } else lprintf(warn ? LOG_WARNING : LOG_DEBUG, "Error %d (%s) opening %s", errno, strerror(errno), path); - return(list); + return list; } static int sess_recv(http_session_t *session, char *buf, size_t length, int flags) @@ -2234,7 +2234,7 @@ static int sockreadline(http_session_t * session, char *buf, size_t length) for (i = 0; true;) { if (session->socket == INVALID_SOCKET) - return(-1); + return -1; if ((!session->is_tls) || (!session->tls_pending)) { if (socket_readable(session->socket, startup->max_inactivity * 1000)) { if (session->is_tls) @@ -2243,7 +2243,7 @@ static int sockreadline(http_session_t * session, char *buf, size_t length) else { /* Timeout */ lprintf(LOG_NOTICE, "%04d Session timeout due to inactivity (%d seconds)", session->socket, startup->max_inactivity); - return(-1); + return -1; } } @@ -2255,13 +2255,13 @@ static int sockreadline(http_session_t * session, char *buf, size_t length) lprintf(LOG_DEBUG, "%04d !ERROR %d receiving on socket", session->socket, SOCKET_ERRNO); } close_session_socket(session); - return(-1); + return -1; } break; case 0: /* Socket has been closed */ close_session_socket(session); - return(-1); + return -1; } if (ch == '\n') @@ -2287,7 +2287,7 @@ static int sockreadline(http_session_t * session, char *buf, size_t length) if (chucked) lprintf(LOG_DEBUG, "%04d Long header, chucked %d bytes", session->socket, chucked); } - return(i); + return i; } #if defined(_WIN32) @@ -2311,7 +2311,7 @@ static int pipereadline(int pipe, char *buf, size_t length, char *fullbuf, size_ ReadFile(pipe, &ch, 1, (DWORD*)&ret, NULL); #else if (!socket_readable(pipe, startup->max_cgi_inactivity * 1000)) - return(-1); + return -1; ret = read(pipe, &ch, 1); #endif if (ret == 1) { @@ -2329,7 +2329,7 @@ static int pipereadline(int pipe, char *buf, size_t length, char *fullbuf, size_ i++; } else - return(-1); + return -1; } /* Terminate at length if longer */ @@ -2343,7 +2343,7 @@ static int pipereadline(int pipe, char *buf, size_t length, char *fullbuf, size_ buf[i] = 0; } - return(i); + return i; } static int recvbufsocket(http_session_t *session, char *buf, long count) @@ -2353,7 +2353,7 @@ static int recvbufsocket(http_session_t *session, char *buf, long count) if (count < 1) { errno = ERANGE; - return(0); + return 0; } while (rd < count && session_check(session, NULL, NULL, startup->max_inactivity * 1000)) { @@ -2366,18 +2366,18 @@ static int recvbufsocket(http_session_t *session, char *buf, long count) case 0: close_session_socket(session); *buf = 0; - return(0); + return 0; } rd += i; } if (rd == count) { - return(rd); + return rd; } *buf = 0; - return(0); + return 0; } static void unescape(char *p) @@ -2659,23 +2659,23 @@ end_of_text: pos++; *out = 0; *p = pos; - return(start); + return start; } static int hexval(unsigned char ch) { ch -= '0'; if (ch < 10) - return(ch); + return ch; ch -= 7; if (ch < 16 && ch > 9) - return(ch); + return ch; if (ch > 41) { ch -= 32; if (ch < 16 && ch > 9) - return(ch); + return ch; } - return(0); + return 0; } static bool parse_headers(http_session_t * session) @@ -3013,16 +3013,16 @@ static int get_version(char *p) { int i; if (p == NULL) - return(0); + return 0; while (*p && *p < ' ') p++; if (*p == 0) - return(0); + return 0; for (i = 1; http_vers[i] != NULL; i++) { if (!stricmp(p, http_vers[i])) { - return(i); + return i; } } - return(i - 1); + return i - 1; } static int is_dynamic_req(http_session_t* session) @@ -3056,26 +3056,26 @@ static int is_dynamic_req(http_session_t* session) lprintf(LOG_DEBUG, "%04d Setting up JavaScript support", session->socket); if (!js_setup(session)) { send_error(session, __LINE__, error_500); - return(IS_STATIC); + return IS_STATIC; } - return(i); + return i; } if (!(startup->options & WEB_OPT_NO_CGI)) { for (i = 0; startup->cgi_ext != NULL && startup->cgi_ext[i] != NULL; i++) { if (stricmp(ext, startup->cgi_ext[i]) == 0) { init_enviro(session); - return(IS_CGI); + return IS_CGI; } } _splitpath(session->req.cgi_dir?session->req.cgi_dir:cgi_dir, cgidrive, cgidir, fname, ext); if (stricmp(dir, cgidir) == 0 && stricmp(drive, cgidrive) == 0) { init_enviro(session); - return(IS_CGI); + return IS_CGI; } } - return(IS_STATIC); + return IS_STATIC; } static char * split_port_part(char *host) @@ -3192,7 +3192,7 @@ static char *get_request(http_session_t * session, char *req_line) if (query != NULL) SAFECOPY(session->req.query_str, query); - return(retval); + return retval; } static char *get_method(http_session_t * session, char *req_line) @@ -3204,14 +3204,14 @@ static char *get_method(http_session_t * session, char *req_line) session->req.method = i; if (strlen(req_line) < strlen(methods[i]) + 2) { send_error(session, __LINE__, "400 Bad Request"); - return(NULL); + return NULL; } - return(req_line + strlen(methods[i]) + 1); + return req_line + strlen(methods[i]) + 1; } } if (req_line != NULL && *req_line >= ' ') send_error(session, __LINE__, "501 Not Implemented"); - return(NULL); + return NULL; } static bool get_request_headers(http_session_t * session) @@ -3345,7 +3345,7 @@ static enum get_fullpath get_fullpath(http_session_t * session) if (FULLPATH(session->req.physical_path, str, sizeof(session->req.physical_path)) == NULL) return FULLPATH_INVALID; - return(isabspath(session->req.physical_path) ? FULLPATH_VALID : FULLPATH_INVALID); + return isabspath(session->req.physical_path) ? FULLPATH_VALID : FULLPATH_INVALID; } // Create root-directory aliases from File Areas ... Virtual Shortcut config strings @@ -3428,7 +3428,7 @@ static bool get_req(http_session_t * session, char *request_line) */ while ((len = sockreadline(session, req_line, sizeof(req_line) - 1)) == 0); if (len < 0) - return(false); + return false; if (req_line[0]) lprintf(LOG_INFO, "%04d %s [%s] Request: %s", session->socket, session->client.protocol, session->host_ip, req_line); if (session->req.ld != NULL && session->req.ld->request == NULL) @@ -3467,7 +3467,7 @@ static bool get_req(http_session_t * session, char *request_line) enum get_fullpath fullpath_valid = get_fullpath(session); if (fullpath_valid != FULLPATH_VALID) { send_error(session, __LINE__, fullpath_valid == FULLPATH_NOEXIST ? error_404 : error_500); - return(false); + return false; } if (session->req.ld != NULL && session->req.ld->vhost == NULL) /* FREE()d in http_logging_thread() */ @@ -3478,7 +3478,7 @@ static bool get_req(http_session_t * session, char *request_line) add_env(session, "REQUEST_METHOD", methods[session->req.method]); add_env(session, "SERVER_PROTOCOL", session->http_ver ? http_vers[session->http_ver] : "HTTP/0.9"); - return(true); + return true; } } session->req.keep_alive = false; @@ -3496,14 +3496,14 @@ static char *find_last_slash(char *str) LastFSlash = strrchr(str, '/'); LastBSlash = strrchr(str, '\\'); if (LastFSlash == NULL) - return(LastBSlash); + return LastBSlash; if (LastBSlash == NULL) - return(LastFSlash); + return LastFSlash; if (LastBSlash < LastFSlash) - return(LastFSlash); - return(LastBSlash); + return LastFSlash; + return LastBSlash; #else - return(strrchr(str, '/')); + return strrchr(str, '/'); #endif } @@ -3517,14 +3517,14 @@ static char *find_first_slash(char *str) FirstFSlash = strchr(str, '/'); FirstBSlash = strchr(str, '\\'); if (FirstFSlash == NULL) - return(FirstBSlash); + return FirstBSlash; if (FirstBSlash == NULL) - return(FirstFSlash); + return FirstFSlash; if (FirstBSlash > FirstFSlash) - return(FirstFSlash); - return(FirstBSlash); + return FirstFSlash; + return FirstBSlash; #else - return(strchr(str, '/')); + return strchr(str, '/'); #endif } @@ -3552,7 +3552,7 @@ static bool check_extra_path(http_session_t * session) { *vp_slash = 0; if ((rp_slash = find_last_slash(rpath)) == NULL) - return(false); + return false; SAFECOPY(str, epath); if (*rp_slash) sprintf(epath, "%s%s", rp_slash, str); @@ -3571,21 +3571,21 @@ static bool check_extra_path(http_session_t * session) SAFECOPY(session->req.virtual_path, vpath); SAFECOPY(session->req.physical_path, rpath); session->req.got_extra_path = true; - return(true); + return true; } } /* rpath was an existing path and DID NOT contain an index. */ /* We do not allow scripts to mask existing dirs/files */ - return(false); + return false; } } else { if (isdir(rpath)) - return(false); + return false; } if (vp_slash == vpath) - return(false); + return false; /* Check if this is a script */ *rp_slash = 0; @@ -3596,12 +3596,12 @@ static bool check_extra_path(http_session_t * session) SAFECOPY(session->req.virtual_path, vpath); SAFECOPY(session->req.physical_path, rpath); session->req.got_extra_path = true; - return(true); + return true; } } } } - return(false); + return false; } static bool exec_js_webctrl(http_session_t* session, char *name, char* script, char *curdir, bool rewrite) { @@ -3664,7 +3664,7 @@ static bool exec_js_webctrl(http_session_t* session, char *name, char* script, c JS_ReportPendingException(session->js_cx); JS_RemoveObjectRoot(session->js_cx, &session->js_glob); JS_ENDREQUEST(session->js_cx); - return(false); + return false; } JS_ReportPendingException(session->js_cx); js_EvalOnExit(session->js_cx, session->js_glob, &session->js_callback); @@ -3682,7 +3682,7 @@ static bool exec_js_webctrl(http_session_t* session, char *name, char* script, c JS_ENDREQUEST(session->js_cx); - return(retval); + return retval; } static void read_webctrl_section(FILE *file, char *section, http_session_t *session, char *curdir, bool *recheck_dynamic) @@ -3769,9 +3769,9 @@ static bool check_request(http_session_t * session) bool old_path_info_index; if (session->req.finished) - return(false); + return false; if (session->req.upgrading) - return(true); + return true; SAFECOPY(path, session->req.physical_path); if (startup->options & WEB_OPT_DEBUG_TX) @@ -3791,7 +3791,7 @@ static bool check_request(http_session_t * session) last_slash = find_last_slash(path); if (last_slash == NULL) { send_error(session, __LINE__, error_500); - return(false); + return false; } last_slash++; for (i = 0; startup->index_file_name != NULL && startup->index_file_name[i] != NULL ; i++) { @@ -3838,7 +3838,7 @@ static bool check_request(http_session_t * session) if (startup->sound.hack[0] && !sound_muted(&scfg)) PlaySound(startup->sound.hack, NULL, SND_ASYNC | SND_FILENAME); #endif - return(false); + return false; } /* Walk up from root_dir checking for access.ars and webctrl.ini */ @@ -3860,7 +3860,7 @@ static bool check_request(http_session_t * session) lprintf(LOG_WARNING, "%04d !WARNING! access.ars found at %s.", session->socket, str); } send_error(session, __LINE__, "403 Forbidden"); - return(false); + return false; } if (!stat(str, &sb)) { /* Read access.ars file */ @@ -3881,7 +3881,7 @@ static bool check_request(http_session_t * session) /* NEVER serve up a webctrl.ini file */ if (!strcmp(path, str)) { send_error(session, __LINE__, "403 Forbidden"); - return(false); + return false; } if (!stat(str, &sb)) { /* Read webctrl.ini file */ @@ -3969,11 +3969,11 @@ static bool check_request(http_session_t * session) if (auth_list) free(auth_list); send_error(session, __LINE__, str); - return(false); + return false; } if (session->req.send_location >= MOVED_TEMP && session->redir_req[0]) - return (true); + return true; if (stat(path, &sb) || IS_PATH_DELIM(*(lastchar(path))) || send404) { /* OPTIONS requests never return 404 errors (ala Apache) */ if (session->req.method != HTTP_OPTIONS) { @@ -3982,7 +3982,7 @@ static bool check_request(http_session_t * session) SAFECAT(session->req.physical_path, session->req.extra_path_info); SAFECAT(session->req.virtual_path, session->req.extra_path_info); send_error(session, __LINE__, error_404); - return(false); + return false; } } if (session->req.range_start || session->req.range_end) { @@ -3994,15 +3994,15 @@ static bool check_request(http_session_t * session) session->req.range_end = sb.st_size - 1; if (session->req.range_end < session->req.range_start || session->req.dynamic) { send_error(session, __LINE__, error_416); - return(false); + return false; } if (session->req.range_start < 0 || session->req.range_end < 0) { send_error(session, __LINE__, error_416); - return(false); + return false; } if (session->req.range_start >= sb.st_size) { send_error(session, __LINE__, error_416); - return(false); + return false; } SAFECOPY(session->req.status, "206 Partial Content"); } @@ -4020,7 +4020,7 @@ static bool check_request(http_session_t * session) add_env(session, "PATH_INFO", session->req.extra_path_info); } - return(true); + return true; } static str_list_t get_cgi_env(http_session_t *session) @@ -4037,7 +4037,7 @@ static str_list_t get_cgi_env(http_session_t *session) /* Return value */ if ((env_list = strListInit()) == NULL) - return(NULL); + return NULL; strListAppendList(&env_list, session->req.cgi_env); @@ -4058,7 +4058,7 @@ static str_list_t get_cgi_env(http_session_t *session) iniFreeStringList(add_list); } - return(env_list); + return env_list; } static SOCKET fastcgi_connect(const char *orig_path, SOCKET client_sock) @@ -4483,7 +4483,7 @@ static int fastcgi_done_wait(void *arg) if (cd->request_ended) return 1; - return (socket_recvdone(cd->sock, 0)); + return socket_recvdone(cd->sock, 0); } #ifdef __unix__ @@ -4630,7 +4630,7 @@ static int cgi_done_wait(void *arg) { struct cgi_data *cd = (struct cgi_data *)arg; - return (WaitForSingleObject(cd->child, 0) == WAIT_OBJECT_0); + return WaitForSingleObject(cd->child, 0) == WAIT_OBJECT_0; } #endif @@ -4939,12 +4939,12 @@ static bool exec_fastcgi(http_session_t *session) if (!(ret & CGI_STUFF_VALID_HEADERS)) { errprintf(LOG_ERR, WHERE, "%04d FastCGI Process did not generate valid headers", session->socket); - return(false); + return false; } if (!(ret & CGI_STUFF_DONE_PARSING)) { errprintf(LOG_ERR, WHERE, "%04d FastCGI Process did not send data header termination", session->socket); - return(false); + return false; } return true; @@ -4993,7 +4993,7 @@ static bool exec_cgi(http_session_t *session) if (session->tls_sess) { if (pipe(in_pipe) != 0) { errprintf(LOG_ERR, WHERE, "%04d Can't create in_pipe", session->socket); - return(false); + return false; } } @@ -5003,7 +5003,7 @@ static bool exec_cgi(http_session_t *session) close(in_pipe[1]); } errprintf(LOG_ERR, WHERE, "%04d Can't create out_pipe", session->socket); - return(false); + return false; } if (pipe(err_pipe) != 0) { @@ -5014,7 +5014,7 @@ static bool exec_cgi(http_session_t *session) close(out_pipe[0]); close(out_pipe[1]); errprintf(LOG_ERR, WHERE, "%04d Can't create err_pipe", session->socket); - return(false); + return false; } handler = get_cgi_handler(cmdline); @@ -5079,7 +5079,7 @@ static bool exec_cgi(http_session_t *session) close(err_pipe[1]); /* close excess file descriptor */ if (child == -1) - return(false); + return false; start = time(NULL); @@ -5101,7 +5101,7 @@ static bool exec_cgi(http_session_t *session) close(in_pipe[1]); close(out_pipe[0]); close(err_pipe[0]); - return(false); + return false; } } else { @@ -5109,7 +5109,7 @@ static bool exec_cgi(http_session_t *session) close(in_pipe[1]); close(out_pipe[0]); close(err_pipe[0]); - return(false); + return false; } } } @@ -5174,16 +5174,16 @@ static bool exec_cgi(http_session_t *session) if (!got_valid_headers) { errprintf(LOG_ERR, WHERE, "%04d CGI Process %s did not generate valid headers" , session->socket, getfname(cmdline)); - return(false); + return false; } if (!done_parsing_headers) { errprintf(LOG_ERR, WHERE, "%04d CGI Process %s did not send data header termination" , session->socket, getfname(cmdline)); - return(false); + return false; } - return(true); + return true; #else /* Win32 exec_cgi() */ @@ -5244,7 +5244,7 @@ static bool exec_cgi(http_session_t *session) /* Create the child output pipe (override default 4K buffer size) */ if (!CreatePipe(&rdoutpipe, &startup_info.hStdOutput, &sa, sizeof(buf))) { errprintf(LOG_ERR, WHERE, "%04d !ERROR %d creating stdout pipe", session->socket, GetLastError()); - return(false); + return false; } startup_info.hStdError = startup_info.hStdOutput; @@ -5252,7 +5252,7 @@ static bool exec_cgi(http_session_t *session) if (!CreatePipe(&startup_info.hStdInput, &wrinpipe, &sa, 0 /* default buffer size */)) { errprintf(LOG_ERR, WHERE, "%04d !ERROR %d creating stdin pipe", session->socket, GetLastError()); CloseHandle(rdoutpipe); - return(false); + return false; } DuplicateHandle( @@ -5287,7 +5287,7 @@ static bool exec_cgi(http_session_t *session) if (!success) { errprintf(LOG_ERR, WHERE, "%04d !ERROR %d running %s", session->socket, GetLastError(), cmdline); - return(false); + return false; } cd.wrpipe = wrpipe; @@ -5325,7 +5325,7 @@ static bool exec_cgi(http_session_t *session) lprintf(LOG_WARNING, "%04d !CGI Process %s did not send data header termination" , session->socket, getfname(cmdline)); - return(true); + return true; #endif } @@ -5351,7 +5351,7 @@ JSObject* js_CreateHttpReplyObject(JSContext* cx , NULL, JSPROP_ENUMERATE | JSPROP_READONLY); if ((js_str = JS_NewStringCopyZ(cx, session->req.status)) == NULL) - return(false); + return false; JS_DefineProperty(cx, reply, "status", STRING_TO_JSVAL(js_str) , NULL, NULL, JSPROP_ENUMERATE); @@ -5365,11 +5365,11 @@ JSObject* js_CreateHttpReplyObject(JSContext* cx , NULL, JSPROP_ENUMERATE | JSPROP_READONLY); if ((js_str = JS_NewStringCopyZ(cx, "text/html")) == NULL) - return(false); + return false; JS_DefineProperty(cx, headers, "Content-Type", STRING_TO_JSVAL(js_str) , NULL, NULL, JSPROP_ENUMERATE); - return(reply); + return reply; } JSObject* js_CreateHttpRequestObject(JSContext* cx @@ -5418,7 +5418,7 @@ JSObject* js_CreateHttpRequestObject(JSContext* cx , NULL, JSPROP_ENUMERATE | JSPROP_READONLY); - return(session->js_request); + return session->js_request; } static void @@ -5502,10 +5502,10 @@ js_writefunc(JSContext *cx, uintN argc, jsval *arglist, bool writeln) size_t len; if ((session = (http_session_t*)JS_GetContextPrivate(cx)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (!content_file_open(session)) { - return(JS_FALSE); + return JS_FALSE; } if ((!session->req.prev_write) && (!session->req.sent_headers)) { @@ -5513,7 +5513,7 @@ js_writefunc(JSContext *cx, uintN argc, jsval *arglist, bool writeln) rc = JS_SUSPENDREQUEST(cx); if (!ssjs_send_headers(session, true)) { JS_RESUMEREQUEST(cx, rc); - return(JS_FALSE); + return JS_FALSE; } JS_RESUMEREQUEST(cx, rc); } @@ -5530,7 +5530,7 @@ js_writefunc(JSContext *cx, uintN argc, jsval *arglist, bool writeln) rc = JS_SUSPENDREQUEST(cx); if (!ssjs_send_headers(session, false)) { JS_RESUMEREQUEST(cx, rc); - return(JS_FALSE); + return JS_FALSE; } JS_RESUMEREQUEST(cx, rc); } @@ -5558,7 +5558,7 @@ js_writefunc(JSContext *cx, uintN argc, jsval *arglist, bool writeln) else JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -5566,7 +5566,7 @@ js_write(JSContext *cx, uintN argc, jsval *arglist) { js_writefunc(cx, argc, arglist, false); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -5574,7 +5574,7 @@ js_writeln(JSContext *cx, uintN argc, jsval *arglist) { js_writefunc(cx, argc, arglist, true); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -5593,22 +5593,22 @@ js_set_cookie(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((session = (http_session_t*)JS_GetContextPrivate(cx)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc < 2) - return(JS_FALSE); + return JS_FALSE; header = header_buf; JSVALUE_TO_MSTRING(cx, argv[0], p, NULL); HANDLE_PENDING(cx, p); if (!p) - return(JS_FALSE); + return JS_FALSE; header += sprintf(header, "Set-Cookie: %s=", p); FREE_AND_NULL(p); JSVALUE_TO_MSTRING(cx, argv[1], p, NULL); HANDLE_PENDING(cx, p); if (!p) - return(JS_FALSE); + return JS_FALSE; header += sprintf(header, "%s", p); FREE_AND_NULL(p); if (argc > 2) { @@ -5639,7 +5639,7 @@ js_set_cookie(JSContext *cx, uintN argc, jsval *arglist) } strListPush(&session->req.dynamic_heads, header_buf); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -5655,10 +5655,10 @@ js_log(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((session = (http_session_t*)JS_GetContextPrivate(cx)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (startup == NULL || startup->lputs == NULL) - return(JS_FALSE); + return JS_FALSE; if (argc > 1 && JSVAL_IS_NUMBER(argv[i])) { if (!JS_ValueToInt32(cx, argv[i++], &level)) @@ -5679,7 +5679,7 @@ js_log(JSContext *cx, uintN argc, jsval *arglist) if (js_str != NULL) JS_SET_RVAL(cx, arglist, STRING_TO_JSVAL(js_str)); - return(JS_TRUE); + return JS_TRUE; } static JSBool @@ -5696,12 +5696,12 @@ js_login(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(JS_FALSE)); if ((session = (http_session_t*)JS_GetContextPrivate(cx)) == NULL) - return(JS_FALSE); + return JS_FALSE; /* User name */ JSVALUE_TO_ASTRING(cx, argv[0], username, (LEN_ALIAS > LEN_NAME) ? LEN_ALIAS + 2 : LEN_NAME + 2, NULL); if (username == NULL) - return(JS_FALSE); + return JS_FALSE; rc = JS_SUSPENDREQUEST(cx); @@ -5713,14 +5713,14 @@ js_login(JSContext *cx, uintN argc, jsval *arglist) lprintf(LOG_NOTICE, "%04d !USER NOT FOUND: '%s'" , session->socket, username); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } if (user.misc & (DELETED | INACTIVE)) { lprintf(LOG_WARNING, "%04d !DELETED OR INACTIVE USER #%d: %s" , session->socket, user.number, username); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } JS_RESUMEREQUEST(cx, rc); @@ -5728,7 +5728,7 @@ js_login(JSContext *cx, uintN argc, jsval *arglist) if (user.pass[0]) { JSVALUE_TO_ASTRING(cx, argv[1], password, LEN_PASS + 2, NULL); if (password == NULL) - return(JS_FALSE); + return JS_FALSE; if (stricmp(user.pass, password)) { /* Wrong password */ rc = JS_SUSPENDREQUEST(cx); @@ -5740,7 +5740,7 @@ js_login(JSContext *cx, uintN argc, jsval *arglist) , session->socket, user.alias); badlogin(session->socket, username, password, &session->client, &session->addr); JS_RESUMEREQUEST(cx, rc); - return(JS_TRUE); + return JS_TRUE; } } @@ -5770,7 +5770,7 @@ js_login(JSContext *cx, uintN argc, jsval *arglist) , startup->file_vpath_prefix, session->subscan /* subscan */, &mqtt)) { errprintf(LOG_ERR, WHERE, "%04d !JavaScript ERROR creating user objects", session->socket); send_error(session, __LINE__, "500 Error initializing JavaScript User Objects"); - return(false); + return false; } JS_SET_RVAL(cx, arglist, BOOLEAN_TO_JSVAL(JS_TRUE)); @@ -5780,7 +5780,7 @@ js_login(JSContext *cx, uintN argc, jsval *arglist) PlaySound(startup->sound.login, NULL, SND_ASYNC | SND_FILENAME); #endif - return(JS_TRUE); + return JS_TRUE; } #if 0 @@ -5800,10 +5800,10 @@ static char *find_next_pair(char *buffer, size_t buflen, char find) p = memchr(search, chars[i], buflen2); /* Can't even find one... there's definatly no pair */ if (p == NULL) - return(NULL); + return NULL; if (*(p + 1) == find) - return(p); + return p; /* Next search pos is at the char after the match */ search = p + 1; @@ -5914,39 +5914,39 @@ js_write_template(JSContext *cx, uintN argc, jsval *arglist) JS_SET_RVAL(cx, arglist, JSVAL_VOID); if ((session = (http_session_t*)JS_GetContextPrivate(cx)) == NULL) - return(JS_FALSE); + return JS_FALSE; if (session->req.fp == NULL) - return(JS_FALSE); + return JS_FALSE; JSVALUE_TO_MSTRING(cx, argv[0], filename, NULL); if (filename == NULL) - return(JS_FALSE); + return JS_FALSE; if (!fexist(filename)) { free(filename); JS_ReportError(cx, "Template file %s does not exist.", filename); - return(JS_FALSE); + return JS_FALSE; } len = flength(filename); if ((tfile = fopen(filename, "r")) == NULL) { free(filename); JS_ReportError(cx, "Unable to open template %s for read.", filename); - return(JS_FALSE); + return JS_FALSE; } free(filename); if ((template = (char *)malloc(len)) == NULL) { JS_ReportError(cx, "Unable to allocate %u bytes for template.", len); - return(JS_FALSE); + return JS_FALSE; } if (fread(template, 1, len, tfile) != len) { free(template); fclose(tfile); JS_ReportError(cx, "Unable to read %u bytes from template %s.", len, filename); - return(JS_FALSE); + return JS_FALSE; } fclose(tfile); @@ -5954,7 +5954,7 @@ js_write_template(JSContext *cx, uintN argc, jsval *arglist) if (session->http_ver >= HTTP_1_1 && session->req.keep_alive) { if (!ssjs_send_headers(session, true)) { free(template); - return(JS_FALSE); + return JS_FALSE; } } else { @@ -5968,7 +5968,7 @@ js_write_template(JSContext *cx, uintN argc, jsval *arglist) session->req.keep_alive = false; if (!ssjs_send_headers(session, false)) { free(template); - return(JS_FALSE); + return JS_FALSE; } } } @@ -5978,7 +5978,7 @@ js_write_template(JSContext *cx, uintN argc, jsval *arglist) js_write_template_part(cx, obj, template, len, NULL); free(template); - return(JS_TRUE); + return JS_TRUE; } #endif @@ -6001,7 +6001,7 @@ js_OperationCallback(JSContext *cx) JS_SetOperationCallback(cx, NULL); if ((session = (http_session_t*)JS_GetContextPrivate(cx)) == NULL) { JS_SetOperationCallback(cx, js_OperationCallback); - return(JS_FALSE); + return JS_FALSE; } ret = js_CommonOperationCallback(cx, &session->js_callback); @@ -6017,7 +6017,7 @@ js_initcx(http_session_t *session) if ((js_cx = JS_NewContext(session->js_runtime, JAVASCRIPT_CONTEXT_STACK)) == NULL) { lprintf(LOG_CRIT, "%04d JavaScript: Failed to create new context", session->socket); - return(NULL); + return NULL; } JS_SetOptions(js_cx, startup->js.options); JS_BEGINREQUEST(js_cx); @@ -6049,10 +6049,10 @@ js_initcx(http_session_t *session) JS_RemoveObjectRoot(js_cx, &session->js_glob); JS_ENDREQUEST(js_cx); JS_DestroyContext(js_cx); - return(NULL); + return NULL; } - return(js_cx); + return js_cx; } static bool js_setup_cx(http_session_t* session) @@ -6066,7 +6066,7 @@ static bool js_setup_cx(http_session_t* session) if ((session->js_runtime = jsrt_GetNew(startup->js.max_bytes, 5000, __FILE__, __LINE__)) == NULL) { errprintf(LOG_ERR, WHERE, "%04d !ERROR creating JavaScript runtime", session->socket); - return(false); + return false; } } @@ -6074,7 +6074,7 @@ static bool js_setup_cx(http_session_t* session) /* js_initcx() begins a context */ if (((session->js_cx = js_initcx(session)) == NULL)) { lprintf(LOG_WARNING, "%04d !ERROR initializing JavaScript context", session->socket); - return(false); + return false; } argv = JS_NewArrayObject(session->js_cx, 0, NULL); @@ -6102,7 +6102,7 @@ static bool js_setup_cx(http_session_t* session) if (js_CreateHttpRequestObject(session->js_cx, session->js_glob, session) == NULL) { errprintf(LOG_ERR, WHERE, "%04d !ERROR initializing JavaScript HttpRequest object", session->socket); JS_ENDREQUEST(session->js_cx); - return(false); + return false; } JS_SetContextPrivate(session->js_cx, session); @@ -6119,10 +6119,10 @@ static bool js_setup(http_session_t* session) if (js_CreateHttpReplyObject(session->js_cx, session->js_glob, session) == NULL) { errprintf(LOG_ERR, WHERE, "%04d !ERROR initializing JavaScript HttpReply object", session->socket); JS_ENDREQUEST(session->js_cx); - return(false); + return false; } - return(true); + return true; } static bool ssjs_send_headers(http_session_t* session, int chunked) @@ -6210,7 +6210,7 @@ static bool ssjs_send_headers(http_session_t* session, int chunked) JS_DestroyIdArray(session->js_cx, heads); } JS_ENDREQUEST(session->js_cx); - return(send_headers(session, session->req.status, chunked)); + return send_headers(session, session->req.status, chunked); } static bool exec_ssjs(http_session_t* session, char* script) { @@ -6270,7 +6270,7 @@ static bool exec_ssjs(http_session_t* session, char* script) { , session->socket, script); JS_RemoveObjectRoot(session->js_cx, &session->js_glob); JS_ENDREQUEST(session->js_cx); - return(false); + return false; } lprintf(LOG_DEBUG, "%04d JavaScript: Executing script: %s", session->socket, script); @@ -6295,7 +6295,7 @@ static bool exec_ssjs(http_session_t* session, char* script) { session->req.dynamic = IS_SSJS; JS_ENDREQUEST(session->js_cx); - return(retval); + return retval; } static void respond(http_session_t * session) @@ -6386,11 +6386,11 @@ bool post_to_file(http_session_t *session, FILE*fp, size_t ch_len) bytes_read = recvbufsocket(session, buf, (ch_len - k) > sizeof(buf)?sizeof(buf):(ch_len - k)); if (!bytes_read) { send_error(session, __LINE__, error_500); - return(false); + return false; } if (fwrite(buf, bytes_read, 1, fp) != 1) { send_error(session, __LINE__, error_500); - return(false); + return false; } k += bytes_read; session->req.post_len += bytes_read; @@ -6448,7 +6448,7 @@ int read_post_data(http_session_t * session) else { send_error(session, __LINE__, error_500); FCLOSE_OPEN_FILE(fp); - return(false); + return false; } if (ch_len == 0) break; @@ -6458,16 +6458,16 @@ int read_post_data(http_session_t * session) if (s > SIZE_MAX) { send_error(session, __LINE__, "413 Request entity too large"); FCLOSE_OPEN_FILE(fp); - return(false); + return false; } if (fp == NULL) { fp = open_post_file(session); if (fp == NULL) - return(false); + return false; } if (!post_to_file(session, fp, ch_len)) { fclose(fp); - return(false); + return false; } } else { @@ -6478,7 +6478,7 @@ int read_post_data(http_session_t * session) errprintf(LOG_CRIT, WHERE, "%04d !ERROR Allocating %lu bytes of memory", session->socket, (ulong)session->req.post_len); send_error(session, __LINE__, "413 Request entity too large"); FCLOSE_OPEN_FILE(fp); - return(false); + return false; } session->req.post_data = p; /* read new data */ @@ -6486,7 +6486,7 @@ int read_post_data(http_session_t * session) if (!bytes_read) { send_error(session, __LINE__, error_500); FCLOSE_OPEN_FILE(fp); - return(false); + return false; } session->req.post_len += bytes_read; /* Read chunk terminator */ @@ -6499,18 +6499,18 @@ int read_post_data(http_session_t * session) FREE_AND_NULL(session->req.post_data); session->req.post_map = xpmap(session->req.cleanup_file[CLEANUP_POST_DATA], XPMAP_WRITE); if (!session->req.post_map) - return(false); + return false; session->req.post_data = session->req.post_map->addr; } /* Read more headers! */ if (!get_request_headers(session)) - return(false); + return false; if (!is_legal_host(session->req.vhost, false)) { send_error(session, __LINE__, "400 Bad Request"); return false; } if (!parse_headers(session)) - return(false); + return false; } else { s = session->req.post_len; @@ -6518,14 +6518,14 @@ int read_post_data(http_session_t * session) if (s > MAX_POST_LEN) { fp = open_post_file(session); if (fp == NULL) - return(false); + return false; bool success = post_to_file(session, fp, s); fclose(fp); if (!success) - return(false); + return false; session->req.post_map = xpmap(session->req.cleanup_file[CLEANUP_POST_DATA], XPMAP_WRITE); if (!session->req.post_map) - return(false); + return false; session->req.post_data = session->req.post_map->addr; } else { @@ -6535,7 +6535,7 @@ int read_post_data(http_session_t * session) else { errprintf(LOG_CRIT, WHERE, "%04d !ERROR Allocating %lu bytes of memory", session->socket, (ulong)s); send_error(session, __LINE__, "413 Request entity too large"); - return(false); + return false; } } } @@ -6546,7 +6546,7 @@ int read_post_data(http_session_t * session) if (session->req.post_data != NULL) session->req.post_data[session->req.post_len] = 0; } - return(true); + return true; } void http_output_thread(void *arg) @@ -7123,7 +7123,7 @@ const char* web_ver(void) , GIT_BRANCH, GIT_HASH , GIT_DATE, compiler); - return(ver); + return ver; } void http_logging_thread(void* arg) diff --git a/src/sbbs3/writemsg.cpp b/src/sbbs3/writemsg.cpp index 6511a63100c5b1a3e9c016a96502e869f8da1574..9fa185c55d542fcfe4c22e9ee2ca16cbfe9a82a8 100644 --- a/src/sbbs3/writemsg.cpp +++ b/src/sbbs3/writemsg.cpp @@ -310,7 +310,7 @@ bool sbbs_t::writemsg(const char *fname, const char *top, char *subj, int mode, == NULL) { errormsg(WHERE, ERR_ALLOC, fname , (cfg.level_linespermsg[useron_level] * MAX_LINE_LEN) + 1); - return(false); + return false; } if (mode & WM_NETMAIL || @@ -346,7 +346,7 @@ bool sbbs_t::writemsg(const char *fname, const char *top, char *subj, int mode, if ((stream = fnopen(NULL, path, O_RDONLY)) == NULL) { errormsg(WHERE, ERR_OPEN, path, O_RDONLY); free(buf); - return(false); + return false; } if (cfg.xedit[useron_xedit - 1]->type == XTRN_WWIV) { // 2 lines of metadata if (fgets(str, sizeof(str), stream) == NULL) @@ -358,7 +358,7 @@ bool sbbs_t::writemsg(const char *fname, const char *top, char *subj, int mode, errormsg(WHERE, ERR_OPEN, msgtmp, O_WRONLY | O_CREAT | O_TRUNC); free(buf); fclose(stream); - return(false); + return false; } while (!feof(stream) && !ferror(stream)) { @@ -384,7 +384,7 @@ bool sbbs_t::writemsg(const char *fname, const char *top, char *subj, int mode, if ((stream = fnopen(&file, path, O_RDONLY)) == NULL) { errormsg(WHERE, ERR_OPEN, path, O_RDONLY); free(buf); - return(false); + return false; } if (useron_xedit > 0 && cfg.xedit[useron_xedit - 1]->type == XTRN_WWIV) { // 2 lines of metadata @@ -398,7 +398,7 @@ bool sbbs_t::writemsg(const char *fname, const char *top, char *subj, int mode, errormsg(WHERE, ERR_OPEN, msgtmp, O_WRONLY | O_CREAT | O_TRUNC); free(buf); fclose(stream); - return(false); + return false; } l = (long)ftell(stream); /* l now points to start of message */ @@ -411,7 +411,7 @@ bool sbbs_t::writemsg(const char *fname, const char *top, char *subj, int mode, fclose(stream); close(file); free(buf); - return(false); + return false; } if (!i && linesquoted) break; @@ -494,7 +494,7 @@ bool sbbs_t::writemsg(const char *fname, const char *top, char *subj, int mode, if (!online || sys_status & SS_ABORT) { free(buf); - return(false); + return false; } if (!(mode & (WM_EXTDESC | WM_SUBJ_RO))) { @@ -515,25 +515,25 @@ bool sbbs_t::writemsg(const char *fname, const char *top, char *subj, int mode, if (!getstr(subj, max_title_len, mode & WM_FILE ? K_LINE | K_TRIM : K_LINE | K_EDIT | K_AUTODEL | K_TRIM | K_UTF8) && useron_level && useron.logons) { free(buf); - return(false); + return false; } if ((mode & WM_FILE) && !checkfname(subj)) { free(buf); bprintf(text[BadFilename], subj); - return(false); + return false; } if (!(mode & (WM_EMAIL | WM_NETMAIL)) && cfg.sub[subnum]->misc & SUB_QNET && !SYSOP && (!stricmp(subj, "DROP") || !stricmp(subj, "ADD") || !strnicmp(to, "SBBS", 4))) { free(buf); /* Users can't post DROP or ADD in QWK netted subs */ - return(false); /* or messages to "SBBS" */ + return false; /* or messages to "SBBS" */ } } if (!online || sys_status & SS_ABORT) { free(buf); - return(false); + return false; } editor_details[0] = 0; @@ -560,7 +560,7 @@ bool sbbs_t::writemsg(const char *fname, const char *top, char *subj, int mode, c = getkey(0); if (sys_status & SS_ABORT) { /* Ctrl-C */ free(buf); - return(false); + return false; } if ((c == ESC || c == CTRL_A) && useron.rest & FLAG('A')) /* ANSI restriction */ continue; @@ -642,7 +642,7 @@ bool sbbs_t::writemsg(const char *fname, const char *top, char *subj, int mode, if (result != EXIT_SUCCESS || !fexistcase(msgtmp) || !online || (linesquoted && qlen == flength(msgtmp) && qtime == fdate(msgtmp))) { free(buf); - return(false); + return false; } SAFEPRINTF(str, "%sRESULT.ED", cfg.node_dir); if (!(mode & (WM_EXTDESC | WM_FILE)) @@ -669,7 +669,7 @@ bool sbbs_t::writemsg(const char *fname, const char *top, char *subj, int mode, if ((file = nopen(msgtmp, O_RDONLY)) == -1) { errormsg(WHERE, ERR_OPEN, msgtmp, O_RDONLY); free(buf); - return(false); + return false; } length = (long)filelength(file); if (length < 0) { @@ -724,7 +724,7 @@ bool sbbs_t::writemsg(const char *fname, const char *top, char *subj, int mode, } } free(buf); /* Assertion here Dec-17-2003, think I fixed in block above (rev 1.52) */ - return(false); + return false; } } @@ -734,7 +734,7 @@ bool sbbs_t::writemsg(const char *fname, const char *top, char *subj, int mode, if ((stream = fnopen(NULL, fname, O_WRONLY | O_CREAT | O_TRUNC)) == NULL) { errormsg(WHERE, ERR_OPEN, fname, O_WRONLY | O_CREAT | O_TRUNC); free(buf); - return(false); + return false; } l = process_edited_text(buf, stream, mode, &lines, cfg.level_linespermsg[useron_level]); if (editor_details[0] && editor != NULL) @@ -792,7 +792,7 @@ bool sbbs_t::writemsg(const char *fname, const char *top, char *subj, int mode, fclose(stream); free((char *)buf); bprintf(text[SavedNBytes], l, lines); - return(true); + return true; } void sbbs_t::editor_info_to_msg(smbmsg_t* msg, const char* editor, const char* charset) @@ -961,7 +961,7 @@ uint sbbs_t::msgeditor(char *buf, const char *top, char *title, uint maxlines, u if ((str = strListDivide(NULL, buf, "\n")) == NULL) { errormsg(WHERE, ERR_ALLOC, "msgeditor", strlen(buf)); - return(0); + return 0; } lines = strListCount(str); while (lines > maxlines) @@ -1068,7 +1068,7 @@ uint sbbs_t::msgeditor(char *buf, const char *top, char *title, uint maxlines, u } else if (!stricmp(strin, "/ABT")) { strListFree(&str); - return(0); + return 0; } else if (toupper(strin[1]) == 'D') { // delete line(s) lines = strListCount(str); @@ -1259,7 +1259,7 @@ upload: strListFree(&str); if (!online) return 0; - return(lines); + return lines; } /****************************************************************************/ @@ -1809,18 +1809,18 @@ bool sbbs_t::movemsg(smbmsg_t* msg, int subnum) for (i = 0; i < usrgrps; i++) /* Select New Group */ uselect(1, i, "Message Group", cfg.grp[usrgrp[i]]->lname, 0); if ((newgrp = uselect(0, 0, 0, 0, 0)) < 0) - return(false); + return false; for (i = 0; i < usrsubs[newgrp]; i++) /* Select New Sub-Board */ uselect(1, i, "Sub-Board", cfg.sub[usrsub[newgrp][i]]->lname, 0); if ((newsub = uselect(0, 0, 0, 0, 0)) < 0) - return(false); + return false; newsub = usrsub[newgrp][newsub]; length = smb_getmsgdatlen(msg); if ((buf = (char *)malloc(length)) == NULL) { errormsg(WHERE, ERR_ALLOC, smb.file, length); - return(false); + return false; } fseek(smb.sdt_fp, msg->hdr.offset, SEEK_SET); @@ -1836,7 +1836,7 @@ bool sbbs_t::movemsg(smbmsg_t* msg, int subnum) if ((i = smb_open(&newsmb)) != SMB_SUCCESS) { free(buf); errormsg(WHERE, ERR_OPEN, newsmb.file, i, newsmb.last_error); - return(false); + return false; } if (filelength(fileno(newsmb.shd_fp)) < 1) { /* Create it if it doesn't exist */ @@ -1848,7 +1848,7 @@ bool sbbs_t::movemsg(smbmsg_t* msg, int subnum) free(buf); smb_close(&newsmb); errormsg(WHERE, ERR_CREATE, newsmb.file, i, newsmb.last_error); - return(false); + return false; } } @@ -1856,14 +1856,14 @@ bool sbbs_t::movemsg(smbmsg_t* msg, int subnum) free(buf); smb_close(&newsmb); errormsg(WHERE, ERR_LOCK, newsmb.file, i, newsmb.last_error); - return(false); + return false; } if ((i = smb_getstatus(&newsmb)) != SMB_SUCCESS) { free(buf); smb_close(&newsmb); errormsg(WHERE, ERR_READ, newsmb.file, i, newsmb.last_error); - return(false); + return false; } if (newsmb.status.attr & SMB_HYPERALLOC) { @@ -1875,7 +1875,7 @@ bool sbbs_t::movemsg(smbmsg_t* msg, int subnum) free(buf); smb_close(&newsmb); errormsg(WHERE, ERR_OPEN, newsmb.file, i, newsmb.last_error); - return(false); + return false; } if (cfg.sub[newsub]->misc & SUB_FAST) { offset = smb_fallocdat(&newsmb, length, 1); @@ -1909,7 +1909,7 @@ bool sbbs_t::movemsg(smbmsg_t* msg, int subnum) if (i) { errormsg(WHERE, ERR_WRITE, newsmb.file, i, newsmb.last_error); smb_freemsg_dfields(&newsmb, &newmsg, 1); - return(false); + return false; } bprintf("\r\nMoved to %s %s\r\n\r\n" @@ -1920,7 +1920,7 @@ bool sbbs_t::movemsg(smbmsg_t* msg, int subnum) logline("M+", str); signal_sub_sem(&cfg, newsub); - return(true); + return true; } ushort sbbs_t::chmsgattr(const smbmsg_t* msg) @@ -1973,8 +1973,8 @@ ushort sbbs_t::chmsgattr(const smbmsg_t* msg) attr ^= MSG_REPLIED; break; default: - return(attr); + return attr; } } - return(attr); + return attr; } diff --git a/src/sbbs3/xmodem.c b/src/sbbs3/xmodem.c index 2c0efcea981a405ad511f8980190cfc2b821506d..e68abbea2f4b016fa1a350dd70f12cb4e696627a 100644 --- a/src/sbbs3/xmodem.c +++ b/src/sbbs3/xmodem.c @@ -44,7 +44,7 @@ static int lprintf(xmodem_t* xm, int level, const char *fmt, ...) char sbuf[1024]; if (xm->lputs == NULL) - return(-1); + return -1; if (xm->log_level != NULL) if (level > *xm->log_level) return 0; @@ -53,21 +53,21 @@ static int lprintf(xmodem_t* xm, int level, const char *fmt, ...) vsnprintf(sbuf, sizeof(sbuf), fmt, argptr); sbuf[sizeof(sbuf) - 1] = 0; va_end(argptr); - return(xm->lputs(xm->cbdata, level, sbuf)); + return xm->lputs(xm->cbdata, level, sbuf); } static BOOL is_connected(xmodem_t* xm) { if (xm->is_connected != NULL) - return(xm->is_connected(xm->cbdata)); - return(TRUE); + return xm->is_connected(xm->cbdata); + return TRUE; } static BOOL is_cancelled(xmodem_t* xm) { if (xm->is_cancelled != NULL) - return(xm->cancelled = xm->is_cancelled(xm->cbdata)); - return(xm->cancelled); + return xm->cancelled = xm->is_cancelled(xm->cbdata); + return xm->cancelled; } static void xmodem_flush(xmodem_t* xm) @@ -81,19 +81,19 @@ static char *chr(uchar ch) static char str[25]; switch (ch) { - case SOH: return("SOH"); - case STX: return("STX"); - case ETX: return("ETX"); - case EOT: return("EOT"); - case ACK: return("ACK"); - case NAK: return("NAK"); - case CAN: return("CAN"); + case SOH: return "SOH"; + case STX: return "STX"; + case ETX: return "ETX"; + case EOT: return "EOT"; + case ACK: return "ACK"; + case NAK: return "NAK"; + case CAN: return "CAN"; } if (ch >= ' ' && ch <= '~') sprintf(str, "'%c' (%02Xh)", ch, ch); else sprintf(str, "%u (%02Xh)", ch, ch); - return(str); + return str; } @@ -207,7 +207,7 @@ int xmodem_get_block(xmodem_t* xm, uchar* block, unsigned expected_block_num) xmodem_put_nak(xm, expected_block_num); /* chuck's double EOT trick */ continue; } - return(EOT); + return EOT; case CAN: if (!can) { /* must get two CANs in a row */ can = 1; @@ -216,15 +216,15 @@ int xmodem_get_block(xmodem_t* xm, uchar* block, unsigned expected_block_num) continue; } lprintf(xm, LOG_WARNING, "Block %u: Canceled remotely", expected_block_num); - return(CAN); + return CAN; default: lprintf(xm, LOG_WARNING, "Block %u: Received %s Expected SOH, STX, or EOT" , expected_block_num, chr((uchar)i)); /* Fall-through */ case NOINP: /* Nothing came in */ if (eot) - return(EOT); - return(NOINP); + return EOT; + return NOINP; } if ((i = getcom(xm->byte_timeout)) == NOINP) break; @@ -277,9 +277,9 @@ int xmodem_get_block(xmodem_t* xm, uchar* block, unsigned expected_block_num) lprintf(xm, LOG_WARNING, "Block number error (%u received, expected %u)" , block_num, expected_block_num & 0xff); if ((*xm->mode) & XMODEM && expected_block_num == 1 && block_num == 0) - return(NOT_XMODEM); + return NOT_XMODEM; if (expected_block_num == 0 && block_num == 1) - return(NOT_YMODEM); + return NOT_YMODEM; if (expected_block_num && block_num == (uchar)((expected_block_num - 1) & 0xff)) continue; /* silently discard repeated packets (ymodem.doc 7.3.2) */ break; @@ -306,7 +306,7 @@ int xmodem_put_block(xmodem_t* xm, uchar* block, unsigned block_size, unsigned b else /* 1024 */ result = putcom(STX); if (result != 0) - return(result); + return result; ch = (uchar)(block_num & 0xff); if ((result = putcom(ch)) != 0) return result; @@ -351,9 +351,9 @@ int xmodem_get_ack(xmodem_t* xm, unsigned tries, unsigned block_num) if (getcom(0) == CAN) { lprintf(xm, LOG_WARNING, "Block %u: !Canceled remotely", block_num); xmodem_cancel(xm); - return(CAN); + return CAN; } - return(ACK); + return ACK; } i = getcom(xm->ack_timeout); @@ -365,7 +365,7 @@ int xmodem_get_ack(xmodem_t* xm, unsigned tries, unsigned block_num) if (can) { /* 2 CANs in a row */ lprintf(xm, LOG_WARNING, "Block %u: !Canceled remotely", block_num); xmodem_cancel(xm); - return(CAN); + return CAN; } can = 1; } @@ -373,13 +373,13 @@ int xmodem_get_ack(xmodem_t* xm, unsigned tries, unsigned block_num) lprintf(xm, LOG_WARNING, "Block %u: !Received %s Expected ACK" , block_num, chr((uchar)i)); if (i != CAN) - return(i); + return i; } if (i != CAN) errors++; } - return(i); + return i; } BOOL xmodem_get_mode(xmodem_t* xm) @@ -398,23 +398,23 @@ BOOL xmodem_get_mode(xmodem_t* xm) switch (i) { case NAK: /* checksum */ lprintf(xm, LOG_INFO, "Receiver requested mode: 8-bit Checksum"); - return(TRUE); + return TRUE; case 'C': lprintf(xm, LOG_INFO, "Receiver requested mode: 16-bit CRC"); if (!xm->crc_mode_supported) continue; *(xm->mode) |= CRC; - return(TRUE); + return TRUE; case 'G': lprintf(xm, LOG_INFO, "Receiver requested mode: Streaming, 16-bit CRC"); if (!xm->crc_mode_supported || !xm->g_mode_supported) continue; *(xm->mode) |= (GMODE | CRC); - return(TRUE); + return TRUE; case CAN: if (can) { lprintf(xm, LOG_WARNING, "Canceled remotely"); - return(FALSE); + return FALSE; } can = 1; break; @@ -428,7 +428,7 @@ BOOL xmodem_get_mode(xmodem_t* xm) } lprintf(xm, LOG_ERR, "Failed to get transfer mode request from receiver"); - return(FALSE); + return FALSE; } BOOL xmodem_put_eot(xmodem_t* xm) @@ -450,7 +450,7 @@ BOOL xmodem_put_eot(xmodem_t* xm) continue; lprintf(xm, LOG_INFO, "Received %s", chr((uchar)ch)); if (ch == ACK) - return(TRUE); + return TRUE; if (ch == CAN && ++cans > 1) break; if (ch == NAK && errors == 0 && (*(xm->mode) & (YMODEM | GMODE)) == YMODEM) { @@ -458,7 +458,7 @@ BOOL xmodem_put_eot(xmodem_t* xm) } lprintf(xm, LOG_WARNING, "Expected ACK"); } - return(FALSE); + return FALSE; } BOOL xmodem_send_file(xmodem_t* xm, const char* fname, FILE* fp, time_t* start, uint64_t* sent) @@ -597,13 +597,13 @@ BOOL xmodem_send_file(xmodem_t* xm, const char* fname, FILE* fp, time_t* start, if (sent != NULL) *sent = sent_bytes; - return(success); + return success; } const char* xmodem_source(void) { - return(__FILE__); + return __FILE__; } char* xmodem_ver(char *buf) diff --git a/src/sbbs3/xtrn.cpp b/src/sbbs3/xtrn.cpp index 9e6d4d3d9f5b180b4396feada653a35d442e62bb..f4c64c18cad69e99bb1be7ed373a5b7fce699dbc 100644 --- a/src/sbbs3/xtrn.cpp +++ b/src/sbbs3/xtrn.cpp @@ -204,7 +204,7 @@ BYTE* wwiv_expand(BYTE* buf, uint buflen, BYTE* outbuf, size_t& newlen } } newlen = j; - return(outbuf); + return outbuf; } static void petscii_convert(BYTE* buf, uint len) @@ -275,18 +275,18 @@ bool native_executable(scfg_t* cfg, const char* cmdline, int mode) if (stricmp(name, cfg->natvpgm[i]->name) == 0 || stricmp(base, cfg->natvpgm[i]->name) == 0) break; - return(i < cfg->total_natvpgms); + return i < cfg->total_natvpgms; } #define XTRN_LOADABLE_MODULE(cmdline, startup_dir) \ if (cmdline[0] == '*') /* Baja module or JavaScript */ \ - return(exec_bin(cmdline + 1, &main_csi, startup_dir)); + return exec_bin(cmdline + 1, &main_csi, startup_dir); #ifdef JAVASCRIPT #define XTRN_LOADABLE_JS_MODULE(cmdline, mode, startup_dir) \ if (cmdline[0] == '?' && (mode & EX_SH)) \ - return(js_execxtrn(cmdline + 1, startup_dir)); \ + return js_execxtrn(cmdline + 1, startup_dir); \ if (cmdline[0] == '?') \ - return(js_execfile(cmdline + 1, startup_dir)); + return js_execfile(cmdline + 1, startup_dir); #else #define XTRN_LOADABLE_JS_MODULE #endif @@ -310,7 +310,7 @@ BYTE* cr_expand(BYTE* inbuf, size_t inlen, BYTE* outbuf, size_t& newlen) outbuf[j++] = '\n'; } newlen = j; - return(outbuf); + return outbuf; } static void add_env_var(str_list_t* list, const char* var, const char* val) @@ -427,7 +427,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) if ((env_list = strListInit()) == NULL) { XTRN_CLEANUP; errormsg(WHERE, ERR_CREATE, "env_list", 0); - return(errno); + return errno; } // Current environment passed to child process @@ -458,7 +458,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) if (env_block == NULL) { XTRN_CLEANUP; errormsg(WHERE, ERR_CREATE, "env_block", 0); - return(errno); + return errno; } } else { // DOS external @@ -491,7 +491,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) if (fp == NULL) { XTRN_CLEANUP; errormsg(WHERE, ERR_CREATE, path, 0); - return(errno); + return errno; } fprintf(fp, "%s\n", fullcmdline); fprintf(fp, "DSZLOG=%sPROTOCOL.LOG\n", node_dir); @@ -538,7 +538,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) )) == NULL) { XTRN_CLEANUP; errormsg(WHERE, ERR_CREATE, str, 0); - return(GetLastError()); + return GetLastError(); } sprintf(str, "sbbsexec_hangup%d", cfg.node_num); @@ -550,7 +550,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) )) == NULL) { XTRN_CLEANUP; errormsg(WHERE, ERR_CREATE, str, 0); - return(GetLastError()); + return GetLastError(); } sprintf(str, "\\\\.\\mailslot\\sbbsexec\\rd%d" @@ -562,7 +562,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) if (rdslot == INVALID_HANDLE_VALUE) { XTRN_CLEANUP; errormsg(WHERE, ERR_CREATE, str, 0); - return(GetLastError()); + return GetLastError(); } } } @@ -598,7 +598,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) if (!CreatePipe(&rdoutpipe, &startup_info.hStdOutput, &sa, sizeof(buf))) { errormsg(WHERE, ERR_CREATE, "stdout pipe", 0); strListFreeBlock(env_block); - return(GetLastError()); + return GetLastError(); } startup_info.hStdError = startup_info.hStdOutput; @@ -607,7 +607,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) errormsg(WHERE, ERR_CREATE, "stdin pipe", 0); CloseHandle(rdoutpipe); strListFreeBlock(env_block); - return(GetLastError()); + return GetLastError(); } DuplicateHandle( @@ -658,7 +658,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) SetLastError(last_error); /* Restore LastError */ errormsg(WHERE, ERR_EXEC, realcmdline, mode); SetLastError(last_error); /* Restore LastError */ - return(GetLastError()); + return GetLastError(); } #if 0 @@ -931,7 +931,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) errorlevel = retval; // Baja or JS retrievable error value - return(retval); + return retval; } #else /* !WIN32 */ @@ -949,7 +949,7 @@ BYTE* lf_expand(BYTE* inbuf, uint inlen, BYTE* outbuf, size_t& newlen) outbuf[j++] = inbuf[i]; } newlen = j; - return(outbuf); + return outbuf; } #define MAX_ARGS 1000 @@ -963,13 +963,13 @@ static int setenv(const char *name, const char *value, int overwrite) envstr = (char *)malloc(strlen(name) + strlen(value) + 2); if (envstr == NULL) { errno = ENOMEM; - return(-1); + return -1; } /* Note, on some platforms, this can be free()d... */ sprintf(envstr, "%s=%s", name, value); putenv(envstr); } - return(0); + return 0; } #endif @@ -990,13 +990,13 @@ static int login_tty(int fd) { (void) setsid(); if (!isatty(fd)) - return (-1); + return -1; (void) dup2(fd, 0); (void) dup2(fd, 1); (void) dup2(fd, 2); if (fd > 2) (void) close(fd); - return (0); + return 0; } #ifdef NEEDS_DAEMON @@ -1010,7 +1010,7 @@ daemon(int nochdir, int noclose) switch (fork()) { case -1: - return (-1); + return -1; case 0: break; default: @@ -1018,7 +1018,7 @@ daemon(int nochdir, int noclose) } if (setsid() == -1) - return (-1); + return -1; if (!nochdir) (void)chdir("/"); @@ -1030,7 +1030,7 @@ daemon(int nochdir, int noclose) if (fd > 2) (void)close(fd); } - return (0); + return 0; } #endif @@ -1071,14 +1071,14 @@ static int openpty(int *amaster, int *aslave, char *name, struct termios *termp, if (winp) (void) ioctl(slave, TIOCSWINSZ, (char *)winp); - return (0); + return 0; } (void) close(master); } } } errno = ENOENT; /* out of ptys */ - return (-1); + return -1; } static int forkpty(int *amaster, char *name, termios *termp, winsize *winp) @@ -1086,24 +1086,24 @@ static int forkpty(int *amaster, char *name, termios *termp, winsize *winp) int master, slave, pid; if (openpty(&master, &slave, name, termp, winp) == -1) - return (-1); + return -1; switch (pid = FORK()) { case -1: - return (-1); + return -1; case 0: /* * child */ (void) close(master); login_tty(slave); - return (0); + return 0; } /* * parent */ *amaster = master; (void) close(slave); - return (pid); + return pid; } #endif /* NEED_FORKPTY */ @@ -1216,7 +1216,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) snprintf(str, sizeof str, "%s.doscmdrc", cfg.node_dir); if ((doscmdrc = fopen(str, "w+")) == NULL) { errormsg(WHERE, ERR_CREATE, str, 0); - return(-1); + return -1; } if (startup_dir[0]) fprintf(doscmdrc, "assign C: %s\n", startup_dir); @@ -1368,7 +1368,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) SAFEPRINTF(str, "/etc/%s", dosemu_cnf_fn); if (!fexist(str)) { errormsg(WHERE, ERR_READ, str, 0); - return(-1); + return -1; } else SAFECOPY(dosemuconf, str); /* using system conf */ } @@ -1382,7 +1382,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) SAFEPRINTF2(str, "%s%s", cfg.node_dir, external_bat_fn); if (!(dosemubatfp = fopen(str, "w+"))) { errormsg(WHERE, ERR_CREATE, str, 0); - return(-1); + return -1; } fprintf(dosemubatfp, "@ECHO OFF\r\n"); @@ -1438,7 +1438,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) if (!fexist(str)) { errormsg(WHERE, ERR_READ, str, 0); fclose(dosemubatfp); - return(-1); + return -1; } } @@ -1447,7 +1447,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) if (!(externalbatfp = fopen(externalbatsrc, "r"))) { errormsg(WHERE, ERR_OPEN, externalbatsrc, 0); fclose(dosemubatfp); - return(-1); + return -1; } /* append the command line to the batch file */ @@ -1539,7 +1539,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) if (!fexist(str)) { errormsg(WHERE, ERR_OPEN, "dosemu.ini", 0); fclose(dosemubatfp); - return(-1); + return -1; } } @@ -1547,7 +1547,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) if ((de_launch_inifp = iniOpenFile(str, false)) == NULL) { errormsg(WHERE, ERR_OPEN, str, 0); fclose(dosemubatfp); - return(-1); + return -1; } de_launch_ini = iniReadFile(de_launch_inifp); iniCloseFile(de_launch_inifp); @@ -1588,7 +1588,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) lprintf((mode & EX_OFFLINE) ? LOG_ERR : LOG_WARNING, "DOS programs not supported: %s", cmdline); bprintf("Sorry, DOS programs are not supported on this node.\r\n"); - return(-1); + return -1; #endif } @@ -1601,7 +1601,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) if (!(mode & EX_NOLOG) && pipe(err_pipe) != 0) { errormsg(WHERE, ERR_CREATE, "err_pipe", 0); - return(-1); + return -1; } if ((mode & EX_STDIO) == EX_STDIO) { @@ -1714,7 +1714,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) pthread_mutex_unlock(&input_thread_mutex); } errormsg(WHERE, ERR_EXEC, fullcmdline, 0); - return(-1); + return -1; } out_pipe[0] = in_pipe[1]; } @@ -1722,12 +1722,12 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) if (mode & EX_STDIN) if (pipe(in_pipe) != 0) { errormsg(WHERE, ERR_CREATE, "in_pipe", 0); - return(-1); + return -1; } if (mode & EX_STDOUT) if (pipe(out_pipe) != 0) { errormsg(WHERE, ERR_CREATE, "out_pipe", 0); - return(-1); + return -1; } @@ -1739,7 +1739,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) pthread_mutex_unlock(&input_thread_mutex); } errormsg(WHERE, ERR_EXEC, fullcmdline, 0); - return(-1); + return -1; } } if (pid == 0) { /* child process */ @@ -1765,7 +1765,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) if (startup_dir[0]) if (chdir(startup_dir) != 0) { errormsg(WHERE, ERR_CHDIR, startup_dir, 0); - return(-1); + return -1; } if (mode & EX_SH || strcspn(fullcmdline, "<>|;\"") != strlen(fullcmdline)) { @@ -2053,7 +2053,7 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) if (!(mode & EX_NOLOG)) close(err_pipe[0]); - return(errorlevel = WEXITSTATUS(i)); + return errorlevel = WEXITSTATUS(i); } #endif /* !WIN32 */ @@ -2061,9 +2061,9 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) static const char* quoted_string(const char* str, char* buf, size_t maxlen) { if (strchr(str, ' ') == NULL) - return(str); + return str; safe_snprintf(buf, maxlen, "\"%s\"", str); - return(buf); + return buf; } #define QUOTED_STRING(ch, str, buf, maxlen) \ @@ -2283,5 +2283,5 @@ char* sbbs_t::cmdstr(const char *instr, const char *fpath, const char *fspec, ch } cmd[j] = 0; - return(cmd); + return cmd; } diff --git a/src/sbbs3/xtrn_sec.cpp b/src/sbbs3/xtrn_sec.cpp index dd0df0d25bee18a416eb5dc877626f8364d66202..bfcab11a1a732bcace0b102a7c4c6014184c2052 100644 --- a/src/sbbs3/xtrn_sec.cpp +++ b/src/sbbs3/xtrn_sec.cpp @@ -51,13 +51,13 @@ int unixtojulian(time_t unix_time) struct tm tm; if (localtime_r(&unix_time, &tm) == NULL) - return(0); + return 0; j = 36525L * (1900 + tm.tm_year); if (!(j % 100) && TM_MONTH(tm.tm_mon) < 3) j--; j = (j - (1900 * 36525)) / 100; j += tm.tm_mday + days[tm.tm_mon]; - return(j); + return j; } /****************************************************************************/ @@ -75,7 +75,7 @@ time_t juliantounix(uint j) int leap, counter; struct tm tm; - if (!j) return(0L); + if (!j) return 0L; tm.tm_year = ((100L * j) / 36525L) - 1900; temp = (long)date.da_year * 36525L; @@ -96,9 +96,9 @@ time_t juliantounix(uint j) date.da_mon++; /* go from 0 to 1 based */ curtime.ti_hour = curtime.ti_min = curtime.ti_sec = 0; - return(dostounix(&date, &curtime)); + return dostounix(&date, &curtime); #else - return((time_t)-1); + return (time_t)-1; #endif } @@ -1265,14 +1265,14 @@ bool sbbs_t::exec_xtrn(uint xtrnnum, bool user_event) if (!chk_ar(cfg.xtrn[xtrnnum]->run_ar, &useron, &client) || !chk_ar(cfg.xtrnsec[cfg.xtrn[xtrnnum]->sec]->ar, &useron, &client)) { bputs(text[CantRunThatProgram]); - return(false); + return false; } if (cfg.xtrn[xtrnnum]->cost && !(useron.exempt & FLAG('X'))) { /* costs */ if (cfg.xtrn[xtrnnum]->cost > user_available_credits(&useron)) { bputs(text[NotEnoughCredits]); pause(); - return(false); + return false; } subtract_cdt(&cfg, &useron, cfg.xtrn[xtrnnum]->cost); } @@ -1280,7 +1280,7 @@ bool sbbs_t::exec_xtrn(uint xtrnnum, bool user_event) if (cfg.prextrn_mod[0] != '\0') { SAFEPRINTF2(str, "%s %s", cfg.prextrn_mod, cfg.xtrn[xtrnnum]->code); if (exec_bin(str, &main_csi) != 0) { - return(false); + return false; } } @@ -1305,7 +1305,7 @@ bool sbbs_t::exec_xtrn(uint xtrnnum, bool user_event) } } if (i <= cfg.sys_nodes) - return(false); + return false; } if (cfg.xtrn[xtrnnum]->misc & XTRN_TEMP_DIR) @@ -1368,7 +1368,7 @@ bool sbbs_t::exec_xtrn(uint xtrnnum, bool user_event) tleft = (cfg.xtrn[xtrnnum]->maxtime * 60); xtrndat(name, dropdir, cfg.xtrn[xtrnnum]->type, tleft, cfg.xtrn[xtrnnum]->misc); if (!online) - return(false); + return false; snprintf(str, sizeof(str), "running external %s: %s" , user_event ? "user event" : "program" , cfg.xtrn[xtrnnum]->name); @@ -1478,7 +1478,7 @@ bool sbbs_t::exec_xtrn(uint xtrnnum, bool user_event) exec_bin(str, &main_csi); } - return(true); + return true; } /****************************************************************************/ @@ -1500,7 +1500,7 @@ bool sbbs_t::user_event(user_event_t event) success = exec_xtrn(i, /* user_event: */ true); } - return(success); + return success; } diff --git a/src/sbbs3/zmodem.c b/src/sbbs3/zmodem.c index 9ec586eea8a369e18ba6b8dce35028a1db8c62ff..9dfb80e34cc498b672ad242a186b231d0d661ed4 100644 --- a/src/sbbs3/zmodem.c +++ b/src/sbbs3/zmodem.c @@ -72,7 +72,7 @@ static int lprintf(zmodem_t* zm, int level, const char *fmt, ...) char sbuf[1024]; if (zm->lputs == NULL) - return(-1); + return -1; if (zm->log_level != NULL) if (level > *zm->log_level) return 0; @@ -81,28 +81,28 @@ static int lprintf(zmodem_t* zm, int level, const char *fmt, ...) vsnprintf(sbuf, sizeof(sbuf), fmt, argptr); sbuf[sizeof(sbuf) - 1] = 0; va_end(argptr); - return(zm->lputs(zm->cbdata, level, sbuf)); + return zm->lputs(zm->cbdata, level, sbuf); } static BOOL is_connected(zmodem_t* zm) { if (zm->is_connected != NULL) - return(zm->is_connected(zm->cbdata)); - return(TRUE); + return zm->is_connected(zm->cbdata); + return TRUE; } static BOOL is_cancelled(zmodem_t* zm) { if (zm->is_cancelled != NULL) - return(zm->cancelled = zm->is_cancelled(zm->cbdata)); - return(zm->cancelled); + return zm->cancelled = zm->is_cancelled(zm->cbdata); + return zm->cancelled; } static BOOL is_data_waiting(zmodem_t* zm, unsigned timeout) { if (zm->data_waiting) - return(zm->data_waiting(zm->cbdata, timeout)); - return(FALSE); + return zm->data_waiting(zm->cbdata, timeout); + return FALSE; } static char *chr(int ch) @@ -110,37 +110,37 @@ static char *chr(int ch) static char str[25]; switch (ch) { - case TIMEOUT: return("TIMEOUT"); - case ABORTED: return("ABORTED"); + case TIMEOUT: return "TIMEOUT"; + case ABORTED: return "ABORTED"; case SUBPKTOVERFLOW: return "Subpacket Overflow"; case CRCFAILED: return "CRC ERROR"; case INVALIDSUBPKT: return "Invalid Subpacket"; - case ZRQINIT: return("ZRQINIT"); - case ZRINIT: return("ZRINIT"); - case ZSINIT: return("ZSINIT"); - case ZACK: return("ZACK"); - case ZFILE: return("ZFILE"); - case ZSKIP: return("ZSKIP"); - case ZCRC: return("ZCRC"); - case ZNAK: return("ZNAK"); - case ZABORT: return("ZABORT"); - case ZFIN: return("ZFIN"); - case ZRPOS: return("ZRPOS"); - case ZDATA: return("ZDATA"); - case ZEOF: return("ZEOF"); - case ZFERR: return("ZFERR"); - case ZPAD: return("ZPAD"); - case ZCAN: return("ZCAN"); - case ZDLE: return("ZDLE"); - case ZDLEE: return("ZDLEE"); - case ZBIN: return("ZBIN"); - case ZHEX: return("ZHEX"); - case ZBIN32: return("ZBIN32"); - case ZRESC: return("ZRESC"); - case ZCRCE: return("ZCRCE"); - case ZCRCG: return("ZCRCG"); - case ZCRCQ: return("ZCRCQ"); - case ZCRCW: return("ZCRCW"); + case ZRQINIT: return "ZRQINIT"; + case ZRINIT: return "ZRINIT"; + case ZSINIT: return "ZSINIT"; + case ZACK: return "ZACK"; + case ZFILE: return "ZFILE"; + case ZSKIP: return "ZSKIP"; + case ZCRC: return "ZCRC"; + case ZNAK: return "ZNAK"; + case ZABORT: return "ZABORT"; + case ZFIN: return "ZFIN"; + case ZRPOS: return "ZRPOS"; + case ZDATA: return "ZDATA"; + case ZEOF: return "ZEOF"; + case ZFERR: return "ZFERR"; + case ZPAD: return "ZPAD"; + case ZCAN: return "ZCAN"; + case ZDLE: return "ZDLE"; + case ZDLEE: return "ZDLEE"; + case ZBIN: return "ZBIN"; + case ZHEX: return "ZHEX"; + case ZBIN32: return "ZBIN32"; + case ZRESC: return "ZRESC"; + case ZCRCE: return "ZCRCE"; + case ZCRCG: return "ZCRCG"; + case ZCRCQ: return "ZCRCQ"; + case ZCRCW: return "ZCRCW"; case XON: return "XON"; case XOFF: return "XOFF"; } @@ -150,7 +150,7 @@ static char *chr(int ch) sprintf(str, "'%c' (%02Xh)", (uchar)ch, (uchar)ch); else sprintf(str, "%u (%02Xh)", (uchar)ch, (uchar)ch); - return(str); + return str; } static char* frame_desc(int frame) @@ -195,7 +195,7 @@ static char* frame_desc(int frame) } } else return chr(frame); - return(str); + return str; } ulong frame_pos(zmodem_t* zm, int type) @@ -205,7 +205,7 @@ ulong frame_pos(zmodem_t* zm, int type) case ZACK: case ZEOF: case ZDATA: - return(zm->rxd_header_pos); + return zm->rxd_header_pos; } return 0; @@ -294,7 +294,7 @@ int zmodem_tx(zmodem_t* zm, unsigned char c) case TELNET_IAC: if (zm->escape_telnet_iac) { if ((result = zmodem_send_raw(zm, ZDLE)) != SEND_SUCCESS) - return(result); + return result; return zmodem_send_raw(zm, ZRUB1); } break; @@ -399,7 +399,7 @@ int zmodem_send_hex_header(zmodem_t* zm, unsigned char * p) zmodem_flush(zm); - return(result); + return result; } /* @@ -666,9 +666,9 @@ int zmodem_recv_raw(zmodem_t* zm) if ((c = zm->recv_byte(zm->cbdata, 1 /* second timeout */)) >= 0) break; if (is_cancelled(zm)) - return(ZCAN); + return ZCAN; if (!is_connected(zm)) - return(ABORTED); + return ABORTED; lprintf(zm, LOG_DEBUG, "%s Received NO INPUT (attempt %u of %u)" , __FUNCTION__, attempt + 1, zm->recv_timeout); } @@ -772,7 +772,7 @@ int zmodem_rx(zmodem_t* zm) case ZCRCQ: case ZCRCW: // lprintf(zm,LOG_DEBUG, "%lu Encoding data subpacket type: %s", (ulong)zm->current_file_pos, chr(c)); - return (c | ZDLEESC); + return c | ZDLEESC; case ZRUB0: return 0x7f; case ZRUB1: @@ -962,7 +962,7 @@ int zmodem_recv_data(zmodem_t* zm, unsigned char* buf, size_t maxlen, unsigned* if (subpkt_type <= 0) { /* e.g. TIMEOUT, SUBPKTOVERFLOW, CRCFAILED */ lprintf(zm, LOG_WARNING, "%s data subpacket (%u bytes) %s" , chr(*type), *len, chr(subpkt_type)); - return(subpkt_type); + return subpkt_type; } lprintf(zm, LOG_DEBUG, "%lu Successful receipt of subpacket type: %s (%u bytes)" @@ -1011,10 +1011,10 @@ BOOL zmodem_recv_subpacket(zmodem_t* zm, BOOL ack, int* type) lprintf(zm, LOG_DEBUG, "%lu %s ERROR: %s (subpacket type: %s, %u bytes)" , (ulong)zm->ack_file_pos, __FUNCTION__, chr(result), chr(*type), len); zmodem_send_znak(zm); - return(FALSE); + return FALSE; } - return(TRUE); + return TRUE; } int zmodem_recv_nibble(zmodem_t* zm) @@ -1095,7 +1095,7 @@ BOOL zmodem_recv_bin16_header(zmodem_t* zm) if (c < 0) { lprintf(zm, LOG_WARNING, "%lu %s ERROR: %s" , (ulong)zm->current_file_pos, __FUNCTION__, chr(c)); - return(FALSE); + return FALSE; } crc = ucrc16(c, crc); zm->rxd_header[n] = c; @@ -1107,14 +1107,14 @@ BOOL zmodem_recv_bin16_header(zmodem_t* zm) if (rxd_crc != crc) { lprintf(zm, LOG_WARNING, "%lu %s CRC ERROR: 0x%hX, expected: 0x%hX" , (ulong)zm->ack_file_pos, __FUNCTION__, rxd_crc, crc); - return(FALSE); + return FALSE; } // lprintf(zm,LOG_DEBUG, "%lu %s GOOD CRC: %04hX", __FUNCTION__ // ,(ulong)zm->ack_file_pos, __FUNCTION__, crc); zm->rxd_header_len = n; - return(TRUE); + return TRUE; } BOOL zmodem_recv_hex_header(zmodem_t* zm) @@ -1196,7 +1196,7 @@ BOOL zmodem_recv_bin32_header(zmodem_t* zm) for (n = 0; n < HDRLEN; n++) { c = zmodem_rx(zm); if (c < 0) - return(TRUE); + return TRUE; crc = ucrc32(c, crc); zm->rxd_header[n] = c; } @@ -1211,12 +1211,12 @@ BOOL zmodem_recv_bin32_header(zmodem_t* zm) if (rxd_crc != crc) { lprintf(zm, LOG_WARNING, "%lu %s CRC ERROR (%08X, expected: %08X)" , (ulong)zm->ack_file_pos, __FUNCTION__, rxd_crc, crc); - return(FALSE); + return FALSE; } // lprintf(zm,LOG_DEBUG, "%lu %s GOOD CRC: %08lX", (ulong)zm->ack_file_pos, __FUNCTION__, crc); zm->rxd_header_len = n; - return(TRUE); + return TRUE; } /* @@ -1240,17 +1240,17 @@ int zmodem_recv_header_raw(zmodem_t* zm) do { do { if ((c = zmodem_recv_raw(zm)) < 0) - return(c); + return c; if (is_cancelled(zm)) - return(ZCAN); + return ZCAN; } while (STRIPPED_PARITY(c) != ZPAD); if ((c = zmodem_recv_raw(zm)) < 0) - return(c); + return c; if (STRIPPED_PARITY(c) == ZPAD) { if ((c = zmodem_recv_raw(zm)) < 0) - return(c); + return c; } /* @@ -1301,7 +1301,7 @@ int zmodem_recv_header_raw(zmodem_t* zm) } while (zm->rxd_header_len == 0 && !is_cancelled(zm)); if (is_cancelled(zm)) - return(ZCAN); + return ZCAN; /* * this appears to have been a valid header. @@ -1386,12 +1386,12 @@ BOOL zmodem_recv_crc(zmodem_t* zm, uint32_t* crc) if (!is_data_waiting(zm, zm->crc_timeout)) { lprintf(zm, LOG_ERR, "%lu %s Timeout waiting for response (%u seconds)" , (ulong)zm->current_file_pos, __FUNCTION__, zm->crc_timeout); - return(FALSE); + return FALSE; } if ((type = zmodem_recv_header(zm)) != ZCRC) { lprintf(zm, LOG_ERR, "%lu %s Received %s instead of ZCRC" , (ulong)zm->current_file_pos, __FUNCTION__, frame_desc(type)); - return(FALSE); + return FALSE; } if (crc != NULL) *crc = zm->crc_request; @@ -1440,7 +1440,7 @@ int zmodem_get_zrinit(zmodem_t* zm) zmodem_send_hex_header(zm, zrqinit_header); if (!is_data_waiting(zm, zm->init_timeout)) - return(TIMEOUT); + return TIMEOUT; return zmodem_recv_header(zm); } @@ -1599,7 +1599,7 @@ int zmodem_send_from(zmodem_t* zm, FILE* fp, uint64_t pos, uint64_t* sent) lprintf(zm, LOG_DEBUG, "Back-channel traffic detected"); if ((c = zmodem_recv_raw(zm)) < 0) { lprintf(zm, LOG_ERR, "Back-channel receive ERROR: %s", chr(c)); - return(c); + return c; } if (c == ZPAD) { rx_type = zmodem_recv_header(zm); @@ -1623,7 +1623,7 @@ int zmodem_send_from(zmodem_t* zm, FILE* fp, uint64_t pos, uint64_t* sent) lprintf(zm, LOG_INFO, "Unexpected back-channel data received: %s", chr(c)); } if (is_cancelled(zm)) - return(ZCAN); + return ZCAN; /* * read a block from the file @@ -1691,10 +1691,10 @@ int zmodem_send_from(zmodem_t* zm, FILE* fp, uint64_t pos, uint64_t* sent) while (is_connected(zm)) { int ack; if ((ack = zmodem_recv_header(zm)) != ZACK) - return(ack); + return ack; if (is_cancelled(zm)) - return(ZCAN); + return ZCAN; if (zmodem_handle_zack(zm, (uint32_t)zm->current_file_pos, (uint32_t)zm->current_file_pos)) { zm->current_window_size = 0; @@ -1790,7 +1790,7 @@ BOOL zmodem_send_file(zmodem_t* zm, char* fname, FILE* fp, BOOL request_init, ti , __FUNCTION__, frame_desc(i)); } if (zm->errors >= zm->max_errors || is_cancelled(zm) || !is_connected(zm)) - return(FALSE); + return FALSE; } fstat(fileno(fp), &s); @@ -1868,7 +1868,7 @@ BOOL zmodem_send_file(zmodem_t* zm, char* fname, FILE* fp, BOOL request_init, ti for (type = INVALIDSUBPKT, attempts = 0; type != ZRPOS; attempts++) { if (attempts >= zm->max_errors) - return(FALSE); + return FALSE; /* * send the header and the data @@ -1892,11 +1892,11 @@ BOOL zmodem_send_file(zmodem_t* zm, char* fname, FILE* fp, BOOL request_init, ti do { type = zmodem_recv_header(zm); if (is_cancelled(zm)) - return(FALSE); + return FALSE; } while (type == ZACK && is_connected(zm)); if (!is_connected(zm)) - return(FALSE); + return FALSE; #if 0 lprintf(zm, LOG_INFO, "type : %d", type); @@ -1915,12 +1915,12 @@ BOOL zmodem_send_file(zmodem_t* zm, char* fname, FILE* fp, BOOL request_init, ti if (type == ZSKIP) { zm->file_skipped = TRUE; lprintf(zm, LOG_WARNING, "File skipped by receiver"); - return(TRUE); + return TRUE; } } if (!zmodem_handle_zrpos(zm, &pos)) - return(FALSE); + return FALSE; zm->transfer_start_pos = pos; zm->transfer_start_time = time(NULL); @@ -1941,7 +1941,7 @@ BOOL zmodem_send_file(zmodem_t* zm, char* fname, FILE* fp, BOOL request_init, ti type = zmodem_send_from(zm, fp, pos, &sent_bytes); if (!is_connected(zm)) - return(FALSE); + return FALSE; if (type == ZFERR || type == ZABORT || is_cancelled(zm)) { lprintf(zm, LOG_WARNING, "Aborting receive"); @@ -1953,14 +1953,14 @@ BOOL zmodem_send_file(zmodem_t* zm, char* fname, FILE* fp, BOOL request_init, ti lprintf(zm, LOG_WARNING, "File skipped by receiver at offset: %" PRIu64, pos + sent_bytes); /* ZOC sends a ZRINIT after mid-file ZSKIP, so consume the ZRINIT here */ zmodem_recv_header(zm); - return(TRUE); + return TRUE; } if (sent != NULL) *sent += sent_bytes; if (type == ZRINIT) - return(TRUE); /* Success */ + return TRUE; /* Success */ pos = zm->ack_file_pos; @@ -1993,7 +1993,7 @@ BOOL zmodem_send_file(zmodem_t* zm, char* fname, FILE* fp, BOOL request_init, ti lprintf(zm, LOG_WARNING, "Transfer failed on receipt of: %s", chr(type)); - return(FALSE); + return FALSE; } /* Returns number of successfully-received files */ @@ -2151,7 +2151,7 @@ int zmodem_recv_files(zmodem_t* zm, const char* download_dir, uint64_t* bytes_re zmodem_rx(zm); zm->recv_timeout = timeout; - return(files_received); + return files_received; } int zmodem_recv_init(zmodem_t* zm) @@ -2186,12 +2186,12 @@ int zmodem_recv_init(zmodem_t* zm) if (type == ZFILE) { zmodem_parse_zfile_subpacket(zm); - return(type); + return type; } if (type == ZFIN) { zmodem_send_zfin(zm); /* ACK */ - return(type); + return type; } lprintf(zm, LOG_WARNING, "%s received %s instead of ZFILE or ZFIN" @@ -2200,7 +2200,7 @@ int zmodem_recv_init(zmodem_t* zm) , zm->rxd_header[ZF0], zm->rxd_header[ZF1], zm->rxd_header[ZF2], zm->rxd_header[ZF3]); } - return(type); + return type; } void zmodem_parse_zfile_subpacket(zmodem_t* zm) @@ -2391,7 +2391,7 @@ int zmodem_recv_file_frame(zmodem_t* zm, FILE* fp, int* type) const char* zmodem_source(void) { - return(__FILE__); + return __FILE__; } char* zmodem_ver(char *buf) diff --git a/src/smblib/smbadd.c b/src/smblib/smbadd.c index df572090455b8c7580336656c0b5bd5266132901..8616c11bef42ab2113a6fda4499354bf1a08e974 100644 --- a/src/smblib/smbadd.c +++ b/src/smblib/smbadd.c @@ -56,7 +56,7 @@ int smb_addmsg(smb_t* smb, smbmsg_t* msg, int storage, int dupechk_hashes if (filelength(fileno(smb->shd_fp)) < 1) { /* Create it if it doesn't exist */ /* smb->status.max_crcs, max_msgs, max_age, and attr should be pre-initialized */ if ((retval = smb_create(smb)) != SMB_SUCCESS) - return(retval); + return retval; } if (!smb->locked && smb_locksmbhdr(smb) != SMB_SUCCESS) @@ -309,7 +309,7 @@ int smb_addmsg(smb_t* smb, smbmsg_t* msg, int storage, int dupechk_hashes FREE_AND_NULL(lzhbuf); FREE_LIST(hashes, n); - return(retval); + return retval; } int smb_addvote(smb_t* smb, smbmsg_t* msg, int storage) diff --git a/src/smblib/smballoc.c b/src/smblib/smballoc.c index 6ced8f585966e35fbd3a5d4b679f3d8a4bc149a9..89f47349e40a85a29a2948a10bc190a01b6e64dd 100644 --- a/src/smblib/smballoc.c +++ b/src/smblib/smballoc.c @@ -39,7 +39,7 @@ off_t smb_allocdat(smb_t* smb, off_t length, uint16_t refs) if (smb->sda_fp == NULL) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s msgbase not open", __FUNCTION__); - return(SMB_ERR_NOT_OPEN); + return SMB_ERR_NOT_OPEN; } blocks = smb_datblocks(length); j = 0; /* j is consecutive unused block counter */ @@ -58,23 +58,23 @@ off_t smb_allocdat(smb_t* smb, off_t length, uint16_t refs) } if ((int)offset < 0) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s invalid data offset: %" PRIdOFF, __FUNCTION__, offset); - return(SMB_ERR_DAT_OFFSET); + return SMB_ERR_DAT_OFFSET; } clearerr(smb->sda_fp); if (fseeko(smb->sda_fp, (offset / SDT_BLOCK_LEN) * sizeof(refs), SEEK_SET)) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s seeking to: %" PRIdOFF, __FUNCTION__ , (offset / SDT_BLOCK_LEN) * sizeof(refs)); - return(SMB_ERR_SEEK); + return SMB_ERR_SEEK; } for (l = 0; l < blocks; l++) if (!fwrite(&refs, sizeof(refs), 1, smb->sda_fp)) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s writing allocation bytes at offset %" PRIdOFF, __FUNCTION__ , ((offset / SDT_BLOCK_LEN) + l) * sizeof(refs)); - return(SMB_ERR_WRITE); + return SMB_ERR_WRITE; } fflush(smb->sda_fp); - return(offset); + return offset; } /****************************************************************************/ @@ -88,20 +88,20 @@ off_t smb_fallocdat(smb_t* smb, off_t length, uint16_t refs) if (smb->sda_fp == NULL) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s msgbase not open", __FUNCTION__); - return(SMB_ERR_NOT_OPEN); + return SMB_ERR_NOT_OPEN; } fflush(smb->sda_fp); clearerr(smb->sda_fp); blocks = smb_datblocks(length); if (fseek(smb->sda_fp, 0L, SEEK_END)) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s rewinding", __FUNCTION__); - return(SMB_ERR_SEEK); + return SMB_ERR_SEEK; } offset = (ftell(smb->sda_fp) / sizeof(refs)) * SDT_BLOCK_LEN; if ((int)offset < 0) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s invalid data offset: %" PRIdOFF, __FUNCTION__, offset); - return(SMB_ERR_DAT_OFFSET); + return SMB_ERR_DAT_OFFSET; } for (l = 0; l < blocks; l++) if (!fwrite(&refs, sizeof(refs), 1, smb->sda_fp)) @@ -110,9 +110,9 @@ off_t smb_fallocdat(smb_t* smb, off_t length, uint16_t refs) if (l < blocks) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s writing allocation bytes", __FUNCTION__); - return(SMB_ERR_WRITE); + return SMB_ERR_WRITE; } - return(offset); + return offset; } /****************************************************************************/ @@ -133,7 +133,7 @@ int smb_freemsgdat(smb_t* smb, off_t offset, uint length, uint16_t refs) return SMB_ERR_DAT_OFFSET; if (smb->status.attr & SMB_HYPERALLOC) /* do nothing */ - return(SMB_SUCCESS); + return SMB_SUCCESS; blocks = smb_datblocks(length); @@ -142,7 +142,7 @@ int smb_freemsgdat(smb_t* smb, off_t offset, uint length, uint16_t refs) if (smb->sda_fp == NULL) { if ((i = smb_open_da(smb)) != SMB_SUCCESS) - return(i); + return i; da_opened = true; } flen = filelength(fileno(smb->sda_fp)); @@ -206,7 +206,7 @@ int smb_freemsgdat(smb_t* smb, off_t offset, uint length, uint16_t refs) if (da_opened) smb_close_da(smb); smb_unlocksmbhdr(smb); - return(retval); + return retval; } /****************************************************************************/ @@ -221,7 +221,7 @@ int smb_incdat(smb_t* smb, off_t offset, uint length, uint16_t refs) if (smb->sda_fp == NULL) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s msgbase not open", __FUNCTION__); - return(SMB_ERR_NOT_OPEN); + return SMB_ERR_NOT_OPEN; } clearerr(smb->sda_fp); blocks = smb_datblocks(length); @@ -229,24 +229,24 @@ int smb_incdat(smb_t* smb, off_t offset, uint length, uint16_t refs) if (fseeko(smb->sda_fp, ((offset / SDT_BLOCK_LEN) + l) * sizeof(i), SEEK_SET)) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s seeking to %" PRIdOFF, __FUNCTION__ , ((offset / SDT_BLOCK_LEN) + l) * sizeof(i)); - return(SMB_ERR_SEEK); + return SMB_ERR_SEEK; } if (smb_fread(smb, &i, sizeof(i), smb->sda_fp) != sizeof(i)) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s reading allocation record at offset %" PRIdOFF, __FUNCTION__ , ((offset / SDT_BLOCK_LEN) + l) * sizeof(i)); - return(SMB_ERR_READ); + return SMB_ERR_READ; } i += refs; if (fseek(smb->sda_fp, -(int)sizeof(i), SEEK_CUR)) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s rewinding %d", __FUNCTION__, -(int)sizeof(i)); - return(SMB_ERR_SEEK); + return SMB_ERR_SEEK; } if (!fwrite(&i, sizeof(i), 1, smb->sda_fp)) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s writing allocation record at offset %" PRIdOFF, __FUNCTION__ , ((offset / SDT_BLOCK_LEN) + l) * sizeof(i)); - return(SMB_ERR_WRITE); + return SMB_ERR_WRITE; } } return fflush(smb->sda_fp); /* SMB_SUCCESS == 0 */ @@ -265,11 +265,11 @@ int smb_incmsg_dfields(smb_t* smb, smbmsg_t* msg, uint16_t refs) uint16_t x; if (smb->status.attr & SMB_HYPERALLOC) /* Nothing to do */ - return(SMB_SUCCESS); + return SMB_SUCCESS; if (smb->sda_fp == NULL) { if ((i = smb_open_da(smb)) != SMB_SUCCESS) - return(i); + return i; da_opened = true; } @@ -286,7 +286,7 @@ int smb_incmsg_dfields(smb_t* smb, smbmsg_t* msg, uint16_t refs) if (da_opened) smb_close_da(smb); - return(i); + return i; } /****************************************************************************/ @@ -300,11 +300,11 @@ int smb_freemsghdr(smb_t* smb, off_t offset, uint length) off_t sha_offset; if (smb->status.attr & SMB_HYPERALLOC) /* Nothing to do */ - return(SMB_SUCCESS); + return SMB_SUCCESS; if (smb->sha_fp == NULL) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s msgbase not open", __FUNCTION__); - return(SMB_ERR_NOT_OPEN); + return SMB_ERR_NOT_OPEN; } clearerr(smb->sha_fp); blocks = smb_hdrblocks(length); @@ -326,13 +326,13 @@ int smb_freemsghdr(smb_t* smb, off_t offset, uint length) if (fseeko(smb->sha_fp, sha_offset, SEEK_SET)) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s seeking to %d", __FUNCTION__, (int)sha_offset); - return(SMB_ERR_SEEK); + return SMB_ERR_SEEK; } for (l = 0; l < blocks; l++) if (!fwrite(&c, 1, 1, smb->sha_fp)) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s writing allocation record", __FUNCTION__); - return(SMB_ERR_WRITE); + return SMB_ERR_WRITE; } return fflush(smb->sha_fp); /* SMB_SUCCESS == 0 */ } @@ -347,9 +347,9 @@ int smb_freemsg_dfields(smb_t* smb, smbmsg_t* msg, uint16_t refs) for (x = 0; x < msg->hdr.total_dfields; x++) { if ((i = smb_freemsgdat(smb, msg->hdr.offset + msg->dfield[x].offset , msg->dfield[x].length, refs)) != SMB_SUCCESS) - return(i); + return i; } - return(SMB_SUCCESS); + return SMB_SUCCESS; } /****************************************************************************/ @@ -360,16 +360,16 @@ int smb_freemsg(smb_t* smb, smbmsg_t* msg) int i; if (smb->status.attr & SMB_HYPERALLOC) /* Nothing to do */ - return(SMB_SUCCESS); + return SMB_SUCCESS; if (!smb_valid_hdr_offset(smb, msg->idx.offset)) - return(SMB_ERR_HDR_OFFSET); + return SMB_ERR_HDR_OFFSET; if ((i = smb_freemsg_dfields(smb, msg, 1)) != SMB_SUCCESS) - return(i); + return i; - return(smb_freemsghdr(smb, msg->idx.offset - smb->status.header_offset - , msg->hdr.length)); + return smb_freemsghdr(smb, msg->idx.offset - smb->status.header_offset + , msg->hdr.length); } /****************************************************************************/ @@ -388,7 +388,7 @@ off_t smb_allochdr(smb_t* smb, uint length) if (smb->sha_fp == NULL) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s msgbase not open", __FUNCTION__); - return(SMB_ERR_NOT_OPEN); + return SMB_ERR_NOT_OPEN; } blocks = smb_hdrblocks(length); i = 0; /* i is consecutive unused block counter */ @@ -408,16 +408,16 @@ off_t smb_allochdr(smb_t* smb, uint length) clearerr(smb->sha_fp); if (fseek(smb->sha_fp, offset / SHD_BLOCK_LEN, SEEK_SET)) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s seeking to %d", __FUNCTION__, offset / SHD_BLOCK_LEN); - return(SMB_ERR_SEEK); + return SMB_ERR_SEEK; } for (l = 0; l < blocks; l++) if (fputc(1, smb->sha_fp) != 1) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s writing allocation record", __FUNCTION__); - return(SMB_ERR_WRITE); + return SMB_ERR_WRITE; } fflush(smb->sha_fp); - return(offset); + return offset; } /****************************************************************************/ @@ -431,24 +431,24 @@ off_t smb_fallochdr(smb_t* smb, uint length) if (smb->sha_fp == NULL) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s msgbase not open", __FUNCTION__); - return(SMB_ERR_NOT_OPEN); + return SMB_ERR_NOT_OPEN; } blocks = smb_hdrblocks(length); fflush(smb->sha_fp); clearerr(smb->sha_fp); if (fseek(smb->sha_fp, 0L, SEEK_END)) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s rewinding", __FUNCTION__); - return(SMB_ERR_SEEK); + return SMB_ERR_SEEK; } offset = ftell(smb->sha_fp) * SHD_BLOCK_LEN; for (l = 0; l < blocks; l++) if (!fwrite(&c, 1, 1, smb->sha_fp)) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s writing allocation record", __FUNCTION__); - return(SMB_ERR_WRITE); + return SMB_ERR_WRITE; } fflush(smb->sha_fp); - return(offset); + return offset; } /************************************************************************/ @@ -462,23 +462,23 @@ off_t smb_hallochdr(smb_t* smb) if (smb->shd_fp == NULL) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s msgbase not open", __FUNCTION__); - return(SMB_ERR_NOT_OPEN); + return SMB_ERR_NOT_OPEN; } fflush(smb->shd_fp); if (fseek(smb->shd_fp, 0L, SEEK_END)) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s rewinding", __FUNCTION__); - return(SMB_ERR_SEEK); + return SMB_ERR_SEEK; } offset = ftell(smb->shd_fp); if (offset < smb->status.header_offset) /* Header file truncated?!? */ - return(smb->status.header_offset); + return smb->status.header_offset; offset -= smb->status.header_offset; /* SMB headers not included */ /* Even block boundry */ offset += PAD_LENGTH_FOR_ALIGNMENT(offset, SHD_BLOCK_LEN); - return(offset); + return offset; } /************************************************************************/ @@ -494,24 +494,24 @@ off_t smb_hallocdat(smb_t* smb) if (smb->sdt_fp == NULL) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s msgbase not open", __FUNCTION__); - return(SMB_ERR_NOT_OPEN); + return SMB_ERR_NOT_OPEN; } fflush(smb->sdt_fp); offset = filelength(fileno(smb->sdt_fp)); if (offset < 0) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s invalid file length: %" PRIdOFF, __FUNCTION__, offset); - return(SMB_ERR_FILE_LEN); + return SMB_ERR_FILE_LEN; } if (fseek(smb->sdt_fp, 0L, SEEK_END)) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s rewinding", __FUNCTION__); - return(SMB_ERR_SEEK); + return SMB_ERR_SEEK; } offset = ftell(smb->sdt_fp); if (offset < 0) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s invalid file offset: %" PRIdOFF, __FUNCTION__, offset); - return(SMB_ERR_DAT_OFFSET); + return SMB_ERR_DAT_OFFSET; } /* Make sure even block boundry */ diff --git a/src/smblib/smbdump.c b/src/smblib/smbdump.c index 83d9f644a3e3446dccf99e63af5ee8743003984f..d431758dd16c2a7982ffeb0feb7215f2b51675d3 100644 --- a/src/smblib/smbdump.c +++ b/src/smblib/smbdump.c @@ -37,7 +37,7 @@ static char *binstr(uchar *buf, uint16_t length, char* str) sprintf(str, "'%s'", buf); return str; } - return((char*)buf); + return (char*)buf; } for (i = 0; i < length; i++) { sprintf(str + strlen(str), "%02X ", buf[i]); @@ -47,7 +47,7 @@ static char *binstr(uchar *buf, uint16_t length, char* str) } } truncsp(str); - return(str); + return str; } str_list_t smb_msghdr_str_list(smbmsg_t* msg) diff --git a/src/smblib/smbfile.c b/src/smblib/smbfile.c index 49034295324fdbe1be948e531cba5b9aeba5d8e6..645a4ac11ac54105c420e15a637f2eae1a2a81ce 100644 --- a/src/smblib/smbfile.c +++ b/src/smblib/smbfile.c @@ -23,47 +23,47 @@ int smb_feof(FILE* fp) { - return(feof(fp)); + return feof(fp); } int smb_ferror(FILE* fp) { - return(ferror(fp)); + return ferror(fp); } int smb_fflush(FILE* fp) { - return(fflush(fp)); + return fflush(fp); } int smb_fgetc(FILE* fp) { - return(fgetc(fp)); + return fgetc(fp); } int smb_fputc(int ch, FILE* fp) { - return(fputc(ch, fp)); + return fputc(ch, fp); } int smb_fseek(FILE* fp, off_t offset, int whence) { - return(fseeko(fp, offset, whence)); + return fseeko(fp, offset, whence); } off_t smb_ftell(FILE* fp) { - return(ftello(fp)); + return ftello(fp); } off_t smb_fgetlength(FILE* fp) { - return(filelength(fileno(fp))); + return filelength(fileno(fp)); } int smb_fsetlength(FILE* fp, off_t length) { - return(chsize(fileno(fp), length)); + return chsize(fileno(fp), length); } void smb_rewind(FILE* fp) @@ -83,9 +83,9 @@ size_t smb_fread(smb_t* smb, void* buf, size_t bytes, FILE* fp) while (1) { if ((ret = fread(buf, sizeof(char), bytes, fp)) == bytes) - return(ret); + return ret; if (feof(fp) || !FILE_RETRY_ERRNO(get_errno())) - return(ret); + return ret; if (!start) start = time(NULL); else @@ -93,7 +93,7 @@ size_t smb_fread(smb_t* smb, void* buf, size_t bytes, FILE* fp) break; SLEEP(smb->retry_delay); } - return(ret); + return ret; } #if defined(__BORLANDC__) @@ -102,7 +102,7 @@ size_t smb_fread(smb_t* smb, void* buf, size_t bytes, FILE* fp) size_t smb_fwrite(smb_t* smb, const void* buf, size_t bytes, FILE* fp) { - return(fwrite(buf, 1, bytes, fp)); + return fwrite(buf, 1, bytes, fp); } /****************************************************************************/ @@ -133,11 +133,11 @@ int smb_open_fp(smb_t* smb, FILE** fp, int share) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s opening %s: Illegal FILE* pointer argument: %p", __FUNCTION__ , smb->file, fp); - return(SMB_ERR_OPEN); + return SMB_ERR_OPEN; } if (*fp != NULL) /* Already open! */ - return(SMB_SUCCESS); + return SMB_SUCCESS; SAFEPRINTF2(path, "%s.%s", smb->file, ext); @@ -148,7 +148,7 @@ int smb_open_fp(smb_t* smb, FILE** fp, int share) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s %d '%s' opening %s", __FUNCTION__ , get_errno(), strerror(get_errno()), path); - return(SMB_ERR_OPEN); + return SMB_ERR_OPEN; } if (!start) start = time(NULL); @@ -157,7 +157,7 @@ int smb_open_fp(smb_t* smb, FILE** fp, int share) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s timeout opening %s (errno=%d, retry_time=%lu)", __FUNCTION__ , path, get_errno(), (ulong)smb->retry_time); - return(SMB_ERR_TIMEOUT); + return SMB_ERR_TIMEOUT; } SLEEP(smb->retry_delay); } @@ -166,10 +166,10 @@ int smb_open_fp(smb_t* smb, FILE** fp, int share) , "%s %d '%s' fdopening %s (%d)", __FUNCTION__ , get_errno(), strerror(get_errno()), path, file); close(file); - return(SMB_ERR_OPEN); + return SMB_ERR_OPEN; } setvbuf(*fp, NULL, _IOFBF, 2 * 1024); - return(SMB_SUCCESS); + return SMB_SUCCESS; } /****************************************************************************/ diff --git a/src/smblib/smbhash.c b/src/smblib/smbhash.c index ec1833051d5ffa190277a99d036efb19e669d737..2553e6fdd2a5db810021d96c201586c148662b24 100644 --- a/src/smblib/smbhash.c +++ b/src/smblib/smbhash.c @@ -42,7 +42,7 @@ int smb_findhash(smb_t* smb, hash_t** compare, hash_t* found_hash, memset(found_hash, 0, sizeof(hash_t)); if ((retval = smb_open_hash(smb)) != SMB_SUCCESS) - return(retval); + return retval; COUNT_LIST_ITEMS(compare, count); @@ -104,12 +104,12 @@ int smb_findhash(smb_t* smb, hash_t** compare, hash_t* found_hash, } if (found) { smb_close_hash(smb); - return(SMB_SUCCESS); + return SMB_SUCCESS; } } /* hash file left open */ - return(SMB_ERR_NOT_FOUND); + return SMB_ERR_NOT_FOUND; } int smb_addhashes(smb_t* smb, hash_t** hashes, bool skip_marked) @@ -120,11 +120,11 @@ int smb_addhashes(smb_t* smb, hash_t** hashes, bool skip_marked) COUNT_LIST_ITEMS(hashes, h); if (!h) { /* nothing to add */ smb_close_hash(smb); - return(SMB_SUCCESS); + return SMB_SUCCESS; } if ((retval = smb_open_hash(smb)) != SMB_SUCCESS) - return(retval); + return retval; fseek(smb->hash_fp, 0, SEEK_END); @@ -143,7 +143,7 @@ int smb_addhashes(smb_t* smb, hash_t** hashes, bool skip_marked) smb_close_hash(smb); - return(retval); + return retval; } static char* strip_chars(uchar* dst, const uchar* src, uchar* set) @@ -155,7 +155,7 @@ static char* strip_chars(uchar* dst, const uchar* src, uchar* set) } *dst = 0; - return((char *)dst); + return (char *)dst; } static char* strip_ctrla(uchar* dst, const uchar* src) @@ -171,7 +171,7 @@ static char* strip_ctrla(uchar* dst, const uchar* src) } *dst = 0; - return((char *)dst); + return (char *)dst; } /* Allocates and calculates hashes of data (based on flags) */ @@ -182,10 +182,10 @@ hash_t* smb_hash(uint msgnum, uint32_t t, unsigned source, unsigned flags hash_t* hash; if (length == 0) /* Don't hash 0-length sources (e.g. empty/blank message bodies) */ - return(NULL); + return NULL; if ((hash = (hash_t*)malloc(sizeof(hash_t))) == NULL) - return(NULL); + return NULL; memset(hash, 0, sizeof(hash_t)); hash->number = msgnum; @@ -202,7 +202,7 @@ hash_t* smb_hash(uint msgnum, uint32_t t, unsigned source, unsigned flags if (flags & SMB_HASH_SHA1) SHA1_calc(hash->data.sha1, data, length); - return(hash); + return hash; } /* Allocates and calculates hashes of data (based on flags) */ @@ -216,7 +216,7 @@ hash_t* smb_hashstr(uint msgnum, uint32_t t, unsigned source, unsigned flags if (flags & SMB_HASH_PROC_MASK) { /* string pre-processing */ if ((p = strdup(str)) == NULL) - return(NULL); + return NULL; if (flags & SMB_HASH_STRIP_CTRL_A) strip_ctrla((uchar *)p, (uchar *)p); if (flags & SMB_HASH_STRIP_WSP) @@ -231,7 +231,7 @@ hash_t* smb_hashstr(uint msgnum, uint32_t t, unsigned source, unsigned flags } else hash = smb_hash(msgnum, t, source, flags, str, strlen(str)); - return(hash); + return hash; } /* Allocates and calculates all hashes for a single message */ @@ -245,7 +245,7 @@ hash_t** smb_msghashes(smbmsg_t* msg, const uchar* body, int source_mask) time_t t = time(NULL); if ((hashes = (hash_t**)malloc(sizeof(hash_t*) * (SMB_HASH_SOURCE_TYPES + 1))) == NULL) - return(NULL); + return NULL; memset(hashes, 0, sizeof(hash_t*) * (SMB_HASH_SOURCE_TYPES + 1)); @@ -277,7 +277,7 @@ hash_t** smb_msghashes(smbmsg_t* msg, const uchar* body, int source_mask) hashes[h++] = hash; } - return(hashes); + return hashes; } void smb_freehashes(hash_t** hashes) @@ -296,7 +296,7 @@ int smb_hashmsg(smb_t* smb, smbmsg_t* msg, const uchar* text, bool update) hash_t** hashes; /* This is a NULL-terminated list of hashes */ if (smb->status.attr & (SMB_EMAIL | SMB_NOHASH | SMB_FILE_DIRECTORY)) - return(SMB_SUCCESS); + return SMB_SUCCESS; hashes = smb_msghashes(msg, text, SMB_HASH_SOURCE_DUPE); @@ -313,7 +313,7 @@ int smb_hashmsg(smb_t* smb, smbmsg_t* msg, const uchar* text, bool update) FREE_LIST(hashes, n); - return(retval); + return retval; } /* length=0 specifies ASCIIZ data */ @@ -326,7 +326,7 @@ int smb_getmsgidx_by_hash(smb_t* smb, smbmsg_t* msg, unsigned source hash_t found; if ((hashes = (hash_t**)calloc(n, sizeof(hash_t*))) == NULL) - return(SMB_ERR_MEM); + return SMB_ERR_MEM; if (length == 0) hashes[0] = smb_hashstr(0, 0, source, flags, data); @@ -334,7 +334,7 @@ int smb_getmsgidx_by_hash(smb_t* smb, smbmsg_t* msg, unsigned source hashes[0] = smb_hash(0, 0, source, flags, data, length); if (hashes[0] == NULL) { FREE_LIST(hashes, n); - return(SMB_ERR_MEM); + return SMB_ERR_MEM; } if ((retval = smb_findhash(smb, hashes, &found, 1 << source, false)) == SMB_SUCCESS) { @@ -348,7 +348,7 @@ int smb_getmsgidx_by_hash(smb_t* smb, smbmsg_t* msg, unsigned source FREE_LIST(hashes, n); - return(retval); + return retval; } int smb_getmsghdr_by_hash(smb_t* smb, smbmsg_t* msg, unsigned source @@ -357,16 +357,16 @@ int smb_getmsghdr_by_hash(smb_t* smb, smbmsg_t* msg, unsigned source int retval; if ((retval = smb_getmsgidx_by_hash(smb, msg, source, flags, data, length)) != SMB_SUCCESS) - return(retval); + return retval; if ((retval = smb_lockmsghdr(smb, msg)) != SMB_SUCCESS) - return(retval); + return retval; retval = smb_getmsghdr(smb, msg); smb_unlockmsghdr(smb, msg); - return(retval); + return retval; } uint16_t smb_subject_crc(const char* subj) @@ -375,7 +375,7 @@ uint16_t smb_subject_crc(const char* subj) uint16_t crc; if (subj == NULL) - return(0); + return 0; while (!strnicmp(subj, "RE:", 3)) { subj += 3; @@ -384,14 +384,14 @@ uint16_t smb_subject_crc(const char* subj) } if ((str = strdup(subj)) == NULL) - return(0xffff); + return 0xffff; strlwr(str); truncsp(str); crc = crc16(str, 0 /* auto-length */); free(str); - return(crc); + return crc; } uint16_t smb_name_crc(const char* name) @@ -400,17 +400,17 @@ uint16_t smb_name_crc(const char* name) uint16_t crc; if (name == NULL) - return(0); + return 0; if ((str = strdup(name)) == NULL) - return(0xffff); + return 0xffff; strlwr(str); truncsp(str); crc = crc16(str, 0 /* auto-length */); free(str); - return(crc); + return crc; } // Returns hashflags_t on success diff --git a/src/smblib/smblib.c b/src/smblib/smblib.c index beb0537c120d56286fbd1ea7379a220794c35337..0e3527cfde56527e7cb86b881c46878faf8312a6 100644 --- a/src/smblib/smblib.c +++ b/src/smblib/smblib.c @@ -45,12 +45,12 @@ static char* nulstr = ""; int smb_ver(void) { - return(SMB_VERSION); + return SMB_VERSION; } char* smb_lib_ver(void) { - return(SMBLIB_VERSION); + return SMBLIB_VERSION; } /****************************************************************************/ @@ -80,26 +80,26 @@ int smb_open(smb_t* smb) start = time(NULL); else if (time(NULL) - start >= (time_t)smb->retry_time) - return(SMB_ERR_TIMEOUT); + return SMB_ERR_TIMEOUT; SLEEP(smb->retry_delay); } if ((i = smb_open_fp(smb, &smb->shd_fp, SH_DENYNO)) != SMB_SUCCESS) - return(i); + return i; memset(&(smb->status), 0, sizeof(smb->status)); if (filelength(fileno(smb->shd_fp)) >= (int)sizeof(smbhdr_t)) { if (smb_locksmbhdr(smb) != SMB_SUCCESS) { smb_close(smb); /* smb_locksmbhdr set last_error */ - return(SMB_ERR_LOCK); + return SMB_ERR_LOCK; } memset(&hdr, 0, sizeof(smbhdr_t)); if (smb_fread(smb, &hdr, sizeof(smbhdr_t), smb->shd_fp) != sizeof(smbhdr_t)) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s reading header", __FUNCTION__); smb_close(smb); - return(SMB_ERR_READ); + return SMB_ERR_READ; } if (memcmp(hdr.smbhdr_id, SMB_HEADER_ID, LEN_HEADER_ID) && !smb->continue_on_error) { safe_snprintf(smb->last_error, sizeof(smb->last_error) @@ -110,34 +110,34 @@ int smb_open(smb_t* smb) , hdr.smbhdr_id[3] ); smb_close(smb); - return(SMB_ERR_HDR_ID); + return SMB_ERR_HDR_ID; } if (hdr.version < 0x110 && !smb->continue_on_error) { /* Compatibility check */ safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s insufficient header version: %X", __FUNCTION__ , hdr.version); smb_close(smb); - return(SMB_ERR_HDR_VER); + return SMB_ERR_HDR_VER; } if (smb_fread(smb, &(smb->status), sizeof(smbstatus_t), smb->shd_fp) != sizeof(smbstatus_t)) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s reading status", __FUNCTION__); smb_close(smb); - return(SMB_ERR_READ); + return SMB_ERR_READ; } if ((i = smb_unlocksmbhdr(smb)) != SMB_SUCCESS) { smb_close(smb); - return(i); + return i; } } if ((i = smb_open_fp(smb, &smb->sdt_fp, SH_DENYNO)) != SMB_SUCCESS) - return(i); + return i; if ((i = smb_open_index(smb)) != SMB_SUCCESS) return i; - return(SMB_SUCCESS); + return SMB_SUCCESS; } int smb_open_index(smb_t* smb) @@ -170,7 +170,7 @@ void smb_close(smb_t* smb) static char* smb_lockfname(smb_t* smb, char* fname, size_t maxlen) { safe_snprintf(fname, maxlen, "%s.lock", smb->file); - return(fname); + return fname; } /****************************************************************************/ @@ -192,12 +192,12 @@ int smb_lock(smb_t* smb) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s %d '%s' creating %s", __FUNCTION__ , get_errno(), strerror(get_errno()), path); - return(SMB_ERR_LOCK); + return SMB_ERR_LOCK; } SLEEP(smb->retry_delay); } close(file); - return(SMB_SUCCESS); + return SMB_SUCCESS; } int smb_unlock(smb_t* smb) @@ -209,9 +209,9 @@ int smb_unlock(smb_t* smb) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s %d '%s' removing %s", __FUNCTION__ , get_errno(), strerror(get_errno()), path); - return(SMB_ERR_DELETE); + return SMB_ERR_DELETE; } - return(SMB_SUCCESS); + return SMB_SUCCESS; } bool smb_islocked(smb_t* smb) @@ -219,9 +219,9 @@ bool smb_islocked(smb_t* smb) char path[MAX_PATH + 1]; if (access(smb_lockfname(smb, path, sizeof(path) - 1), 0) != 0) - return(false); + return false; safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s %s exists", __FUNCTION__, path); - return(true); + return true; } /****************************************************************************/ @@ -235,7 +235,7 @@ int smb_trunchdr(smb_t* smb) if (smb->shd_fp == NULL) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s msgbase not open", __FUNCTION__); - return(SMB_ERR_NOT_OPEN); + return SMB_ERR_NOT_OPEN; } rewind(smb->shd_fp); while (1) { @@ -245,7 +245,7 @@ int smb_trunchdr(smb_t* smb) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s %d '%s' changing header file size", __FUNCTION__ , get_errno(), strerror(get_errno())); - return(SMB_ERR_WRITE); + return SMB_ERR_WRITE; } if (!start) start = time(NULL); @@ -254,11 +254,11 @@ int smb_trunchdr(smb_t* smb) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s timeout changing header file size (retry_time=%u)", __FUNCTION__ , (uint)smb->retry_time); - return(SMB_ERR_TIMEOUT); + return SMB_ERR_TIMEOUT; } SLEEP(smb->retry_delay); } - return(SMB_SUCCESS); + return SMB_SUCCESS; } /*********************************/ @@ -278,12 +278,12 @@ int smb_locksmbhdr(smb_t* smb) if (smb->shd_fp == NULL) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s msgbase not open", __FUNCTION__); - return(SMB_ERR_NOT_OPEN); + return SMB_ERR_NOT_OPEN; } while (1) { if (lock(fileno(smb->shd_fp), 0L, sizeof(smbhdr_t) + sizeof(smbstatus_t)) == 0) { smb->locked = true; - return(SMB_SUCCESS); + return SMB_SUCCESS; } /* In case we've already locked it */ if (unlock(fileno(smb->shd_fp), 0L, sizeof(smbhdr_t) + sizeof(smbstatus_t)) == 0) @@ -298,7 +298,7 @@ int smb_locksmbhdr(smb_t* smb) } safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s timeout locking message base after %d seconds" , __FUNCTION__, (int)(time(NULL) - start)); - return(SMB_ERR_TIMEOUT); + return SMB_ERR_TIMEOUT; } /****************************************************************************/ @@ -310,7 +310,7 @@ int smb_getstatus(smb_t* smb) if (smb->shd_fp == NULL) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s msgbase not open", __FUNCTION__); - return(SMB_ERR_NOT_OPEN); + return SMB_ERR_NOT_OPEN; } fflush(smb->shd_fp); clearerr(smb->shd_fp); @@ -318,14 +318,14 @@ int smb_getstatus(smb_t* smb) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s %d '%s' seeking to %d in header file", __FUNCTION__ , get_errno(), strerror(get_errno()), (int)sizeof(smbhdr_t)); - return(SMB_ERR_SEEK); + return SMB_ERR_SEEK; } i = smb_fread(smb, &(smb->status), sizeof(smbstatus_t), smb->shd_fp); if (i == sizeof(smbstatus_t)) - return(SMB_SUCCESS); + return SMB_SUCCESS; safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s reading status", __FUNCTION__); - return(SMB_ERR_READ); + return SMB_ERR_READ; } /****************************************************************************/ @@ -337,22 +337,22 @@ int smb_putstatus(smb_t* smb) if (smb->shd_fp == NULL) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s msgbase not open", __FUNCTION__); - return(SMB_ERR_NOT_OPEN); + return SMB_ERR_NOT_OPEN; } clearerr(smb->shd_fp); if (fseek(smb->shd_fp, sizeof(smbhdr_t), SEEK_SET)) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s %d '%s' seeking to %d in header file", __FUNCTION__ , get_errno(), strerror(get_errno()), (int)sizeof(smbhdr_t)); - return(SMB_ERR_SEEK); + return SMB_ERR_SEEK; } i = fwrite(&(smb->status), 1, sizeof(smbstatus_t), smb->shd_fp); fflush(smb->shd_fp); if (i == sizeof(smbstatus_t)) - return(SMB_SUCCESS); + return SMB_SUCCESS; safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s writing status", __FUNCTION__); - return(SMB_ERR_WRITE); + return SMB_ERR_WRITE; } /****************************************************************************/ @@ -363,16 +363,16 @@ int smb_unlocksmbhdr(smb_t* smb) if (smb->locked) { if (smb->shd_fp == NULL) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s msgbase not open", __FUNCTION__); - return(SMB_ERR_NOT_OPEN); + return SMB_ERR_NOT_OPEN; } if (unlock(fileno(smb->shd_fp), 0L, sizeof(smbhdr_t) + sizeof(smbstatus_t)) != 0) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s %d '%s' unlocking message base header", __FUNCTION__, get_errno(), strerror(get_errno())); - return(SMB_ERR_UNLOCK); + return SMB_ERR_UNLOCK; } smb->locked = false; } - return(SMB_SUCCESS); + return SMB_SUCCESS; } /********************************/ @@ -389,9 +389,9 @@ bool smb_valid_hdr_offset(smb_t* smb, uint offset) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s invalid header offset: %u (0x%X)", __FUNCTION__ , offset, offset); - return(false); + return false; } - return(true); + return true; } /****************************************************************************/ @@ -403,14 +403,14 @@ int smb_lockmsghdr(smb_t* smb, smbmsg_t* msg) if (smb->shd_fp == NULL) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s msgbase not open", __FUNCTION__); - return(SMB_ERR_NOT_OPEN); + return SMB_ERR_NOT_OPEN; } if (!smb_valid_hdr_offset(smb, msg->idx.offset)) - return(SMB_ERR_HDR_OFFSET); + return SMB_ERR_HDR_OFFSET; while (1) { if (lock(fileno(smb->shd_fp), msg->idx.offset, sizeof(msghdr_t)) == 0) - return(SMB_SUCCESS); + return SMB_SUCCESS; if (!start) start = time(NULL); else @@ -422,7 +422,7 @@ int smb_lockmsghdr(smb_t* smb, smbmsg_t* msg) } } safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s timeout locking header", __FUNCTION__); - return(SMB_ERR_TIMEOUT); + return SMB_ERR_TIMEOUT; } /****************************************************************************/ @@ -442,7 +442,7 @@ int smb_getmsgidx(smb_t* smb, smbmsg_t* msg) if (smb->sid_fp == NULL) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s index not open", __FUNCTION__); - return(SMB_ERR_NOT_OPEN); + return SMB_ERR_NOT_OPEN; } clearerr(smb->sid_fp); @@ -450,13 +450,13 @@ int smb_getmsgidx(smb_t* smb, smbmsg_t* msg) if (length < (int)idxreclen) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s invalid index file length: %" PRIdOFF, __FUNCTION__, length); - return(SMB_ERR_FILE_LEN); + return SMB_ERR_FILE_LEN; } total = (uint)(length / idxreclen); if (!total) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s invalid index file length: %" PRIdOFF, __FUNCTION__, length); - return(SMB_ERR_FILE_LEN); + return SMB_ERR_FILE_LEN; } if (!msg->hdr.number) { @@ -468,7 +468,7 @@ int smb_getmsgidx(smb_t* smb, smbmsg_t* msg) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s invalid index offset: %d, byte offset: %d, length: %" PRIdOFF, __FUNCTION__ , (int)msg->idx_offset, byte_offset, length); - return(SMB_ERR_HDR_OFFSET); + return SMB_ERR_HDR_OFFSET; } if (ftell(smb->sid_fp) != byte_offset) { if (fseek(smb->sid_fp, byte_offset, SEEK_SET)) { @@ -476,18 +476,18 @@ int smb_getmsgidx(smb_t* smb, smbmsg_t* msg) , "%s %d '%s' seeking to offset %d (byte %u) in index file", __FUNCTION__ , get_errno(), strerror(get_errno()) , (int)msg->idx_offset, byte_offset); - return(SMB_ERR_SEEK); + return SMB_ERR_SEEK; } } if (smb_fread(smb, &msg->idx, idxreclen, smb->sid_fp) != idxreclen) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s reading index at offset %d (byte %u)", __FUNCTION__ , (int)msg->idx_offset, byte_offset); - return(SMB_ERR_READ); + return SMB_ERR_READ; } /* Save the correct offset (from the beginning of the file) */ msg->idx_offset = byte_offset / idxreclen; - return(SMB_SUCCESS); + return SMB_SUCCESS; } bot = 0; @@ -497,25 +497,25 @@ int smb_getmsgidx(smb_t* smb, smbmsg_t* msg) if (l >= total) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s msg %u not found" , __FUNCTION__, (uint)msg->hdr.number); - return(SMB_ERR_NOT_FOUND); + return SMB_ERR_NOT_FOUND; } if (fseek(smb->sid_fp, l * idxreclen, SEEK_SET)) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s %d '%s' seeking to offset %u (byte %u) in index file", __FUNCTION__ , get_errno(), strerror(get_errno()) , l, (uint)(l * idxreclen)); - return(SMB_ERR_SEEK); + return SMB_ERR_SEEK; } if (smb_fread(smb, &idx, idxreclen, smb->sid_fp) != idxreclen) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s reading index at offset %u (byte %u)", __FUNCTION__ , l, (uint)(l * idxreclen)); - return(SMB_ERR_READ); + return SMB_ERR_READ; } if (bot == top - 1 && idx.idx.number != msg->hdr.number) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s msg %u not found" , __FUNCTION__, (uint)msg->hdr.number); - return(SMB_ERR_NOT_FOUND); + return SMB_ERR_NOT_FOUND; } if (idx.idx.number > msg->hdr.number) { top = l; @@ -531,7 +531,7 @@ int smb_getmsgidx(smb_t* smb, smbmsg_t* msg) } msg->file_idx = idx; msg->idx_offset = l; - return(SMB_SUCCESS); + return SMB_SUCCESS; } /****************************************************************************/ @@ -570,21 +570,21 @@ int smb_getfirstidx(smb_t* smb, idxrec_t *idx) { if (smb->sid_fp == NULL) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s index not open", __FUNCTION__); - return(SMB_ERR_NOT_OPEN); + return SMB_ERR_NOT_OPEN; } clearerr(smb->sid_fp); if (fseek(smb->sid_fp, 0, SEEK_SET)) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s %d '%s' seeking to beginning of index file", __FUNCTION__ , get_errno(), strerror(get_errno())); - return(SMB_ERR_SEEK); + return SMB_ERR_SEEK; } if (smb_fread(smb, idx, sizeof(*idx), smb->sid_fp) != sizeof(*idx)) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s reading first index", __FUNCTION__); - return(SMB_ERR_READ); + return SMB_ERR_READ; } - return(SMB_SUCCESS); + return SMB_SUCCESS; } /****************************************************************************/ @@ -597,28 +597,28 @@ int smb_getlastidx(smb_t* smb, idxrec_t *idx) if (smb->sid_fp == NULL) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s index not open", __FUNCTION__); - return(SMB_ERR_NOT_OPEN); + return SMB_ERR_NOT_OPEN; } clearerr(smb->sid_fp); length = filelength(fileno(smb->sid_fp)); if (length < (int)idxreclen) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s invalid index file length: %" PRIdOFF, __FUNCTION__, length); - return(SMB_ERR_FILE_LEN); + return SMB_ERR_FILE_LEN; } if (fseeko(smb->sid_fp, length - idxreclen, SEEK_SET)) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s %d '%s' seeking to %u in index file", __FUNCTION__ , get_errno(), strerror(get_errno()) , (unsigned)(length - sizeof(idxrec_t))); - return(SMB_ERR_SEEK); + return SMB_ERR_SEEK; } if (smb_fread(smb, idx, sizeof(*idx), smb->sid_fp) != sizeof(*idx)) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s reading last index", __FUNCTION__); - return(SMB_ERR_READ); + return SMB_ERR_READ; } - return(SMB_SUCCESS); + return SMB_SUCCESS; } /****************************************************************************/ @@ -701,7 +701,7 @@ uint smb_getmsghdrlen(smbmsg_t* msg) length += sizeof(hfield_t); length += msg->hfield[i].length; } - return(length); + return length; } /****************************************************************************/ @@ -715,7 +715,7 @@ uint smb_getmsgdatlen(smbmsg_t* msg) for (i = 0; i < msg->hdr.total_dfields; i++) length += msg->dfield[i].length; - return(length); + return length; } /****************************************************************************/ @@ -739,7 +739,7 @@ uint smb_getmsgtxtlen(smbmsg_t* msg) for (i = 0; i < msg->hdr.total_dfields; i++) if (msg->dfield[i].type == TEXT_BODY || msg->dfield[i].type == TEXT_TAIL) length += msg->dfield[i].length; - return(length); + return length; } static void set_convenience_ptr(smbmsg_t* msg, uint16_t hfield_type, size_t len, void* hfield_dat) @@ -980,11 +980,11 @@ int smb_getmsghdr(smb_t* smb, smbmsg_t* msg) if (smb->shd_fp == NULL) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s msgbase not open", __FUNCTION__); - return(SMB_ERR_NOT_OPEN); + return SMB_ERR_NOT_OPEN; } if (!smb_valid_hdr_offset(smb, msg->idx.offset)) - return(SMB_ERR_HDR_OFFSET); + return SMB_ERR_HDR_OFFSET; offset = ftell(smb->shd_fp); if (offset != msg->idx.offset) { @@ -993,7 +993,7 @@ int smb_getmsghdr(smb_t* smb, smbmsg_t* msg) , "%s %d '%s' seeking to offset %u in header file", __FUNCTION__ , get_errno(), strerror(get_errno()) , (uint)msg->idx.offset); - return(SMB_ERR_SEEK); + return SMB_ERR_SEEK; } } @@ -1005,7 +1005,7 @@ int smb_getmsghdr(smb_t* smb, smbmsg_t* msg) if (smb_fread(smb, &msg->hdr, sizeof(msghdr_t), smb->shd_fp) != sizeof(msghdr_t)) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s reading msg header at offset %u", __FUNCTION__, (uint)msg->idx.offset); - return(SMB_ERR_READ); + return SMB_ERR_READ; } if (memcmp(msg->hdr.msghdr_id, SHD_HEADER_ID, LEN_HEADER_ID)) { safe_snprintf(smb->last_error, sizeof(smb->last_error) @@ -1015,13 +1015,13 @@ int smb_getmsghdr(smb_t* smb, smbmsg_t* msg) , msg->hdr.msghdr_id[2] , msg->hdr.msghdr_id[3] , (uint)msg->idx.offset); - return(SMB_ERR_HDR_ID); + return SMB_ERR_HDR_ID; } if (msg->hdr.version < 0x110) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s insufficient header version: %X at offset %u", __FUNCTION__ , msg->hdr.version, (uint)msg->idx.offset); - return(SMB_ERR_HDR_VER); + return SMB_ERR_HDR_VER; } l = sizeof(msg->hdr); if (msg->hdr.total_dfields @@ -1030,7 +1030,7 @@ int smb_getmsghdr(smb_t* smb, smbmsg_t* msg) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s malloc failure of %d bytes for %u data fields", __FUNCTION__ , (int)(sizeof(*msg->dfield) * msg->hdr.total_dfields), msg->hdr.total_dfields); - return(SMB_ERR_MEM); + return SMB_ERR_MEM; } i = fread(msg->dfield, sizeof(*msg->dfield), msg->hdr.total_dfields, smb->shd_fp); if (i != msg->hdr.total_dfields) { @@ -1038,7 +1038,7 @@ int smb_getmsghdr(smb_t* smb, smbmsg_t* msg) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s insufficient data fields read (%d instead of %d)", __FUNCTION__ , (int)i, msg->hdr.total_dfields); - return(SMB_ERR_READ); + return SMB_ERR_READ; } l += msg->hdr.total_dfields * sizeof(*msg->dfield); while (l < (int)msg->hdr.length) { @@ -1048,7 +1048,7 @@ int smb_getmsghdr(smb_t* smb, smbmsg_t* msg) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s realloc failure of %d bytes for header field data", __FUNCTION__ , (int)(sizeof(void*) * (i + 1))); - return(SMB_ERR_MEM); + return SMB_ERR_MEM; } msg->hfield_dat = vpp; if ((vp = (hfield_t *)realloc(msg->hfield, sizeof(hfield_t) * (i + 1))) == NULL) { @@ -1056,14 +1056,14 @@ int smb_getmsghdr(smb_t* smb, smbmsg_t* msg) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s realloc failure of %d bytes for header fields", __FUNCTION__ , (int)(sizeof(hfield_t) * (i + 1))); - return(SMB_ERR_MEM); + return SMB_ERR_MEM; } msg->hfield = vp; if (smb_fread(smb, &msg->hfield[i], sizeof(hfield_t), smb->shd_fp) != sizeof(hfield_t)) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s reading header field (#%d)", __FUNCTION__, (int)i); smb_freemsgmem(msg); - return(SMB_ERR_READ); + return SMB_ERR_READ; } l += sizeof(hfield_t); if ((msg->hfield_dat[i] = (char*)malloc(msg->hfield[i].length + 1)) @@ -1072,7 +1072,7 @@ int smb_getmsghdr(smb_t* smb, smbmsg_t* msg) , "%s malloc failure of %d bytes for header field %d", __FUNCTION__ , msg->hfield[i].length + 1, (int)i); smb_freemsgmem(msg); /* or 0 length field */ - return(SMB_ERR_MEM); + return SMB_ERR_MEM; } msg->total_hfields++; memset(msg->hfield_dat[i], 0, msg->hfield[i].length + 1); /* init to NULL */ @@ -1082,7 +1082,7 @@ int smb_getmsghdr(smb_t* smb, smbmsg_t* msg) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s reading header (#%d) field data (%d bytes)", __FUNCTION__, (int)i, (int)msg->hfield[i].length); smb_freemsgmem(msg); - return(SMB_ERR_READ); + return SMB_ERR_READ; } set_convenience_ptr(msg, msg->hfield[i].type, msg->hfield[i].length, msg->hfield_dat[i]); @@ -1102,7 +1102,7 @@ int smb_getmsghdr(smb_t* smb, smbmsg_t* msg) while ((offset = ftell(smb->shd_fp)) >= 0 && ((offset - smb->status.header_offset) % SHD_BLOCK_LEN) != 0) (void)fgetc(smb->shd_fp); - return(SMB_SUCCESS); + return SMB_SUCCESS; } /****************************************************************************/ @@ -1169,7 +1169,7 @@ int smb_copymsgmem(smb_t* smb, smbmsg_t* msg, smbmsg_t* srcmsg) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s malloc failure of %d bytes for %d data fields", __FUNCTION__ , (int)(msg->hdr.total_dfields * sizeof(dfield_t)), msg->hdr.total_dfields); - return(SMB_ERR_MEM); + return SMB_ERR_MEM; } memcpy(msg->dfield, srcmsg->dfield, msg->hdr.total_dfields * sizeof(dfield_t)); } @@ -1181,7 +1181,7 @@ int smb_copymsgmem(smb_t* smb, smbmsg_t* msg, smbmsg_t* srcmsg) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s malloc failure of %d bytes for %d header fields", __FUNCTION__ , (int)(msg->total_hfields * sizeof(hfield_t)), msg->total_hfields); - return(SMB_ERR_MEM); + return SMB_ERR_MEM; } memcpy(msg->hfield, srcmsg->hfield, msg->total_hfields * sizeof(hfield_t)); @@ -1191,7 +1191,7 @@ int smb_copymsgmem(smb_t* smb, smbmsg_t* msg, smbmsg_t* srcmsg) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s malloc failure of %d bytes for %d header fields", __FUNCTION__ , (int)(msg->total_hfields * sizeof(void*)), msg->total_hfields); - return(SMB_ERR_MEM); + return SMB_ERR_MEM; } for (i = 0; i < msg->total_hfields; i++) { @@ -1200,7 +1200,7 @@ int smb_copymsgmem(smb_t* smb, smbmsg_t* msg, smbmsg_t* srcmsg) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s malloc failure of %d bytes for header field #%d", __FUNCTION__ , msg->hfield[i].length + 1, i + 1); - return(SMB_ERR_MEM); + return SMB_ERR_MEM; } memset(msg->hfield_dat[i], 0, msg->hfield[i].length + 1); memcpy(msg->hfield_dat[i], srcmsg->hfield_dat[i], msg->hfield[i].length); @@ -1208,7 +1208,7 @@ int smb_copymsgmem(smb_t* smb, smbmsg_t* msg, smbmsg_t* srcmsg) } } - return(SMB_SUCCESS); + return SMB_SUCCESS; } /****************************************************************************/ @@ -1218,11 +1218,11 @@ int smb_unlockmsghdr(smb_t* smb, smbmsg_t* msg) { if (smb->shd_fp == NULL) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s msgbase not open", __FUNCTION__); - return(SMB_ERR_NOT_OPEN); + return SMB_ERR_NOT_OPEN; } if (!smb_valid_hdr_offset(smb, msg->idx.offset)) - return(SMB_ERR_HDR_OFFSET); - return(unlock(fileno(smb->shd_fp), msg->idx.offset, sizeof(msghdr_t))); + return SMB_ERR_HDR_OFFSET; + return unlock(fileno(smb->shd_fp), msg->idx.offset, sizeof(msghdr_t)); } @@ -1236,15 +1236,15 @@ int smb_hfield_add(smbmsg_t* msg, uint16_t type, size_t length, void* data, bool int i; if (smb_getmsghdrlen(msg) + sizeof(hfield_t) + length > SMB_MAX_HDR_LEN) - return(SMB_ERR_HDR_LEN); + return SMB_ERR_HDR_LEN; i = msg->total_hfields; if ((hp = (hfield_t *)realloc(msg->hfield, sizeof(hfield_t) * (i + 1))) == NULL) - return(SMB_ERR_MEM); + return SMB_ERR_MEM; msg->hfield = hp; if ((vpp = (void* *)realloc(msg->hfield_dat, sizeof(void*) * (i + 1))) == NULL) - return(SMB_ERR_MEM); + return SMB_ERR_MEM; msg->hfield_dat = vpp; if (insert) { @@ -1256,12 +1256,12 @@ int smb_hfield_add(smbmsg_t* msg, uint16_t type, size_t length, void* data, bool msg->hfield[i].type = type; msg->hfield[i].length = (uint16_t)length; if ((msg->hfield_dat[i] = (void* )malloc(length + 1)) == NULL) - return(SMB_ERR_MEM); /* Allocate 1 extra for ASCIIZ terminator */ + return SMB_ERR_MEM; /* Allocate 1 extra for ASCIIZ terminator */ memset(msg->hfield_dat[i], 0, length + 1); memcpy(msg->hfield_dat[i], data, length); set_convenience_ptr(msg, type, length, msg->hfield_dat[i]); - return(SMB_SUCCESS); + return SMB_SUCCESS; } /****************************************************************************/ @@ -1273,14 +1273,14 @@ int smb_hfield_add_list(smbmsg_t* msg, hfield_t** hfield_list, void** hfield_dat unsigned n; if (hfield_list == NULL) - return(SMB_FAILURE); + return SMB_FAILURE; for (n = 0; hfield_list[n] != NULL; n++) if ((retval = smb_hfield_add(msg , hfield_list[n]->type, hfield_list[n]->length, hfield_dat[n], insert)) != SMB_SUCCESS) - return(retval); + return retval; - return(SMB_SUCCESS); + return SMB_SUCCESS; } /****************************************************************************/ @@ -1355,23 +1355,23 @@ int smb_hfield_append(smbmsg_t* msg, uint16_t type, size_t length, void* data) BYTE* p; if (length == 0) /* nothing to append */ - return(SMB_SUCCESS); + return SMB_SUCCESS; if (msg->total_hfields < 1) - return(SMB_ERR_NOT_FOUND); + return SMB_ERR_NOT_FOUND; /* search for the last header field of this type */ for (i = msg->total_hfields - 1; i >= 0; i--) if (msg->hfield[i].type == type) break; if (i < 0) - return(SMB_ERR_NOT_FOUND); + return SMB_ERR_NOT_FOUND; if (smb_getmsghdrlen(msg) + length > SMB_MAX_HDR_LEN) - return(SMB_ERR_HDR_LEN); + return SMB_ERR_HDR_LEN; if ((p = (BYTE*)realloc(msg->hfield_dat[i], msg->hfield[i].length + length + 1)) == NULL) - return(SMB_ERR_MEM); /* Allocate 1 extra for ASCIIZ terminator */ + return SMB_ERR_MEM; /* Allocate 1 extra for ASCIIZ terminator */ msg->hfield_dat[i] = p; p += msg->hfield[i].length; /* skip existing data */ @@ -1380,7 +1380,7 @@ int smb_hfield_append(smbmsg_t* msg, uint16_t type, size_t length, void* data) msg->hfield[i].length += (uint16_t)length; set_convenience_ptr(msg, type, length, msg->hfield_dat[i]); - return(SMB_SUCCESS); + return SMB_SUCCESS; } /****************************************************************************/ @@ -1400,17 +1400,17 @@ int smb_hfield_replace(smbmsg_t* msg, uint16_t type, size_t length, void* data) void* p; if (msg->total_hfields < 1) - return(SMB_ERR_NOT_FOUND); + return SMB_ERR_NOT_FOUND; /* search for the last header field of this type */ for (i = msg->total_hfields - 1; i >= 0; i--) if (msg->hfield[i].type == type) break; if (i < 0) - return(SMB_ERR_NOT_FOUND); + return SMB_ERR_NOT_FOUND; if ((p = (BYTE*)realloc(msg->hfield_dat[i], length + 1)) == NULL) - return(SMB_ERR_MEM); /* Allocate 1 extra for ASCIIZ terminator */ + return SMB_ERR_MEM; /* Allocate 1 extra for ASCIIZ terminator */ msg->hfield_dat[i] = p; memset(p, 0, length + 1); @@ -1440,10 +1440,10 @@ void* smb_get_hfield(smbmsg_t* msg, uint16_t type, hfield_t** hfield) if (msg->hfield[i].type == type) { if (hfield != NULL) *hfield = &msg->hfield[i]; - return(msg->hfield_dat[i]); + return msg->hfield_dat[i]; } - return(NULL); + return NULL; } /****************************************************************************/ @@ -1477,7 +1477,7 @@ int smb_dfield(smbmsg_t* msg, uint16_t type, uint length) i = msg->hdr.total_dfields; if ((dp = (dfield_t *)realloc(msg->dfield, sizeof(dfield_t) * (i + 1))) == NULL) - return(SMB_ERR_MEM); + return SMB_ERR_MEM; msg->dfield = dp; msg->hdr.total_dfields++; @@ -1485,7 +1485,7 @@ int smb_dfield(smbmsg_t* msg, uint16_t type, uint length) msg->dfield[i].length = length; for (j = msg->dfield[i].offset = 0; j < i; j++) msg->dfield[i].offset += msg->dfield[j].length; - return(SMB_SUCCESS); + return SMB_SUCCESS; } /****************************************************************************/ @@ -1505,7 +1505,7 @@ int smb_addcrc(smb_t* smb, uint32_t crc) time_t start = 0; if (!smb->status.max_crcs) - return(SMB_SUCCESS); + return SMB_SUCCESS; SAFEPRINTF(str, "%s.sch", smb->file); while (1) { @@ -1515,7 +1515,7 @@ int smb_addcrc(smb_t* smb, uint32_t crc) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s %d '%s' opening %s", __FUNCTION__ , get_errno(), strerror(get_errno()), str); - return(SMB_ERR_OPEN); + return SMB_ERR_OPEN; } if (!start) start = time(NULL); @@ -1524,7 +1524,7 @@ int smb_addcrc(smb_t* smb, uint32_t crc) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s timeout opening %s (retry_time=%u)", __FUNCTION__ , str, (uint)smb->retry_time); - return(SMB_ERR_TIMEOUT); + return SMB_ERR_TIMEOUT; } SLEEP(smb->retry_delay); } @@ -1534,7 +1534,7 @@ int smb_addcrc(smb_t* smb, uint32_t crc) close(file); safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s invalid file length: %" PRIdOFF, __FUNCTION__, length); - return(SMB_ERR_FILE_LEN); + return SMB_ERR_FILE_LEN; } if (length != 0) { @@ -1543,7 +1543,7 @@ int smb_addcrc(smb_t* smb, uint32_t crc) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s malloc failure of %" PRIdOFF " bytes", __FUNCTION__ , length); - return(SMB_ERR_MEM); + return SMB_ERR_MEM; } if (read(file, buf, (uint)length) != length) { @@ -1552,7 +1552,7 @@ int smb_addcrc(smb_t* smb, uint32_t crc) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s %d '%s' reading %" PRIdOFF " bytes", __FUNCTION__ , get_errno(), strerror(get_errno()), length); - return(SMB_ERR_READ); + return SMB_ERR_READ; } for (l = 0; l < length / sizeof(int32_t); l++) @@ -1563,7 +1563,7 @@ int smb_addcrc(smb_t* smb, uint32_t crc) free(buf); safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s duplicate message text CRC detected", __FUNCTION__); - return(SMB_DUPE_MSG); + return SMB_DUPE_MSG; } if (length >= (int)(smb->status.max_crcs * sizeof(int32_t))) { @@ -1585,7 +1585,7 @@ int smb_addcrc(smb_t* smb, uint32_t crc) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s %d '%s' writing %d bytes", __FUNCTION__ , get_errno(), strerror(get_errno()), (int)sizeof(crc)); - return(SMB_ERR_WRITE); + return SMB_ERR_WRITE; } return result; @@ -1612,11 +1612,11 @@ int smb_new_msghdr(smb_t* smb, smbmsg_t* msg, int storage, bool new_msg) if (smb->shd_fp == NULL) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s msgbase not open", __FUNCTION__); - return(SMB_ERR_NOT_OPEN); + return SMB_ERR_NOT_OPEN; } if (!smb->locked && smb_locksmbhdr(smb) != SMB_SUCCESS) - return(SMB_ERR_LOCK); + return SMB_ERR_LOCK; hdrlen = smb_getmsghdrlen(msg); if (hdrlen > SMB_MAX_HDR_LEN) { /* headers are limited to 64k in size */ @@ -1624,12 +1624,12 @@ int smb_new_msghdr(smb_t* smb, smbmsg_t* msg, int storage, bool new_msg) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s illegal message header length (%u > %u)", __FUNCTION__ , hdrlen, SMB_MAX_HDR_LEN); - return(SMB_ERR_HDR_LEN); + return SMB_ERR_HDR_LEN; } if ((i = smb_getstatus(smb)) != SMB_SUCCESS) { smb_unlocksmbhdr(smb); - return(i); + return i; } idxlen = filelength(fileno(smb->sid_fp)); @@ -1651,12 +1651,12 @@ int smb_new_msghdr(smb_t* smb, smbmsg_t* msg, int storage, bool new_msg) if (!(msg->flags & MSG_FLAG_HASHED) /* not already hashed */ && (i = smb_hashmsg(smb, msg, /* text: */ NULL, /* update? */ true)) != SMB_SUCCESS) { smb_unlocksmbhdr(smb); - return(i); /* error updating hash table */ + return i; /* error updating hash table */ } } if (storage != SMB_HYPERALLOC && (i = smb_open_ha(smb)) != SMB_SUCCESS) { smb_unlocksmbhdr(smb); - return(i); + return i; } if (msg->hdr.version == 0) @@ -1686,7 +1686,7 @@ int smb_new_msghdr(smb_t* smb, smbmsg_t* msg, int storage, bool new_msg) smb_putstatus(smb); } smb_unlocksmbhdr(smb); - return(i); + return i; } /****************************************************************************/ @@ -1700,7 +1700,7 @@ int smb_updatemsg(smb_t* smb, smbmsg_t* msg) /* Insure no one else can be changing the index at this time */ if ((retval = smb_locksmbhdr(smb)) != SMB_SUCCESS) - return(retval); + return retval; /* Get the current index record offset (for later update by smb_putmsgidx) */ if ((retval = smb_getmsgidx(smb, msg)) == SMB_SUCCESS) { /* Don't let any one else read or write this header while we're updating it */ @@ -1710,7 +1710,7 @@ int smb_updatemsg(smb_t* smb, smbmsg_t* msg) } } smb_unlocksmbhdr(smb); - return(retval); + return retval; } /****************************************************************************/ @@ -1723,9 +1723,9 @@ int smb_putmsg(smb_t* smb, smbmsg_t* msg) smb_init_idx(smb, msg); if ((i = smb_putmsghdr(smb, msg)) != SMB_SUCCESS) - return(i); + return i; - return(smb_putmsgidx(smb, msg)); + return smb_putmsgidx(smb, msg); } /****************************************************************************/ @@ -1763,7 +1763,7 @@ int smb_init_idx(smb_t* smb, smbmsg_t* msg) msg->idx.attr = msg->hdr.attr; msg->idx.time = msg->hdr.when_imported.time; - return(SMB_SUCCESS); + return SMB_SUCCESS; } bool smb_msg_is_from(smbmsg_t* msg, const char* name, enum smb_net_type net_type, const void* net_addr) @@ -1853,7 +1853,7 @@ int smb_putmsgidx(smb_t* smb, smbmsg_t* msg) if (smb->sid_fp == NULL) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s index not open", __FUNCTION__); - return(SMB_ERR_NOT_OPEN); + return SMB_ERR_NOT_OPEN; } clearerr(smb->sid_fp); length = filelength(fileno(smb->sid_fp)); @@ -1861,27 +1861,27 @@ int smb_putmsgidx(smb_t* smb, smbmsg_t* msg) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s invalid index offset: %d, byte offset: %u, length: %" PRIdOFF, __FUNCTION__ , (int)msg->idx_offset, (uint)(msg->idx_offset * idxreclen), length); - return(SMB_ERR_HDR_OFFSET); + return SMB_ERR_HDR_OFFSET; } if (fseek(smb->sid_fp, msg->idx_offset * idxreclen, SEEK_SET)) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s %d '%s' seeking to %u in index file", __FUNCTION__ , get_errno(), strerror(get_errno()) , (unsigned)(msg->idx_offset * idxreclen)); - return(SMB_ERR_SEEK); + return SMB_ERR_SEEK; } if (smb->status.attr & SMB_FILE_DIRECTORY) { if (!fwrite(&msg->file_idx, sizeof(msg->file_idx), 1, smb->sid_fp)) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s %d '%s' writing index", __FUNCTION__ , get_errno(), strerror(get_errno())); - return(SMB_ERR_WRITE); + return SMB_ERR_WRITE; } } else { if (!fwrite(&msg->idx, sizeof(msg->idx), 1, smb->sid_fp)) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s writing index", __FUNCTION__); - return(SMB_ERR_WRITE); + return SMB_ERR_WRITE; } } return fflush(smb->sid_fp); /* SMB_SUCCESS == 0 */ @@ -1901,18 +1901,18 @@ int smb_putmsghdr(smb_t* smb, smbmsg_t* msg) if (smb->shd_fp == NULL) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s msgbase not open", __FUNCTION__); - return(SMB_ERR_NOT_OPEN); + return SMB_ERR_NOT_OPEN; } if (!smb_valid_hdr_offset(smb, msg->idx.offset)) - return(SMB_ERR_HDR_OFFSET); + return SMB_ERR_HDR_OFFSET; clearerr(smb->shd_fp); if (fseek(smb->shd_fp, msg->idx.offset, SEEK_SET)) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s %d '%s' seeking to %u in header file", __FUNCTION__ , get_errno(), strerror(get_errno()), (uint)msg->idx.offset); - return(SMB_ERR_SEEK); + return SMB_ERR_SEEK; } /* Verify that the number of blocks required to stored the actual (calculated) header length does not exceed the number allocated. */ @@ -1921,7 +1921,7 @@ int smb_putmsghdr(smb_t* smb, smbmsg_t* msg) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s illegal message header length (%u > %u)", __FUNCTION__ , hdrlen, SMB_MAX_HDR_LEN); - return(SMB_ERR_HDR_LEN); + return SMB_ERR_HDR_LEN; } if (smb_hdrblocks(hdrlen) > smb_hdrblocks(msg->hdr.length)) { smbmsg_t old_msg = *msg; @@ -1932,13 +1932,13 @@ int smb_putmsghdr(smb_t* smb, smbmsg_t* msg) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s %d '%s' seeking to %u in header file (to delete)", __FUNCTION__ , get_errno(), strerror(get_errno()), (uint)msg->idx.offset); - return(SMB_ERR_SEEK); + return SMB_ERR_SEEK; } old_msg.hdr.attr |= MSG_DELETE; if (fwrite(&old_msg.hdr, sizeof(old_msg.hdr), 1, smb->shd_fp) != 1) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s writing fixed portion of header record (to delete)", __FUNCTION__); - return(SMB_ERR_WRITE); + return SMB_ERR_WRITE; } if (!(smb->status.attr & SMB_HYPERALLOC)) { if ((result = smb_open_ha(smb)) != SMB_SUCCESS) @@ -1960,7 +1960,7 @@ int smb_putmsghdr(smb_t* smb, smbmsg_t* msg) if (!fwrite(&msg->hdr, sizeof(msghdr_t), 1, smb->shd_fp)) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s writing fixed portion of header record", __FUNCTION__); - return(SMB_ERR_WRITE); + return SMB_ERR_WRITE; } /************************************************/ @@ -1970,7 +1970,7 @@ int smb_putmsghdr(smb_t* smb, smbmsg_t* msg) if (!fwrite(&msg->dfield[i], sizeof(dfield_t), 1, smb->shd_fp)) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s writing data field", __FUNCTION__); - return(SMB_ERR_WRITE); + return SMB_ERR_WRITE; } /*******************************************/ /* Write the variable length header fields */ @@ -1979,13 +1979,13 @@ int smb_putmsghdr(smb_t* smb, smbmsg_t* msg) if (!fwrite(&msg->hfield[i], sizeof(hfield_t), 1, smb->shd_fp)) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s writing header field", __FUNCTION__); - return(SMB_ERR_WRITE); + return SMB_ERR_WRITE; } if (msg->hfield[i].length /* more then 0 bytes int */ && !fwrite(msg->hfield_dat[i], msg->hfield[i].length, 1, smb->shd_fp)) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s writing header field data", __FUNCTION__); - return(SMB_ERR_WRITE); + return SMB_ERR_WRITE; } } @@ -1993,7 +1993,7 @@ int smb_putmsghdr(smb_t* smb, smbmsg_t* msg) if (fputc(0, smb->shd_fp) != 0) { safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s padding header block", __FUNCTION__); - return(SMB_ERR_WRITE); /* pad block with NULL */ + return SMB_ERR_WRITE; /* pad block with NULL */ } hdrlen++; } @@ -2009,11 +2009,11 @@ int smb_initsmbhdr(smb_t* smb) if (smb->shd_fp == NULL || smb->sdt_fp == NULL || smb->sid_fp == NULL) { safe_snprintf(smb->last_error, sizeof(smb->last_error), "%s msgbase not open", __FUNCTION__); - return(SMB_ERR_NOT_OPEN); + return SMB_ERR_NOT_OPEN; } if (filelength(fileno(smb->shd_fp)) >= (int)(sizeof(smbhdr_t) + sizeof(smbstatus_t)) && smb_locksmbhdr(smb) != SMB_SUCCESS) /* header exists, so lock it */ - return(SMB_ERR_LOCK); + return SMB_ERR_LOCK; memset(&hdr, 0, sizeof(smbhdr_t)); memcpy(hdr.smbhdr_id, SMB_HEADER_ID, LEN_HEADER_ID); hdr.version = SMB_VERSION; @@ -2068,7 +2068,7 @@ int smb_create(smb_t* smb) SAFEPRINTF(str, "%s.hash", smb->file); (void)remove(str); smb_unlocksmbhdr(smb); - return(SMB_SUCCESS); + return SMB_SUCCESS; } /****************************************************************************/ @@ -2081,7 +2081,7 @@ uint smb_datblocks(off_t length) blocks = (uint)(length / SDT_BLOCK_LEN); if (length % SDT_BLOCK_LEN) blocks++; - return(blocks); + return blocks; } /****************************************************************************/ @@ -2094,7 +2094,7 @@ uint smb_hdrblocks(uint length) blocks = length / SHD_BLOCK_LEN; if (length % SHD_BLOCK_LEN) blocks++; - return(blocks); + return blocks; } /****************************************************************************/ @@ -2105,17 +2105,17 @@ int smb_tzutc(int16_t zone) int tz; if (OTHER_ZONE(zone)) - return(zone); + return zone; tz = zone & 0xfff; if (zone & (WESTERN_ZONE | US_ZONE)) { /* West of UTC? */ if (zone & DAYLIGHT) tz -= SMB_DST_OFFSET; /* ToDo: Daylight Saving Time adjustment is *not* always +60 minutes */ - return(-tz); + return -tz; } if (zone & DAYLIGHT) tz += SMB_DST_OFFSET; /* ToDo: Daylight Saving Time adjustment is *not* always +60 minutes */ - return(tz); + return tz; } #define SMB_DATE_MASK ( \ @@ -2177,17 +2177,17 @@ int smb_updatethread(smb_t* smb, smbmsg_t* remsg, uint newmsgnum) if (!remsg->hdr.thread_first) { /* New msg is first reply */ if ((remsg->idx_offset == 0 || remsg->idx.offset == 0) /* index not read? */ && (retval = smb_getmsgidx(smb, remsg)) != SMB_SUCCESS) - return(retval); + return retval; if (!remsg->hdr.length) { /* header not read? */ if ((retval = smb_lockmsghdr(smb, remsg)) != SMB_SUCCESS) - return(retval); + return retval; if ((retval = smb_getmsghdr(smb, remsg)) != SMB_SUCCESS) - return(retval); + return retval; } remsg->hdr.thread_first = newmsgnum; remsg->idx.attr = (remsg->hdr.attr |= MSG_REPLIED); retval = smb_putmsg(smb, remsg); - return(retval); + return retval; } /* Search for last reply and extend chain */ @@ -2218,7 +2218,7 @@ int smb_updatethread(smb_t* smb, smbmsg_t* remsg, uint newmsgnum) break; } - return(retval); + return retval; } /* Find oldest *existing* message in the thread referenced by the passed msg */ diff --git a/src/smblib/smbstr.c b/src/smblib/smbstr.c index 658f352b3d1d5bf4b1d56b49ccc8fb8d61c22d25..d1fcc70296de2ae45d4d41078d6f39ffbb3df95e 100644 --- a/src/smblib/smbstr.c +++ b/src/smblib/smbstr.c @@ -28,92 +28,92 @@ char* smb_hfieldtype(uint16_t type) static char str[8]; switch (type) { - case SENDER: return("Sender"); /* RFC-compliant */ - case SENDERAGENT: return("SenderAgent"); - case SENDERNETTYPE: return("SenderNetType"); - case SENDERNETADDR: return("SenderNetAddr"); - case SENDEREXT: return("SenderExt"); - case SENDERORG: return("Organization"); /* RFC-compliant */ - case SENDERIPADDR: return("SenderIpAddr"); - case SENDERHOSTNAME: return("SenderHostName"); - case SENDERPROTOCOL: return("SenderProtocol"); - case SENDERPORT_BIN: return("SenderPortBin"); - case SENDERPORT: return("SenderPort"); - case SENDERUSERID: return("SenderUserID"); - case SENDERTIME: return("SenderTime"); - case SENDERSERVER: return("SenderServer"); - - case SMB_AUTHOR: return("Author"); - case SMB_AUTHOR_ORG: return("AuthorOrg"); - - case REPLYTO: return("Reply-To"); /* RFC-compliant */ - case REPLYTOAGENT: return("Reply-ToAgent"); - case REPLYTONETTYPE: return("Reply-ToNetType"); - case REPLYTONETADDR: return("Reply-ToNetAddr"); - case REPLYTOEXT: return("Reply-ToExt"); - case REPLYTOLIST: return("Reply-ToList"); - - case RECIPIENT: return("To"); /* RFC-compliant */ - case RECIPIENTAGENT: return("ToAgent"); - case RECIPIENTNETTYPE: return("ToNetType"); - case RECIPIENTNETADDR: return("ToNetAddr"); - case RECIPIENTEXT: return("ToExt"); - case RECIPIENTLIST: return("ToList"); - - case SUBJECT: return("Subject"); /* RFC-compliant */ - case SMB_SUMMARY: return("Summary"); - case SMB_COMMENT: return("Comment"); /* RFC-compliant */ - case SMB_CARBONCOPY: return("CC"); /* RFC-compliant */ - case SMB_GROUP: return("Group"); - case SMB_EXPIRATION: return("Expiration"); - case SMB_PRIORITY: return("Priority"); - case SMB_COST: return("Cost"); - case SMB_EDITOR: return("Editor"); - case SMB_TAGS: return("Tags"); - case SMB_COLUMNS: return("Columns"); - case FORWARDED: return("Forwarded"); + case SENDER: return "Sender"; /* RFC-compliant */ + case SENDERAGENT: return "SenderAgent"; + case SENDERNETTYPE: return "SenderNetType"; + case SENDERNETADDR: return "SenderNetAddr"; + case SENDEREXT: return "SenderExt"; + case SENDERORG: return "Organization"; /* RFC-compliant */ + case SENDERIPADDR: return "SenderIpAddr"; + case SENDERHOSTNAME: return "SenderHostName"; + case SENDERPROTOCOL: return "SenderProtocol"; + case SENDERPORT_BIN: return "SenderPortBin"; + case SENDERPORT: return "SenderPort"; + case SENDERUSERID: return "SenderUserID"; + case SENDERTIME: return "SenderTime"; + case SENDERSERVER: return "SenderServer"; + + case SMB_AUTHOR: return "Author"; + case SMB_AUTHOR_ORG: return "AuthorOrg"; + + case REPLYTO: return "Reply-To"; /* RFC-compliant */ + case REPLYTOAGENT: return "Reply-ToAgent"; + case REPLYTONETTYPE: return "Reply-ToNetType"; + case REPLYTONETADDR: return "Reply-ToNetAddr"; + case REPLYTOEXT: return "Reply-ToExt"; + case REPLYTOLIST: return "Reply-ToList"; + + case RECIPIENT: return "To"; /* RFC-compliant */ + case RECIPIENTAGENT: return "ToAgent"; + case RECIPIENTNETTYPE: return "ToNetType"; + case RECIPIENTNETADDR: return "ToNetAddr"; + case RECIPIENTEXT: return "ToExt"; + case RECIPIENTLIST: return "ToList"; + + case SUBJECT: return "Subject"; /* RFC-compliant */ + case SMB_SUMMARY: return "Summary"; + case SMB_COMMENT: return "Comment"; /* RFC-compliant */ + case SMB_CARBONCOPY: return "CC"; /* RFC-compliant */ + case SMB_GROUP: return "Group"; + case SMB_EXPIRATION: return "Expiration"; + case SMB_PRIORITY: return "Priority"; + case SMB_COST: return "Cost"; + case SMB_EDITOR: return "Editor"; + case SMB_TAGS: return "Tags"; + case SMB_COLUMNS: return "Columns"; + case FORWARDED: return "Forwarded"; /* All X-FTN-* are RFC-compliant */ - case FIDOCTRL: return("X-FTN-Kludge"); - case FIDOAREA: return("X-FTN-AREA"); - case FIDOSEENBY: return("X-FTN-SEEN-BY"); - case FIDOPATH: return("X-FTN-PATH"); - case FIDOMSGID: return("X-FTN-MSGID"); - case FIDOREPLYID: return("X-FTN-REPLY"); - case FIDOPID: return("X-FTN-PID"); - case FIDOFLAGS: return("X-FTN-Flags"); - case FIDOTID: return("X-FTN-TID"); - case FIDOCHARSET: return("X-FTN-CHRS"); - case FIDOBBSID: return("X-FTN-BBSID"); - - case RFC822HEADER: return("OtherHeader"); - case RFC822MSGID: return("Message-ID"); /* RFC-compliant */ - case RFC822REPLYID: return("In-Reply-To"); /* RFC-compliant */ - case RFC822TO: return("RFC822To"); - case RFC822FROM: return("RFC822From"); - case RFC822REPLYTO: return("RFC822ReplyTo"); - case RFC822CC: return("RFC822Cc"); - case RFC822ORG: return("RFC822Org"); - case RFC822SUBJECT: return("RFC822Subject"); - - case USENETPATH: return("Path"); /* RFC-compliant */ - case USENETNEWSGROUPS: return("Newsgroups"); /* RFC-compliant */ - - case SMTPCOMMAND: return("SMTPCommand"); - case SMTPREVERSEPATH: return("Return-Path"); /* RFC-compliant */ - case SMTPFORWARDPATH: return("SMTPForwardPath"); - case SMTPRECEIVED: return("Received"); /* RFC-compliant */ - - case SMTPSYSMSG: return("SMTPSysMsg"); - - case SMB_POLL_ANSWER: return("PollAnswer"); - - case UNKNOWN: return("UNKNOWN"); - case UNKNOWNASCII: return("UNKNOWNASCII"); - case UNUSED: return("UNUSED"); + case FIDOCTRL: return "X-FTN-Kludge"; + case FIDOAREA: return "X-FTN-AREA"; + case FIDOSEENBY: return "X-FTN-SEEN-BY"; + case FIDOPATH: return "X-FTN-PATH"; + case FIDOMSGID: return "X-FTN-MSGID"; + case FIDOREPLYID: return "X-FTN-REPLY"; + case FIDOPID: return "X-FTN-PID"; + case FIDOFLAGS: return "X-FTN-Flags"; + case FIDOTID: return "X-FTN-TID"; + case FIDOCHARSET: return "X-FTN-CHRS"; + case FIDOBBSID: return "X-FTN-BBSID"; + + case RFC822HEADER: return "OtherHeader"; + case RFC822MSGID: return "Message-ID"; /* RFC-compliant */ + case RFC822REPLYID: return "In-Reply-To"; /* RFC-compliant */ + case RFC822TO: return "RFC822To"; + case RFC822FROM: return "RFC822From"; + case RFC822REPLYTO: return "RFC822ReplyTo"; + case RFC822CC: return "RFC822Cc"; + case RFC822ORG: return "RFC822Org"; + case RFC822SUBJECT: return "RFC822Subject"; + + case USENETPATH: return "Path"; /* RFC-compliant */ + case USENETNEWSGROUPS: return "Newsgroups"; /* RFC-compliant */ + + case SMTPCOMMAND: return "SMTPCommand"; + case SMTPREVERSEPATH: return "Return-Path"; /* RFC-compliant */ + case SMTPFORWARDPATH: return "SMTPForwardPath"; + case SMTPRECEIVED: return "Received"; /* RFC-compliant */ + + case SMTPSYSMSG: return "SMTPSysMsg"; + + case SMB_POLL_ANSWER: return "PollAnswer"; + + case UNKNOWN: return "UNKNOWN"; + case UNKNOWNASCII: return "UNKNOWNASCII"; + case UNUSED: return "UNUSED"; } sprintf(str, "%02Xh", type); - return(str); + return str; } uint16_t smb_hfieldtypelookup(const char* str) @@ -121,13 +121,13 @@ uint16_t smb_hfieldtypelookup(const char* str) uint16_t type; if (IS_DIGIT(*str)) - return((uint16_t)strtol(str, NULL, 0)); + return (uint16_t)strtol(str, NULL, 0); for (type = 0; type <= UNUSED; type++) if (stricmp(str, smb_hfieldtype(type)) == 0) - return(type); + return type; - return(UNKNOWN); + return UNKNOWN; } char* smb_dfieldtype(uint16_t type) @@ -135,12 +135,12 @@ char* smb_dfieldtype(uint16_t type) static char str[8]; switch (type) { - case TEXT_BODY: return("TEXT_BODY"); - case TEXT_TAIL: return("TEXT_TAIL"); - case UNUSED: return("UNUSED"); + case TEXT_BODY: return "TEXT_BODY"; + case TEXT_TAIL: return "TEXT_TAIL"; + case UNUSED: return "UNUSED"; } sprintf(str, "%02Xh", type); - return(str); + return str; } char* smb_hashsourcetype(uchar type) @@ -148,26 +148,26 @@ char* smb_hashsourcetype(uchar type) static char str[8]; switch (type) { - case SMB_HASH_SOURCE_BODY: return(smb_dfieldtype(TEXT_BODY)); - case SMB_HASH_SOURCE_MSG_ID: return(smb_hfieldtype(RFC822MSGID)); - case SMB_HASH_SOURCE_FTN_ID: return(smb_hfieldtype(FIDOMSGID)); - case SMB_HASH_SOURCE_SUBJECT: return(smb_hfieldtype(SUBJECT)); + case SMB_HASH_SOURCE_BODY: return smb_dfieldtype(TEXT_BODY); + case SMB_HASH_SOURCE_MSG_ID: return smb_hfieldtype(RFC822MSGID); + case SMB_HASH_SOURCE_FTN_ID: return smb_hfieldtype(FIDOMSGID); + case SMB_HASH_SOURCE_SUBJECT: return smb_hfieldtype(SUBJECT); } sprintf(str, "%02Xh", type); - return(str); + return str; } char* smb_hashsource(smbmsg_t* msg, int source) { switch (source) { case SMB_HASH_SOURCE_MSG_ID: - return(msg->id); + return msg->id; case SMB_HASH_SOURCE_FTN_ID: - return(msg->ftn_msgid); + return msg->ftn_msgid; case SMB_HASH_SOURCE_SUBJECT: - return(msg->subj); + return msg->subj; } - return("hash"); + return "hash"; } /****************************************************************************/ @@ -181,55 +181,55 @@ char* smb_zonestr(int16_t zone, char* str) if (str == NULL) str = buf; switch ((uint16_t)zone) { - case 0: return("UTC"); - case AST: return("AST"); - case EST: return("EST"); - case CST: return("CST"); - case MST: return("MST"); - case PST: return("PST"); - case YST: return("YST"); - case HST: return("HST"); - case BST: return("BST"); - case ADT: return("ADT"); - case EDT: return("EDT"); - case CDT: return("CDT"); - case MDT: return("MDT"); - case PDT: return("PDT"); - case YDT: return("YDT"); - case HDT: return("HDT"); - case BDT: return("BDT"); - case MID: return("MID"); - case VAN: return("VAN"); - case EDM: return("EDM"); - case WIN: return("WIN"); - case BOG: return("BOG"); - case CAR: return("CAR"); - case RIO: return("RIO"); - case FER: return("FER"); - case AZO: return("AZO"); - case WET: return("WET"); - case WEST: return("WEST"); - case CET: return("CET"); - case CEST: return("CEST"); - case EET: return("EET"); - case EEST: return("EEST"); - case MOS: return("MOS"); - case DUB: return("DUB"); - case KAB: return("KAB"); - case KAR: return("KAR"); - case BOM: return("BOM"); - case KAT: return("KAT"); - case DHA: return("DHA"); - case BAN: return("BAN"); - case HON: return("HON"); - case TOK: return("TOK"); - case ACST: return("ACST"); - case ACDT: return("ACDT"); - case AEST: return("AEST"); - case AEDT: return("AEDT"); - case NOU: return("NOU"); - case NZST: return("NZST"); - case NZDT: return("NZDT"); + case 0: return "UTC"; + case AST: return "AST"; + case EST: return "EST"; + case CST: return "CST"; + case MST: return "MST"; + case PST: return "PST"; + case YST: return "YST"; + case HST: return "HST"; + case BST: return "BST"; + case ADT: return "ADT"; + case EDT: return "EDT"; + case CDT: return "CDT"; + case MDT: return "MDT"; + case PDT: return "PDT"; + case YDT: return "YDT"; + case HDT: return "HDT"; + case BDT: return "BDT"; + case MID: return "MID"; + case VAN: return "VAN"; + case EDM: return "EDM"; + case WIN: return "WIN"; + case BOG: return "BOG"; + case CAR: return "CAR"; + case RIO: return "RIO"; + case FER: return "FER"; + case AZO: return "AZO"; + case WET: return "WET"; + case WEST: return "WEST"; + case CET: return "CET"; + case CEST: return "CEST"; + case EET: return "EET"; + case EEST: return "EEST"; + case MOS: return "MOS"; + case DUB: return "DUB"; + case KAB: return "KAB"; + case KAR: return "KAR"; + case BOM: return "BOM"; + case KAT: return "KAT"; + case DHA: return "DHA"; + case BAN: return "BAN"; + case HON: return "HON"; + case TOK: return "TOK"; + case ACST: return "ACST"; + case ACDT: return "ACDT"; + case AEST: return "AEST"; + case AEDT: return "AEDT"; + case NOU: return "NOU"; + case NZST: return "NZST"; + case NZDT: return "NZDT"; } if (!OTHER_ZONE(zone)) { @@ -247,7 +247,7 @@ char* smb_zonestr(int16_t zone, char* str) plus = ""; sprintf(str, "UTC%s%d:%02u", plus, zone / 60, zone < 0 ? (-zone) % 60 : zone % 60); - return(str); + return str; } /****************************************************************************/ @@ -259,7 +259,7 @@ char* smb_faddrtoa(const fidoaddr_t* addr, char* str) char point[25]; if (addr == NULL) - return("0:0/0"); + return "0:0/0"; if (str == NULL) str = buf; sprintf(str, "%hu:%hu/%hu", addr->zone, addr->net, addr->node); @@ -267,7 +267,7 @@ char* smb_faddrtoa(const fidoaddr_t* addr, char* str) sprintf(point, ".%hu", addr->point); strcat(str, point); } - return(str); + return str; } /****************************************************************************/ @@ -304,7 +304,7 @@ fidoaddr_t smb_atofaddr(const fidoaddr_t* sys_addr, const char *str) } if ((p = strchr(str, '.')) != NULL && p < terminator) addr.point = atoi(p + 1); - return(addr); + return addr; } /****************************************************************************/ @@ -313,7 +313,7 @@ fidoaddr_t smb_atofaddr(const fidoaddr_t* sys_addr, const char *str) /****************************************************************************/ char* smb_netaddr(const net_t* net) { - return(smb_netaddrstr(net, NULL)); + return smb_netaddrstr(net, NULL); } /****************************************************************************/ @@ -322,8 +322,8 @@ char* smb_netaddr(const net_t* net) char* smb_netaddrstr(const net_t* net, char* fidoaddr_buf) { if (net->type == NET_FIDO) - return(smb_faddrtoa((fidoaddr_t*)net->addr, fidoaddr_buf)); - return(net->addr); + return smb_faddrtoa((fidoaddr_t*)net->addr, fidoaddr_buf); + return net->addr; } /****************************************************************************/ @@ -352,7 +352,7 @@ enum smb_net_type smb_netaddr_type(const char* str) p++; SKIP_WHITESPACE(p); if (*p == 0) - return(NET_UNKNOWN); + return NET_UNKNOWN; type = smb_get_net_type_by_addr(p); if (type == NET_INTERNET && strchr(str, ' ') != NULL) diff --git a/src/smblib/smbtxt.c b/src/smblib/smbtxt.c index 21bc06807a86099f70fd1996bd514d4a7e237359..a8a0f67cd2142ae1f39d29da30f472450854e2ba 100644 --- a/src/smblib/smbtxt.c +++ b/src/smblib/smbtxt.c @@ -49,7 +49,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, uint mode) safe_snprintf(smb->last_error, sizeof(smb->last_error) , "%s malloc failure of %" XP_PRIsize_t "u bytes for buffer" , __FUNCTION__, sizeof(char)); - return(NULL); + return NULL; } *buf = 0; @@ -64,7 +64,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, uint mode) , "%s realloc failure of %d bytes for comment buffer" , __FUNCTION__, l + length + 1); free(buf); - return(NULL); + return NULL; } buf = p; l += sprintf(buf + l, "%s\r\n", str); @@ -75,7 +75,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, uint mode) , "%s realloc failure of %d bytes for comment buffer" , __FUNCTION__, l + 3); free(buf); - return(NULL); + return NULL; } buf = p; l += sprintf(buf + l, "\r\n"); @@ -91,7 +91,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, uint mode) , "%s realloc failure of %d bytes for comment buffer" , __FUNCTION__, l + length + 1); free(buf); - return(NULL); + return NULL; } buf = p; memcpy(buf + l, tmp, length); @@ -140,7 +140,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, uint mode) , __FUNCTION__, length); free(buf); free(preamble); - return(NULL); + return NULL; } if (smb_fread(smb, lzhbuf, length, smb->sdt_fp) != length) { safe_snprintf(smb->last_error, sizeof(smb->last_error) @@ -149,7 +149,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, uint mode) free(lzhbuf); free(buf); free(preamble); - return(NULL); + return NULL; } memcpy(&lzhlen, lzhbuf, sizeof(lzhlen)); lzhlen = LE_INT32(lzhlen); @@ -160,7 +160,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, uint mode) free(lzhbuf); free(buf); free(preamble); - return(NULL); + return NULL; } buf = p; lzh_decoded = lzh_decode((uint8_t *)lzhbuf, length, (uint8_t *)buf + l, l + lzhlen + 3); @@ -171,7 +171,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, uint mode) free(lzhbuf); free(buf); free(preamble); - return(NULL); + return NULL; } free(lzhbuf); l += lzhlen; @@ -183,7 +183,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, uint mode) , __FUNCTION__, l + length + 3); free(buf); free(preamble); - return(NULL); + return NULL; } buf = p; p = buf + l; @@ -215,7 +215,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, uint mode) } } free(preamble); - return(buf); + return buf; } void smb_freemsgtxt(char* buf) diff --git a/src/uncrustify.cfg b/src/uncrustify.cfg index edfecc907119368fa1ff6c546726ece1566c8ae8..9d729e13c6c986fb84bd7b590a184cd1d4f28daf 100644 --- a/src/uncrustify.cfg +++ b/src/uncrustify.cfg @@ -3243,7 +3243,7 @@ mod_full_brace_nl = 0 # unsigned number mod_full_brace_nl_block_rem_mlcond = false # true/false # Add or remove unnecessary parentheses on 'return' statement. -mod_paren_on_return = ignore # ignore/add/remove/force +mod_paren_on_return = remove # ignore/add/remove/force # Add or remove unnecessary parentheses on 'throw' statement. mod_paren_on_throw = ignore # ignore/add/remove/force diff --git a/src/xpdev/dat_file.c b/src/xpdev/dat_file.c index 9d842221e2aa9bdffa69d4fd86732ad09ae4deaa..74da2c776760e9a1312f24cd94a7c0405f71d476 100644 --- a/src/xpdev/dat_file.c +++ b/src/xpdev/dat_file.c @@ -42,7 +42,7 @@ static char* csvEncode(char* field) bool enclose; if ((buf = malloc(strlen(field) * 2)) == NULL) - return(NULL); + return NULL; nl = strchr(field, '\n'); comma = strchr(field, ','); @@ -66,7 +66,7 @@ static char* csvEncode(char* field) *dst = 0; - return(buf); + return buf; } char* csvLineCreator(const str_list_t columns) @@ -77,7 +77,7 @@ char* csvLineCreator(const str_list_t columns) size_t i, len; if (columns == NULL) - return(NULL); + return NULL; for (i = 0; columns[i] != NULL; i++) { len = strlen(columns[i]) * 2; @@ -94,7 +94,7 @@ char* csvLineCreator(const str_list_t columns) free(val); } - return(str); + return str; } str_list_t csvLineParser(const char* line) @@ -106,11 +106,11 @@ str_list_t csvLineParser(const char* line) str_list_t list; if ((list = strListInit()) == NULL) - return(NULL); + return NULL; if ((buf = strdup(line)) == NULL) { strListFree(&list); - return(NULL); + return NULL; } truncsp(buf); @@ -120,7 +120,7 @@ str_list_t csvLineParser(const char* line) free(buf); - return(list); + return list; } /*********************/ @@ -134,7 +134,7 @@ char* tabLineCreator(const str_list_t columns) size_t i, len; if (columns == NULL) - return(NULL); + return NULL; for (i = 0; columns[i] != NULL; i++) { len = strlen(columns[i]) * 2; @@ -148,7 +148,7 @@ char* tabLineCreator(const str_list_t columns) strcat(str, columns[i]); } - return(str); + return str; } str_list_t tabLineParser(const char* line) @@ -160,11 +160,11 @@ str_list_t tabLineParser(const char* line) str_list_t list; if ((list = strListInit()) == NULL) - return(NULL); + return NULL; if ((buf = strdup(line)) == NULL) { strListFree(&list); - return(NULL); + return NULL; } for (p = strtok_r(buf, "\t", &tmp); p; p = strtok_r(NULL, "\t", &tmp)) @@ -172,7 +172,7 @@ str_list_t tabLineParser(const char* line) free(buf); - return(list); + return list; } /* Generic API */ @@ -185,7 +185,7 @@ str_list_t dataCreateList(const str_list_t records[], const str_list_t columns, size_t li = 0; if ((list = strListInit()) == NULL) - return(NULL); + return NULL; if (columns != NULL) { p = lineCreator(columns); @@ -200,7 +200,7 @@ str_list_t dataCreateList(const str_list_t records[], const str_list_t columns, free(p); } - return(list); + return list; } bool dataWriteFile(FILE* fp, const str_list_t records[], const str_list_t columns, const char* separator @@ -216,16 +216,16 @@ bool dataWriteFile(FILE* fp, const str_list_t records[], const str_list_t column rewind(fp); if (chsize(fileno(fp), 0) != 0) /* truncate */ - return(FALSE); + return FALSE; if ((list = dataCreateList(records, columns, lineCreator)) == NULL) - return(FALSE); + return FALSE; total = strListCount(list); count = strListWriteFile(fp, list, separator); strListFree(&list); - return(count == total); + return count == total; #endif } @@ -236,15 +236,15 @@ str_list_t* dataParseList(const str_list_t records, str_list_t* columns, dataLin str_list_t* list; if (records == NULL) - return(NULL); + return NULL; if ((list = (str_list_t*)malloc(sizeof(str_list_t) * (strListCount(records) + 1))) == NULL) - return(NULL); + return NULL; if (columns != NULL) { if ((*columns = lineParser(records[ri++])) == NULL) { free(list); - return(NULL); + return NULL; } } @@ -253,7 +253,7 @@ str_list_t* dataParseList(const str_list_t records, str_list_t* columns, dataLin list[li] = NULL; /* terminate */ - return(list); + return list; } str_list_t* dataReadFile(FILE* fp, str_list_t* columns, dataLineParser_t lineParser) @@ -265,7 +265,7 @@ str_list_t* dataReadFile(FILE* fp, str_list_t* columns, dataLineParser_t linePar rewind(fp); if ((lines = strListReadFile(fp, NULL, 0)) == NULL) - return(NULL); + return NULL; /* truncate line-feed chars off end of strings */ for (i = 0; lines[i] != NULL; i++) @@ -275,7 +275,7 @@ str_list_t* dataReadFile(FILE* fp, str_list_t* columns, dataLineParser_t linePar strListFree(&lines); - return(records); + return records; } bool dataListFree(str_list_t* list) diff --git a/src/xpdev/datewrap.c b/src/xpdev/datewrap.c index b6e3154b5aa835045e31038fd4cdca37642debb1..5c2d7ff018e4b018ad27077978b8a62036fde14d 100644 --- a/src/xpdev/datewrap.c +++ b/src/xpdev/datewrap.c @@ -93,10 +93,10 @@ struct tm* localtime32(const time32_t* t32, struct tm* tm) struct tm* tmp; if ((tmp = localtime(&t)) == NULL) - return(NULL); + return NULL; *tm = *tmp; - return(tm); + return tm; } @@ -164,10 +164,10 @@ struct tm* gmtime_r(const time_t* t, struct tm* tm) struct tm* tmp = gmtime(t); if (tmp == NULL) - return(NULL); + return NULL; *tm = *tmp; - return(tm); + return tm; } struct tm* localtime_r(const time_t* t, struct tm* tm) @@ -175,10 +175,10 @@ struct tm* localtime_r(const time_t* t, struct tm* tm) struct tm* tmp = localtime(t); if (tmp == NULL) - return(NULL); + return NULL; *tm = *tmp; - return(tm); + return tm; } char* ctime_r(const time_t *t, char *buf) @@ -186,10 +186,10 @@ char* ctime_r(const time_t *t, char *buf) char* p = ctime(t); if (p == NULL) - return(NULL); + return NULL; strcpy(buf, p); - return(buf); + return buf; } char* asctime_r(const struct tm *tm, char *buf) @@ -197,10 +197,10 @@ char* asctime_r(const struct tm *tm, char *buf) char* p = asctime(tm); if (p == NULL) - return(NULL); + return NULL; strcpy(buf, p); - return(buf); + return buf; } #endif /* !defined(__unix__) */ diff --git a/src/xpdev/filewrap.c b/src/xpdev/filewrap.c index 122b83c2894481868e9d7f9f29bd16d27b269f36..ee5b53be5667b21d36d0d4be34a7e802536efac4 100644 --- a/src/xpdev/filewrap.c +++ b/src/xpdev/filewrap.c @@ -49,9 +49,9 @@ time_t filetime(int fd) struct stat st; if (fstat(fd, &st) != 0) - return(-1); + return -1; - return(st.st_mtime); + return st.st_mtime; } #if defined(__unix__) && !defined(__BORLANDC__) @@ -65,9 +65,9 @@ off_t filelength(int fd) struct stat st; if (fstat(fd, &st) != 0) - return(-1L); + return -1L; - return(st.st_size); + return st.st_size; } /*************************************/ @@ -117,9 +117,9 @@ int xp_lockfile(int fd, off_t pos, off_t len, bool block) op |= LOCK_NB; /* use flock (doesn't work over NFS) */ if (flock(fd, op) != 0 && errno != EOPNOTSUPP) - return(-1); + return -1; #endif - return(0); + return 0; } /* Removes a lock from a file record */ @@ -139,10 +139,10 @@ int unlock(int fd, off_t pos, off_t len) #elif !defined(__QNX__) && !defined(__solaris__) /* use flock (doesn't work over NFS) */ if (flock(fd, LOCK_UN | LOCK_NB) != 0 && errno != EOPNOTSUPP) - return(-1); + return -1; #endif - return(0); + return 0; } /* Opens a file in specified sharing (file-locking) mode */ @@ -231,7 +231,7 @@ int sopen(const char *fn, int sh_access, int share, ...) if (errno == EWOULDBLOCK) errno = EAGAIN; close(fd); - return(-1); + return -1; } #endif return fd; @@ -260,7 +260,7 @@ int unlock(int file, off_t offset, off_t size) i = _locking(file, LK_UNLCK, (long)size); if (offset != pos) (void)lseek(file, pos, SEEK_SET); - return(i); + return i; } #endif /* !__unix__ && (_MSC_VER || __MINGW32__ || __DMC__) */ @@ -286,7 +286,7 @@ p2roundup(size_t n) #endif n++; } - return (n); + return n; } static int expandtofit(char **linep, size_t len, size_t *linecapp) @@ -374,7 +374,7 @@ FILE *_fsopen(const char *pszFilename, const char *pszMode, int shmode) break; default: errno = EINVAL; - return(NULL); + return NULL; } } switch (Mode) { @@ -398,15 +398,15 @@ FILE *_fsopen(const char *pszFilename, const char *pszMode, int shmode) break; default: errno = EINVAL; - return(NULL); + return NULL; } if (Mode & O_CREAT) file = sopen(pszFilename, Mode, shmode, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); else file = sopen(pszFilename, Mode, shmode); if (file == -1) - return(NULL); - return(fdopen(file, pszMode)); + return NULL; + return fdopen(file, pszMode); #endif } #endif @@ -429,7 +429,7 @@ int xp_lockfile(int file, off_t offset, off_t size, bool block) } while (block && i != 0 && errno == EDEADLOCK); if (offset != pos) (void)lseek(file, pos, SEEK_SET); - return(i); + return i; } #endif // _WIN32 diff --git a/src/xpdev/genwrap.c b/src/xpdev/genwrap.c index 6a1029676d69ca94b4433f7d9f286719837a293e..facc8206fa4e270b1e25c81a4cfd52afb50dc726 100644 --- a/src/xpdev/genwrap.c +++ b/src/xpdev/genwrap.c @@ -67,7 +67,7 @@ int safe_snprintf(char *dst, size_t size, const char *fmt, ...) else numchars = size - 1; } - return(numchars); + return numchars; } #ifdef NEEDS_STRLCPY @@ -92,7 +92,7 @@ size_t strlcpy(char *dst, const char *src, size_t dsize) ; } - return(src - osrc - 1); /* count does not include NUL */ + return src - osrc - 1; /* count does not include NUL */ } size_t @@ -110,7 +110,7 @@ strlcat(char *dst, const char *src, size_t dsize) n = dsize - dlen; if (n-- == 0) - return(dlen + strlen(src)); + return dlen + strlen(src); while (*src != '\0') { if (n != 0) { *dst++ = *src; @@ -120,7 +120,7 @@ strlcat(char *dst, const char *src, size_t dsize) } *dst = '\0'; - return(dlen + (src - osrc)); /* count does not include NUL */ + return dlen + (src - osrc); /* count does not include NUL */ } #endif @@ -151,9 +151,9 @@ char* lastchar(const char* str) len = strlen(str); if (len) - return((char*)&str[len - 1]); + return (char*)&str[len - 1]; - return((char*)str); + return (char*)str; } /****************************************************************************/ @@ -162,16 +162,16 @@ char* lastchar(const char* str) char c_unescape_char(char ch) { switch (ch) { - case 'e': return(ESC); /* non-standard */ - case 'a': return('\a'); - case 'b': return('\b'); - case 'f': return('\f'); - case 'n': return('\n'); - case 'r': return('\r'); - case 't': return('\t'); - case 'v': return('\v'); + case 'e': return ESC; /* non-standard */ + case 'a': return '\a'; + case 'b': return '\b'; + case 'f': return '\f'; + case 'n': return '\n'; + case 'r': return '\r'; + case 't': return '\t'; + case 'v': return '\v'; } - return(ch); + return ch; } /****************************************************************************/ @@ -233,7 +233,7 @@ char* c_unescape_str(char* str) char* dst; if (str == NULL || (buf = strdup(str)) == NULL) - return(NULL); + return NULL; src = buf; dst = str; @@ -244,27 +244,27 @@ char* c_unescape_str(char* str) } *dst = 0; free(buf); - return(str); + return str; } char* c_escape_char(char ch) { switch (ch) { - case 0: return("\\x00"); - case 1: return("\\x01"); - case ESC: return("\\e"); /* non-standard */ - case '\a': return("\\a"); - case '\b': return("\\b"); - case '\f': return("\\f"); - case '\n': return("\\n"); - case '\r': return("\\r"); - case '\t': return("\\t"); - case '\v': return("\\v"); - case '\\': return("\\\\"); - case '\"': return("\\\""); - case '\'': return("\\'"); + case 0: return "\\x00"; + case 1: return "\\x01"; + case ESC: return "\\e"; /* non-standard */ + case '\a': return "\\a"; + case '\b': return "\\b"; + case '\f': return "\\f"; + case '\n': return "\\n"; + case '\r': return "\\r"; + case '\t': return "\\t"; + case '\v': return "\\v"; + case '\\': return "\\\\"; + case '\"': return "\\\""; + case '\'': return "\\'"; } - return(NULL); + return NULL; } char* c_escape_str(const char* src, char* dst, size_t maxlen, bool ctrl_only) @@ -283,7 +283,7 @@ char* c_escape_str(const char* src, char* dst, size_t maxlen, bool ctrl_only) } *d = 0; - return(dst); + return dst; } /* Returns a byte count parsed from the 'str' argument, supporting power-of-2 @@ -557,7 +557,7 @@ char* strupr(char* str) *p = toupper(*p); p++; } - return(str); + return str; } /****************************************************************************/ /* Convert ASCIIZ string to lower case */ @@ -570,7 +570,7 @@ char* strlwr(char* str) *p = tolower(*p); p++; } - return(str); + return str; } /****************************************************************************/ /* Reverse characters of a string (provided by amcleod) */ @@ -683,7 +683,7 @@ long xp_random(int n) unsigned long limit; if (n < 2) - return(0); + return 0; limit = ((1UL << ((sizeof(long) * CHAR_BIT) - 1)) / n) * n - 1; @@ -691,20 +691,20 @@ long xp_random(int n) /* coverity[dont_call] */ curr = random(); if (curr <= limit) - return(curr % n); + return curr % n; } #else double f = 0; int ret; if (n < 2) - return(0); + return 0; do { f = (double)rand() / (double)(RAND_MAX + 1); ret = (int)(n * f); } while (ret == n); - return(ret); + return ret; #endif } @@ -729,7 +729,7 @@ char* ultoa(ulong val, char* str, int radix) sprintf(str, "bad radix: %d", radix); break; } - return(str); + return str; } #if (defined(__GNUC__) && (__GNUC__ < 5)) || !defined(__MINGW32__) @@ -861,7 +861,7 @@ char* os_version(char *str, size_t size) #endif - return(str); + return str; } /****************************************************************************/ @@ -927,7 +927,7 @@ char* os_cmdshell(void) #endif #endif - return(shell); + return shell; } /********************************************************/ @@ -946,7 +946,7 @@ clock_t msclock(void) char* skipsp(char* str) { SKIP_WHITESPACE(str); - return(str); + return str; } /****************************************************************************/ @@ -963,7 +963,7 @@ char* truncsp(char* str) if (i != len) str[i] = 0; /* truncate */ } - return(str); + return str; } /****************************************************************************/ @@ -977,7 +977,7 @@ char* truncsp_lines(char* dst) char* src; if ((src = strdup(dst)) == NULL) - return(dst); + return dst; for (sp = src, dp = dst; *sp != 0; sp++) { if (*sp == '\n') { @@ -992,7 +992,7 @@ char* truncsp_lines(char* dst) *dp = 0; free(src); - return(dst); + return dst; } /****************************************************************************/ @@ -1009,7 +1009,7 @@ char* truncnl(char* str) if (i != len) str[i] = 0; /* truncate */ } - return(str); + return str; } /****************************************************************************/ @@ -1018,7 +1018,7 @@ char* truncnl(char* str) /****************************************************************************/ int get_errno(void) { - return(errno); + return errno; } /****************************************************************************/ @@ -1057,7 +1057,7 @@ long double xp_timer(void) #else #error no high-resolution time for this platform #endif - return(ret); + return ret; } /****************************************************************************/ @@ -1114,7 +1114,7 @@ uint64_t xp_timer64(void) #else #error no high-resolution time for this platform #endif - return(ret); + return ret; } /****************************************************************************/ @@ -1167,7 +1167,7 @@ int64_t xp_fast_timer64(void) #else #error no high-resolution time for this platform #endif - return(ret); + return ret; } /* Returns true if specified process is running */ @@ -1178,7 +1178,7 @@ bool check_pid(pid_t pid) return false; #else #if defined(__unix__) - return(kill(pid, 0) == 0); + return kill(pid, 0) == 0; #elif defined(_WIN32) HANDLE h; bool result = false; @@ -1204,7 +1204,7 @@ bool terminate_pid(pid_t pid) return false; #else #if defined(__unix__) - return(kill(pid, SIGKILL) == 0); + return kill(pid, SIGKILL) == 0; #elif defined(_WIN32) HANDLE h; bool result = false; diff --git a/src/xpdev/ini_file.c b/src/xpdev/ini_file.c index 7dd641e64760564638f33dc7e91cc840ecfca1c0..e0aeab8459e1d52b7191c118e9fd0efd6a5c0b91 100644 --- a/src/xpdev/ini_file.c +++ b/src/xpdev/ini_file.c @@ -54,12 +54,12 @@ static char* logLevelStringList[] str_list_t iniLogLevelStringList(void) { - return(logLevelStringList); + return logLevelStringList; } static bool is_eof(char* str) { - return(*str == '!' && stricmp(truncsp(str), INI_EOF_DIRECTIVE) == 0); + return *str == '!' && stricmp(truncsp(str), INI_EOF_DIRECTIVE) == 0; } static char* section_name(char* p) @@ -68,16 +68,16 @@ static char* section_name(char* p) SKIP_WHITESPACE(p); if (*p != INI_OPEN_SECTION_CHAR) - return(NULL); + return NULL; p++; SKIP_WHITESPACE(p); tp = strrchr(p, INI_CLOSE_SECTION_CHAR); if (tp == NULL) - return(NULL); + return NULL; *tp = 0; truncsp(p); - return(p); + return p; } static bool section_match(const char* name, const char* compare, bool case_sensitive) @@ -111,7 +111,7 @@ static bool section_match(const char* name, const char* compare, bool case_sensi strListFree(&names); strListFree(&comps); - return(found); + return found; } static bool seek_section(FILE* fp, const char* section) @@ -122,7 +122,7 @@ static bool seek_section(FILE* fp, const char* section) rewind(fp); if (section == ROOT_SECTION) - return(true); + return true; /* Perform case-sensitive search first */ while (!feof(fp)) { @@ -133,7 +133,7 @@ static bool seek_section(FILE* fp, const char* section) if ((p = section_name(str)) == NULL) continue; if (section_match(p, section, /* case-sensitive */ true)) - return(true); + return true; } /* Then perform case-insensitive search */ @@ -146,10 +146,10 @@ static bool seek_section(FILE* fp, const char* section) if ((p = section_name(str)) == NULL) continue; if (section_match(p, section, /* case-sensitive */ false)) - return(true); + return true; } - return(false); + return false; } static size_t find_section_index(str_list_t list, const char* section) @@ -162,21 +162,21 @@ static size_t find_section_index(str_list_t list, const char* section) for (i = 0; list[i] != NULL; i++) { SAFECOPY(str, list[i]); if (is_eof(str)) - return(strListCount(list)); + return strListCount(list); if ((p = section_name(str)) != NULL && section_match(p, section, /* case-sensitive */ true)) - return(i); + return i; } /* Then perform case-insensitive search */ for (i = 0; list[i] != NULL; i++) { SAFECOPY(str, list[i]); if (is_eof(str)) - return(strListCount(list)); + return strListCount(list); if ((p = section_name(str)) != NULL && section_match(p, section, /* case-sensitive */ false)) - return(i); + return i; } - return(i); + return i; } static size_t section_start(str_list_t list, size_t index) @@ -212,14 +212,14 @@ static char* key_name(char* p, char** vp, bool literals_supported) *vp = NULL; if (p == NULL) - return(NULL); + return NULL; /* Parse value name */ SKIP_WHITESPACE(p); if (*p == INI_COMMENT_CHAR) - return(NULL); + return NULL; if (*p == INI_OPEN_SECTION_CHAR) - return(INI_NEW_SECTION); + return INI_NEW_SECTION; equal = strchr(p, '='); colon = strchr(p, ':'); if (colon == NULL || (equal != NULL && equal < colon)) { @@ -229,7 +229,7 @@ static char* key_name(char* p, char** vp, bool literals_supported) *vp = colon; if (*vp == NULL) - return(NULL); + return NULL; *(*vp) = 0; truncsp(p); @@ -250,7 +250,7 @@ static char* key_name(char* p, char** vp, bool literals_supported) } else truncsp(*vp); /* "key = value" - truncate all white-space chars */ - return(p); + return p; } static char* clean_value(char* str) @@ -270,10 +270,10 @@ static char* read_value(FILE* fp, const char* section, const char* key, char* va char str[INI_MAX_LINE_LEN]; if (fp == NULL) - return(NULL); + return NULL; if (!seek_section(fp, section)) - return(NULL); + return NULL; while (!feof(fp)) { if (fgets(str, sizeof(str), fp) == NULL) @@ -293,7 +293,7 @@ static char* read_value(FILE* fp, const char* section, const char* key, char* va return clean_value(value); } - return(NULL); + return NULL; } static size_t get_value(str_list_t list, const char* section, const char* key, char* value, char** vpp, bool literals_supported) @@ -326,10 +326,10 @@ static size_t get_value(str_list_t list, const char* section, const char* key, c } if (vpp != NULL) *vpp = list[i] + (vp - str); - return(i); + return i; } - return(i); + return i; } bool iniSectionExists(str_list_t list, const char* section) @@ -337,13 +337,13 @@ bool iniSectionExists(str_list_t list, const char* section) size_t i; if (list == NULL) - return(false); + return false; if (section == ROOT_SECTION) - return(true); + return true; i = find_section_index(list, section); - return(list[i] != NULL); + return list[i] != NULL; } str_list_t iniGetSection(str_list_t list, const char *section) @@ -353,10 +353,10 @@ str_list_t iniGetSection(str_list_t list, const char *section) char * p; if (list == NULL) - return(NULL); + return NULL; if ((retval = strListInit()) == NULL) - return(NULL); + return NULL; i = find_section(list, section); if (list[i] != NULL) { @@ -370,7 +370,7 @@ str_list_t iniGetSection(str_list_t list, const char *section) strListPush(&retval, list[i]); } } - return(retval); + return retval; } bool iniKeyExists(str_list_t list, const char* section, const char* key) @@ -378,14 +378,14 @@ bool iniKeyExists(str_list_t list, const char* section, const char* key) size_t i; if (list == NULL) - return(false); + return false; i = get_value(list, section, key, NULL, NULL, /* literals_supported: */ false); if (list[i] == NULL || *(list[i]) == INI_OPEN_SECTION_CHAR) - return(false); + return false; - return(true); + return true; } bool iniValueExists(str_list_t list, const char* section, const char* key) @@ -394,7 +394,7 @@ bool iniValueExists(str_list_t list, const char* section, const char* key) get_value(list, section, key, NULL, &vp, /* literals_supported: */ false); - return(vp != NULL && *vp != 0); + return vp != NULL && *vp != 0; } bool iniRemoveKey(str_list_t* list, const char* section, const char* key) @@ -423,12 +423,12 @@ bool iniRemoveValue(str_list_t* list, const char* section, const char* key) get_value(*list, section, key, NULL, &vp, /* literals_supported: */ false); if (vp == NULL) - return(false); + return false; while (*vp != '\0' && isspace(*(vp - 1))) --vp; *vp = 0; - return(true); + return true; } bool iniRemoveSection(str_list_t* list, const char* section) @@ -437,12 +437,12 @@ bool iniRemoveSection(str_list_t* list, const char* section) i = find_section_index(*list, section); if ((*list)[i] == NULL) /* not found */ - return(false); + return false; do { strListDelete(list, i); } while ((*list)[i] != NULL && *(*list)[i] != INI_OPEN_SECTION_CHAR); - return(true); + return true; } bool iniRemoveSectionFast(str_list_t list, const char* section) @@ -451,12 +451,12 @@ bool iniRemoveSectionFast(str_list_t list, const char* section) i = find_section_index(list, section); if (list[i] == NULL) /* not found */ - return(false); + return false; do { strListFastDelete(list, i, /* count: */ 1); } while (list[i] != NULL && *list[i] != INI_OPEN_SECTION_CHAR); - return(true); + return true; } str_list_t iniCutSection(str_list_t list, const char *section) @@ -478,11 +478,11 @@ bool iniRemoveSections(str_list_t* list, const char* prefix) sections = iniGetSectionList(*list, prefix); while ((section = strListPop(§ions)) != NULL) if (!iniRemoveSection(list, section)) - return(false); + return false; strListFree(§ions); - return(true); + return true; } // This sorts comments too, so should not be used on human created/edited files @@ -536,20 +536,20 @@ bool iniRenameSection(str_list_t* list, const char* section, const char* newname size_t i; if (section == ROOT_SECTION) - return(false); + return false; if (stricmp(section, newname) != 0) { i = find_section_index(*list, newname); if ((*list)[i] != NULL) /* duplicate */ - return(false); + return false; } i = find_section_index(*list, section); if ((*list)[i] == NULL) /* not found */ - return(false); + return false; SAFEPRINTF(str, "[%s]", newname); - return(strListReplace(*list, i, str) != NULL); + return strListReplace(*list, i, str) != NULL; } static size_t ini_add_section(str_list_t* list, const char* section @@ -558,10 +558,10 @@ static size_t ini_add_section(str_list_t* list, const char* section char str[INI_MAX_LINE_LEN]; if (section == ROOT_SECTION) - return(0); + return 0; if ((*list)[index] != NULL) - return(index); + return index; if (style == NULL) style = &default_style; @@ -570,13 +570,13 @@ static size_t ini_add_section(str_list_t* list, const char* section SAFEPRINTF(str, "[%s]", section); strListAppend(list, str, index); - return(index); + return index; } size_t iniAddSection(str_list_t* list, const char* section, ini_style_t* style) { if (section == ROOT_SECTION) - return(0); + return 0; return ini_add_section(list, section, style, find_section_index(*list, section)); } @@ -584,7 +584,7 @@ size_t iniAddSection(str_list_t* list, const char* section, ini_style_t* style) size_t iniAppendSection(str_list_t* list, const char* section, ini_style_t* style) { if (section == ROOT_SECTION) - return(0); + return 0; return ini_add_section(list, section, style, strListCount(*list)); } @@ -593,7 +593,7 @@ size_t iniAppendSectionWithKeys(str_list_t* list, const char* section, const str , ini_style_t* style) { if (section == ROOT_SECTION) - return(0); + return 0; ini_add_section(list, section, style, strListCount(*list)); @@ -627,7 +627,7 @@ static char* ini_set_string(str_list_t* list, const char* section, const char* k iniAddSection(list, section, style); if (key == NULL) - return(NULL); + return NULL; if (style->key_prefix != NULL) key_prefix = style->key_prefix; if (style->value_separator != NULL) @@ -651,7 +651,7 @@ static char* ini_set_string(str_list_t* list, const char* section, const char* k } if (strcmp(curval, value) == 0) - return((*list)[i]); /* no change */ + return (*list)[i]; /* no change */ return strListReplace(*list, i, str); } @@ -1001,7 +1001,7 @@ static char* default_value(const char* deflt, char* value) if (deflt != NULL && deflt != value && value != NULL) sprintf(value, "%.*s", INI_MAX_VALUE_LEN - 1, deflt); - return((char*)deflt); + return (char*)deflt; } /* Supports string literals: */ @@ -1010,7 +1010,7 @@ char* iniReadString(FILE* fp, const char* section, const char* key, const char* if (read_value(fp, section, key, value, /* literals_supported: */ true) == NULL || *value == 0 /* blank */) return default_value(deflt, value); - return(value); + return value; } char* iniReadSString(FILE* fp, const char* section, const char* key, const char* deflt, char* value, size_t sz) @@ -1044,7 +1044,7 @@ char* iniReadValue(FILE* fp, const char* section, const char* key, const char* d if (read_value(fp, section, key, value, /* literals_supported: */ false) == NULL || *value == 0 /* blank */) return default_value(deflt, value); - return(value); + return value; } /* Supports string literals: */ @@ -1060,7 +1060,7 @@ char* iniGetString(str_list_t list, const char* section, const char* key, const if (value != NULL) /* return the modified (trimmed) value */ return value; - return(vp); + return vp; } char* iniGetSString(str_list_t list, const char* section, const char* key, const char* deflt, char* value, size_t sz) @@ -1101,7 +1101,7 @@ char* iniGetValue(str_list_t list, const char* section, const char* key, const c if (value != NULL) /* return the modified (trimmed) value */ return value; - return(vp); + return vp; } /* Does NOT support string literals: */ @@ -1119,7 +1119,7 @@ char* iniPopKey(str_list_t* list, const char* section, const char* key, char* va strListDelete(list, i); - return(value); + return value; } /* Supports string literals: */ @@ -1137,24 +1137,24 @@ char* iniPopString(str_list_t* list, const char* section, const char* key, char* strListDelete(list, i); - return(value); + return value; } char* iniReadExistingString(FILE* fp, const char* section, const char* key, const char* deflt, char* value) { if (read_value(fp, section, key, value, /* literals_supported: */ true) == NULL) - return(NULL); + return NULL; if (*value == 0 /* blank */) return default_value(deflt, value); - return(value); + return value; } char* iniGetExistingString(str_list_t list, const char* section, const char* key, const char* deflt, char* value) { if (!iniKeyExists(list, section, key)) - return(NULL); + return NULL; return iniGetString(list, section, key, deflt, value); } @@ -1162,18 +1162,18 @@ char* iniGetExistingString(str_list_t list, const char* section, const char* key char* iniReadExistingValue(FILE* fp, const char* section, const char* key, const char* deflt, char* value) { if (read_value(fp, section, key, value, /* literals_supported: */ false) == NULL) - return(NULL); + return NULL; if (*value == 0 /* blank */) return default_value(deflt, value); - return(value); + return value; } char* iniGetExistingValue(str_list_t list, const char* section, const char* key, const char* deflt, char* value) { if (!iniKeyExists(list, section, key)) - return(NULL); + return NULL; return iniGetValue(list, section, key, deflt, value); } @@ -1187,7 +1187,7 @@ static str_list_t splitList(char* list, const char* sep) str_list_t lp; if ((lp = strListInit()) == NULL) - return(NULL); + return NULL; if (sep == NULL) sep = ","; @@ -1201,7 +1201,7 @@ static str_list_t splitList(char* list, const char* sep) token = strtok_r(NULL, sep, &tmp); } - return(lp); + return lp; } str_list_t iniReadStringList(FILE* fp, const char* section, const char* key @@ -1215,11 +1215,11 @@ str_list_t iniReadStringList(FILE* fp, const char* section, const char* key value = (char*)deflt; if (value == NULL) - return(NULL); + return NULL; SAFECOPY(list, value); - return(splitList(list, sep)); + return splitList(list, sep); } str_list_t iniGetStringList(str_list_t list, const char* section, const char* key @@ -1231,17 +1231,17 @@ str_list_t iniGetStringList(str_list_t list, const char* section, const char* ke if (*value == 0 /* blank value or missing key */) { if (deflt == NULL) - return(NULL); + return NULL; SAFECOPY(value, deflt); } - return(splitList(value, sep)); + return splitList(value, sep); } void* iniFreeStringList(str_list_t list) { strListFree(&list); - return(list); + return list; } void* iniFreeNamedStringList(named_string_t** list) @@ -1249,7 +1249,7 @@ void* iniFreeNamedStringList(named_string_t** list) ulong i; if (list == NULL) - return(NULL); + return NULL; for (i = 0; list[i] != NULL; i++) { if (list[i]->name != NULL) @@ -1260,7 +1260,7 @@ void* iniFreeNamedStringList(named_string_t** list) } free(list); - return(NULL); + return NULL; } static str_list_t ini_read_section_list(FILE* fp, const char* prefix, bool include_dupes) @@ -1271,10 +1271,10 @@ static str_list_t ini_read_section_list(FILE* fp, const char* prefix, bool inclu str_list_t lp; if ((lp = strListInit()) == NULL) - return(NULL); + return NULL; if (fp == NULL) - return(lp); + return lp; rewind(fp); @@ -1294,7 +1294,7 @@ static str_list_t ini_read_section_list(FILE* fp, const char* prefix, bool inclu break; } - return(lp); + return lp; } str_list_t iniReadSectionList(FILE* fp, const char* prefix) @@ -1315,10 +1315,10 @@ static str_list_t ini_get_section_list(str_list_t list, const char* prefix, bool str_list_t lp; if ((lp = strListInit()) == NULL) - return(NULL); + return NULL; if (list == NULL) - return(lp); + return lp; for (i = 0; list[i] != NULL; i++) { SAFECOPY(str, list[i]); @@ -1335,7 +1335,7 @@ static str_list_t ini_get_section_list(str_list_t list, const char* prefix, bool break; } - return(lp); + return lp; } str_list_t iniGetSectionList(str_list_t list, const char* prefix) @@ -1355,7 +1355,7 @@ size_t iniGetSectionCount(str_list_t list, const char* prefix) size_t i, items = 0; if (list == NULL) - return(0); + return 0; for (i = 0; list[i] != NULL; i++) { SAFECOPY(str, list[i]); @@ -1369,7 +1369,7 @@ size_t iniGetSectionCount(str_list_t list, const char* prefix) items++; } - return(items); + return items; } size_t iniReadSectionCount(FILE* fp, const char* prefix) @@ -1379,7 +1379,7 @@ size_t iniReadSectionCount(FILE* fp, const char* prefix) ulong items = 0; if (fp == NULL) - return(0); + return 0; rewind(fp); @@ -1396,7 +1396,7 @@ size_t iniReadSectionCount(FILE* fp, const char* prefix) items++; } - return(items); + return items; } @@ -1409,15 +1409,15 @@ str_list_t iniReadKeyList(FILE* fp, const char* section) str_list_t lp; if ((lp = strListInit()) == NULL) - return(NULL); + return NULL; if (fp == NULL) - return(lp); + return lp; rewind(fp); if (!seek_section(fp, section)) - return(lp); + return lp; while (!feof(fp)) { if (fgets(str, sizeof(str), fp) == NULL) @@ -1432,7 +1432,7 @@ str_list_t iniReadKeyList(FILE* fp, const char* section) break; } - return(lp); + return lp; } str_list_t iniGetKeyList(str_list_t list, const char* section) @@ -1444,10 +1444,10 @@ str_list_t iniGetKeyList(str_list_t list, const char* section) str_list_t lp; if ((lp = strListInit()) == NULL) - return(NULL); + return NULL; if (list == NULL) - return(lp); + return lp; for (i = find_section(list, section); list[i] != NULL; i++) { SAFECOPY(str, list[i]); @@ -1461,7 +1461,7 @@ str_list_t iniGetKeyList(str_list_t list, const char* section) break; } - return(lp); + return lp; } @@ -1476,16 +1476,16 @@ iniReadNamedStringList(FILE* fp, const char* section) named_string_t** np; if (fp == NULL) - return(NULL); + return NULL; rewind(fp); if (!seek_section(fp, section)) - return(NULL); + return NULL; /* New behavior, if section exists but is empty, return single element array (terminator only) */ if ((lp = (named_string_t**)malloc(sizeof(named_string_t*))) == NULL) - return(NULL); + return NULL; while (!feof(fp)) { if (fgets(str, sizeof(str), fp) == NULL) @@ -1510,7 +1510,7 @@ iniReadNamedStringList(FILE* fp, const char* section) lp[items] = NULL; /* terminate list */ - return(lp); + return lp; } named_string_t** @@ -1524,15 +1524,15 @@ iniGetNamedStringList(str_list_t list, const char* section) named_string_t** np; if (list == NULL) - return(NULL); + return NULL; i = find_section(list, section); if (section != ROOT_SECTION && list[i] == NULL) - return(NULL); + return NULL; /* New behavior, if section exists but is empty, return single element array (terminator only) */ if ((lp = (named_string_t**)malloc(sizeof(named_string_t*))) == NULL) - return(NULL); + return NULL; for (; list[i] != NULL; i++) { SAFECOPY(str, list[i]); @@ -1556,7 +1556,7 @@ iniGetNamedStringList(str_list_t list, const char* section) lp[items] = NULL; /* terminate list */ - return(lp); + return lp; } // the 'list' must remain allocated/valid through-out the life of the returned named_str_list @@ -1711,33 +1711,33 @@ static bool isTrue(const char* value) static int parseInteger(const char* value) { if (isTrue(value)) - return(true); + return true; - return((int)strtol(value, NULL, 0)); + return (int)strtol(value, NULL, 0); } static uint parseUInteger(const char* value) { if (isTrue(value)) - return(true); + return true; - return((uint)strtoul(value, NULL, 0)); + return (uint)strtoul(value, NULL, 0); } static long parseLongInteger(const char* value) { if (isTrue(value)) - return(true); + return true; - return(strtol(value, NULL, 0)); + return strtol(value, NULL, 0); } static ulong parseULongInteger(const char* value) { if (isTrue(value)) - return(true); + return true; - return(strtoul(value, NULL, 0)); + return strtoul(value, NULL, 0); } #if !defined __BORLANDC__ @@ -1760,7 +1760,7 @@ static uint64_t parseUInt64(const char* value) static bool parseBool(const char* value) { - return(INT_TO_BOOL(parseInteger(value))); + return INT_TO_BOOL(parseInteger(value)); } int iniReadInteger(FILE* fp, const char* section, const char* key, int deflt) @@ -1769,12 +1769,12 @@ int iniReadInteger(FILE* fp, const char* section, const char* key, int deflt) char buf[INI_MAX_VALUE_LEN]; if ((value = read_value(fp, section, key, buf, /* literals_supported: */ false)) == NULL) - return(deflt); + return deflt; if (*value == 0) /* blank value */ - return(deflt); + return deflt; - return(parseInteger(value)); + return parseInteger(value); } uint iniReadUInteger(FILE* fp, const char* section, const char* key, uint deflt) @@ -1783,12 +1783,12 @@ uint iniReadUInteger(FILE* fp, const char* section, const char* key, uint deflt) char buf[INI_MAX_VALUE_LEN]; if ((value = read_value(fp, section, key, buf, /* literals_supported: */ false)) == NULL) - return(deflt); + return deflt; if (*value == 0) /* blank value */ - return(deflt); + return deflt; - return(parseUInteger(value)); + return parseUInteger(value); } int iniGetInteger(str_list_t list, const char* section, const char* key, int deflt) @@ -1798,9 +1798,9 @@ int iniGetInteger(str_list_t list, const char* section, const char* key, int def get_value(list, section, key, NULL, &vp, /* literals_supported: */ false); if (vp == NULL || *vp == 0) /* blank value or missing key */ - return(deflt); + return deflt; - return(parseInteger(vp)); + return parseInteger(vp); } /* Returns the default value if key value is out of range */ @@ -1846,29 +1846,29 @@ uint iniGetUInteger(str_list_t list, const char* section, const char* key, uint get_value(list, section, key, NULL, &vp, /* literals_supported: */ false); if (vp == NULL || *vp == 0) /* blank value or missing key */ - return(deflt); + return deflt; - return(parseUInteger(vp)); + return parseUInteger(vp); } short iniReadShortInt(FILE* fp, const char* section, const char* key, short deflt) { - return((short)iniReadInteger(fp, section, key, deflt)); + return (short)iniReadInteger(fp, section, key, deflt); } ushort iniReadUShortInt(FILE* fp, const char* section, const char* key, ushort deflt) { - return((ushort)iniReadUInteger(fp, section, key, deflt)); + return (ushort)iniReadUInteger(fp, section, key, deflt); } short iniGetShortInt(str_list_t list, const char* section, const char* key, short deflt) { - return((short)iniGetInteger(list, section, key, deflt)); + return (short)iniGetInteger(list, section, key, deflt); } ushort iniGetUShortInt(str_list_t list, const char* section, const char* key, ushort deflt) { - return((ushort)iniGetUInteger(list, section, key, deflt)); + return (ushort)iniGetUInteger(list, section, key, deflt); } long iniReadLongInt(FILE* fp, const char* section, const char* key, long deflt) @@ -1877,12 +1877,12 @@ long iniReadLongInt(FILE* fp, const char* section, const char* key, long deflt) char buf[INI_MAX_VALUE_LEN]; if ((value = read_value(fp, section, key, buf, /* literals_supported: */ false)) == NULL) - return(deflt); + return deflt; if (*value == 0) /* blank value */ - return(deflt); + return deflt; - return(parseLongInteger(value)); + return parseLongInteger(value); } ulong iniReadULongInt(FILE* fp, const char* section, const char* key, ulong deflt) @@ -1891,12 +1891,12 @@ ulong iniReadULongInt(FILE* fp, const char* section, const char* key, ulong defl char buf[INI_MAX_VALUE_LEN]; if ((value = read_value(fp, section, key, buf, /* literals_supported: */ false)) == NULL) - return(deflt); + return deflt; if (*value == 0) /* blank value */ - return(deflt); + return deflt; - return(parseULongInteger(value)); + return parseULongInteger(value); } long iniGetLongInt(str_list_t list, const char* section, const char* key, long deflt) @@ -1906,9 +1906,9 @@ long iniGetLongInt(str_list_t list, const char* section, const char* key, long d get_value(list, section, key, NULL, &vp, /* literals_supported: */ false); if (vp == NULL || *vp == 0) /* blank value or missing key */ - return(deflt); + return deflt; - return(parseLongInteger(vp)); + return parseLongInteger(vp); } ulong iniGetULongInt(str_list_t list, const char* section, const char* key, ulong deflt) @@ -1918,9 +1918,9 @@ ulong iniGetULongInt(str_list_t list, const char* section, const char* key, ulon get_value(list, section, key, NULL, &vp, /* literals_supported: */ false); if (vp == NULL || *vp == 0) /* blank value or missing key */ - return(deflt); + return deflt; - return(parseULongInteger(vp)); + return parseULongInteger(vp); } #if !defined __BORLANDC__ @@ -1983,12 +1983,12 @@ int64_t iniReadBytes(FILE* fp, const char* section, const char* key, uint unit, char buf[INI_MAX_VALUE_LEN]; if ((value = read_value(fp, section, key, buf, /* literals_supported: */ false)) == NULL) - return(deflt); + return deflt; if (*value == 0) /* blank value */ - return(deflt); + return deflt; - return(parse_byte_count(value, unit)); + return parse_byte_count(value, unit); } int64_t iniGetBytes(str_list_t list, const char* section, const char* key, uint unit, int64_t deflt) @@ -1998,9 +1998,9 @@ int64_t iniGetBytes(str_list_t list, const char* section, const char* key, uint get_value(list, section, key, NULL, &vp, /* literals_supported: */ false); if (vp == NULL || *vp == 0) /* blank value or missing key */ - return(deflt); + return deflt; - return(parse_byte_count(vp, unit)); + return parse_byte_count(vp, unit); } double iniReadDuration(FILE* fp, const char* section, const char* key, double deflt) @@ -2009,12 +2009,12 @@ double iniReadDuration(FILE* fp, const char* section, const char* key, double de char buf[INI_MAX_VALUE_LEN]; if ((value = read_value(fp, section, key, buf, /* literals_supported: */ false)) == NULL) - return(deflt); + return deflt; if (*value == 0) /* blank value */ - return(deflt); + return deflt; - return(parse_duration(value)); + return parse_duration(value); } double iniGetDuration(str_list_t list, const char* section, const char* key, double deflt) @@ -2024,9 +2024,9 @@ double iniGetDuration(str_list_t list, const char* section, const char* key, dou get_value(list, section, key, NULL, &vp, /* literals_supported: */ false); if (vp == NULL || *vp == 0) /* blank value or missing key */ - return(deflt); + return deflt; - return(parse_duration(vp)); + return parse_duration(vp); } #if !defined(NO_SOCKET_SUPPORT) @@ -2053,13 +2053,13 @@ int iniGetSocketOptions(str_list_t list, const char* section, SOCKET sock len = sizeof(type); if ((result = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char*)&type, &len)) != 0) { safe_snprintf(error, errlen, "%d (%s) getting socket type", SOCKET_ERRNO, SOCKET_STRERROR(err, sizeof(err))); - return(result); + return result; } #ifdef IPPROTO_IPV6 len = sizeof(addr); if ((result = getsockname(sock, &addr.addr, &len)) != 0) { safe_snprintf(error, errlen, "%d (%s) getting socket name", SOCKET_ERRNO, SOCKET_STRERROR(err, sizeof(err))); - return(result); + return result; } #endif for (i = 0; socket_options[i].name != NULL; i++) { @@ -2095,11 +2095,11 @@ int iniGetSocketOptions(str_list_t list, const char* section, SOCKET sock if ((result = setsockopt(sock, level, option, (const char *)vp, len)) != 0) { safe_snprintf(error, errlen, "%d (%s) setting socket option (%s, %d) to %d" , SOCKET_ERRNO, SOCKET_STRERROR(err, sizeof(err)), name, option, value); - return(result); + return result; } } - return(0); + return 0; } uint32_t iniReadIpAddress(FILE* fp, const char* section, const char* key, uint32_t deflt) @@ -2108,10 +2108,10 @@ uint32_t iniReadIpAddress(FILE* fp, const char* section, const char* key, uint32 char* value; if ((value = read_value(fp, section, key, buf, /* literals_supported: */ false)) == NULL) - return(deflt); + return deflt; if (*value == 0) /* blank value */ - return(deflt); + return deflt; return parseIPv4Address(value); } @@ -2122,10 +2122,10 @@ struct in6_addr iniReadIp6Address(FILE* fp, const char* section, const char* key char* value; if ((value = read_value(fp, section, key, buf, /* literals_supported: */ false)) == NULL) - return(deflt); + return deflt; if (*value == 0) /* blank value */ - return(deflt); + return deflt; return parseIPv6Address(value); } @@ -2137,7 +2137,7 @@ uint32_t iniGetIpAddress(str_list_t list, const char* section, const char* key, get_value(list, section, key, NULL, &vp, /* literals_supported: */ false); if (vp == NULL || *vp == 0) /* blank value or missing key */ - return(deflt); + return deflt; return parseIPv4Address(vp); } @@ -2149,7 +2149,7 @@ struct in6_addr iniGetIp6Address(str_list_t list, const char* section, const cha get_value(list, section, key, NULL, &vp, /* literals_supported: */ false); if (vp == NULL || *vp == 0) /* blank value or missing key */ - return(deflt); + return deflt; return parseIPv6Address(vp); } @@ -2179,12 +2179,12 @@ char* iniFileName(char* dest, size_t maxlen, const char* indir, const char* infn if (gethostname(hostname, sizeof(hostname)) == 0) { safe_snprintf(dest, maxlen, "%s%s.%s%s", dir, fname, hostname, ext); if (fexistcase(dest)) /* path/file.host.domain.ini */ - return(dest); + return dest; if ((p = strchr(hostname, '.')) != NULL) { *p = 0; safe_snprintf(dest, maxlen, "%s%s.%s%s", dir, fname, hostname, ext); if (fexistcase(dest)) /* path/file.host.ini */ - return(dest); + return dest; } } } @@ -2192,11 +2192,11 @@ char* iniFileName(char* dest, size_t maxlen, const char* indir, const char* infn safe_snprintf(dest, maxlen, "%s%s.%s%s", dir, fname, PLATFORM_DESC, ext); if (fexistcase(dest)) /* path/file.platform.ini */ - return(dest); + return dest; safe_snprintf(dest, maxlen, "%s%s%s", dir, fname, ext); fexistcase(dest); /* path/file.ini */ - return(dest); + return dest; } double iniReadFloat(FILE* fp, const char* section, const char* key, double deflt) @@ -2205,12 +2205,12 @@ double iniReadFloat(FILE* fp, const char* section, const char* key, double deflt char* value; if ((value = read_value(fp, section, key, buf, /* literals_supported: */ false)) == NULL) - return(deflt); + return deflt; if (*value == 0) /* blank value */ - return(deflt); + return deflt; - return(atof(value)); + return atof(value); } double iniGetFloat(str_list_t list, const char* section, const char* key, double deflt) @@ -2220,9 +2220,9 @@ double iniGetFloat(str_list_t list, const char* section, const char* key, double get_value(list, section, key, NULL, &vp, /* literals_supported: */ false); if (vp == NULL || *vp == 0) /* blank value or missing key */ - return(deflt); + return deflt; - return(atof(vp)); + return atof(vp); } bool iniReadBool(FILE* fp, const char* section, const char* key, bool deflt) @@ -2231,12 +2231,12 @@ bool iniReadBool(FILE* fp, const char* section, const char* key, bool deflt) char* value; if ((value = read_value(fp, section, key, buf, /* literals_supported: */ false)) == NULL) - return(deflt); + return deflt; if (*value == 0) /* blank value */ - return(deflt); + return deflt; - return(parseBool(value)); + return parseBool(value); } bool iniGetBool(str_list_t list, const char* section, const char* key, bool deflt) @@ -2246,15 +2246,15 @@ bool iniGetBool(str_list_t list, const char* section, const char* key, bool defl get_value(list, section, key, NULL, &vp, /* literals_supported: */ false); if (vp == NULL || *vp == 0) /* blank value or missing key */ - return(deflt); + return deflt; - return(parseBool(vp)); + return parseBool(vp); } static bool validDate(struct tm* tm) { - return(tm->tm_mon && tm->tm_mon <= 12 - && tm->tm_mday && tm->tm_mday <= 31); + return tm->tm_mon && tm->tm_mon <= 12 + && tm->tm_mday && tm->tm_mday <= 31; } static time_t fixedDateTime(struct tm* tm, const char* tstr, char pm) @@ -2273,7 +2273,7 @@ static time_t fixedDateTime(struct tm* tm, const char* tstr, char pm) tm->tm_isdst = -1; /* auto-detect */ - return(mktime(tm)); + return mktime(tm); } static int getMonth(const char* month) @@ -2284,9 +2284,9 @@ static int getMonth(const char* month) for (i = 0; mon[i] != NULL; i++) if (strnicmp(month, mon[i], 3) == 0) - return(i + 1); + return i + 1; - return(atoi(month)); + return atoi(month); } static time_t parseDateTime(const char* value) @@ -2313,62 +2313,62 @@ static time_t parseDateTime(const char* value) /* CCYYMMDDTHHMMSS <--- ISO-8601 date and time format */ if (sscanf(value, "%uT%u" , &isoDate, &isoTime) >= 2) - return(isoDateTime_to_time(isoDate, isoTime)); + return isoDateTime_to_time(isoDate, isoTime); /* DD.MM.[CC]YY [time] [p] <-- Euro/Canadian numeric date format */ if (sscanf(value, "%u.%u.%u %s %c" , &tm.tm_mday, &tm.tm_mon, &tm.tm_year, tstr, &pm) >= 2 && validDate(&tm)) - return(fixedDateTime(&tm, tstr, pm)); + return fixedDateTime(&tm, tstr, pm); /* MM/DD/[CC]YY [time] [p] <-- American numeric date format */ if (sscanf(value, "%u%*c %u%*c %u %s %c" , &tm.tm_mon, &tm.tm_mday, &tm.tm_year, tstr, &pm) >= 2 && validDate(&tm)) - return(fixedDateTime(&tm, tstr, pm)); + return fixedDateTime(&tm, tstr, pm); /* DD[-]Mon [CC]YY [time] [p] <-- Perversion of RFC822 date format */ if (sscanf(value, "%u%*c %s %u %s %c" , &tm.tm_mday, month, &tm.tm_year, tstr, &pm) >= 2 && (tm.tm_mon = getMonth(month)) != 0 && validDate(&tm)) - return(fixedDateTime(&tm, tstr, pm)); + return fixedDateTime(&tm, tstr, pm); /* Wday, DD Mon YYYY [time] <-- IETF standard (RFC2822) date format */ if (sscanf(value, "%*s %u %s %u %s" , &tm.tm_mday, month, &tm.tm_year, tstr) >= 2 && (tm.tm_mon = getMonth(month)) != 0 && validDate(&tm)) - return(fixedDateTime(&tm, tstr, 0)); + return fixedDateTime(&tm, tstr, 0); /* Mon DD[,] [CC]YY [time] [p] <-- Preferred date format */ if (sscanf(value, "%s %u%*c %u %s %c" , month, &tm.tm_mday, &tm.tm_year, tstr, &pm) >= 2 && (tm.tm_mon = getMonth(month)) != 0 && validDate(&tm)) - return(fixedDateTime(&tm, tstr, pm)); + return fixedDateTime(&tm, tstr, pm); /* Wday Mon DD YYYY [time] <-- JavaScript (SpiderMonkey) Date.toString() format */ if (sscanf(value, "%*s %s %u %u %s" , month, &tm.tm_mday, &tm.tm_year, tstr) >= 2 && (tm.tm_mon = getMonth(month)) != 0 && validDate(&tm)) - return(fixedDateTime(&tm, tstr, 0)); + return fixedDateTime(&tm, tstr, 0); /* Wday Mon DD [time] YYYY <-- ctime() format */ if (sscanf(value, "%*s %s %u %s %u" , month, &tm.tm_mday, tstr, &tm.tm_year) >= 2 && (tm.tm_mon = getMonth(month)) != 0 && validDate(&tm)) - return(fixedDateTime(&tm, tstr, 0)); + return fixedDateTime(&tm, tstr, 0); if ((t = xpDateTime_to_time(isoDateTimeStr_parse(value))) != INVALID_TIME) return t; #if defined __BORLANDC__ - return((time_t)strtoul(value, NULL, 0)); + return (time_t)strtoul(value, NULL, 0); #else - return((time_t)strtoull(value, NULL, 0)); + return (time_t)strtoull(value, NULL, 0); #endif } @@ -2378,12 +2378,12 @@ time_t iniReadDateTime(FILE* fp, const char* section, const char* key, time_t de char* value; if ((value = read_value(fp, section, key, buf, /* literals_supported: */ false)) == NULL) - return(deflt); + return deflt; if (*value == 0) /* blank value */ - return(deflt); + return deflt; - return(parseDateTime(value)); + return parseDateTime(value); } time_t iniGetDateTime(str_list_t list, const char* section, const char* key, time_t deflt) @@ -2393,9 +2393,9 @@ time_t iniGetDateTime(str_list_t list, const char* section, const char* key, tim get_value(list, section, key, NULL, &vp, /* literals_supported: */ false); if (vp == NULL || *vp == 0) /* blank value or missing key */ - return(deflt); + return deflt; - return(parseDateTime(vp)); + return parseDateTime(vp); } // Like stricmp(), but either string may be shorter than the other and still match @@ -2431,12 +2431,12 @@ static unsigned parseEnum(const char* value, str_list_t names, unsigned deflt) /* Look for exact matches first */ for (i = 0; i < count; i++) if (stricmp(names[i], val) == 0) - return(i); + return i; /* Look for partial matches second */ for (i = 0; i < count; i++) if (partial_stricmp(names[i], val) == 0) - return(i); + return i; i = strtoul(val, &endptr, 0); if (*endptr != 0 && !IS_WHITESPACE(*endptr)) @@ -2486,12 +2486,12 @@ unsigned iniReadEnum(FILE* fp, const char* section, const char* key, str_list_t char* value; if ((value = read_value(fp, section, key, buf, /* literals_supported: */ false)) == NULL) - return(deflt); + return deflt; if (*value == 0) /* blank value */ - return(deflt); + return deflt; - return(parseEnum(value, names, deflt)); + return parseEnum(value, names, deflt); } unsigned* iniReadEnumList(FILE* fp, const char* section, const char* key @@ -2510,7 +2510,7 @@ unsigned* iniReadEnumList(FILE* fp, const char* section, const char* key if ((value = read_value(fp, section, key, buf, /* literals_supported: */ false)) == NULL || *value == 0 /* blank */) value = (char*)deflt; - return(parseEnumList(value, sep, names, cp)); + return parseEnumList(value, sep, names, cp); } unsigned iniGetEnum(str_list_t list, const char* section, const char* key, str_list_t names, unsigned deflt) @@ -2520,9 +2520,9 @@ unsigned iniGetEnum(str_list_t list, const char* section, const char* key, str_l get_value(list, section, key, NULL, &vp, /* literals_supported: */ false); if (vp == NULL || *vp == 0) /* blank value or missing key */ - return(deflt); + return deflt; - return(parseEnum(vp, names, deflt)); + return parseEnum(vp, names, deflt); } unsigned* iniGetEnumList(str_list_t list, const char* section, const char* key @@ -2540,10 +2540,10 @@ unsigned* iniGetEnumList(str_list_t list, const char* section, const char* key if (vp == NULL || *vp == 0 /* blank value or missing key */) { if (deflt == NULL) - return(NULL); + return NULL; vp = (char*)deflt; } - return(parseEnumList(vp, sep, names, cp)); + return parseEnumList(vp, sep, names, cp); } static int parseNamedInt(const char* value, named_int_t* names) @@ -2553,14 +2553,14 @@ static int parseNamedInt(const char* value, named_int_t* names) /* Look for exact matches first */ for (i = 0; names[i].name != NULL; i++) if (stricmp(names[i].name, value) == 0) - return(names[i].value); + return names[i].value; /* Look for partial matches second */ for (i = 0; names[i].name != NULL; i++) if (partial_stricmp(names[i].name, value) == 0) - return(names[i].value); + return names[i].value; - return(parseInteger(value)); + return parseInteger(value); } int iniReadNamedInt(FILE* fp, const char* section, const char* key @@ -2570,12 +2570,12 @@ int iniReadNamedInt(FILE* fp, const char* section, const char* key char* value; if ((value = read_value(fp, section, key, buf, /* literals_supported: */ false)) == NULL) - return(deflt); + return deflt; if (*value == 0) /* blank value */ - return(deflt); + return deflt; - return(parseNamedInt(value, names)); + return parseNamedInt(value, names); } int iniGetNamedInt(str_list_t list, const char* section, const char* key @@ -2586,9 +2586,9 @@ int iniGetNamedInt(str_list_t list, const char* section, const char* key get_value(list, section, key, NULL, &vp, /* literals_supported: */ false); if (vp == NULL || *vp == 0) /* blank value or missing key */ - return(deflt); + return deflt; - return(parseNamedInt(vp, names)); + return parseNamedInt(vp, names); } static ulong parseNamedULongInt(const char* value, named_ulong_t* names) @@ -2598,14 +2598,14 @@ static ulong parseNamedULongInt(const char* value, named_ulong_t* names) /* Look for exact matches first */ for (i = 0; names[i].name != NULL; i++) if (stricmp(names[i].name, value) == 0) - return(names[i].value); + return names[i].value; /* Look for partial matches second */ for (i = 0; names[i].name != NULL; i++) if (partial_stricmp(names[i].name, value) == 0) - return(names[i].value); + return names[i].value; - return(parseULongInteger(value)); + return parseULongInteger(value); } ulong iniReadNamedULongInt(FILE* fp, const char* section, const char* key @@ -2615,12 +2615,12 @@ ulong iniReadNamedULongInt(FILE* fp, const char* section, const char* key char* value; if ((value = read_value(fp, section, key, buf, /* literals_supported: */ false)) == NULL) - return(deflt); + return deflt; if (*value == 0) /* blank value */ - return(deflt); + return deflt; - return(parseNamedULongInt(value, names)); + return parseNamedULongInt(value, names); } ulong iniGetNamedULongInt(str_list_t list, const char* section, const char* key @@ -2631,9 +2631,9 @@ ulong iniGetNamedULongInt(str_list_t list, const char* section, const char* key get_value(list, section, key, NULL, &vp, /* literals_supported: */ false); if (vp == NULL || *vp == 0) /* blank value or missing key */ - return(deflt); + return deflt; - return(parseNamedULongInt(vp, names)); + return parseNamedULongInt(vp, names); } static double parseNamedFloat(const char* value, named_double_t* names) @@ -2643,14 +2643,14 @@ static double parseNamedFloat(const char* value, named_double_t* names) /* Look for exact matches first */ for (i = 0; names[i].name != NULL; i++) if (stricmp(names[i].name, value) == 0) - return(names[i].value); + return names[i].value; /* Look for partial matches second */ for (i = 0; names[i].name != NULL; i++) if (partial_stricmp(names[i].name, value) == 0) - return(names[i].value); + return names[i].value; - return(atof(value)); + return atof(value); } double iniReadNamedFloat(FILE* fp, const char* section, const char* key @@ -2660,12 +2660,12 @@ double iniReadNamedFloat(FILE* fp, const char* section, const char* key char* value; if ((value = read_value(fp, section, key, buf, /* literals_supported: */ false)) == NULL) - return(deflt); + return deflt; if (*value == 0) /* blank value */ - return(deflt); + return deflt; - return(parseNamedFloat(value, names)); + return parseNamedFloat(value, names); } double iniGetNamedFloat(str_list_t list, const char* section, const char* key @@ -2676,9 +2676,9 @@ double iniGetNamedFloat(str_list_t list, const char* section, const char* key get_value(list, section, key, NULL, &vp, /* literals_supported: */ false); if (vp == NULL || *vp == 0) /* blank value or missing key */ - return(deflt); + return deflt; - return(parseNamedFloat(vp, names)); + return parseNamedFloat(vp, names); } static ulong parseBitField(char* value, ini_bitdesc_t* bitdesc) @@ -2710,7 +2710,7 @@ static ulong parseBitField(char* value, ini_bitdesc_t* bitdesc) SKIP_WHITESPACE(p); } - return(v); + return v; } uint iniReadBitField(FILE* fp, const char* section, const char* key, @@ -2720,9 +2720,9 @@ uint iniReadBitField(FILE* fp, const char* section, const char* key, char buf[INI_MAX_VALUE_LEN]; if ((value = read_value(fp, section, key, buf, /* literals_supported: */ false)) == NULL) /* missing key */ - return(deflt); + return deflt; - return(parseBitField(value, bitdesc)); + return parseBitField(value, bitdesc); } uint iniGetBitField(str_list_t list, const char* section, const char* key, @@ -2733,9 +2733,9 @@ uint iniGetBitField(str_list_t list, const char* section, const char* key, get_value(list, section, key, NULL, &vp, /* literals_supported: */ false); if (vp == NULL) /* missing key */ - return(deflt); + return deflt; - return(parseBitField(vp, bitdesc)); + return parseBitField(vp, bitdesc); } int* parseIntList(const char* values, const char* sep, unsigned* count) @@ -2818,12 +2818,12 @@ FILE* iniOpenFile(const char* fname, bool for_modify) if (for_modify) mode = fexist(fname) ? "r+" : "w+"; - return(fopen(fname, mode)); + return fopen(fname, mode); } bool iniCloseFile(FILE* fp) { - return(fclose(fp) == 0); + return fclose(fp) == 0; } str_list_t iniReadFile(FILE* fp) @@ -2842,7 +2842,7 @@ str_list_t iniReadFile(FILE* fp) list = strListReadFile(fp, NULL, INI_MAX_LINE_LEN); if (list == NULL) - return(NULL); + return NULL; /* Look for !include directives */ inc_len = strlen(INI_INCLUDE_DIRECTIVE); @@ -2882,7 +2882,7 @@ str_list_t iniReadFile(FILE* fp) for (i = 0; list[i] != NULL; i++) truncnl(list[i]); - return(list); + return list; } bool iniHasInclude(const str_list_t list) @@ -2908,11 +2908,11 @@ bool iniWriteFile(FILE* fp, const str_list_t list) fflush(fp); pos = ftell(fp); if (pos == -1) - return (false); + return false; if (chsize(fileno(fp), pos) != 0) /* truncate */ - return(false); + return false; - return(count == strListCount(list)); + return count == strListCount(list); } #ifdef INI_FILE_TEST diff --git a/src/xpdev/link_list.c b/src/xpdev/link_list.c index aeb2498cfe7586e0e4ccae1c47bb91e873323cbd..ab4ecf0dd7d6b91c8f4d04aa616a9de727b114d0 100644 --- a/src/xpdev/link_list.c +++ b/src/xpdev/link_list.c @@ -50,7 +50,7 @@ link_list_t* listInit(link_list_t* list, long flags) if (flags & LINK_LIST_ATTACH) listAttach(list); - return(list); + return list; } bool listFreeNodeData(list_node_t* node) @@ -58,9 +58,9 @@ bool listFreeNodeData(list_node_t* node) if (node != NULL && node->data != NULL && !(node->flags & LINK_LIST_LOCKED)) { free(node->data); node->data = NULL; - return(true); + return true; } - return(false); + return false; } long listFreeNodes(link_list_t* list) @@ -69,7 +69,7 @@ long listFreeNodes(link_list_t* list) list_node_t* next; if (list == NULL) - return(-1); + return -1; listLock(list); @@ -96,16 +96,16 @@ long listFreeNodes(link_list_t* list) listUnlock(list); - return(list->count); + return list->count; } bool listFree(link_list_t* list) { if (list == NULL) - return(false); + return false; if (listFreeNodes(list)) - return(false); + return false; #if defined(LINK_LIST_THREADSAFE) @@ -123,19 +123,19 @@ bool listFree(link_list_t* list) } #endif - return(true); + return true; } long listAttach(link_list_t* list) { if (list == NULL) - return(-1); + return -1; listLock(list); list->refs++; listUnlock(list); - return(list->refs); + return list->refs; } long listDettach(link_list_t* list) @@ -145,7 +145,7 @@ long listDettach(link_list_t* list) listLock(list); if (list == NULL || list->refs < 1) { listUnlock(list); - return(-1); + return -1; } if ((refs = --list->refs) == 0) { @@ -156,7 +156,7 @@ long listDettach(link_list_t* list) else listUnlock(list); - return(refs); + return refs; } void* listSetPrivateData(link_list_t* list, void* p) @@ -164,20 +164,20 @@ void* listSetPrivateData(link_list_t* list, void* p) void* old; if (list == NULL) - return(NULL); + return NULL; listLock(list); old = list->private_data; list->private_data = p; listUnlock(list); - return(old); + return old; } void* listGetPrivateData(link_list_t* list) { if (list == NULL) - return(NULL); - return(list->private_data); + return NULL; + return list->private_data; } #if defined(LINK_LIST_THREADSAFE) @@ -185,33 +185,33 @@ void* listGetPrivateData(link_list_t* list) bool listSemPost(link_list_t* list) { if (list == NULL || !(list->flags & LINK_LIST_SEMAPHORE)) - return(false); + return false; - return(sem_post(&list->sem) == 0); + return sem_post(&list->sem) == 0; } bool listSemWait(link_list_t* list) { if (list == NULL || !(list->flags & LINK_LIST_SEMAPHORE)) - return(false); + return false; - return(sem_wait(&list->sem) == 0); + return sem_wait(&list->sem) == 0; } bool listSemTryWait(link_list_t* list) { if (list == NULL || !(list->flags & LINK_LIST_SEMAPHORE)) - return(false); + return false; - return(sem_trywait(&list->sem) == 0); + return sem_trywait(&list->sem) == 0; } bool listSemTryWaitBlock(link_list_t* list, unsigned long timeout) { if (list == NULL || !(list->flags & LINK_LIST_SEMAPHORE)) - return(false); + return false; - return(sem_trywait_block(&list->sem, timeout) == 0); + return sem_trywait_block(&list->sem, timeout) == 0; } #endif @@ -221,19 +221,19 @@ bool listLock(link_list_t* list) int ret = 0; if (list == NULL) - return(false); + return false; #if defined(LINK_LIST_THREADSAFE) if ((list->flags & LINK_LIST_MUTEX) && (ret = pthread_mutex_lock(&list->mutex)) == 0) #endif list->locks++; - return(ret == 0); + return ret == 0; } bool listIsLocked(const link_list_t* list) { if (list == NULL) - return(false); - return(list->locks > 0 ? true : false); + return false; + return list->locks > 0 ? true : false; } bool listUnlock(link_list_t* list) @@ -241,12 +241,12 @@ bool listUnlock(link_list_t* list) int ret = 0; if (list == NULL) - return(false); + return false; #if defined(LINK_LIST_THREADSAFE) if ((list->flags & LINK_LIST_MUTEX) && (ret = pthread_mutex_unlock(&list->mutex)) == 0) #endif list->locks--; - return(ret == 0); + return ret == 0; } long listCountNodes(link_list_t* list) @@ -255,10 +255,10 @@ long listCountNodes(link_list_t* list) list_node_t* node; if (list == NULL) - return(-1); + return -1; if (list->count) - return(list->count); + return list->count; listLock(list); @@ -267,7 +267,7 @@ long listCountNodes(link_list_t* list) listUnlock(list); - return(count); + return count; } list_node_t* listFindNode(link_list_t* list, const void* data, size_t length) @@ -275,7 +275,7 @@ list_node_t* listFindNode(link_list_t* list, const void* data, size_t length) list_node_t* node; if (list == NULL) - return(NULL); + return NULL; listLock(list); @@ -292,7 +292,7 @@ list_node_t* listFindNode(link_list_t* list, const void* data, size_t length) listUnlock(list); - return(node); + return node; } ulong listCountMatches(link_list_t* list, const void* data, size_t length) @@ -331,10 +331,10 @@ str_list_t listStringList(link_list_t* list) size_t count = 0; if (list == NULL) - return(NULL); + return NULL; if ((str_list = strListInit()) == NULL) - return(NULL); + return NULL; listLock(list); @@ -345,7 +345,7 @@ str_list_t listStringList(link_list_t* list) listUnlock(list); - return(str_list); + return str_list; } str_list_t listSubStringList(const list_node_t* node, long max) @@ -355,10 +355,10 @@ str_list_t listSubStringList(const list_node_t* node, long max) link_list_t* list; if (node == NULL) - return(NULL); + return NULL; if ((str_list = strListInit()) == NULL) - return(NULL); + return NULL; list = node->list; listLock(list); @@ -370,13 +370,13 @@ str_list_t listSubStringList(const list_node_t* node, long max) listUnlock(list); - return(str_list); + return str_list; } void* listFreeStringList(str_list_t list) { strListFree(&list); - return(list); + return list; } #endif /* #ifndef NO_STR_LIST_SUPPORT */ @@ -386,13 +386,13 @@ list_node_t* listFirstNode(link_list_t* list) list_node_t* node; if (list == NULL) - return(NULL); + return NULL; listLock(list); node = list->first; listUnlock(list); - return(node); + return node; } list_node_t* listLastNode(link_list_t* list) @@ -401,7 +401,7 @@ list_node_t* listLastNode(link_list_t* list) list_node_t* last = NULL; if (list == NULL) - return(NULL); + return NULL; listLock(list); if (list->last != NULL) @@ -411,7 +411,7 @@ list_node_t* listLastNode(link_list_t* list) last = node; listUnlock(list); - return(last); + return last; } long listNodeIndex(link_list_t* list, list_node_t* find_node) @@ -420,7 +420,7 @@ long listNodeIndex(link_list_t* list, list_node_t* find_node) list_node_t* node; if (list == NULL) - return(-1); + return -1; listLock(list); @@ -431,9 +431,9 @@ long listNodeIndex(link_list_t* list, list_node_t* find_node) listUnlock(list); if (node == NULL) - return(-1); + return -1; - return(i); + return i; } list_node_t* listNodeAt(link_list_t* list, long index) @@ -442,7 +442,7 @@ list_node_t* listNodeAt(link_list_t* list, long index) list_node_t* node; if (list == NULL || index < 0) - return(NULL); + return NULL; listLock(list); @@ -451,7 +451,7 @@ list_node_t* listNodeAt(link_list_t* list, long index) listUnlock(list); - return(node); + return node; } list_node_t* listNextNode(const list_node_t* node) @@ -459,13 +459,13 @@ list_node_t* listNextNode(const list_node_t* node) list_node_t* next; if (node == NULL) - return(NULL); + return NULL; listLock(node->list); next = node->next; listUnlock(node->list); - return(next); + return next; } list_node_t* listPrevNode(const list_node_t* node) @@ -473,13 +473,13 @@ list_node_t* listPrevNode(const list_node_t* node) list_node_t* prev; if (node == NULL) - return(NULL); + return NULL; listLock(node->list); prev = node->prev; listUnlock(node->list); - return(prev); + return prev; } void* listNodeData(const list_node_t* node) @@ -487,18 +487,18 @@ void* listNodeData(const list_node_t* node) void* data; if (node == NULL) - return(NULL); + return NULL; listLock(node->list); data = node->data; listUnlock(node->list); - return(data); + return data; } bool listNodeIsLocked(const list_node_t* node) { - return(node != NULL && (node->flags & LINK_LIST_LOCKED)); + return node != NULL && (node->flags & LINK_LIST_LOCKED); } bool listLockNode(list_node_t* node) @@ -509,31 +509,31 @@ bool listLockNode(list_node_t* node) listLock(node->list); if (node->flags & LINK_LIST_LOCKED) { listUnlock(node->list); - return(false); + return false; } node->flags |= LINK_LIST_LOCKED; listUnlock(node->list); - return(true); + return true; } bool listUnlockNode(list_node_t* node) { if (!listNodeIsLocked(node)) - return(false); + return false; listLock(node->list); node->flags &= ~LINK_LIST_LOCKED; listUnlock(node->list); - return(true); + return true; } static list_node_t* list_add_node(link_list_t* list, list_node_t* node, list_node_t* after) { if (list == NULL) - return(NULL); + return NULL; listLock(list); @@ -566,7 +566,7 @@ static list_node_t* list_add_node(link_list_t* list, list_node_t* node, list_nod listSemPost(list); #endif - return(node); + return node; } list_node_t* listAddNode(link_list_t* list, void* data, list_node_tag_t tag, list_node_t* after) @@ -574,16 +574,16 @@ list_node_t* listAddNode(link_list_t* list, void* data, list_node_tag_t tag, lis list_node_t* node; if (list == NULL) - return(NULL); + return NULL; if ((node = (list_node_t*)malloc(sizeof(list_node_t))) == NULL) - return(NULL); + return NULL; memset(node, 0, sizeof(list_node_t)); node->data = data; node->tag = tag; - return(list_add_node(list, node, after)); + return list_add_node(list, node, after); } long listAddNodes(link_list_t* list, void** data, list_node_tag_t* tag, list_node_t* after) @@ -592,13 +592,13 @@ long listAddNodes(link_list_t* list, void** data, list_node_tag_t* tag, list_nod list_node_t* node = NULL; if (data == NULL) - return(-1); + return -1; for (i = 0; data[i] != NULL ; i++) if ((node = listAddNode(list, data[i], tag == NULL ? LIST_NODE_TAG_DEFAULT : *(tag++), node == NULL ? after:node)) == NULL) - return(i); + return i; - return(i); + return i; } list_node_t* listAddNodeData(link_list_t* list, const void* data, size_t length, list_node_tag_t tag, list_node_t* after) @@ -607,16 +607,16 @@ list_node_t* listAddNodeData(link_list_t* list, const void* data, size_t length, void* buf; if ((buf = malloc(length)) == NULL) - return(NULL); + return NULL; memcpy(buf, data, length); if ((node = listAddNode(list, buf, tag, after)) == NULL) { free(buf); - return(NULL); + return NULL; } node->flags |= LINK_LIST_MALLOC; - return(node); + return node; } list_node_t* listAddNodeString(link_list_t* list, const char* str, list_node_tag_t tag, list_node_t* after) @@ -625,18 +625,18 @@ list_node_t* listAddNodeString(link_list_t* list, const char* str, list_node_tag char* buf; if (str == NULL) - return(NULL); + return NULL; if ((buf = strdup(str)) == NULL) - return(NULL); + return NULL; if ((node = listAddNode(list, buf, tag, after)) == NULL) { free(buf); - return(NULL); + return NULL; } node->flags |= LINK_LIST_MALLOC; - return(node); + return node; } #ifndef NO_STR_LIST_SUPPORT @@ -647,13 +647,13 @@ long listAddStringList(link_list_t* list, str_list_t str_list, list_node_tag_t* list_node_t* node = NULL; if (str_list == NULL) - return(-1); + return -1; for (i = 0; str_list[i] != NULL ; i++) if ((node = listAddNodeString(list, str_list[i], tag == NULL ? LIST_NODE_TAG_DEFAULT : *(tag++), node == NULL ? after:node)) == NULL) - return(i); + return i; - return(i); + return i; } #endif @@ -665,15 +665,15 @@ long listAddNodeList(link_list_t* list, const link_list_t* src, list_node_t* aft list_node_t* src_node; if (src == NULL) - return(-1); + return -1; for (src_node = src->first; src_node != NULL; src_node = src_node->next, count++) { if ((node = listAddNode(list, src_node->data, src_node->tag, node == NULL ? after:node)) == NULL) - return(count); + return count; node->flags = src_node->flags; } - return(count); + return count; } long listMerge(link_list_t* list, const link_list_t* src, list_node_t* after) @@ -683,13 +683,13 @@ long listMerge(link_list_t* list, const link_list_t* src, list_node_t* after) list_node_t* src_node; if (src == NULL) - return(-1); + return -1; for (src_node = src->first; src_node != NULL; src_node = src_node->next, count++) if ((node = list_add_node(list, src_node, node == NULL ? after:node)) == NULL) - return(count); + return count; - return(count); + return count; } link_list_t* listExtract(link_list_t* dest_list, const list_node_t* node, long max) @@ -698,17 +698,17 @@ link_list_t* listExtract(link_list_t* dest_list, const list_node_t* node, long m link_list_t* list; if (node == NULL || node->list == NULL) - return(NULL); + return NULL; if ((list = listInit(dest_list, node->list->flags)) == NULL) - return(NULL); + return NULL; for (count = 0; count < max && node != NULL; node = node->next) { listAddNode(list, node->data, node->tag, list->last); count++; } - return(list); + return list; } static void* list_remove_node(link_list_t* list, list_node_t* node, bool free_data) @@ -720,10 +720,10 @@ static void* list_remove_node(link_list_t* list, list_node_t* node, bool free_da else if (node == LAST_NODE) node = list->last; if (node == NULL) - return(NULL); + return NULL; if (node->flags & LINK_LIST_LOCKED) - return(NULL); + return NULL; if (node->prev != NULL) node->prev->next = node->next; @@ -744,7 +744,7 @@ static void* list_remove_node(link_list_t* list, list_node_t* node, bool free_da if (list->count) list->count--; - return(data); + return data; } void* listRemoveNode(link_list_t* list, list_node_t* node, bool free_data) @@ -752,7 +752,7 @@ void* listRemoveNode(link_list_t* list, list_node_t* node, bool free_data) void* data; if (list == NULL) - return(NULL); + return NULL; listLock(list); @@ -760,7 +760,7 @@ void* listRemoveNode(link_list_t* list, list_node_t* node, bool free_data) listUnlock(list); - return(data); + return data; } void* listRemoveTaggedNode(link_list_t* list, list_node_tag_t tag, bool free_data) @@ -769,7 +769,7 @@ void* listRemoveTaggedNode(link_list_t* list, list_node_tag_t tag, bool free_dat list_node_t* node; if (list == NULL) - return(NULL); + return NULL; listLock(list); @@ -779,7 +779,7 @@ void* listRemoveTaggedNode(link_list_t* list, list_node_tag_t tag, bool free_dat listUnlock(list); - return(data); + return data; } long listRemoveNodes(link_list_t* list, list_node_t* node, long max, bool free_data) @@ -788,7 +788,7 @@ long listRemoveNodes(link_list_t* list, list_node_t* node, long max, bool free_d long count; if (list == NULL) - return(-1); + return -1; listLock(list); @@ -807,7 +807,7 @@ long listRemoveNodes(link_list_t* list, list_node_t* node, long max, bool free_d // coverity[double_unlock:SUPPRESS] listUnlock(list); - return(count); + return count; } bool listSwapNodes(list_node_t* node1, list_node_t* node2) @@ -815,13 +815,13 @@ bool listSwapNodes(list_node_t* node1, list_node_t* node2) list_node_t tmp; if (node1 == NULL || node2 == NULL || node1 == node2) - return(false); + return false; if (listNodeIsLocked(node1) || listNodeIsLocked(node2)) - return(false); + return false; if (node1->list == NULL || node2->list == NULL) - return(false); + return false; #if defined(LINK_LIST_THREADSAFE) listLock(node1->list); @@ -843,7 +843,7 @@ bool listSwapNodes(list_node_t* node1, list_node_t* node2) listUnlock(node2->list); #endif - return(true); + return true; } static void list_update_prev(link_list_t* list) diff --git a/src/xpdev/msg_queue.c b/src/xpdev/msg_queue.c index aed70e5523e7e1e24c1ead9a6d587a92edff6502..f426a1fa92def9606365ededba1146471051e1f3 100644 --- a/src/xpdev/msg_queue.c +++ b/src/xpdev/msg_queue.c @@ -30,7 +30,7 @@ msg_queue_t* msgQueueInit(msg_queue_t* q, long flags) { if (q == NULL) { if ((q = (msg_queue_t*)malloc(sizeof(msg_queue_t))) == NULL) - return(NULL); + return NULL; flags |= MSG_QUEUE_MALLOC; } @@ -44,13 +44,13 @@ msg_queue_t* msgQueueInit(msg_queue_t* q, long flags) listInit(&q->in, LINK_LIST_SEMAPHORE | LINK_LIST_MUTEX); listInit(&q->out, LINK_LIST_SEMAPHORE | LINK_LIST_MUTEX); - return(q); + return q; } bool msgQueueOwner(msg_queue_t* q) { if (q == NULL) - return(false); + return false; return q->owner_thread_id == pthread_self(); } @@ -58,7 +58,7 @@ bool msgQueueOwner(msg_queue_t* q) bool msgQueueFree(msg_queue_t* q) { if (q == NULL) - return(false); + return false; listFree(&q->in); listFree(&q->out); @@ -66,17 +66,17 @@ bool msgQueueFree(msg_queue_t* q) if (q->flags & MSG_QUEUE_MALLOC) free(q); - return(true); + return true; } long msgQueueAttach(msg_queue_t* q) { if (q == NULL) - return(-1); + return -1; q->refs++; - return(q->refs); + return q->refs; } long msgQueueDetach(msg_queue_t* q) @@ -84,7 +84,7 @@ long msgQueueDetach(msg_queue_t* q) int refs; if (q == NULL || q->refs < 1) - return(-1); + return -1; if (msgQueueOwner(q)) q->flags |= MSG_QUEUE_ORPHAN; @@ -92,7 +92,7 @@ long msgQueueDetach(msg_queue_t* q) if ((refs = --q->refs) == 0) msgQueueFree(q); - return(refs); + return refs; } void* msgQueueSetPrivateData(msg_queue_t* q, void* p) @@ -100,40 +100,40 @@ void* msgQueueSetPrivateData(msg_queue_t* q, void* p) void* old; if (q == NULL) - return(NULL); + return NULL; old = q->private_data; q->private_data = p; - return(old); + return old; } void* msgQueueGetPrivateData(msg_queue_t* q) { if (q == NULL) - return(NULL); - return(q->private_data); + return NULL; + return q->private_data; } static link_list_t* msgQueueReadList(msg_queue_t* q) { if (q == NULL) - return(NULL); + return NULL; if ((q->flags & MSG_QUEUE_BIDIR) && q->owner_thread_id == pthread_self()) - return(&q->in); - return(&q->out); + return &q->in; + return &q->out; } static link_list_t* msgQueueWriteList(msg_queue_t* q) { if (q == NULL) - return(NULL); + return NULL; if (!(q->flags & MSG_QUEUE_BIDIR) || q->owner_thread_id == pthread_self()) - return(&q->out); - return(&q->in); + return &q->out; + return &q->in; } long msgQueueReadLevel(msg_queue_t* q) @@ -162,7 +162,7 @@ static bool list_wait(link_list_t* list, long timeout) break; YIELD(); } - return(INT_TO_BOOL(count)); + return INT_TO_BOOL(count); #endif } @@ -177,7 +177,7 @@ bool msgQueueWait(msg_queue_t* q, long timeout) #endif ; - return(result); + return result; } void* msgQueueRead(msg_queue_t* q, long timeout) @@ -208,7 +208,7 @@ void* msgQueueFind(msg_queue_t* q, const void* data, size_t length) list_node_t* node; if ((node = listFindNode(list, data, length)) == NULL) - return(NULL); + return NULL; return listRemoveNode(list, node, /* Free Data? */ false); } diff --git a/src/xpdev/netwrap.c b/src/xpdev/netwrap.c index 0d1635d1aa7c2eb9b206af7d3f2843be5afc6e5e..0e6fc757d7d3897f11170d11192d9dec0890125c 100644 --- a/src/xpdev/netwrap.c +++ b/src/xpdev/netwrap.c @@ -38,7 +38,7 @@ str_list_t getNameServerList(void) str_list_t list; if ((list = strListInit()) == NULL) - return(NULL); + return NULL; if ((fp = fopen("/etc/resolv.conf", "r")) != NULL) { while (!feof(fp)) { if (fgets(str, sizeof(str), fp) == NULL) @@ -54,7 +54,7 @@ str_list_t getNameServerList(void) } fclose(fp); } - return(list); + return list; #elif defined(_WIN32) FIXED_INFO* FixedInfo = NULL; @@ -63,7 +63,7 @@ str_list_t getNameServerList(void) str_list_t list; if ((list = strListInit()) == NULL) - return(NULL); + return NULL; if (GetNetworkParams(FixedInfo, &FixedInfoLen) == ERROR_BUFFER_OVERFLOW) { FixedInfo = (FIXED_INFO*)malloc(FixedInfoLen); if (GetNetworkParams(FixedInfo, &FixedInfoLen) == ERROR_SUCCESS) { @@ -74,7 +74,7 @@ str_list_t getNameServerList(void) if (FixedInfo != NULL) free(FixedInfo); } - return(list); + return list; #else #error "Need a get_nameserver() implementation for this platform" #endif diff --git a/src/xpdev/sdlfuncs.c b/src/xpdev/sdlfuncs.c index 65d95d632a06b6d52d8c358c6cb486689ae69e20..08efeb25abe32c0b21afd889002e76165b07f905 100644 --- a/src/xpdev/sdlfuncs.c +++ b/src/xpdev/sdlfuncs.c @@ -26,67 +26,67 @@ int xpbeep_load_sdl_funcs(struct sdlfuncs *sdlf) putenv("SDL_VIDEO_ALLOW_SCREENSAVER=1"); sdlf->gotfuncs = 0; if ((sdl_dll = xp_dlopen(libnames, RTLD_LAZY | RTLD_GLOBAL, SDL_PATCHLEVEL)) == NULL) - return(-1); + return -1; if ((sdlf->Init = xp_dlsym(sdl_dll, SDL_Init)) == NULL) { xp_dlclose(sdl_dll); - return(-1); + return -1; } if ((sdlf->Quit = xp_dlsym(sdl_dll, SDL_Quit)) == NULL) { xp_dlclose(sdl_dll); - return(-1); + return -1; } if ((sdlf->SemWait = xp_dlsym(sdl_dll, SDL_SemWait)) == NULL) { xp_dlclose(sdl_dll); - return(-1); + return -1; } if ((sdlf->SemPost = xp_dlsym(sdl_dll, SDL_SemPost)) == NULL) { xp_dlclose(sdl_dll); - return(-1); + return -1; } if ((sdlf->SDL_CreateSemaphore = xp_dlsym(sdl_dll, SDL_CreateSemaphore)) == NULL) { xp_dlclose(sdl_dll); - return(-1); + return -1; } if ((sdlf->SDL_DestroySemaphore = xp_dlsym(sdl_dll, SDL_DestroySemaphore)) == NULL) { xp_dlclose(sdl_dll); - return(-1); + return -1; } if ((sdlf->InitSubSystem = xp_dlsym(sdl_dll, SDL_InitSubSystem)) == NULL) { xp_dlclose(sdl_dll); - return(-1); + return -1; } if ((sdlf->QuitSubSystem = xp_dlsym(sdl_dll, SDL_QuitSubSystem)) == NULL) { xp_dlclose(sdl_dll); - return(-1); + return -1; } if ((sdlf->OpenAudio = xp_dlsym(sdl_dll, SDL_OpenAudio)) == NULL) { xp_dlclose(sdl_dll); - return(-1); + return -1; } if ((sdlf->CloseAudio = xp_dlsym(sdl_dll, SDL_CloseAudio)) == NULL) { xp_dlclose(sdl_dll); - return(-1); + return -1; } if ((sdlf->PauseAudio = xp_dlsym(sdl_dll, SDL_PauseAudio)) == NULL) { xp_dlclose(sdl_dll); - return(-1); + return -1; } if ((sdlf->LockAudio = xp_dlsym(sdl_dll, SDL_LockAudio)) == NULL) { xp_dlclose(sdl_dll); - return(-1); + return -1; } if ((sdlf->UnlockAudio = xp_dlsym(sdl_dll, SDL_UnlockAudio)) == NULL) { xp_dlclose(sdl_dll); - return(-1); + return -1; } if ((sdlf->GetAudioStatus = xp_dlsym(sdl_dll, SDL_GetAudioStatus)) == NULL) { xp_dlclose(sdl_dll); - return(-1); + return -1; } sdlf->gotfuncs = 1; sdl_funcs_loaded = 1; - return(0); + return 0; } int init_sdl_audio(void) @@ -99,13 +99,13 @@ int init_sdl_audio(void) if (xpbeep_sdl.Init(0) == 0) sdl_initialized = TRUE; else - return(-1); + return -1; } if (sdl_audio_initialized) - return(0); + return 0; if (xpbeep_sdl.InitSubSystem(SDL_INIT_AUDIO) == 0) { sdl_audio_initialized = TRUE; - return(0); + return 0; } - return(-1); + return -1; } diff --git a/src/xpdev/semfile.c b/src/xpdev/semfile.c index 85ba9ef9c9abc2d390d8c8106ef3968688306cdd..caafb3da498fe5e51231a6da347be67fcc5f86a0 100644 --- a/src/xpdev/semfile.c +++ b/src/xpdev/semfile.c @@ -46,10 +46,10 @@ bool semfile_check(time_t* t, const char* fname) *t = time(NULL); if ((ft = fdate(fname)) == -1 || ft <= *t) - return(false); + return false; *t = ft; - return(true); + return true; } /****************************************************************************/ @@ -67,7 +67,7 @@ char* semfile_list_check(time_t* t, str_list_t filelist) if (semfile_check(t, filelist[i])) signaled = filelist[i]; - return(signaled); + return signaled; } str_list_t semfile_list_init(const char* parent, @@ -79,7 +79,7 @@ str_list_t semfile_list_init(const char* parent, str_list_t list; if ((list = strListInit()) == NULL) - return(NULL); + return NULL; SAFEPRINTF2(path, "%s%s", parent, action); strListPush(&list, path); SAFEPRINTF3(path, "%s%s.%s", parent, action, service); @@ -99,7 +99,7 @@ str_list_t semfile_list_init(const char* parent, } } #endif - return(list); + return list; } void semfile_list_add(str_list_t* filelist, const char* path) @@ -124,7 +124,7 @@ bool semfile_signal(const char* fname, const char* text) text = hostname; #endif if ((file = open(fname, O_CREAT | O_WRONLY, DEFFILEMODE)) < 0) /* use sopen instead? */ - return(false); + return false; if (text != NULL) wrlen = write(file, text, textlen = strlen(text)); close(file); diff --git a/src/xpdev/semwrap.c b/src/xpdev/semwrap.c index 199f11b8b8527036282ec6476d0b47adb55590b6..807558aa4e5508c3638e7f3bab90d4e9a98d0655 100644 --- a/src/xpdev/semwrap.c +++ b/src/xpdev/semwrap.c @@ -95,7 +95,7 @@ int sem_getvalue(sem_t* psem, int* vp) else retval = -1; } - return(retval); + return retval; #endif } diff --git a/src/xpdev/sockwrap.c b/src/xpdev/sockwrap.c index 08f069a545645c7b5ce2ecc48e37ca2c924bf756..da292684de5c2ffc013e511ca1770dba97054d02 100644 --- a/src/xpdev/sockwrap.c +++ b/src/xpdev/sockwrap.c @@ -140,17 +140,17 @@ int getSocketOptionByName(const char* name, int* level) if (stricmp(name, socket_options[i].name) == 0) { if (level != NULL) *level = socket_options[i].level; - return(socket_options[i].value); + return socket_options[i].value; } } if (!IS_DIGIT(*name)) /* unknown option name */ - return(-1); - return(strtol(name, NULL, 0)); + return -1; + return strtol(name, NULL, 0); } socket_option_t* getSocketOptionList(void) { - return(socket_options); + return socket_options; } /* Return true if connected, optionally sets *rd_p to true if read data available */ @@ -197,7 +197,7 @@ bool socket_check(SOCKET sock, bool* rd_p, bool* wr_p, DWORD timeout) *wr_p = false; if (sock == INVALID_SOCKET) - return(false); + return false; pfd.fd = sock; pfd.events = POLLIN | POLLHUP; @@ -252,7 +252,7 @@ bool socket_check(SOCKET sock, bool* rd_p, bool* wr_p, DWORD timeout) *wr_p = false; if (sock == INVALID_SOCKET) - return(false); + return false; FD_ZERO(&rd_set); FD_SET(sock, &rd_set); @@ -270,15 +270,15 @@ bool socket_check(SOCKET sock, bool* rd_p, bool* wr_p, DWORD timeout) i = select(sock + 1, rd_set_p, wr_set_p, NULL, &tv); if (i == SOCKET_ERROR) - return(false); + return false; if (i == 0) - return(true); + return true; if (wr_p != NULL && FD_ISSET(sock, wr_set_p)) { *wr_p = true; if (i == 1) - return(true); + return true; } if (rd_p != NULL || wr_p == NULL) { @@ -287,11 +287,11 @@ bool socket_check(SOCKET sock, bool* rd_p, bool* wr_p, DWORD timeout) || (rd == SOCKET_ERROR && SOCKET_ERRNO == EMSGSIZE)) { if (rd_p != NULL) *rd_p = true; - return(true); + return true; } } - return(false); + return false; #endif } @@ -465,7 +465,7 @@ int retry_bind(SOCKET s, const struct sockaddr *addr, socklen_t addrlen SLEEP(wait_secs * 1000); } } - return(result); + return result; } int nonblocking_connect(SOCKET sock, struct sockaddr* addr, size_t size, unsigned timeout) diff --git a/src/xpdev/str_list.c b/src/xpdev/str_list.c index 81b526f489046d633f2fd935697170f9ec28eb2c..a6bb11ea68e25ce6277ea1487a1ae282b2a9b0e9 100644 --- a/src/xpdev/str_list.c +++ b/src/xpdev/str_list.c @@ -30,10 +30,10 @@ str_list_t strListInit(void) str_list_t list; if ((list = (str_list_t)malloc(sizeof(char*))) == NULL) - return(NULL); + return NULL; list[0] = NULL; /* terminated by default */ - return(list); + return list; } size_t strListCount(const str_list_t list) @@ -42,7 +42,7 @@ size_t strListCount(const str_list_t list) COUNT_LIST_ITEMS(list, i); - return(i); + return i; } bool strListIsEmpty(const str_list_t list) @@ -90,13 +90,13 @@ static char* str_list_append(str_list_t* list, char* str, size_t index) str_list_t lp; if ((lp = (str_list_t)realloc(*list, sizeof(char*) * (index + 2))) == NULL) - return(NULL); + return NULL; *list = lp; lp[index++] = str; lp[index] = NULL; /* terminate list */ - return(str); + return str; } static char* str_list_insert(str_list_t* list, char* str, size_t index) @@ -109,18 +109,18 @@ static char* str_list_insert(str_list_t* list, char* str, size_t index) *list = strListInit(); count = strListCount(*list); if (index > count) /* invalid index, do nothing */ - return(NULL); + return NULL; count++; if ((lp = (str_list_t)realloc(*list, sizeof(char*) * (count + 1))) == NULL) - return(NULL); + return NULL; *list = lp; for (i = count; i > index; i--) lp[i] = lp[i - 1]; lp[index] = str; - return(str); + return str; } char* strListRemove(str_list_t* list, size_t index) @@ -136,11 +136,11 @@ char* strListRemove(str_list_t* list, size_t index) index = count - 1; if (index >= count) /* invalid index, do nothing */ - return(NULL); + return NULL; count--; if ((lp = (str_list_t)realloc(*list, sizeof(char*) * (count + 1))) == NULL) - return(NULL); + return NULL; *list = lp; str = lp[index]; @@ -148,7 +148,7 @@ char* strListRemove(str_list_t* list, size_t index) lp[i] = lp[i + 1]; lp[count] = NULL; - return(str); + return str; } // Remove without realloc @@ -176,11 +176,11 @@ bool strListDelete(str_list_t* list, size_t index) char* str; if ((str = strListRemove(list, index)) == NULL) - return(false); + return false; free(str); - return(true); + return true; } bool strListFastDelete(str_list_t list, size_t index, size_t count) @@ -212,7 +212,7 @@ char* strListReplace(const str_list_t list, size_t index, const char* str) size_t count; if (str == NULL) - return(NULL); + return NULL; count = strListCount(list); @@ -220,15 +220,15 @@ char* strListReplace(const str_list_t list, size_t index, const char* str) index = count - 1; if (index >= count) /* invalid index, do nothing */ - return(NULL); + return NULL; if ((buf = (char*)realloc(list[index], strlen(str) + 1)) == NULL) - return(NULL); + return NULL; list[index] = buf; strcpy(buf, str); - return(buf); + return buf; } size_t strListModifyEach(const str_list_t list, char*(modify(size_t, char*, void*)), void* cbdata) @@ -263,13 +263,13 @@ bool strListSwap(const str_list_t list, size_t index1, size_t index2) index2 = count - 1; if (index1 >= count || index2 >= count || index1 == index2) - return(false); /* invalid index, do nothing */ + return false; /* invalid index, do nothing */ tmp = list[index1]; list[index1] = list[index2]; list[index2] = tmp; - return(true); + return true; } char* strListAnnex(str_list_t* list, const char* str, size_t index) @@ -292,10 +292,10 @@ char* strListAppend(str_list_t* list, const char* str, size_t index) char *ret; if (str == NULL) - return(NULL); + return NULL; if ((buf = strdup(str)) == NULL) - return(NULL); + return NULL; if (index == STR_LIST_LAST_INDEX) index = strListCount(*list); @@ -315,7 +315,7 @@ size_t strListAppendList(str_list_t* list, const str_list_t add_list) for (i = 0; add_list != NULL && add_list[i] != NULL; i++) strListAppend(list, add_list[i], count++); - return(count); + return count; } #if !defined(__BORLANDC__) // Doesn't have asprintf() or va_copy()_vscprintf() @@ -346,10 +346,10 @@ char* strListInsert(str_list_t* list, const char* str, size_t index) char* ret; if (str == NULL) - return(NULL); + return NULL; if ((buf = strdup(str)) == NULL) - return(NULL); + return NULL; ret = str_list_insert(list, buf, index); if (ret == NULL) @@ -368,7 +368,7 @@ size_t strListInsertList(str_list_t* list, const str_list_t add_list, size_t ind if (strListInsert(list, add_list[i], index++) == NULL) break; - return(i); + return i; } #if !defined(__BORLANDC__) // Doesn't have asprintf() or va_copy()_vscprintf() @@ -402,11 +402,11 @@ str_list_t strListSplit(str_list_t* lp, char* str, const char* delimit) str_list_t list; if (str == NULL || delimit == NULL) - return(NULL); + return NULL; if (lp == NULL) { if ((list = strListInit()) == NULL) - return(NULL); + return NULL; lp = &list; count = 0; } else @@ -416,7 +416,7 @@ str_list_t strListSplit(str_list_t* lp, char* str, const char* delimit) if (strListAppend(lp, token, count++) == NULL) break; - return(*lp); + return *lp; } str_list_t strListSplitCopy(str_list_t* list, const char* str, const char* delimit) @@ -425,10 +425,10 @@ str_list_t strListSplitCopy(str_list_t* list, const char* str, const char* delim str_list_t new_list; if (str == NULL || delimit == NULL) - return(NULL); + return NULL; if ((buf = strdup(str)) == NULL) - return(NULL); + return NULL; new_list = strListSplit(list, buf, delimit); @@ -437,7 +437,7 @@ str_list_t strListSplitCopy(str_list_t* list, const char* str, const char* delim if (list != NULL) *list = new_list; - return(new_list); + return new_list; } // Consecutive delimiters are treated as multiple (empty strings are supported) @@ -484,7 +484,7 @@ size_t strListMerge(str_list_t* list, str_list_t add_list) for (i = 0; add_list[i] != NULL; i++) str_list_append(list, add_list[i], count++); - return(i); + return i; } char* strListCombine(str_list_t list, char* buf, size_t maxlen, const char* delimit) @@ -494,11 +494,11 @@ char* strListCombine(str_list_t list, char* buf, size_t maxlen, const char* deli char* ptr; if (maxlen < 1) - return(NULL); + return NULL; if (buf == NULL) if ((buf = (char*)malloc(maxlen)) == NULL) - return(NULL); + return NULL; memset(buf, 0, maxlen); if (list == NULL) @@ -508,7 +508,7 @@ char* strListCombine(str_list_t list, char* buf, size_t maxlen, const char* deli for (i = 0, ptr = buf; list[i] != NULL && buf < end; i++) ptr += safe_snprintf(ptr, end - ptr, "%s%s", i ? delimit:"", list[i]); - return(buf); + return buf; } #if defined(_WIN32) @@ -652,7 +652,7 @@ str_list_t strListReadFile(FILE* fp, str_list_t* lp, size_t max_line_len) if (lp == NULL) { if ((list = strListInit()) == NULL) - return(NULL); + return NULL; lp = &list; } @@ -675,7 +675,7 @@ str_list_t strListReadFile(FILE* fp, str_list_t* lp, size_t max_line_len) } free(buf); - return(*lp); + return *lp; } size_t strListInsertFile(FILE* fp, str_list_t* lp, size_t index, size_t max_line_len) @@ -684,13 +684,13 @@ size_t strListInsertFile(FILE* fp, str_list_t* lp, size_t index, size_t max_line size_t count; if ((list = strListReadFile(fp, NULL, max_line_len)) == NULL) - return(0); + return 0; count = strListInsertList(lp, list, index); strListFree(&list); - return(count); + return count; } size_t strListWriteFile(FILE* fp, const str_list_t list, const char* separator) @@ -698,7 +698,7 @@ size_t strListWriteFile(FILE* fp, const str_list_t list, const char* separator) size_t i; if (list == NULL) - return(0); + return 0; for (i = 0; list[i] != NULL; i++) { if (fputs(list[i], fp) == EOF) @@ -707,7 +707,7 @@ size_t strListWriteFile(FILE* fp, const str_list_t list, const char* separator) break; } - return(i); + return i; } char* strListJoin(const str_list_t list, char* buf, size_t buflen, const char* separator) @@ -742,7 +742,7 @@ size_t strListBlockLength(char* block) size_t block_len = 0; if (block == NULL) - return(0); + return 0; /* calculate total block length */ while ((str_len = strlen(p)) != 0) { @@ -754,7 +754,7 @@ size_t strListBlockLength(char* block) block_len = 1; block_len++; - return(block_len); + return block_len; } char* strListCopyBlock(char* block) @@ -763,12 +763,12 @@ char* strListCopyBlock(char* block) size_t block_len; if ((block_len = strListBlockLength(block)) == 0) - return(NULL); + return NULL; if ((p = (char*)malloc(block_len)) == NULL) - return(NULL); + return NULL; memcpy(p, block, block_len); - return(p); + return p; } char* strListAppendBlock(char* block, str_list_t list) @@ -787,7 +787,7 @@ char* strListAppendBlock(char* block, str_list_t list) continue; /* can't include empty strings in block */ if ((p = (char*)realloc(block, block_len + str_len + 1)) == NULL) { FREE_AND_NULL(block); - return(block); + return block; } block = p; strcpy(block + block_len, list[i]); @@ -800,17 +800,17 @@ char* strListAppendBlock(char* block, str_list_t list) block_len++; if ((p = (char*)realloc(block, block_len)) == NULL) { FREE_AND_NULL(block); - return(block); + return block; } block = p; memset(block + (block_len - 2), 0, 2); - return(block); + return block; } char* strListCreateBlock(str_list_t list) { - return(strListAppendBlock(NULL, list)); + return strListAppendBlock(NULL, list); } void strListFreeBlock(char* block) @@ -823,7 +823,7 @@ int strListTruncateTrailingWhitespaces(str_list_t list) size_t i; if (list == NULL) - return(0); + return 0; for (i = 0; list[i] != NULL; i++) { truncsp(list[i]); @@ -836,7 +836,7 @@ int strListTruncateTrailingLineEndings(str_list_t list) size_t i; if (list == NULL) - return(0); + return 0; for (i = 0; list[i] != NULL; i++) { truncnl(list[i]); @@ -851,7 +851,7 @@ int strListTruncateStrings(str_list_t list, const char* set) char* p; if (list == NULL) - return(0); + return 0; for (i = 0; list[i] != NULL; i++) { p = strpbrk(list[i], set); diff --git a/src/xpdev/strwrap.c b/src/xpdev/strwrap.c index f1779ab61f0aa170ce37158939b234fae9cb9fff..1463f014d7735d41411364ba0c31b2e560343e6a 100644 --- a/src/xpdev/strwrap.c +++ b/src/xpdev/strwrap.c @@ -19,7 +19,7 @@ char* itoa(int val, char* str, int radix) sprintf(str, "bad radix: %d", radix); break; } - return(str); + return str; } char* ltoa(long val, char* str, int radix) @@ -38,7 +38,7 @@ char* ltoa(long val, char* str, int radix) sprintf(str, "bad radix: %d", radix); break; } - return(str); + return str; } #endif @@ -53,7 +53,7 @@ strnlen(const char *s, size_t maxlen) if (!*s) break; } - return (len); + return len; } #endif diff --git a/src/xpdev/threadwrap.c b/src/xpdev/threadwrap.c index b42370660789702319f0c90b19c445e73e00e0d1..9bbd7bb4e2b7d740ead16b6fde53c26ac1057956 100644 --- a/src/xpdev/threadwrap.c +++ b/src/xpdev/threadwrap.c @@ -72,11 +72,11 @@ ulong _beginthread(void (*start_address)( void * ) , (void * (*)(void *)) start_address , arglist) == 0) { pthread_attr_destroy(&attr); - return((ulong) thread /* thread handle */); + return (ulong) thread /* thread handle */; } pthread_attr_destroy(&attr); - return(-1); /* error */ + return -1; /* error */ } #else @@ -113,7 +113,7 @@ bool pthread_mutex_init_np(pthread_mutex_t *mutex, bool recursive) (void)recursive; pthread_mutex_init(mutex, NULL); #endif - return(true); + return true; } /****************************************************************************/ @@ -136,7 +136,7 @@ pthread_mutex_t pthread_mutex_initializer_np(bool recursive) (void)recursive; pthread_mutex_init(&mutex, NULL); #endif - return(mutex); + return mutex; } #if !defined(_POSIX_THREADS) @@ -168,7 +168,7 @@ int pthread_mutex_init(pthread_mutex_t* mutex, void* attr) { (void)attr; #if defined(PTHREAD_MUTEX_AS_WIN32_MUTEX) - return ((((*mutex) = CreateMutex(/* security */ NULL, /* owned */ FALSE, /* name */ NULL)) == NULL) ? -1 : 0); + return (((*mutex) = CreateMutex(/* security */ NULL, /* owned */ FALSE, /* name */ NULL)) == NULL) ? -1 : 0; #elif defined(_WIN32) /* Win32 Critical Section */ InitializeCriticalSection(mutex); return 0; /* No error */ @@ -180,7 +180,7 @@ int pthread_mutex_init(pthread_mutex_t* mutex, void* attr) int pthread_mutex_lock(pthread_mutex_t* mutex) { #if defined(PTHREAD_MUTEX_AS_WIN32_MUTEX) - return (WaitForSingleObject(*mutex, INFINITE) == WAIT_OBJECT_0 ? 0 : EBUSY); + return WaitForSingleObject(*mutex, INFINITE) == WAIT_OBJECT_0 ? 0 : EBUSY; #elif defined(_WIN32) /* Win32 Critical Section */ EnterCriticalSection(mutex); return 0; /* No error */ @@ -192,10 +192,10 @@ int pthread_mutex_lock(pthread_mutex_t* mutex) int pthread_mutex_trylock(pthread_mutex_t* mutex) { #if defined(PTHREAD_MUTEX_AS_WIN32_MUTEX) - return (WaitForSingleObject(*mutex, 0) == WAIT_OBJECT_0 ? 0 : EBUSY); + return WaitForSingleObject(*mutex, 0) == WAIT_OBJECT_0 ? 0 : EBUSY; #elif defined(_WIN32) /* Win32 Critical Section */ /* TryEnterCriticalSection only available on NT4+ :-( */ - return (TryEnterCriticalSection(mutex) ? 0 : EBUSY); + return TryEnterCriticalSection(mutex) ? 0 : EBUSY; #elif defined(__OS2__) return DosRequestMutexSem(*mutex, 0 /* SEM_IMMEDIATE_RETURN */); #endif @@ -204,7 +204,7 @@ int pthread_mutex_trylock(pthread_mutex_t* mutex) int pthread_mutex_unlock(pthread_mutex_t* mutex) { #if defined(PTHREAD_MUTEX_AS_WIN32_MUTEX) - return (ReleaseMutex(*mutex) ? 0 : GetLastError()); + return ReleaseMutex(*mutex) ? 0 : GetLastError(); #elif defined(_WIN32) /* Win32 Critical Section */ LeaveCriticalSection(mutex); return 0; /* No error */ @@ -216,7 +216,7 @@ int pthread_mutex_unlock(pthread_mutex_t* mutex) int pthread_mutex_destroy(pthread_mutex_t* mutex) { #if defined(PTHREAD_MUTEX_AS_WIN32_MUTEX) - return (CloseHandle(*mutex) ? 0 : GetLastError()); + return CloseHandle(*mutex) ? 0 : GetLastError(); #elif defined(_WIN32) /* Win32 Critical Section */ DeleteCriticalSection(mutex); return 0; /* No error */ diff --git a/src/xpdev/wraptest.c b/src/xpdev/wraptest.c index 926634ec31234f6628b6174c0db3925b70456747..5d6acaae28fcd7268c2f94d08efb1f8b67ce989b 100644 --- a/src/xpdev/wraptest.c +++ b/src/xpdev/wraptest.c @@ -109,7 +109,7 @@ int main() printf("\nsopen() test\n"); if ((fd = sopen(LOCK_FNAME, O_RDWR | O_CREAT, SH_DENYRW, S_IREAD | S_IWRITE)) == -1) { perror(LOCK_FNAME); - return(errno); + return errno; } printf("%s is opened with an exclusive (read/write) lock\n", LOCK_FNAME); getkey(); @@ -127,7 +127,7 @@ int main() printf("\nlock() test\n"); if ((fd = sopen(LOCK_FNAME, O_RDWR | O_CREAT, SH_DENYNO, S_IREAD | S_IWRITE)) == -1) { perror(LOCK_FNAME); - return(errno); + return errno; } write(fd, "lock testing\n", LOCK_LEN); if (lock(fd, LOCK_OFFSET, LOCK_LEN) == 0) diff --git a/src/xpdev/xp_dl.c b/src/xpdev/xp_dl.c index b4c6fdc34a2cfd5361ebbb39dbacb1a5378154a8..85c8a746b39c6f1320d61da0e409631bb987a6b1 100644 --- a/src/xpdev/xp_dl.c +++ b/src/xpdev/xp_dl.c @@ -17,46 +17,46 @@ DLLEXPORT dll_handle xp_dlopen(const char **names, int mode, int major) /* Try for version match */ sprintf(fname, "lib%s.so.%d", name, major); if ((ret = dlopen(fname, mode)) != NULL) - return(ret); + return ret; /* Try for name match */ sprintf(fname, "lib%s.so", name); if ((ret = dlopen(fname, mode)) != NULL) - return(ret); + return ret; /* Try for name match without the prefix */ sprintf(fname, "%s.so", name); if ((ret = dlopen(fname, mode)) != NULL) - return(ret); + return ret; /* Try all previous major versions */ for (i = major - 1; i >= 0; i--) { sprintf(fname, "lib%s.so.%d", name, i); if ((ret = dlopen(fname, mode)) != NULL) - return(ret); + return ret; } #if defined(__APPLE__) && defined(__MACH__) /* Try for version match */ sprintf(fname, "lib%s.%d.dylib", name, major); if ((ret = dlopen(fname, mode)) != NULL) - return(ret); + return ret; /* Try for name match */ sprintf(fname, "lib%s.dylib", name); if ((ret = dlopen(fname, mode)) != NULL) - return(ret); + return ret; /* Try all previous major versions */ for (i = major - 1; i >= 0; i--) { sprintf(fname, "lib%s.%d.dylib", name, i); if ((ret = dlopen(fname, mode)) != NULL) - return(ret); + return ret; } #endif /* OS X */ } - return(NULL); + return NULL; } #elif defined(_WIN32) DLLEXPORT dll_handle xp_dlopen(const char **names, int mode, int major) @@ -69,9 +69,9 @@ DLLEXPORT dll_handle xp_dlopen(const char **names, int mode, int major) for (; *names && (*names)[0]; names++) { sprintf(fname, "%s.dll", *names); if ((ret = LoadLibrary(fname)) != NULL) - return(ret); + return ret; } - return(NULL); + return NULL; } #endif /* __unix__,_WIN32 */ diff --git a/src/xpdev/xp_syslog.c b/src/xpdev/xp_syslog.c index da9e5488a620a22bbf872241bf9aeb6c75d96a37..913f6007b35f002781e0e3234a6687f7e3517f96 100644 --- a/src/xpdev/xp_syslog.c +++ b/src/xpdev/xp_syslog.c @@ -31,7 +31,7 @@ static in_addr_t resolve_ip(char *addr) if (*p != '.' && !isdigit(*p)) break; if (!(*p)) - return(inet_addr(addr)); + return inet_addr(addr); if ((host = gethostbyname(addr)) == NULL) return INADDR_NONE; if (host->h_addr_list == NULL) diff --git a/src/xpdev/xpbeep.c b/src/xpdev/xpbeep.c index 910c0fdd6913f8766811b3a06e13750ce2d064e3..330e4060a4070f7784b72ec157e3b6f0cbe42a90 100644 --- a/src/xpdev/xpbeep.c +++ b/src/xpdev/xpbeep.c @@ -346,8 +346,8 @@ static int portaudio_callback(void *inputBuffer portaudio_buf_pos += copylen; } if (portaudio_buf_pos >= portaudio_buf_len) - return(1); - return(0); + return 1; + return 0; } #endif @@ -398,7 +398,7 @@ xptone_open_locked(void) if (handle_type != SOUND_DEVICE_CLOSED) { handle_rc++; - return(true); + return true; } #ifdef WITH_PULSEAUDIO @@ -437,7 +437,7 @@ xptone_open_locked(void) handle_type = SOUND_DEVICE_CLOSED; } else { - return(true); + return true; } } } @@ -504,7 +504,7 @@ xptone_open_locked(void) else { handle_type = SOUND_DEVICE_PORTAUDIO; handle_rc++; - return(true); + return true; } } } @@ -534,7 +534,7 @@ xptone_open_locked(void) xpbeep_sdl.PauseAudio(false); handle_type = SOUND_DEVICE_SDL; handle_rc++; - return(true); + return true; } } } @@ -552,14 +552,14 @@ xptone_open_locked(void) if (!sound_device_open_failed && waveOutOpen(&waveOut, WAVE_MAPPER, &w, 0, 0, 0) != MMSYSERR_NOERROR) sound_device_open_failed = true; if (sound_device_open_failed) - return(false); + return false; memset(&wh, 0, sizeof(wh)); wh[0].dwBufferLength = S_RATE * 15 / 2 + 1; wh[1].dwBufferLength = S_RATE * 15 / 2 + 1; handle_type = SOUND_DEVICE_WIN32; if (!sound_device_open_failed) { handle_rc++; - return(true); + return true; } } #endif @@ -616,7 +616,7 @@ xptone_open_locked(void) alsa_api->snd_pcm_hw_params_free(hw_params); handle_type = SOUND_DEVICE_ALSA; handle_rc++; - return(true); + return true; } } } @@ -644,16 +644,16 @@ xptone_open_locked(void) } } if (sound_device_open_failed) { - return(false); + return false; } handle_type = SOUND_DEVICE_OSS; if (!sound_device_open_failed) { handle_rc++; - return(true); + return true; } #endif - return(false); + return false; } bool @@ -807,7 +807,7 @@ bool xptone_close_locked(void) pulseaudio_device_open_failed = false; #endif - return(true); + return true; } bool @@ -1126,7 +1126,7 @@ bool xp_play_sample(unsigned char *sample, size_t size, bool background) pthread_mutex_lock(&sample_mutex); ret = xp_play_sample_locked(sample, size, background); pthread_mutex_unlock(&sample_mutex); - return(ret); + return ret; } #else bool xp_play_sample(unsigned char *sample, size_t sample_size, bool background) @@ -1138,13 +1138,13 @@ bool xp_play_sample(unsigned char *sample, size_t sample_size, bool background) if (handle_type == SOUND_DEVICE_CLOSED) { must_close = true; if (!xptone_open()) - return(false); + return false; } ret = do_xp_play_sample(sample, sample_size, NULL); if (must_close) xptone_close(); - return(ret); + return ret; } #endif diff --git a/src/xpdev/xpdatetime.c b/src/xpdev/xpdatetime.c index 7f19092b8e52577568ddc769615beabacfabb539..8084ff476744a841fef6484df016b2fb5bea2c24 100644 --- a/src/xpdev/xpdatetime.c +++ b/src/xpdev/xpdatetime.c @@ -50,9 +50,9 @@ xpDateTime_t xpDateTime_now(void) SYSTEMTIME systime; GetLocalTime(&systime); - return(xpDateTime_create(systime.wYear, systime.wMonth, systime.wDay + return xpDateTime_create(systime.wYear, systime.wMonth, systime.wDay , systime.wHour, systime.wMinute, (float)systime.wSecond + (systime.wMilliseconds * 0.001F) - , xpTimeZone_local())); + , xpTimeZone_local()); #else /* !Win32 (e.g. Unix) */ struct tm tm; struct timeval tv; @@ -76,7 +76,7 @@ xpTimeZone_t xpTimeZone_local(void) time_t t = time(NULL); localtime_r(&t, &tm); - return(tm.tm_gmtoff / 60); + return tm.tm_gmtoff / 60; #elif defined(_WIN32) TIME_ZONE_INFORMATION tz; DWORD tzRet; @@ -116,7 +116,7 @@ time_t xpDateTime_to_time(xpDateTime_t xpDateTime) ZERO_VAR(tm); if (xpDateTime.date.year == 0) - return(INVALID_TIME); + return INVALID_TIME; tm.tm_year = xpDateTime.date.year; tm.tm_mon = xpDateTime.date.month; @@ -148,7 +148,7 @@ xpDateTime_t time_to_xpDateTime(time_t ti, xpTimeZone_t zone) ZERO_VAR(never); ZERO_VAR(tm); if (localtime_r(&ti, &tm) == NULL) - return(never); + return never; return xpDateTime_create(1900 + tm.tm_year, 1 + tm.tm_mon, tm.tm_mday , tm.tm_hour, tm.tm_min, (float)tm.tm_sec @@ -177,7 +177,7 @@ xpDateTime_t gmtime_to_xpDateTime(time_t ti) ZERO_VAR(never); ZERO_VAR(tm); if (gmtime_r(&ti, &tm) == NULL) - return(never); + return never; return xpDateTime_create(1900 + tm.tm_year, 1 + tm.tm_mon, tm.tm_mday , tm.tm_hour, tm.tm_min, (float)tm.tm_sec @@ -194,7 +194,7 @@ isoDate_t xpDateTime_to_isoDateTime(xpDateTime_t xpDateTime, isoTime_t* isoTime) *isoTime = 0; if (xpDateTime.date.year == 0) - return(0); + return 0; if (isoTime != NULL) *isoTime = isoTime_create(xpDateTime.time.hour, xpDateTime.time.minute, xpDateTime.time.second); @@ -217,7 +217,7 @@ isoDate_t time_to_isoDateTime(time_t ti, isoTime_t* isoTime) ZERO_VAR(tm); if (localtime_r(&ti, &tm) == NULL) - return(0); + return 0; if (isoTime != NULL) *isoTime = isoTime_create(tm.tm_hour, tm.tm_min, tm.tm_sec); @@ -243,7 +243,7 @@ isoDate_t gmtime_to_isoDateTime(time_t ti, isoTime_t* isoTime) ZERO_VAR(tm); if (gmtime_r(&ti, &tm) == NULL) - return(0); + return 0; if (isoTime != NULL) *isoTime = isoTime_create(tm.tm_hour, tm.tm_min, tm.tm_sec); @@ -267,7 +267,7 @@ time_t isoDateTime_to_time(isoDate_t date, isoTime_t ti) ZERO_VAR(tm); if (date == 0) - return(INVALID_TIME); + return INVALID_TIME; tm.tm_year = isoDate_year(date); tm.tm_mon = isoDate_month(date); diff --git a/src/xpdev/xpevent.c b/src/xpdev/xpevent.c index caf4c1a14d0c17a928bbfdfc844f662fccb99a5e..888d32dad4efe88c213bdc8660cf4d773676d596 100644 --- a/src/xpdev/xpevent.c +++ b/src/xpdev/xpevent.c @@ -32,7 +32,7 @@ CreateEvent(void *sec, BOOL bManualReset, BOOL bInitialState, const char *name) event = (xpevent_t)malloc(sizeof(struct xpevent)); if (event == NULL) { errno = ENOSPC; - return(NULL); + return NULL; } memset(event, 0, sizeof(struct xpevent)); @@ -42,7 +42,7 @@ CreateEvent(void *sec, BOOL bManualReset, BOOL bInitialState, const char *name) if (pthread_mutex_init(&event->lock, NULL) != 0) { free(event); errno = ENOSPC; - return(NULL); + return NULL; } if (pthread_cond_init(&event->gtzero, NULL) != 0) { @@ -50,7 +50,7 @@ CreateEvent(void *sec, BOOL bManualReset, BOOL bInitialState, const char *name) SLEEP(1); free(event); errno = ENOSPC; - return(NULL); + return NULL; } event->mreset = bManualReset; @@ -58,7 +58,7 @@ CreateEvent(void *sec, BOOL bManualReset, BOOL bInitialState, const char *name) event->nwaiters = 0; event->magic = EVENT_MAGIC; - return(event); + return event; } BOOL @@ -66,7 +66,7 @@ SetEvent(xpevent_t event) { if (event == NULL || (event->magic != EVENT_MAGIC)) { errno = EINVAL; - return(FALSE); + return FALSE; } pthread_mutex_lock(&event->lock); @@ -84,7 +84,7 @@ SetEvent(xpevent_t event) pthread_mutex_unlock(&event->lock); - return(TRUE); + return TRUE; } BOOL @@ -92,7 +92,7 @@ ResetEvent(xpevent_t event) { if (event == NULL || (event->magic != EVENT_MAGIC)) { errno = EINVAL; - return(FALSE); + return FALSE; } pthread_mutex_lock(&event->lock); @@ -101,7 +101,7 @@ ResetEvent(xpevent_t event) pthread_mutex_unlock(&event->lock); - return(TRUE); + return TRUE; } BOOL @@ -109,7 +109,7 @@ CloseEvent(xpevent_t event) { if (event == NULL || (event->magic != EVENT_MAGIC)) { errno = EINVAL; - return(FALSE); + return FALSE; } /* Make sure there are no waiters. */ @@ -117,7 +117,7 @@ CloseEvent(xpevent_t event) if (event->nwaiters > 0) { pthread_mutex_unlock(&event->lock); errno = EBUSY; - return(FALSE); + return FALSE; } pthread_mutex_unlock(&event->lock); @@ -130,7 +130,7 @@ CloseEvent(xpevent_t event) free(event); - return(TRUE); + return TRUE; } DWORD @@ -142,7 +142,7 @@ WaitForEvent(xpevent_t event, DWORD ms) if (event == NULL || (event->magic != EVENT_MAGIC)) { errno = EINVAL; - return(WAIT_FAILED); + return WAIT_FAILED; } if (ms && ms != INFINITE) { diff --git a/src/xpdev/xpprintf.c b/src/xpdev/xpprintf.c index 21aea370f932eddd5b88ff8543392cf038587313..85a3005f3f157647c0c087f6d70671f0eff56216 100644 --- a/src/xpdev/xpprintf.c +++ b/src/xpdev/xpprintf.c @@ -105,10 +105,10 @@ int xp_printf_get_next(char *format) long l; if (!*(size_t *)format) - return (-1); + return -1; char * p = format + *(size_t *)format; if (*p != '%') - return(-1); + return -1; p++; while (j) { @@ -159,10 +159,10 @@ int xp_printf_get_type(const char *format) int correct_type = 0; if (!*(size_t *)format) - return(0); + return 0; p = format + *(size_t *)format; if (*p != '%') - return(0); + return 0; p++; /* @@ -230,13 +230,13 @@ int xp_printf_get_type(const char *format) } } if (*p == '*') - return(XP_PRINTF_TYPE_INT); + return XP_PRINTF_TYPE_INT; while (*p >= '0' && *p <= '9') p++; if (*p == '.') { p++; if (*p == '*') - return(XP_PRINTF_TYPE_INT); + return XP_PRINTF_TYPE_INT; } while (*p >= '0' && *p <= '9') p++; @@ -394,7 +394,7 @@ int xp_printf_get_type(const char *format) correct_type = XP_PRINTF_TYPE_VOIDP; break; } - return(correct_type); + return correct_type; } /* @@ -421,7 +421,7 @@ find_next_replacement(char *format) *(size_t *)format = 0; else *(size_t *)format = p - format; - return (format); + return format; } /* @@ -467,7 +467,7 @@ char* xp_asprintf_next(char *format, int type, ...) * Check if we're already done... */ if (!*(size_t *) format) - return(format); + return format; p = format + *(size_t *)format; offset = p - format; @@ -560,7 +560,7 @@ char* xp_asprintf_next(char *format, int type, ...) newbuf = (char *)realloc(format, format_len + i - 1 /* -1 for the '*' that's already there */); if (newbuf == NULL) { free(format); - return(NULL); + return NULL; } format = newbuf; p = format + offset2; @@ -576,7 +576,7 @@ char* xp_asprintf_next(char *format, int type, ...) *p = int_buf[0]; p = format + offset; *(size_t *)format = p - format; - return(format); + return format; } /* Skip width */ while (*p >= '0' && *p <= '9') @@ -601,7 +601,7 @@ char* xp_asprintf_next(char *format, int type, ...) newbuf = (char *)realloc(format, format_len + i - 1 /* -1 for the '*' that's already there */); if (newbuf == NULL) { free(format); - return(NULL); + return NULL; } format = newbuf; p = format + offset2; @@ -617,7 +617,7 @@ char* xp_asprintf_next(char *format, int type, ...) *p = int_buf[0]; p = format + offset; *(size_t *)format = p - format; - return(format); + return format; } /* Skip precision */ while (*p >= '0' && *p <= '9') @@ -1378,7 +1378,7 @@ char* xp_asprintf_next(char *format, int type, ...) if (newbuf == NULL) { FREE_AND_NULL(entry); free(format); - return(NULL); + return NULL; } format = newbuf; } @@ -1410,7 +1410,7 @@ char* xp_asprintf_next(char *format, int type, ...) *(size_t *)format = 0; else *(size_t *)format = p - format; - return(format); + return format; } char* xp_asprintf_start(const char *format) @@ -1420,7 +1420,7 @@ char* xp_asprintf_start(const char *format) ret = (char *)malloc(strlen(format) + 1 + ((sizeof(size_t) * 2))); if (ret == NULL) - return(NULL); + return NULL; /* Place current offset at the start of the buffer */ strcpy(ret + sizeof(size_t) * 2, format); /* Place the current length after the offset */ @@ -1441,7 +1441,7 @@ char* xp_asprintf_start(const char *format) *(size_t *)ret = 0; else *(size_t *)ret = p - ret; - return(ret); + return ret; } char* xp_asprintf_end(char *format, size_t *lenret) @@ -1461,7 +1461,7 @@ char* xp_asprintf_end(char *format, size_t *lenret) memmove(format, format + sizeof(size_t) * 2, end_len + 1); if (lenret) *lenret = end_len; - return(format); + return format; } static struct arg_table_entry * @@ -1475,13 +1475,13 @@ build_arg_table(const char *format, va_list va) // First, count arguments... next = xp_asprintf_start(format); if (next == NULL) - return(NULL); + return NULL; unsigned curpos = 0; while (*(size_t *)next) { int newpos = xp_printf_get_next(next); if (newpos == -1) { free(next); - return(NULL); + return NULL; } if (newpos > 0 && newpos != (curpos + 1)) curpos = newpos; @@ -1502,7 +1502,7 @@ build_arg_table(const char *format, va_list va) next = xp_asprintf_start(format); if (next == NULL) { free(ret); - return(NULL); + return NULL; } curpos = 0; while (*(size_t *)next) { @@ -1510,7 +1510,7 @@ build_arg_table(const char *format, va_list va) if (newpos == -1) { free(next); free(ret); - return(NULL); + return NULL; } if (newpos > 0 && newpos != (curpos + 1)) curpos = newpos; @@ -1587,7 +1587,7 @@ char* xp_vasprintf(const char *format, va_list va) next = xp_asprintf_start(format); if (next == NULL) - return(NULL); + return NULL; working = next; va_copy(wva, va); curpos = 1; @@ -1597,7 +1597,7 @@ char* xp_vasprintf(const char *format, va_list va) if (newpos == -1) { va_end(wva); free(working); - return(NULL); + return NULL; } if (newpos > 0 && newpos != curpos) { va_end(wva); @@ -1616,7 +1616,7 @@ char* xp_vasprintf(const char *format, va_list va) case 0: va_end(wva); free(working); - return(NULL); + return NULL; case XP_PRINTF_TYPE_CHAR: case XP_PRINTF_TYPE_INT: /* Also includes char and short */ next = xp_asprintf_next(working, type, va_arg(wva, int)); @@ -1657,7 +1657,7 @@ char* xp_vasprintf(const char *format, va_list va) if (newpos == -1) { free(atable); free(working); - return(NULL); + return NULL; } if (newpos > 0 && newpos != curpos) curpos = newpos; @@ -1669,7 +1669,7 @@ char* xp_vasprintf(const char *format, va_list va) case 0: free(atable); free(working); - return(NULL); + return NULL; case XP_PRINTF_TYPE_CHAR: case XP_PRINTF_TYPE_INT: /* Also includes char and short */ next = xp_asprintf_next(working, type, atable[curpos - 1].int_type); @@ -1710,7 +1710,7 @@ char* xp_vasprintf(const char *format, va_list va) if (atable == NULL) va_end(wva); free(atable); - return(NULL); + return NULL; } working = next; } @@ -1720,9 +1720,9 @@ char* xp_vasprintf(const char *format, va_list va) next = xp_asprintf_end(working, NULL); if (next == NULL) { free(working); - return(NULL); + return NULL; } - return(next); + return next; } char* xp_asprintf(const char *format, ...) @@ -1733,7 +1733,7 @@ char* xp_asprintf(const char *format, ...) va_start(va, format); ret = xp_vasprintf(format, va); va_end(va); - return(ret); + return ret; } #if defined(XP_PRINTF_TEST) @@ -1759,7 +1759,7 @@ int main(int argc, char *argv[]) free(p); if (argc < 2) - return(1); + return 1; format = argv[1]; format = xp_asprintf_start(format); @@ -1797,7 +1797,7 @@ int main(int argc, char *argv[]) } if (p == NULL) { printf("Failed converting on item after %s\n", format); - return(1); + return 1; } format = p; } diff --git a/src/xpdev/xptime.c b/src/xpdev/xptime.c index 7a330230cf84c2813bdff6679b67acb30a0549ad..89732f9a07fc05c2e7c48875cfc64d0aa1c3a1bf 100644 --- a/src/xpdev/xptime.c +++ b/src/xpdev/xptime.c @@ -94,5 +94,5 @@ int main(int argc, char **argv) ); } - return(0); + return 0; }