bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

code cleanup

Browse source
This commit is contained in:
Aurelien Foret 2006-03-08 18:21:17 +00:00
parent 4f42a0accb
commit d6eeae2716
1 changed files with 13 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
lib/libalpm/package.c
View file

@ -246,7 +246,7 @@ pmpkg_t *_alpm_pkg_load(char *pkgfile)
int config = 0; int config = 0;
int filelist = 0; int filelist = 0;
int scriptcheck = 0; int scriptcheck = 0;
TAR *tar; TAR *tar = NULL;
pmpkg_t *info = NULL; pmpkg_t *info = NULL;
tartype_t gztype = { tartype_t gztype = {
(openfunc_t)_alpm_gzopen_frontend, (openfunc_t)_alpm_gzopen_frontend,
@ -259,21 +259,19 @@ pmpkg_t *_alpm_pkg_load(char *pkgfile)
RET_ERR(PM_ERR_WRONG_ARGS, NULL); RET_ERR(PM_ERR_WRONG_ARGS, NULL);
} }
if(tar_open(&tar, pkgfile, &gztype, O_RDONLY, 0, TAR_GNU) == -1) {
RET_ERR(PM_ERR_NOT_A_FILE, NULL);
}
info = _alpm_pkg_new(NULL, NULL); info = _alpm_pkg_new(NULL, NULL);
if(info == NULL) { if(info == NULL) {
tar_close(tar);
return(NULL); return(NULL);
} }
if(_alpm_pkg_splitname(pkgfile, info->name, info->version) == -1) {
pm_errno = PM_ERR_PKG_INVALID_NAME;
goto error;
}
/* ORE if(tar_open(&tar, pkgfile, &gztype, O_RDONLY, 0, TAR_GNU) == -1) {
* We should get the name and version information from the file name pm_errno = PM_ERR_NOT_A_FILE;
* by using pkg_splitname() goto error;
*/ }
for(i = 0; !th_read(tar); i++) { for(i = 0; !th_read(tar); i++) {
if(config && filelist && scriptcheck) { if(config && filelist && scriptcheck) {
/* we have everything we need */ /* we have everything we need */
@ -296,22 +294,6 @@ pmpkg_t *_alpm_pkg_load(char *pkgfile)
close(fd); close(fd);
goto error; goto error;
} }
if(!strlen(info->name)) {
_alpm_log(PM_LOG_ERROR, "missing package name in %s", pkgfile);
pm_errno = PM_ERR_PKG_INVALID;
unlink(descfile);
FREE(descfile);
close(fd);
goto error;
}
if(!strlen(info->version)) {
_alpm_log(PM_LOG_ERROR, "missing package version in %s", pkgfile);
pm_errno = PM_ERR_PKG_INVALID;
unlink(descfile);
FREE(descfile);
close(fd);
goto error;
}
config = 1; config = 1;
unlink(descfile); unlink(descfile);
FREE(descfile); FREE(descfile);
@ -368,6 +350,7 @@ pmpkg_t *_alpm_pkg_load(char *pkgfile)
expath = NULL; expath = NULL;
} }
tar_close(tar); tar_close(tar);
tar = NULL;
if(!config) { if(!config) {
_alpm_log(PM_LOG_ERROR, "missing package info file in %s", pkgfile); _alpm_log(PM_LOG_ERROR, "missing package info file in %s", pkgfile);
@ -383,8 +366,9 @@ pmpkg_t *_alpm_pkg_load(char *pkgfile)
error: error:
FREEPKG(info); FREEPKG(info);
tar_close(tar); if(tar) {
tar_close(tar);
}
return(NULL); return(NULL);
} }