emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps-repo: do the right thing in some error paths.

Browse Source 
--HG--
extra : convert_revision : xtraeme%40gmail.com-20091118231106-xxbg5oyvnojv1ykd
This commit is contained in:
Juan RP 2009-11-19 00:11:06 +01:00
parent e8d947e15b
commit 9e062cec4f
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bin/xbps-repo/index.c
View File

@ -255,8 +255,8 @@ xbps_repo_genindex(const char *pkgdir)
path = xbps_xasprintf("%s/%s", pkgdir, archdirs[i]); path = xbps_xasprintf("%s/%s", pkgdir, archdirs[i]);
if (path == NULL) { if (path == NULL) {
prop_object_release(idxdict); rv = errno;
return errno; goto out;
} }
dirp = opendir(path); dirp = opendir(path);
@ -279,9 +279,8 @@ xbps_repo_genindex(const char *pkgdir)
if (binfile == NULL) { if (binfile == NULL) {
(void)closedir(dirp); (void)closedir(dirp);
free(path); free(path);
prop_object_release(idxdict); rv = errno;
free(plist); goto out;
return errno;
} }
rv = xbps_repo_addpkg_index(idxdict, binfile); rv = xbps_repo_addpkg_index(idxdict, binfile);
free(binfile); free(binfile);
@ -290,9 +289,7 @@ xbps_repo_genindex(const char *pkgdir)
else if (rv != 0) { else if (rv != 0) {
(void)closedir(dirp); (void)closedir(dirp);
free(path); free(path);
prop_object_release(idxdict); goto out;
free(plist);
return rv;
} }
registered_newpkgs = true; registered_newpkgs = true;
} }
@ -313,7 +310,7 @@ xbps_repo_genindex(const char *pkgdir)
* Don't write plist file if no packages were registered. * Don't write plist file if no packages were registered.
*/ */
if (registered_newpkgs == false) if (registered_newpkgs == false)
return rv; goto out;
/* /*
* If any package was registered in package index, write * If any package was registered in package index, write
* plist file to storage. * plist file to storage.
@ -321,6 +318,7 @@ xbps_repo_genindex(const char *pkgdir)
if (!prop_dictionary_externalize_to_file(idxdict, plist)) if (!prop_dictionary_externalize_to_file(idxdict, plist))
rv = errno; rv = errno;
} }
out:
free(plist); free(plist);
prop_object_release(idxdict); prop_object_release(idxdict);