Skip to content
Snippets Groups Projects
Commit 095a7b4b authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

When importing FidoNet message area tags > 40 chars, use newsgroup name

Follow-up to previous commit for Keyop (extending max area tag length from 35 to 40/50 chars), when importing echolists/areas.bbs files, if the area tag is longer than 40 chars, then import it into the newsgroup name field instead (63 chars max).
parent 8940bde7
Branches
Tags
1 merge request!463MRC mods by Codefenix (2024-10-20)
Pipeline #2425 passed
...@@ -149,7 +149,10 @@ long import_msg_areas(enum import_list_type type, FILE* stream, unsigned grpnum ...@@ -149,7 +149,10 @@ long import_msg_areas(enum import_list_type type, FILE* stream, unsigned grpnum
continue; continue;
SAFECOPY(tmp_code, areatag); // Copy tag to internal code suffix SAFECOPY(tmp_code, areatag); // Copy tag to internal code suffix
SAFECOPY(tmpsub.sname, utos(areatag)); // ... to short name, converting underscores to spaces SAFECOPY(tmpsub.sname, utos(areatag)); // ... to short name, converting underscores to spaces
SAFECOPY(tmpsub.area_tag, areatag); if(strlen(areatag) > sizeof(tmpsub.area_tag) - 1)
SAFECOPY(tmpsub.newsgroup, areatag);
else
SAFECOPY(tmpsub.area_tag, areatag);
SAFECOPY(tmpsub.lname, iniGetString(ini, areatag, "Title", "", value)); SAFECOPY(tmpsub.lname, iniGetString(ini, areatag, "Title", "", value));
} else { } else {
if(feof(stream)) if(feof(stream))
...@@ -278,7 +281,10 @@ long import_msg_areas(enum import_list_type type, FILE* stream, unsigned grpnum ...@@ -278,7 +281,10 @@ long import_msg_areas(enum import_list_type type, FILE* stream, unsigned grpnum
SAFECOPY(tmp_code,p); /* Copy tag to internal code */ SAFECOPY(tmp_code,p); /* Copy tag to internal code */
SAFECOPY(tmpsub.lname,utos(p)); SAFECOPY(tmpsub.lname,utos(p));
SAFECOPY(tmpsub.sname,tmpsub.lname); SAFECOPY(tmpsub.sname,tmpsub.lname);
SAFECOPY(tmpsub.area_tag, p); if(strlen(p) > sizeof(tmpsub.area_tag) - 1)
SAFECOPY(tmpsub.newsgroup, p);
else
SAFECOPY(tmpsub.area_tag, p);
} }
else if(type == IMPORT_LIST_TYPE_SBBSECHO_AREAS_BBS) { /* AREAS.BBS SBBSecho */ else if(type == IMPORT_LIST_TYPE_SBBSECHO_AREAS_BBS) { /* AREAS.BBS SBBSecho */
p=str; p=str;
...@@ -292,7 +298,10 @@ long import_msg_areas(enum import_list_type type, FILE* stream, unsigned grpnum ...@@ -292,7 +298,10 @@ long import_msg_areas(enum import_list_type type, FILE* stream, unsigned grpnum
truncstr(p," \t"); /* Truncate tag */ truncstr(p," \t"); /* Truncate tag */
SAFECOPY(tmpsub.lname,utos(p)); SAFECOPY(tmpsub.lname,utos(p));
SAFECOPY(tmpsub.sname,tmpsub.lname); SAFECOPY(tmpsub.sname,tmpsub.lname);
SAFECOPY(tmpsub.area_tag, p); if(strlen(p) > sizeof(tmpsub.area_tag) - 1)
SAFECOPY(tmpsub.newsgroup, p);
else
SAFECOPY(tmpsub.area_tag, p);
} }
else if(type == IMPORT_LIST_TYPE_BACKBONE_NA) { /* BACKBONE.NA */ else if(type == IMPORT_LIST_TYPE_BACKBONE_NA) { /* BACKBONE.NA */
p=str; p=str;
...@@ -302,7 +311,10 @@ long import_msg_areas(enum import_list_type type, FILE* stream, unsigned grpnum ...@@ -302,7 +311,10 @@ long import_msg_areas(enum import_list_type type, FILE* stream, unsigned grpnum
*tp=0; /* Truncate echo tag */ *tp=0; /* Truncate echo tag */
SAFECOPY(tmp_code,p); /* Copy tag to internal code suffix */ SAFECOPY(tmp_code,p); /* Copy tag to internal code suffix */
SAFECOPY(tmpsub.sname,utos(p)); /* ... to short name, converting underscores to spaces */ SAFECOPY(tmpsub.sname,utos(p)); /* ... to short name, converting underscores to spaces */
SAFECOPY(tmpsub.area_tag, p); if(strlen(p) > sizeof(tmpsub.area_tag) - 1)
SAFECOPY(tmpsub.newsgroup, p);
else
SAFECOPY(tmpsub.area_tag, p);
p=tp+1; p=tp+1;
SKIP_WHITESPACE(p); /* Find description */ SKIP_WHITESPACE(p); /* Find description */
SAFECOPY(tmpsub.lname,p); /* Copy description to long name */ SAFECOPY(tmpsub.lname,p); /* Copy description to long name */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment