mozilla
/
mozilla-history
зеркало из https://github.com/mozilla/mozilla-history.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix #62939. r=pinkerton, sr=sfraser. Return error when no match in IC database. Fixes DL of QT5 beta from apple.com (where they had a warning not to use Netscape 6)

This commit is contained in:
pchen%netscape.com 2001-01-05 00:44:16 +00:00
Родитель 6252df5282
Коммит c861979159
4 изменённых файлов: 44 добавлений и 16 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

28
uriloader/exthandler/mac/nsInternetConfigService.cpp
Просмотреть файл

@ -116,13 +116,14 @@ NS_IMETHODIMP nsInternetConfigService::HasProtocalHandler(const char *protocol,
// This method does the dirty work of traipsing through IC mappings database
// looking for a mapping for mimetype
OSStatus nsInternetConfigService::GetMappingForMIMEType(const char *mimetype, const char *fileextension, ICMapEntry *entry)
nsresult nsInternetConfigService::GetMappingForMIMEType(const char *mimetype, const char *fileextension, ICMapEntry *entry)
{
ICInstance inst = nsInternetConfig::GetInstance();
OSStatus err = noErr;
ICAttr attr;
Handle prefH;
PRBool domimecheck = PR_TRUE;
PRBool domimecheck = PR_TRUE, gotmatch = PR_FALSE;
ICMapEntry ent;
if ((strcmp(mimetype, UNKNOWN_CONTENT_TYPE) == 0) ||
(strcmp(mimetype, APPLICATION_OCTET_STREAM) == 0))
@ -147,13 +148,13 @@ OSStatus nsInternetConfigService::GetMappingForMIMEType(const char *mimetype, co
long pos;
for(long i = 1; i <= count; i++)
{
err = ::ICGetIndMapEntry(inst, prefH, i, &pos, entry);
err = ::ICGetIndMapEntry(inst, prefH, i, &pos, &ent);
if (err == noErr)
{
// first, do mime type check
if (domimecheck)
{
nsCString temp((char *)&entry->MIMEType[1], (int)entry->MIMEType[0]);
nsCAutoString temp((char *)&ent.MIMEType[1], (int)ent.MIMEType[0]);
if (!temp.EqualsIgnoreCase(mimetype))
{
// we need to do mime check, and check failed
@ -164,12 +165,15 @@ OSStatus nsInternetConfigService::GetMappingForMIMEType(const char *mimetype, co
if (fileextension)
{
// if fileextension was passed in, compare that also
if (entry->extension[0] != 0)
if (ent.extension[0]) // check for non-empty pascal string
{
nsCString temp((char *)&entry->extension[1], (int)entry->extension[0]);
nsCAutoString temp((char *)&ent.extension[1], (int)ent.extension[0]);
if (temp.EqualsIgnoreCase(fileextension))
{
// mime type and file extension match, we're outta here
gotmatch = PR_TRUE;
// copy over ICMapEntry
*entry = ent;
break;
}
}
@ -179,6 +183,9 @@ OSStatus nsInternetConfigService::GetMappingForMIMEType(const char *mimetype, co
// at this point, we've got our match because
// domimecheck is true, the mime strings match, and fileextension isn't passed in
// bad thing is we'll stop on first match, but what can you do?
gotmatch = PR_TRUE;
// copy over ICMapEntry
*entry = ent;
break;
}
}
@ -192,9 +199,16 @@ OSStatus nsInternetConfigService::GetMappingForMIMEType(const char *mimetype, co
err = memFullErr;
}
err = ::ICEnd(inst);
if (err == noErr && gotmatch == PR_FALSE)
{
err = fnfErr; // return SOME kind of error
}
}
}
return err;
if (err != noErr)
return NS_ERROR_FAILURE;
else
return NS_OK;
}
nsresult nsInternetConfigService::FillMIMEInfoForICEntry(ICMapEntry& entry, nsIMIMEInfo ** mimeinfo)

2
uriloader/exthandler/mac/nsInternetConfigService.h
Просмотреть файл

@ -36,7 +36,7 @@ public:
NS_DECL_ISUPPORTS
NS_DECL_NSIINTERNETCONFIGSERVICE
OSStatus GetMappingForMIMEType(const char *mimetype, const char *fileextension, ICMapEntry *entry);
nsresult GetMappingForMIMEType(const char *mimetype, const char *fileextension, ICMapEntry *entry);
nsInternetConfigService();
virtual ~nsInternetConfigService();

28
xpfe/appshell/src/nsInternetConfigService.cpp
Просмотреть файл

@ -116,13 +116,14 @@ NS_IMETHODIMP nsInternetConfigService::HasProtocalHandler(const char *protocol,
// This method does the dirty work of traipsing through IC mappings database
// looking for a mapping for mimetype
OSStatus nsInternetConfigService::GetMappingForMIMEType(const char *mimetype, const char *fileextension, ICMapEntry *entry)
nsresult nsInternetConfigService::GetMappingForMIMEType(const char *mimetype, const char *fileextension, ICMapEntry *entry)
{
ICInstance inst = nsInternetConfig::GetInstance();
OSStatus err = noErr;
ICAttr attr;
Handle prefH;
PRBool domimecheck = PR_TRUE;
PRBool domimecheck = PR_TRUE, gotmatch = PR_FALSE;
ICMapEntry ent;
if ((strcmp(mimetype, UNKNOWN_CONTENT_TYPE) == 0) ||
(strcmp(mimetype, APPLICATION_OCTET_STREAM) == 0))
@ -147,13 +148,13 @@ OSStatus nsInternetConfigService::GetMappingForMIMEType(const char *mimetype, co
long pos;
for(long i = 1; i <= count; i++)
{
err = ::ICGetIndMapEntry(inst, prefH, i, &pos, entry);
err = ::ICGetIndMapEntry(inst, prefH, i, &pos, &ent);
if (err == noErr)
{
// first, do mime type check
if (domimecheck)
{
nsCString temp((char *)&entry->MIMEType[1], (int)entry->MIMEType[0]);
nsCAutoString temp((char *)&ent.MIMEType[1], (int)ent.MIMEType[0]);
if (!temp.EqualsIgnoreCase(mimetype))
{
// we need to do mime check, and check failed
@ -164,12 +165,15 @@ OSStatus nsInternetConfigService::GetMappingForMIMEType(const char *mimetype, co
if (fileextension)
{
// if fileextension was passed in, compare that also
if (entry->extension[0] != 0)
if (ent.extension[0]) // check for non-empty pascal string
{
nsCString temp((char *)&entry->extension[1], (int)entry->extension[0]);
nsCAutoString temp((char *)&ent.extension[1], (int)ent.extension[0]);
if (temp.EqualsIgnoreCase(fileextension))
{
// mime type and file extension match, we're outta here
gotmatch = PR_TRUE;
// copy over ICMapEntry
*entry = ent;
break;
}
}
@ -179,6 +183,9 @@ OSStatus nsInternetConfigService::GetMappingForMIMEType(const char *mimetype, co
// at this point, we've got our match because
// domimecheck is true, the mime strings match, and fileextension isn't passed in
// bad thing is we'll stop on first match, but what can you do?
gotmatch = PR_TRUE;
// copy over ICMapEntry
*entry = ent;
break;
}
}
@ -192,9 +199,16 @@ OSStatus nsInternetConfigService::GetMappingForMIMEType(const char *mimetype, co
err = memFullErr;
}
err = ::ICEnd(inst);
if (err == noErr && gotmatch == PR_FALSE)
{
err = fnfErr; // return SOME kind of error
}
}
}
return err;
if (err != noErr)
return NS_ERROR_FAILURE;
else
return NS_OK;
}
nsresult nsInternetConfigService::FillMIMEInfoForICEntry(ICMapEntry& entry, nsIMIMEInfo ** mimeinfo)

2
xpfe/appshell/src/nsInternetConfigService.h
Просмотреть файл

@ -36,7 +36,7 @@ public:
NS_DECL_ISUPPORTS
NS_DECL_NSIINTERNETCONFIGSERVICE
OSStatus GetMappingForMIMEType(const char *mimetype, const char *fileextension, ICMapEntry *entry);
nsresult GetMappingForMIMEType(const char *mimetype, const char *fileextension, ICMapEntry *entry);
nsInternetConfigService();
virtual ~nsInternetConfigService();