Fixed lharc recognition code to LHA

This commit is contained in:
Michiel Broek 2002-03-12 19:41:41 +00:00
parent 1c4c68fa9a
commit 134a92e31f
8 changed files with 33 additions and 9 deletions

View File

@ -4602,6 +4602,7 @@ v0.33.20 10-Feb-2002
Added 2 functions to return the OS name and CPU family. Added 2 functions to return the OS name and CPU family.
Added a function to return the right tearline. Added a function to return the right tearline.
Added support for ext3 filesystem in diskspace check. Added support for ext3 filesystem in diskspace check.
Fixed lharc archives return code to LHA.
mbsetup: mbsetup:
In message groups added default settings for auto area In message groups added default settings for auto area
@ -4658,6 +4659,7 @@ v0.33.20 10-Feb-2002
defaults from the mailgroup. defaults from the mailgroup.
Experimental patch in mkftnhdr to create a To address in news Experimental patch in mkftnhdr to create a To address in news
articles where a Reply-To: header is present. articles where a Reply-To: header is present.
It was not possible to disconnect file areas.
mball: mball:
Will not crash anymore when it needs more then 10 minutes to Will not crash anymore when it needs more then 10 minutes to
@ -4692,6 +4694,7 @@ v0.33.20 10-Feb-2002
Added support for external message editor written by Redy. Added support for external message editor written by Redy.
Doors are now passed the parameter to display a prompt after Doors are now passed the parameter to display a prompt after
the door or return silently. the door or return silently.
Fixed lharc file return code to LHA.
mbnewusr: mbnewusr:
New users have the default internal fullscreen editor. New users have the default internal fullscreen editor.

2
TODO
View File

@ -95,6 +95,8 @@ mbnewusr:
mbsetup: mbsetup:
U: PickAka function lets mbsetup crash if domain is 12 characters U: PickAka function lets mbsetup crash if domain is 12 characters
U: When moving an JAM messagebase, check filefind records.
N: Put ZMH fields in the network setup for each zone. N: Put ZMH fields in the network setup for each zone.
L: Generate crossreference document: L: Generate crossreference document:

View File

@ -370,8 +370,8 @@ UA|Aufgelistete (U)mschalten, alle (A)bwaehlen, <ENTER> um fortzufahren:
JN|Sind Sie sicher? [J/n]: JN|Sind Sie sicher? [J/n]:
|Check auf neue Dateien ist jetzt AN |Check auf neue Dateien ist jetzt AN
|Check auf neue Dateien ist jetzt AUS |Check auf neue Dateien ist jetzt AUS
|Now using the |Sie verwenden jetzt den
123|Select: 1) Line editor, 2) Fullscreen editor, 3) External editor 123|Auswahl: 1) Zeilen-Editor, 2) Vollbild-Editor, 3) Externer Editor
|Es liegen keine Mitteilungen zum Herunterladen vor! |Es liegen keine Mitteilungen zum Herunterladen vor!
|Weiter mit <Enter> ... |Weiter mit <Enter> ...
|Zentrieren |Zentrieren
@ -385,9 +385,9 @@ JN|Sind Sie sicher? [J/n]:
|Beispiel: "Gerhard Schroeder", login = gschroed |Beispiel: "Gerhard Schroeder", login = gschroed
|Ihr gewuenschter Anmeldename: |Ihr gewuenschter Anmeldename:
|Dieser Anmeldename existiert bereits, bitte waehlen Sie einen anderen. |Dieser Anmeldename existiert bereits, bitte waehlen Sie einen anderen.
|Line |Zeilen-
|Fullscreen |Vollbild-
|External |Externen
|Editor |Editor
|Neu |Neu
|Local |Local

View File

@ -58,11 +58,10 @@ char *unpacker(char *fn)
if (memcmp(buf,"PK",2) == 0) return (char *)"ZIP"; if (memcmp(buf,"PK",2) == 0) return (char *)"ZIP";
if (*buf == 0x1a) return (char *)"ARC"; if (*buf == 0x1a) return (char *)"ARC";
if (memcmp(buf+2,"-l",2) == 0) return (char *)"LZH"; if (memcmp(buf+2,"-l",2) == 0) return (char *)"LHA";
if (memcmp(buf,"ZOO",3) == 0) return (char *)"ZOO"; if (memcmp(buf,"ZOO",3) == 0) return (char *)"ZOO";
if (memcmp(buf,"`\352",2) == 0) return (char *)"ARJ"; if (memcmp(buf,"`\352",2) == 0) return (char *)"ARJ";
if (memcmp(buf,"Rar",3) == 0) return (char *)"RAR"; if (memcmp(buf,"Rar",3) == 0) return (char *)"RAR";
// if (memcmp(buf, ";A ",3) == 0) return (char *)"ASC";
Syslog('p', "Unknown compress scheme in file %s", fn); Syslog('p', "Unknown compress scheme in file %s", fn);
return NULL; return NULL;

View File

@ -595,7 +595,7 @@ void F_Disconnect(faddr *t, char *Area, FILE *tmp)
return; return;
} }
if (!TicSystemConnect(&Sys, FALSE)) { if (TicSystemConnect(&Sys, FALSE)) {
/* /*
* Make sure to write an overview afterwards * Make sure to write an overview afterwards

View File

@ -127,6 +127,11 @@ int ProcessTic(fa_list *sbl)
if (TIC.TicIn.Size) { if (TIC.TicIn.Size) {
if (TIC.TicIn.Size != TIC.FileSize) if (TIC.TicIn.Size != TIC.FileSize)
WriteError("Size is %ld, expected %ld", TIC.FileSize, TIC.TicIn.Size); WriteError("Size is %ld, expected %ld", TIC.FileSize, TIC.TicIn.Size);
} else {
/*
* No filesize in TIC file, add filesize.
*/
TIC.TicIn.Size = TIC.FileSize;
} }
if (TIC.Crc_Int) { if (TIC.Crc_Int) {
@ -155,6 +160,7 @@ int ProcessTic(fa_list *sbl)
return 1; return 1;
} }
if ((tic.Secure) && (!TIC.TicIn.Hatch)) { if ((tic.Secure) && (!TIC.TicIn.Hatch)) {
First = TRUE; First = TRUE;
while (GetTicSystem(&Link, First)) { while (GetTicSystem(&Link, First)) {
@ -443,6 +449,7 @@ int ProcessTic(fa_list *sbl)
} }
if (!getarchiver(unarc)) { if (!getarchiver(unarc)) {
WriteError("Can't get archiver for %s", unarc);
chdir(TIC.Inbound); chdir(TIC.Inbound);
free(Temp); free(Temp);
return 1; return 1;

View File

@ -711,7 +711,7 @@ char *GetFileType(char *fn)
*/ */
if (memcmp(buf, "PK\003\004", 4) == 0) return (char *)"ZIP"; if (memcmp(buf, "PK\003\004", 4) == 0) return (char *)"ZIP";
if (*buf == 0x1a) return (char *)"ARC"; if (*buf == 0x1a) return (char *)"ARC";
if (memcmp(buf+2, "-l", 2) == 0) return (char *)"LZH"; if (memcmp(buf+2, "-l", 2) == 0) return (char *)"LHA";
if (memcmp(buf, "ZOO", 3) == 0) return (char *)"ZOO"; if (memcmp(buf, "ZOO", 3) == 0) return (char *)"ZOO";
if (memcmp(buf, "`\352", 2) == 0) return (char *)"ARJ"; if (memcmp(buf, "`\352", 2) == 0) return (char *)"ARJ";
if (memcmp(buf, "Rar!", 4) == 0) return (char *)"RAR"; if (memcmp(buf, "Rar!", 4) == 0) return (char *)"RAR";
@ -770,6 +770,7 @@ int ImportFile(char *fn, int Area, int fileid, time_t iTime, off_t Size)
if ((file_mv(temp1, temp))) { if ((file_mv(temp1, temp))) {
WriteError("$Can't move %s to %s", fn, area.Path); WriteError("$Can't move %s to %s", fn, area.Path);
} else { } else {
chmod(temp, 0664);
if (Addfile(fn, Area, fileid)) { if (Addfile(fn, Area, fileid)) {
ReadExitinfo(); ReadExitinfo();

View File

@ -38,6 +38,18 @@ install:
${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0755 hatch ${BINDIR} ; \ ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0755 hatch ${BINDIR} ; \
echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0755 hatch ${BINDIR}" ; \ echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0755 hatch ${BINDIR}" ; \
fi fi
@if [ -x /usr/bin/joe ]; then \
echo "Making symlinks for joe's editor" ; \
ln -s /usr/bin/joe /usr/bin/bbsjoe ; \
ln -s /usr/bin/joe /usr/bin/bbsjmacs ; \
fi
@if [ -d /usr/lib/joe ]; then \
echo "Installing joerc files for MBSE BBS" ; \
${INSTALL} -c -o root -g root -m 0644 bbsjoerc /usr/lib/joe ; \
echo "${INSTALL} -c -o root -g root -m 0644 bbsjoerc /usr/lib/joe" ; \
${INSTALL} -c -o root -g root -m 0644 bbsjmacsrc /usr/lib/joe ; \
echo "${INSTALL} -c -o root -g root -m 0644 bbsjmacsrc /usr/lib/joe" ; \
fi
${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0755 bbsdoor.sh ${BINDIR} ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0755 bbsdoor.sh ${BINDIR}
${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0755 rundoor.sh ${BINDIR} ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0755 rundoor.sh ${BINDIR}
@bash ./installinit.sh @bash ./installinit.sh