bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

System update to UTF-8

Browse Source
This commit is contained in:
Michiel Broek
2007-02-25 20:28:00 +00:00
parent 2a0fa86557
commit c5e7083deb
52 changed files with 754 additions and 710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mbfido/ftn2rfc.c
View File

@@ -695,12 +695,10 @@ int ftn2rfc(faddr *f, faddr *t, char *subj, char *origline, time_t mdate, int fl
Syslog('m', "ftn2rfc: charset in: %s charset out: %s", charset, getrfcchrs(msgs.Charset));
#ifndef USE_EXPERIMENT
/*
* Setup charset conversion
*/
charset_set_in_out(charset, getrfcchrs(msgs.Charset));
#endif
chartran_init(charset, getrfcchrs(msgs.Charset), 'm');
if (newsmode) {
/*
@@ -1546,6 +1544,7 @@ int ftn2rfc(faddr *f, faddr *t, char *subj, char *origline, time_t mdate, int fl
fprintf(nfp, ".\n");
}
chartran_close();
if (newsgroup)
free(newsgroup);
rbuf = NULL;

34
mbfido/makestat.c
View File

@@ -4,7 +4,7 @@
* Purpose ...............: Make Web statistics
*
*****************************************************************************
* Copyright (C) 1997-2005
* Copyright (C) 1997-2007
*
* Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10
@@ -133,6 +133,8 @@ void MakeStat(void)
else
Lm = Miy -1;
chartran_init((char *)"CP437", (char *)"UTF-8", 'm');
snprintf(name, PATH_MAX, "%s/etc/mgroups.data", getenv("MBSE_ROOT"));
if ((fg = fopen(name, "r")) == NULL) {
WriteError("Can't open %s", name);
@@ -147,9 +149,9 @@ void MakeStat(void)
while ((fread(&mgroup, mgrouphdr.recsize, 1, fg)) == 1) {
if (mgroup.Active) {
fseek(fi, fileptr, SEEK_SET);
html_massage(mgroup.Name, name, PATH_MAX -1);
html_massage(chartran(mgroup.Name), name, PATH_MAX -1);
MacroVars("b", "s", name);
html_massage(mgroup.Comment, name, PATH_MAX -1);
html_massage(chartran(mgroup.Comment), name, PATH_MAX -1);
MacroVars("c", "s", name);
MacroVars("d", "s", mgroup.UseAka.zone ? aka2str(mgroup.UseAka):" ");
MacroVars("e", "s", adate(mgroup.LastDate));
@@ -196,11 +198,11 @@ void MakeStat(void)
}
fseek(fi, fileptr, SEEK_SET);
MacroVars("b", "d", Area);
html_massage(msgs.Name, name, PATH_MAX -1);
html_massage(chartran(msgs.Name), name, PATH_MAX -1);
MacroVars("c", "s", strlen(name) ? name:" ");
html_massage(msgs.Tag, name, PATH_MAX -1);
html_massage(chartran(msgs.Tag), name, PATH_MAX -1);
MacroVars("d", "s", strlen(name) ? name:" ");
html_massage(msgs.Group, name, PATH_MAX -1);
html_massage(chartran(msgs.Group), name, PATH_MAX -1);
MacroVars("e", "s", strlen(name) ? name:" ");
MacroVars("f", "s", adate(msgs.LastRcvd));
MacroVars("g", "d", msgs.Received.lweek);
@@ -238,9 +240,9 @@ void MakeStat(void)
while ((fread(&fgroup, fgrouphdr.recsize, 1, fg)) == 1) {
if (fgroup.Active) {
fseek(fi, fileptr, SEEK_SET);
html_massage(fgroup.Name, name, PATH_MAX -1);
html_massage(chartran(fgroup.Name), name, PATH_MAX -1);
MacroVars("b", "s", name);
html_massage(fgroup.Comment, name, PATH_MAX -1);
html_massage(chartran(fgroup.Comment), name, PATH_MAX -1);
MacroVars("c", "s", name);
MacroVars("d", "s", fgroup.UseAka.zone ? aka2str(fgroup.UseAka):" ");
MacroVars("e", "s", adate(fgroup.LastDate));
@@ -278,11 +280,11 @@ void MakeStat(void)
while ((fread(&tic, tichdr.recsize, 1, fg)) == 1) {
if (tic.Active) {
fseek(fi, fileptr, SEEK_SET);
html_massage(tic.Comment, name, PATH_MAX -1);
html_massage(chartran(tic.Comment), name, PATH_MAX -1);
MacroVars("b", "s", name);
html_massage(tic.Name, name, PATH_MAX -1);
html_massage(chartran(tic.Name), name, PATH_MAX -1);
MacroVars("c", "s", name);
html_massage(tic.Group, name, PATH_MAX -1);
html_massage(chartran(tic.Group), name, PATH_MAX -1);
MacroVars("d", "s", name);
MacroVars("e", "s", adate(tic.LastAction));
MacroVars("f", "d", tic.Files.lweek);
@@ -328,7 +330,7 @@ void MakeStat(void)
else
q = xstrcpy((char *)"Normal");
MacroVars("b", "s", aka2str(nodes.Aka[0]));
html_massage(nodes.Sysop, name, PATH_MAX -1);
html_massage(chartran(nodes.Sysop), name, PATH_MAX -1);
MacroVars("c", "s", name);
MacroVars("d", "s", q);
MacroVars("e", "s", p);
@@ -376,11 +378,11 @@ void MakeStat(void)
if (!strcmp(hist.aka.domain, "(null)"))
hist.aka.domain[0] = '\0';
MacroVars("c", "s", hist.aka.zone ? aka2str(hist.aka):" ");
html_massage(hist.system_name, name, PATH_MAX -1);
html_massage(chartran(hist.system_name), name, PATH_MAX -1);
MacroVars("d", "s", strlen(name) ? name:" ");
html_massage(hist.sysop, name, PATH_MAX -1);
html_massage(chartran(hist.sysop), name, PATH_MAX -1);
MacroVars("e", "s", strlen(name) ? name:" ");
html_massage(hist.location, name, PATH_MAX -1);
html_massage(chartran(hist.location), name, PATH_MAX -1);
MacroVars("f", "s", strlen(name) ? name:" ");
MacroVars("g", "s", strlen(hist.tty) ? hist.tty:" ");
MacroVars("h", "s", adate(hist.online));
@@ -435,6 +437,8 @@ void MakeStat(void)
free(name);
Syslog('+', "Finished making statistic HTML pages");
chartran_close();
if (!do_quiet) {
printf("\r \r");
fflush(stdout);

69
mbfido/mbfindex.c
View File

@@ -39,6 +39,7 @@
extern int do_quiet; /* Suppress screen output */
extern int do_force; /* Force update */
int lastfile; /* Last file number */
int gfilepos = 0; /* Global file position */
int TotalHtml = 0; /* Total html files */
@@ -61,69 +62,23 @@ static char *months[]= {(char *)"Jan",(char *)"Feb",(char *)"Mar",
(char *)"Jul",(char *)"Aug",(char *)"Sep",
(char *)"Oct",(char *)"Nov",(char *)"Dec"};
#ifdef USE_EXPERIMENT
/*
* Translation table from Hi-USA-ANSI to low ASCII and HTML codes,
*/
char htmltab[] = {
"\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017"
"\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
"\040\041\042\043\044\045\046\047\050\051\052\053\054\055\056\057"
"\060\061\062\063\064\065\066\067\070\071\072\073\074\075\076\077"
"\100\101\102\103\104\105\106\107\110\111\112\113\114\115\116\117"
"\120\121\122\123\124\125\126\127\130\131\132\133\134\135\136\137"
"\140\141\142\143\144\145\146\147\150\151\152\153\154\155\156\157"
"\160\161\162\163\164\165\166\167\170\171\172\173\174\175\176\177"
"\103\374\351\342\344\340\345\143\352\353\350\357\357\354\304\305" /* done */
"\311\346\306\364\366\362\374\371\171\326\334\244\243\245\120\146" /* done */
"\341\355\363\372\361\321\141\157\277\055\055\275\274\241\074\076" /* done */
"\043\043\043\174\053\053\053\053\053\043\174\043\043\053\053\053" /* done */
"\053\053\053\053\053\053\053\053\043\043\043\043\043\075\043\053" /* done */
"\053\053\053\053\053\053\053\053\053\053\053\043\043\043\043\043" /* done */
"\141\102\114\156\105\157\265\370\060\060\060\157\070\330\145\156" /* doesn't look good */
"\075\261\076\074\146\146\367\075\260\267\267\126\262\262\267\040" /* almost */
};
#endif
/*
* Translate a string from ANSI to safe HTML characters
*/
/*
char *To_Html(char *);
char *To_Html(char *inp)
{
static char temp[256];
int i;
#ifndef USE_EXPERIMENT
char *xl;
#endif
static char temp[1024];
memset(&temp, 0, sizeof(temp));
#ifdef USE_EXPERIMENT
strncpy(temp, inp, 80);
for (i = 0; i < strlen(temp); i++)
temp[i] = htmltab[temp[i] & 0xff];
#else
for (i = 0; i < strlen(inp); i++) {
if (inp[i] & 0x80) {
if ((xl = charset_map_c(inp[i], FALSE))) {
while (*xl) {
temp[i] = *xl++;
if (*xl)
i++;
}
}
} else
temp[i] = inp[i];
}
#endif
strncpy(temp, chartran(inp), sizeof(temp) -1);
return temp;
}
*/
void tidy_index(Findex **);
@@ -631,13 +586,11 @@ void HtmlIndex(char *Lang)
fileptr = ftell(fi);
}
#ifndef USE_EXPERIMENT
/*
* Setup the correct table to produce file listings for the www.
* This make ANSI grafics look a bit nicer with browsers.
*/
charset_set_in_out((char *)"cp437", (char *)"iso-8859-1");
#endif
chartran_init((char *)"CP437", (char *)"UTF-8", 'f');
for (i = 1; i <= iAreas; i++) {
@@ -679,7 +632,7 @@ void HtmlIndex(char *Lang)
aTotal = 0;
last = 0L;
if (obj_time < db_time) {
if ((obj_time < db_time) || do_force) {
/*
* If not up todate
*/
@@ -753,9 +706,10 @@ void HtmlIndex(char *Lang)
snprintf(desc+k, 2, "\n");
k += 1;
}
snprintf(linebuf, 1024, "%s", To_Html(fdb.Desc[j]));
html_massage(linebuf, outbuf, 1024);
snprintf(desc+k, 6400 -k, "%s", outbuf);
html_massage(fdb.Desc[j], linebuf, 1024);
// strncpy(linebuf, fdb.Desc[j], 1024);
strncpy(outbuf, chartran(linebuf), 1024);
strncat(desc, outbuf, 6400 -k);
k += strlen(outbuf);
}
MacroVars("m", "s", desc);
@@ -844,6 +798,7 @@ void HtmlIndex(char *Lang)
}
fclose(pAreas);
chartran_close();
if (!do_quiet) {
printf("\r \r");

61
mbfido/rfc2ftn.c
View File

@@ -78,36 +78,20 @@ extern int most_debug;
* Internal functions
*/
int needputrfc(rfcmsg *, int);
#ifdef USE_EXPERIMENT
int use_iconv = FALSE;
iconv_t iconv_s;
#endif
int charwrite(char *s, FILE *fp)
{
#ifndef USE_EXPERIMENT
char *o;
#endif
char temp[2048];
if ((strlen(s) >= 3) && (strncmp(s,"---",3) == 0) && (s[3] != '-')) {
putc('-',fp);
putc(' ',fp);
}
while (*s) {
#ifdef USE_EXPERIMENT
putc(*s, fp);
#else
o = s;
if (s[0] &0x080) {
o = charset_map_c(s[0], 0);
}
putc(*o, fp);
#endif
s++;
putc('-',fp);
putc(' ',fp);
}
strncpy(temp, chartran(s), sizeof(temp) -1);
fputs(temp, fp);
return 0;
}
@@ -348,25 +332,11 @@ int rfc2ftn(FILE *fp, faddr *recipient)
hdrsize += (fmsg->to->name)?strlen(fmsg->to->name):0;
Syslog('m', "rfc2ftn: charset in: %s charset out: %s", charset,getrfcchrs(msgs.Charset));
#ifndef USE_EXPERIMENT
/*
* Setup charset conversion
*/
charset_set_in_out(charset,getrfcchrs(msgs.Charset));
#endif
#ifdef USE_EXPERIMENT
if (strcmp(charset,getrfcchrs(msgs.Charset)) == 0) {
Syslog('m', "rfc2ftn: no need for iconv");
} else {
iconv_s = iconv_open(getrfcchrs(msgs.Charset), charset);
if (iconv_s != (iconv_t)-1) {
Syslog('m', "rfc2ftn: activated iconv");
use_iconv = TRUE;
} else {
Syslog('+', "rfc2ftn: iconv_open(%s, %s) failed", getrfcchrs(msgs.Charset), charset);
}
}
#endif
chartran_init(charset,getrfcchrs(msgs.Charset), 'm');
do {
Syslog('m', "rfc2ftn: split loop, splitpart = %d", splitpart);
@@ -767,16 +737,7 @@ int rfc2ftn(FILE *fp, faddr *recipient)
} while (needsplit);
Syslog('m', "rfc2ftn: out of splitloop");
#ifdef USE_EXPERIMENT
if (use_iconv) {
if (iconv_close(iconv_s))
WriteError("$rfc2ftn: iconv_close()");
else
Syslog('m', "rfc2ftn: inconv_close() success");
use_iconv = FALSE;
}
#endif
chartran_close();
free(temp);
if (charset)