moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-21 23:38:49 -05:00
Code Issues Releases Wiki Activity

pacsort: clean up if error

Browse Source 
* free memory
* close open file

Signed-off-by: Rikard Falkeborn <rikard.falkeborn@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Rikard Falkeborn 2015-08-10 21:42:39 +02:00 committed by Allan McRae
parent aa8a674b6b
commit e28aff4d87
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/util/pacsort.c
View File

@ -484,6 +484,7 @@ int main(int argc, char *argv[])
struct list_t *list;
struct buffer_t *buffer;
size_t i;
int ret = 0;
/* option defaults */
opts.order = 1;
@ -507,7 +508,8 @@ int main(int argc, char *argv[])
if(optind == argc) {
if(splitfile(stdin, buffer, list) != 0) {
fprintf(stderr, "%s: memory exhausted\n", argv[0]);
return ENOMEM;
ret = ENOMEM;
goto cleanup;
}
} else {
while(optind < argc) {
@ -515,7 +517,9 @@ int main(int argc, char *argv[])
if(input) {
if(splitfile(input, buffer, list) != 0) {
fprintf(stderr, "%s: memory exhausted\n", argv[0]);
return ENOMEM;
fclose(input);
ret = ENOMEM;
goto cleanup;
}
fclose(input);
} else {
@ -534,10 +538,11 @@ int main(int argc, char *argv[])
}
}
cleanup:
list_free(list, input_free);
buffer_free(buffer);
return 0;
return ret;
}
/* vim: set noet: */