fixing bug 23389. macinstaller was quitting after the downloding of the .xpi files. a=jj

This commit is contained in:
ssu%netscape.com 2000-01-15 00:10:31 +00:00
Родитель 33cee658dc
Коммит 91d3b04aec
2 изменённых файлов: 4 добавлений и 5 удалений

Просмотреть файл

@ -149,8 +149,8 @@ EssentialFiles2Components(char *filename)
*tempStr = 'e'; *tempStr = 'e';
strcpy(finalStr, filename); strcpy(finalStr, filename);
strcpy(&finalStr[prefixLen], "components"); strcpy(&finalStr[prefixLen], "Components");
strcpy(&finalStr[prefixLen + strlen("components")], &filename[prefixLen + strlen("essential files")]); strcpy(&finalStr[prefixLen + strlen("Components")], &filename[prefixLen + strlen("essential files")]);
strcpy(filename, finalStr); strcpy(filename, finalStr);
} }
@ -210,6 +210,7 @@ InflateFiles(void *hZip, void *hFind, short tgtVRefNum, long tgtDirID)
/* create directories if file is nested in new subdirs */ /* create directories if file is nested in new subdirs */
SLASHES_2_COLONS(fullPathStr); SLASHES_2_COLONS(fullPathStr);
EssentialFiles2Components(fullPathStr);
err = DirCreateRecursive(fullPathStr); err = DirCreateRecursive(fullPathStr);
if (err!=noErr) if (err!=noErr)
@ -224,8 +225,6 @@ InflateFiles(void *hZip, void *hFind, short tgtVRefNum, long tgtDirID)
continue; /* XXX do we want to do this? */ continue; /* XXX do we want to do this? */
} }
EssentialFiles2Components(fullPathStr);
/* extract the file to its full path destination */ /* extract the file to its full path destination */
rv = ZIP_ExtractFile( hZip, filename, fullPathStr ); rv = ZIP_ExtractFile( hZip, filename, fullPathStr );

Просмотреть файл

@ -226,7 +226,7 @@ RunAllXPIs(short xpiVRefNum, long xpiDirID, short vRefNum, long dirID)
Str255 installingStr; Str255 installingStr;
err = FSMakeFSSpec(vRefNum, dirID, "\p:viewer", &xpiProgDirSpec); /* temp dir */ err = FSMakeFSSpec(vRefNum, dirID, "\p:viewer", &xpiProgDirSpec); /* temp dir */
err = FSMakeFSSpec(vRefNum, dirID, "\p:viewer:components", &xpiStubDirSpec); /* xpistub dir */ err = FSMakeFSSpec(vRefNum, dirID, "\p:viewer:Components", &xpiStubDirSpec); /* xpistub dir */
err = FSMakeFSSpec(gControls->opt->vRefNum, gControls->opt->dirID, 0, &tgtDirSpec); /* program dir */ err = FSMakeFSSpec(gControls->opt->vRefNum, gControls->opt->dirID, 0, &tgtDirSpec); /* program dir */
ERR_CHECK_RET(LoadXPIStub(&xpi_initProc, &xpi_installProc, &xpi_exitProc, &connID, xpiStubDirSpec), err); ERR_CHECK_RET(LoadXPIStub(&xpi_initProc, &xpi_installProc, &xpi_exitProc, &connID, xpiStubDirSpec), err);