Sempoint OLR patches by Redy

This commit is contained in:
Michiel Broek 2004-04-13 19:29:54 +00:00
parent c07e6d4fe0
commit e802e19058
4 changed files with 59 additions and 14 deletions

View File

@ -28,6 +28,8 @@ v0.51.4 11-Apr-2004
mbsebbs: mbsebbs:
Added loging of virus scanner results. Added loging of virus scanner results.
Patches for offline reader programs that create messages with
wrong line terminaters (Sempoint).
mbsetup: mbsetup:
Added auto setup for message area creation date. Also creates Added auto setup for message area creation date. Also creates

View File

@ -308,26 +308,14 @@ int Msg_WriteHeader (unsigned long ulMsg)
void Msg_Write(FILE *fp) void Msg_Write(FILE *fp)
{ {
char *Buf; char *Buf;
int i;
Buf = calloc(MAX_LINE_LENGTH +1, sizeof(char)); Buf = calloc(MAX_LINE_LENGTH +1, sizeof(char));
while ((fgets(Buf, MAX_LINE_LENGTH, fp)) != NULL) { while ((Fgets(Buf, MAX_LINE_LENGTH, fp)) != NULL)
for (i = 0; i < strlen(Buf); i++) {
if (*(Buf + i) == '\0')
break;
if (*(Buf + i) == '\n')
*(Buf + i) = '\0';
if (*(Buf + i) == '\r')
*(Buf + i) = '\0';
}
MsgText_Add2(Buf); MsgText_Add2(Buf);
}
free(Buf); free(Buf);
} }
typedef struct { typedef struct {
unsigned long Subject; unsigned long Subject;
@ -457,4 +445,57 @@ int Msg_Link(char *Path, int do_quiet, int slow_util)
return msg_link; return msg_link;
} }
/*
* Fgets() is like fgets() but never returns the line terminator
* at end of line and handles that line terminators:
*
* DOS/WINDOWS -> CR/LF
* UNIX -> LF only
* MAC -> CR only
*/
char *Fgets(char *l, int size, FILE *f) {
char *cp = l;
int cr, eol = FALSE;
if (feof(f)) return NULL;
cr = FALSE;
while (size>1 && !feof(f)) {
int c = fgetc(f);
if (c == EOF) {
if (ferror(f)) return NULL;
break;
}
if (cr && c != '\n') {
/* CR end-of-line (MAC) */
ungetc(c,f);
eol = TRUE;
break;
} else
cr = (c=='\r');
if ( cr )
continue;
--size;
if (c=='\n') { eol = TRUE; break; }
*(cp++) = c;
}
*cp = '\0';
cr = FALSE;
while (!eol && !feof(f)) {
int c = fgetc(f);
if (c == EOF)
break;
if (cr && c != '\n') {
/* CR end-of-line (MAC) */
ungetc(c,f);
break;
} else
cr = (c=='\r');
if ( cr )
continue;
if (c=='\n') break;
}
return l;
}

View File

@ -114,6 +114,7 @@ char *strlwr(char *);
char *strupr(char *); char *strupr(char *);
long filelength(int); long filelength(int);
long tell(int); long tell(int);
char *Fgets(char *, int, FILE *);

View File

@ -1612,6 +1612,7 @@ void BlueWave_Fetch()
Syslog('m', " Type : Internet"); Syslog('m', " Type : Internet");
else else
Syslog('m', " Type : Fidonet"); Syslog('m', " Type : Fidonet");
getfilecase(Dirpath, Upr.filename);
Syslog('m', " File : %s", Upr.filename); Syslog('m', " File : %s", Upr.filename);
Syslog('m', " Tag : %s", Upr.echotag); Syslog('m', " Tag : %s", Upr.echotag);