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

More long filename support added

Browse Source
This commit is contained in:
Michiel Broek
2001-12-01 17:14:49 +00:00
parent cae45854ab
commit cd7bf461e6
11 changed files with 221 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
mbsebbs/file.c
View File

@@ -57,20 +57,22 @@ int CheckFile(char *, int);
int CheckFile(char *File, int iArea)
{
FILE *pFileB;
int iFile = FALSE;
char *sFileArea;
sFileArea = calloc(PATH_MAX, sizeof(char));
sprintf(sFileArea,"%s/fdb/fdb%d.dta", getenv("MBSE_ROOT"), iArea);
if(( pFileB = fopen(sFileArea,"r+")) == NULL) {
mkdir(sFileArea, 755);
if ((pFileB = fopen(sFileArea,"r+")) == NULL) {
mkdir(sFileArea, 775);
return FALSE;
}
free(sFileArea);
while ( fread(&file, sizeof(file), 1, pFileB) == 1) {
if((strcmp(tl(file.Name), tl(File))) == 0) {
iFile = TRUE;
/*
* Check long and short filenames, case insensitive
*/
while (fread(&file, sizeof(file), 1, pFileB) == 1) {
if (((strcasecmp(file.Name, File)) == 0) || ((strcasecmp(file.LName, File)) == 0)) {
fclose(pFileB);
return TRUE;
}
@@ -78,11 +80,7 @@ int CheckFile(char *File, int iArea)
}
fclose(pFileB);
free(sFileArea);
if(!iFile)
return FALSE;
return 1;
return FALSE;
}
@@ -128,7 +126,8 @@ void File_List()
T.Active = FALSE;
T.Cost = file.Cost;
T.Size = file.Size;
sprintf(T.File, "%s", file.Name);
strncpy(T.SFile, file.Name, 12);
strncpy(T.LFile, file.LName, 80);
SetTag(T);
if (ShowOneFile() == 1) {
@@ -136,13 +135,13 @@ void File_List()
return;
}
if(file.Deleted)
if (file.Deleted)
/* D E L E T E D */ /* Uploaded by: */
printf("%-15s %s [%ld] %s%s\n", file.Name, (char *) Language(239), file.TimesDL, (char *) Language(238), file.Uploader);
printf("%-12s %s [%ld] %s%s\n", file.Name, (char *) Language(239), file.TimesDL, (char *) Language(238), file.Uploader);
if(file.Missing)
if (file.Missing)
/* M I S S I N G */ /* Uploaded by: */
printf("%-15s %s [%ld] %s%s\n", file.Name, (char *) Language(240), file.TimesDL, (char *) Language(238), file.Uploader);
printf("%-12s %s [%ld] %s%s\n", file.Name, (char *) Language(240), file.TimesDL, (char *) Language(238), file.Uploader);
FileCount++; /* Increase File Counter by 1 */
FileBytes += file.Size; /* Increase File Byte Count */
@@ -207,18 +206,18 @@ void Download(void)
if ((fp = OpenFileBase(Tag.Area, FALSE)) != NULL) {
while (fread(&file, sizeof(file), 1, fp) == 1) {
if (strcmp(file.Name, Tag.File) == 0)
if (strcmp(file.LName, Tag.LFile) == 0)
break;
}
fclose(fp);
}
if (strcmp(file.Name, Tag.File) == 0) {
Syslog('b', "Found file %s in area %d", file.Name, Tag.Area);
if (strcmp(file.LName, Tag.LFile) == 0) {
Syslog('b', "Found file %s in area %d", file.LName, Tag.Area);
if ((file.Deleted) || (file.Missing)) {
pout(CFG.HiliteF, CFG.HiliteB, (char *) Language(248));
/* Sorry that file is unavailable for download */
printf("%s (%s)\n", (char *) Language(248), file.Name);
printf("%s (%s)\n", (char *) Language(248), file.LName);
Tag.Active = FALSE;
}
@@ -233,7 +232,7 @@ void Download(void)
*/
sprintf(symTo, "./tag/filedesc.%ld", exitinfo.Downloads % 256);
if ((fd = fopen(symTo, "a")) != NULL) {
fprintf(fd, "%s\r\n", file.Name);
fprintf(fd, "%s (%s)\r\n", file.LName, file.Name);
for (i = 0; i < 25; i++) {
if (strlen(file.Desc[i]) > 1)
fprintf(fd, " %s\r\n", file.Desc[i]);
@@ -245,11 +244,12 @@ void Download(void)
/*
* Make a symlink to the users download dir.
* First unlink, in case there was an old one.
* The shortname is linked to the original longname.
*/
chdir("./tag");
unlink(Tag.File);
sprintf(symFrom, "%s", Tag.File);
sprintf(symTo, "%s/%s", sAreaPath, Tag.File);
unlink(Tag.SFile);
sprintf(symFrom, "%s", Tag.SFile);
sprintf(symTo, "%s/%s", sAreaPath, Tag.LFile);
if (symlink(symTo, symFrom)) {
WriteError("$Can't create symlink %s %s %d", symTo, symFrom, errno);
Tag.Active = FALSE;
@@ -392,12 +392,12 @@ void Download(void)
if (Tag.Active) {
sprintf(symTo, "./tag/%s", Tag.File);
sprintf(symTo, "./tag/%s", Tag.SFile);
/*
* If symlink is gone the file is sent.
*/
if ((access(symTo, R_OK)) != 0) {
Syslog('+', "File %s from area %d sent ok", Tag.File, Tag.Area);
Syslog('+', "File %s from area %d sent ok", Tag.LFile, Tag.Area);
Tag.Active = FALSE;
fseek(tf, - sizeof(Tag), SEEK_CUR);
fwrite(&Tag, sizeof(Tag), 1, tf);
@@ -409,7 +409,7 @@ void Download(void)
SetFileArea(Tag.Area);
if ((fp = OpenFileBase(Tag.Area, TRUE)) != NULL) {
while (fread(&file, sizeof(file), 1, fp) == 1) {
if (strcmp(file.Name, Tag.File) == 0)
if (strcmp(file.LName, Tag.LFile) == 0)
break;
}
Size += file.Size;
@@ -421,7 +421,7 @@ void Download(void)
Count++;
}
} else {
Syslog('+', "Failed to sent %s from area %d", Tag.File, Tag.Area);
Syslog('+', "Failed to sent %s from area %d", Tag.LFile, Tag.Area);
}
}
}
@@ -501,12 +501,12 @@ void File_RawDir(char *OpData)
if (*(dp->d_name) != '.') {
iFileCount++;
if(stat(FileName,&statfile) != 0)
printf("Can't stat file %s\n",FileName);
if (stat(FileName, &statfile) != 0)
printf("Can't stat file %s\n", FileName);
iBytes += statfile.st_size;
colour(14,0);
printf("%-20s", dp->d_name);
printf("%-12s " , dp->d_name);
colour(13,0);
printf("%-12ld", (long)(statfile.st_size));
@@ -566,7 +566,7 @@ int KeywordScan()
colour(CFG.InputColourF, CFG.InputColourB);
GetstrC(Name, 80);
if((strcmp(Name, "")) == 0)
if ((strcmp(Name, "")) == 0)
return 0;
strcpy(tmpname, tl(Name));
@@ -625,7 +625,8 @@ int KeywordScan()
T.Active = FALSE;
T.Cost = file.Cost;
T.Size = file.Size;
sprintf(T.File, "%s", file.Name);
strncpy(T.SFile, file.Name, 12);
strncpy(T.LFile, file.LName, 80);
SetTag(T);
Count++;
if (ShowOneFile() == 1) {
@@ -681,13 +682,14 @@ int FilenameScan()
FILE *pAreas, *pFile;
int z, y, Found, Count = 0;
char *Name;
char *tmpname;
char *tmpname, *tmpname2;
char temp[81];
_Tag T;
unsigned long OldArea;
Name = calloc(81, sizeof(char));
tmpname = calloc(81, sizeof(char));
tmpname2 = calloc(81, sizeof(char));
OldArea = iAreaNumber;
iLineCount = 2; /* Reset Line Counter to Zero */
@@ -730,6 +732,7 @@ int FilenameScan()
strcat(Name, temp);
}
}
tl(Name);
Syslog('+', "FilenameScan(): \"%s\"", Name);
clear();
@@ -752,13 +755,17 @@ int FilenameScan()
while (fread(&file, sizeof(file), 1, pFile) == 1) {
strcpy(tmpname, tl(file.Name));
if ((strstr(tmpname, Name)) != NULL) {
strcpy(tmpname, file.Name);
strcpy(tmpname2, file.LName);
tl(tmpname);
tl(tmpname2);
if (((strstr(tmpname, Name)) != NULL) || ((strstr(tmpname2, Name)) != NULL)) {
if (!Found) {
Enter(2);
if (iLC(2) == 1) {
free(Name);
free(tmpname);
free(tmpname2);
SetFileArea(OldArea);
return 1;
}
@@ -769,12 +776,14 @@ int FilenameScan()
T.Active = FALSE;
T.Cost = file.Cost;
T.Size = file.Size;
sprintf(T.File, "%s", file.Name);
strncpy(T.SFile, file.Name, 12);
strncpy(T.LFile, file.LName, 81);
SetTag(T);
Count++;
if (ShowOneFile() == 1) {
free(Name);
free(tmpname);
free(tmpname2);
SetFileArea(OldArea);
return 1;
}
@@ -788,6 +797,7 @@ int FilenameScan()
if (iLC(2) == 1) {
free(Name);
free(tmpname);
free(tmpname2);
SetFileArea(OldArea);
return 1;
}
@@ -803,6 +813,7 @@ int FilenameScan()
fclose(pAreas);
free(Name);
free(tmpname);
free(tmpname2);
printf("\n");
if (Count)
Mark();
@@ -912,7 +923,8 @@ int NewfileScan(int AskStart)
T.Active = FALSE;
T.Cost = file.Cost;
T.Size = file.Size;
sprintf(T.File, "%s", file.Name);
strncpy(T.SFile, file.Name, 12);
strncpy(T.LFile, file.LName, 80);
SetTag(T);
Count++;
@@ -1056,7 +1068,7 @@ int Upload()
/* MOET IN ALLE AREAS ZOEKEN */
if (area.Dupes) {
x = CheckFile(File, Area);
if(x) {
if (x) {
Enter(1);
/* The file already exists on the system */
pout(15, 3, (char *) Language(282));
@@ -2008,7 +2020,7 @@ void Copy_Home()
return;
}
if(Access(exitinfo.Security, area.DLSec) == FALSE) {
if (Access(exitinfo.Security, area.DLSec) == FALSE) {
colour(14, 0);
printf("\n%s\n", (char *) Language(236));
Pause();
@@ -2027,7 +2039,7 @@ void Copy_Home()
while (fread(&file, sizeof(file), 1, pFile) == 1) {
if (strcmp(File, file.Name) == 0) {
if ((strcasecmp(File, file.Name) == 0) || (strcasecmp(File, file.LName) == 0)) {
Found = TRUE;
if (((file.Size + Quota()) > (CFG.iQuota * 1048576))) {
@@ -2036,7 +2048,7 @@ void Copy_Home()
printf("%s\n", (char *) Language(279));
Syslog('+', "Copy homedir, not enough quota");
} else {
sprintf(temp1, "%s/%s", area.Path, File);
sprintf(temp1, "%s/%s", area.Path, file.LName); /* Use real longname here */
sprintf(temp2, "%s/%s/wrk/%s", CFG.bbs_usersdir, exitinfo.Name, File);
colour(CFG.TextColourF, CFG.TextColourB);
/* Start copy: */
@@ -2130,7 +2142,7 @@ void EditTaglist()
Fg--;
colour(Fg, 0);
printf("%-14s", Tag.File);
printf("%-12s", Tag.SFile);
Fg--;
colour(Fg, 0);

44
mbsebbs/filesub.c
View File

@@ -319,14 +319,14 @@ void Mark()
i = atoi(temp);
if ((i > 0) && (i < 100)) {
if ((Tagbuf[i].Area) && (strlen(Tagbuf[i].File))) {
if ((Tagbuf[i].Area) && (strlen(Tagbuf[i].LFile))) {
if (Access(exitinfo.Security, area.DLSec)) {
if ((fp = fopen("taglist", "a+")) != NULL) {
fseek(fp, 0, SEEK_SET);
Found = FALSE;
while (fread(&Tag, sizeof(Tag), 1, fp) == 1)
if ((Tag.Area == Tagbuf[i].Area) && (strcmp(Tag.File, Tagbuf[i].File) == 0)) {
if ((Tag.Area == Tagbuf[i].Area) && (strcmp(Tag.LFile, Tagbuf[i].LFile) == 0)) {
Found = TRUE;
Syslog('b', "Tagbuf[i].File already tagged");
}
@@ -336,7 +336,7 @@ void Mark()
Tag = Tagbuf[i];
Tag.Active = TRUE;
fwrite(&Tag, sizeof(Tag), 1, fp);
Syslog('+', "Tagged file %s from area %d", Tag.File, Tag.Area);
Syslog('+', "Tagged file %s from area %d", Tag.LFile, Tag.Area);
}
fclose(fp);
@@ -416,37 +416,16 @@ int ShowOneFile()
printf(" %02d ", Tagnr);
colour(CFG.FilenameF, CFG.FilenameB);
if(strlen(file.Name) < 25)
printf("%-15s", file.Name);
else {
printf("%-75s", file.Name);
if (iLC(1) == 1)
return 1;
}
printf("%-12s", file.Name);
colour(CFG.FilesizeF, CFG.FilesizeB);
if(strlen(file.Name) < 25)
printf("%10lu ", (long)(file.Size));
else
printf("%25lu ", (long)(file.Size));
printf("%10lu ", (long)(file.Size));
colour(CFG.FiledateF, CFG.FiledateB);
printf("%-10s ", StrDateDMY(file.UploadDate));
colour(12, 0);
if(file.TimesDL < 10)
printf(" ");
if(file.TimesDL < 100)
printf(" ");
if(file.TimesDL < 1000)
printf(" ");
if(file.TimesDL > 9999)
file.TimesDL = 9999;
printf("[%ld] ", file.TimesDL);
printf("[%4ld] ", file.TimesDL);
if((strcmp(file.Uploader, "")) == 0)
strcpy(file.Uploader, "SysOp");
@@ -891,14 +870,17 @@ int Addfile(char *File, int AreaNum, int fileid)
}
memset(&file, 0, sizeof(file));
strcpy(file.Name, File);
strcpy(file.LName, File);
strcpy(temp1, File);
name_mangle(temp1);
strcpy(file.Name, temp1);
sprintf(temp1,"%ld",(long)(statfile.st_size));
file.Size = atoi(temp1);
file.FileDate = statfile.st_mtime;
strcpy(file.Uploader, exitinfo.sUserName);
time(&file.UploadDate);
file.UploadDate = time(NULL);
if(area.PwdUP) {
if (area.PwdUP) {
colour(9,0);
/* Do you want to password protect your upload ? [y/N]: */
printf("\n%s", (char *) Language(285));
@@ -998,7 +980,7 @@ int Addfile(char *File, int AreaNum, int fileid)
iPrivate = TRUE;
fprintf(pPrivate, "****************************************************");
fprintf(pPrivate, "\nUser : %s", file.Uploader);
fprintf(pPrivate, "\nFile : %s", file.Name);
fprintf(pPrivate, "\nFile : %s (%s)", file.LName, file.Name);
fprintf(pPrivate, "\nSize : %lu", (long)(file.Size));
fprintf(pPrivate, "\nUpload Date : %s\n\n", StrDateDMY(file.UploadDate));