From 7703d33b1c35a770f011afcfa1238d5b36812cc3 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Mon, 5 Mar 2018 21:32:27 +0000
Subject: [PATCH] When displaying posts and email summary (to/from/subj),
handle 5-digit (for subs and "all mail") and 4-digit message numbers. Subs
with >9999 msgs are not unheard of and its easy to accumulate that much mail
in the mail base these days. Just eliminated the ':' from the format line(s)
to make room.
---
ctrl/text.dat | 6 +++---
src/sbbs3/text_defaults.c | 12 ++++++------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ctrl/text.dat b/ctrl/text.dat
index d8c6590186..b076387dff 100644
--- a/ctrl/text.dat
+++ b/ctrl/text.dat
@@ -50,7 +50,7 @@
"\1n\r\nYou can't write to the auto-message.\r\n" 044 R_AutoMsg
"\1n\r\nYou have no %s.\r\n" 045 NoMailWaiting
"\1_\r\n\1q\1g\1hMail Waiting:\r\n\r\n" 046 MailWaitingLstHdr
-"\1g\1h%3d: \1n\1g%-25.25s \1h%c\1n\1g %.46s\r\n" 047 MailWaitingLstFmt
+"\1g\1h%4d \1n\1g%-25.25s \1h%c\1n\1g %.46s\r\n" 047 MailWaitingLstFmt
"\1_\r\n\1y\1hStart with number [\1w%u\1y]: \1w" 048 StartWithN
"\r\n\1n\1cþ \1b\1hReading E-mail \1n\1cþ \1b\1h(\1w?\1b=Menu)"\ 049 ReadingMail
" (\1w%u\1b of \1w%u\1b): \1n"
@@ -78,7 +78,7 @@
"(\1w%u \1bof \1w%u\1b): \1n"
"\1_\r\n\1q\1g\1h From "\ 065 MailOnSystemLstHdr
"To A Subject\r\n\1n"
-"\1g\1h%4d:\1n\1g %-22.22s %-22.22s \1h%c\1n\1g %.25s\r\n" 066 MailOnSystemLstFmt
+"\1g\1h%5d\1n\1g %-22.22s %-22.22s \1h%c\1n\1g %.25s\r\n" 066 MailOnSystemLstFmt
"\1-\r\n\1c%-15.15s \1y\1h%-44.44s "\ 067 NScanStatusFmt
"\1n\1cNew:\1h%5u \1n\1cof\1h %-u"
"\1-\r\n\1c%-15.15s \1y\1h%-44.44s \1w%u" 068 SearchSubFmt
@@ -96,7 +96,7 @@
"\1yPrivate Chat - \1rCtrl-C to Quit \1y- "\
"Time Left: \1g%-8s\1w"\
" ÃÄÄÄÄ[\1i\1b%c\1n\1h]ÄÄÄÄÄ"
-"\1g\1h%4u:\1n\1g %-22.22s %-22.22s \1h%c\1n\1g %.25s\r\n" 078 SubMsgLstFmt
+"\1g\1h%5u\1n\1g %-22.22s %-22.22s \1h%c\1n\1g %.25s\r\n" 078 SubMsgLstFmt
"\1w\1hÄÄÄÄÄ[\1i\1r%c\1n\1h]ÄÄÄÄ´ "\ 079 SysopChatSeparator
"\1rSplit-Screen \1cSysop\1r Chat \1y"\
"Time Left: \1g%-8s\1w"\
diff --git a/src/sbbs3/text_defaults.c b/src/sbbs3/text_defaults.c
index 56a4457b12..c07c3aaff7 100644
--- a/src/sbbs3/text_defaults.c
+++ b/src/sbbs3/text_defaults.c
@@ -79,8 +79,8 @@ const char * const text_defaults[TOTAL_TEXT]={
"\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\x3a\x0d\x0a\x0d\x0a" // 046 MailWaitingLstHdr
- ,"\x01\x67\x01\x68\x25\x33\x64\x3a\x20\x01\x6e\x01\x67\x25\x2d\x32\x35\x2e\x32\x35\x73\x20\x01\x68\x25\x63\x01\x6e\x01\x67\x20\x25"
- "\x2e\x34\x36\x73\x0d\x0a" // 047 MailWaitingLstFmt
+ ,"\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\x2e"
+ "\x34\x36\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"
@@ -117,8 +117,8 @@ const char * const text_defaults[TOTAL_TEXT]={
,"\x01\x5f\x0d\x0a\x01\x71\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\x34\x64\x3a\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\x2e\x32\x35\x73\x0d\x0a" // 066 MailOnSystemLstFmt
+ ,"\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\x2e\x32\x35\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\x31\x35\x2e\x31\x35\x73\x20\x01\x79\x01\x68\x25\x2d\x34\x34\x2e\x34\x34\x73\x20\x01\x77\x25\x75"
@@ -140,8 +140,8 @@ const char * const text_defaults[TOTAL_TEXT]={
"\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\x34\x75\x3a\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\x2e\x32\x35\x73\x0d\x0a" // 078 SubMsgLstFmt
+ ,"\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\x2e\x32\x35\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"
--
GitLab