The-Homebrew-Cloud/usbloadergx
2
0
Fork 0
mirror of https://github.com/wiidev/usbloadergx.git synced 2024-10-02 03:35:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bugs with sending zip files:

Browse Source 
* Directory creaton failed
  * Forgot to reload the homebrew browser
  * Removed a bunch of printf statements
This commit is contained in:
e.bovendeur 2009-10-02 06:55:40 +00:00
parent 448e3b4aab
commit dd77cce0d1
3 changed files with 64 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/homebrewboot/HomebrewBrowse.cpp
View File

@ -848,7 +848,7 @@ int MenuHomebrewBrowse() {
if (wiiloadVersion[0] > 0 || wiiloadVersion[1] > 4) { if (wiiloadVersion[0] > 0 || wiiloadVersion[1] > 4) {
// We need to unzip... // We need to unzip...
if (temp[0] == 'P' && temp[1] == 'K' && temp[2] == 0x03 && temp[2] == 0x04) { if (temp[0] == 'P' && temp[1] == 'K' && temp[2] == 0x03 && temp[3] == 0x04) {
// It's a zip file, unzip to the apps directory // It's a zip file, unzip to the apps directory
// Zip archive, ask for permission to install the zip // Zip archive, ask for permission to install the zip
@ -866,11 +866,17 @@ int MenuHomebrewBrowse() {
if (uf==NULL) { if (uf==NULL) {
error = true; error = true;
} else { } else {
extractZip(uf,0,1,0); extractZip(uf,0,1,0, Settings.homebrewapps_path);
unzCloseCurrentFile(uf); unzCloseCurrentFile(uf);
remove(zippath); remove(zippath);
// Reload this menu here...
menu = MENU_HOMEBREWBROWSE;
break;
} }
} else {
error = true;
} }
} else if (uncfilesize != 0) { // if uncfilesize == 0, it's not compressed } else if (uncfilesize != 0) { // if uncfilesize == 0, it's not compressed
// It's compressed, uncompress // It's compressed, uncompress

77
source/unzip/miniunz.c
View File

@ -55,7 +55,7 @@ int makedir (char *newdir) {
hold = *p; hold = *p;
*p = 0; *p = 0;
if ((mymkdir(buffer) == -1) && (errno == ENOENT)) { if ((mymkdir(buffer) == -1) && (errno == ENOENT)) {
printf("couldn't create directory %s\n",buffer); // printf("couldn't create directory %s\n",buffer);
free(buffer); free(buffer);
return 0; return 0;
} }
@ -67,9 +67,24 @@ int makedir (char *newdir) {
return 1; return 1;
} }
static int do_extract_currentfile(unzFile uf,const int* popt_extract_without_path,int* popt_overwrite,const char* password) { static char *fullfilename(const char *basedir, char *filename) {
char *file = (char *) malloc(strlen(basedir) + strlen(filename) + 1);
if (basedir == NULL) {
strcpy(file, filename);
} else {
if (basedir[strlen(basedir) - 1] == '/') {
sprintf(file, "%s%s", basedir, filename);
} else {
sprintf(file, "%s/%s", basedir, filename);
}
}
return file;
}
static int do_extract_currentfile(unzFile uf,const int* popt_extract_without_path,int* popt_overwrite,const char* password, const char *basedir) {
char filename_inzip[256]; char filename_inzip[256];
char* filename_withoutpath; char* filename_withoutpath;
char* filename_withpath;
char* p; char* p;
int err=UNZ_OK; int err=UNZ_OK;
FILE *fout=NULL; FILE *fout=NULL;
@ -80,18 +95,19 @@ static int do_extract_currentfile(unzFile uf,const int* popt_extract_without_pat
err = unzGetCurrentFileInfo(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0); err = unzGetCurrentFileInfo(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
if (err!=UNZ_OK) { if (err!=UNZ_OK) {
printf("error %d with zipfile in unzGetCurrentFileInfo\n",err); // printf("error %d with zipfile in unzGetCurrentFileInfo\n",err);
return err; return err;
} }
size_buf = WRITEBUFFERSIZE; size_buf = WRITEBUFFERSIZE;
buf = (void*)malloc(size_buf); buf = (void*)malloc(size_buf);
if (buf==NULL) { if (buf==NULL) {
printf("Error allocating memory\n"); // printf("Error allocating memory\n");
return UNZ_INTERNALERROR; return UNZ_INTERNALERROR;
} }
p = filename_withoutpath = filename_inzip; p = filename_withoutpath = filename_inzip;
filename_withpath = fullfilename(basedir, filename_inzip);
while ((*p) != '\0') { while ((*p) != '\0') {
if (((*p)=='/') || ((*p)=='\\')) if (((*p)=='/') || ((*p)=='\\'))
filename_withoutpath = p+1; filename_withoutpath = p+1;
@ -100,21 +116,30 @@ static int do_extract_currentfile(unzFile uf,const int* popt_extract_without_pat
if ((*filename_withoutpath)=='\0') { if ((*filename_withoutpath)=='\0') {
if ((*popt_extract_without_path)==0) { if ((*popt_extract_without_path)==0) {
printf("creating directory: %s\n",filename_inzip);
mymkdir(filename_inzip); // Fix the path, this will fail if the directoryname is the same as the first filename in the zip
char *path = (char *) malloc(strlen(filename_withpath));
strcpy(path, filename_withpath);
char *ptr = strstr(path, filename_withoutpath);
*ptr = '\0';
// printf("creating directory: %s\n",path);
mymkdir(path);
free(path);
} }
} else { } else {
char* write_filename; char* write_filename;
int skip=0; int skip=0;
if ((*popt_extract_without_path)==0) if ((*popt_extract_without_path)==0)
write_filename = filename_inzip; write_filename = filename_withpath;
else else
write_filename = filename_withoutpath; write_filename = filename_withoutpath;
err = unzOpenCurrentFilePassword(uf,password); err = unzOpenCurrentFilePassword(uf,password);
if (err!=UNZ_OK) { if (err!=UNZ_OK) {
printf("error %d with zipfile in unzOpenCurrentFilePassword\n",err); // printf("error %d with zipfile in unzOpenCurrentFilePassword\n",err);
} }
if (((*popt_overwrite)==0) && (err==UNZ_OK)) { if (((*popt_overwrite)==0) && (err==UNZ_OK)) {
@ -127,7 +152,7 @@ static int do_extract_currentfile(unzFile uf,const int* popt_extract_without_pat
char answer[128]; char answer[128];
int ret; int ret;
printf("The file %s exists. Overwrite ? [y]es, [n]o, [A]ll: ",write_filename); // printf("The file %s exists. Overwrite ? [y]es, [n]o, [A]ll: ",write_filename);
ret = scanf("%1s",answer); ret = scanf("%1s",answer);
if (ret != 1) { if (ret != 1) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -153,28 +178,36 @@ static int do_extract_currentfile(unzFile uf,const int* popt_extract_without_pat
(filename_withoutpath!=(char*)filename_inzip)) { (filename_withoutpath!=(char*)filename_inzip)) {
char c=*(filename_withoutpath-1); char c=*(filename_withoutpath-1);
*(filename_withoutpath-1)='\0'; *(filename_withoutpath-1)='\0';
makedir(write_filename);
// Fix the path, this will fail if the directoryname is the same as the first filename in the zip
char *path = (char *) malloc(strlen(write_filename));
strcpy(path, write_filename);
char *ptr = strstr(path, filename_withoutpath);
*ptr = '\0';
makedir(path);
free(path);
*(filename_withoutpath-1)=c; *(filename_withoutpath-1)=c;
fout=fopen(write_filename,"wb"); fout=fopen(write_filename,"wb");
} }
if (fout==NULL) { if (fout==NULL) {
printf("error opening %s\n",write_filename); // printf("error opening %s\n",write_filename);
} }
} }
if (fout!=NULL) { if (fout!=NULL) {
printf(" extracting: %s\n",write_filename); // printf(" extracting: %s\n",write_filename);
do { do {
err = unzReadCurrentFile(uf,buf,size_buf); err = unzReadCurrentFile(uf,buf,size_buf);
if (err<0) { if (err<0) {
printf("error %d with zipfile in unzReadCurrentFile\n",err); // printf("error %d with zipfile in unzReadCurrentFile\n",err);
break; break;
} }
if (err>0) if (err>0)
if (fwrite(buf,err,1,fout)!=1) { if (fwrite(buf,err,1,fout)!=1) {
printf("error in writing extracted file\n"); // printf("error in writing extracted file\n");
err=UNZ_ERRNO; err=UNZ_ERRNO;
break; break;
} }
@ -187,36 +220,36 @@ static int do_extract_currentfile(unzFile uf,const int* popt_extract_without_pat
if (err==UNZ_OK) { if (err==UNZ_OK) {
err = unzCloseCurrentFile (uf); err = unzCloseCurrentFile (uf);
if (err!=UNZ_OK) { if (err!=UNZ_OK) {
printf("error %d with zipfile in unzCloseCurrentFile\n",err); // printf("error %d with zipfile in unzCloseCurrentFile\n",err);
} }
} else } else
unzCloseCurrentFile(uf); /* don't lose the error */ unzCloseCurrentFile(uf); /* don't lose the error */
} }
free(filename_withpath);
free(buf); free(buf);
return err; return err;
} }
int extractZip(unzFile uf,int opt_extract_without_path,int opt_overwrite,const char* password) { int extractZip(unzFile uf,int opt_extract_without_path,int opt_overwrite,const char* password, const char *basedir) {
uLong i; uLong i;
unz_global_info gi; unz_global_info gi;
int err; int err;
err = unzGetGlobalInfo (uf,&gi); err = unzGetGlobalInfo (uf,&gi);
if (err!=UNZ_OK) if (err!=UNZ_OK)
printf("error %d with zipfile in unzGetGlobalInfo \n",err); // printf("error %d with zipfile in unzGetGlobalInfo \n",err);
for (i=0;i<gi.number_entry;i++) { for (i=0;i<gi.number_entry;i++) {
if (do_extract_currentfile(uf,&opt_extract_without_path, if (do_extract_currentfile(uf,&opt_extract_without_path,
&opt_overwrite, &opt_overwrite,
password) != UNZ_OK) password, basedir) != UNZ_OK)
break; break;
if ((i+1)<gi.number_entry) { if ((i+1)<gi.number_entry) {
err = unzGoToNextFile(uf); err = unzGoToNextFile(uf);
if (err!=UNZ_OK) { if (err!=UNZ_OK) {
printf("error %d with zipfile in unzGoToNextFile\n",err); // printf("error %d with zipfile in unzGoToNextFile\n",err);
break; break;
} }
} }
@ -227,13 +260,13 @@ int extractZip(unzFile uf,int opt_extract_without_path,int opt_overwrite,const c
int extractZipOnefile(unzFile uf,const char* filename,int opt_extract_without_path,int opt_overwrite,const char* password) { int extractZipOnefile(unzFile uf,const char* filename,int opt_extract_without_path,int opt_overwrite,const char* password) {
if (unzLocateFile(uf,filename,CASESENSITIVITY)!=UNZ_OK) { if (unzLocateFile(uf,filename,CASESENSITIVITY)!=UNZ_OK) {
printf("file %s not found in the zipfile\n",filename); // printf("file %s not found in the zipfile\n",filename);
return 2; return 2;
} }
if (do_extract_currentfile(uf,&opt_extract_without_path, if (do_extract_currentfile(uf,&opt_extract_without_path,
&opt_overwrite, &opt_overwrite,
password) == UNZ_OK) password, NULL) == UNZ_OK)
return 0; return 0;
else else
return 1; return 1;

2
source/unzip/miniunz.h
View File

@ -6,7 +6,7 @@
extern "C" { extern "C" {
#endif #endif
int extractZip(unzFile uf,int opt_extract_without_path,int opt_overwrite,const char* password); int extractZip(unzFile uf,int opt_extract_without_path,int opt_overwrite,const char* password, const char *basedir);
int extractZipOnefile(unzFile uf,const char* filename,int opt_extract_without_path,int opt_overwrite,const char* password); int extractZipOnefile(unzFile uf,const char* filename,int opt_extract_without_path,int opt_overwrite,const char* password);
int makedir(char *newdir); int makedir(char *newdir);