callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Also close the fd after we're done.

Browse Source 
2000-05-07    <notzed@helixcode.com>

        * file.c (ibex_open): Also close the fd after we're done.

svn path=/trunk/; revision=2859
This commit is contained in:
7
2000-05-07 05:04:31 +00:00
committed by Michael Zucci
parent cca467781c
commit 97505d5350
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libibex/ChangeLog
View File

@ -1,4 +1,6 @@
2000-05-06 NotZed <NotZed@HelixCode.com>
2000-05-07 <notzed@helixcode.com>
* file.c (ibex_open): Also close the fd after we're done.
* find.c (ibex_contains_name): New function to find out if a file
is indexed.

9
libibex/file.c
View File

@ -114,6 +114,7 @@ ibex_open (char *file, int flags, int mode)
if (f == NULL) {
if (errno == 0)
errno = ENOMEM;
close(fd);
return NULL;
}
@ -124,12 +125,16 @@ ibex_open (char *file, int flags, int mode)
ib->words = g_hash_table_new (g_str_hash, g_str_equal);
ib->oldfiles = g_ptr_array_new ();
if (!f)
if (!f) {
close(fd);
return ib;
}
/* Check version. If its empty, then we have just created it */
if (fread (vbuf, 1, sizeof (vbuf), f) != sizeof (vbuf)) {
if (feof (f)) {
fclose(f);
close(fd);
return ib;
}
}
@ -177,11 +182,13 @@ ibex_open (char *file, int flags, int mode)
g_free (ibfs);
fclose (f);
close(fd);
return ib;
errout:
fclose (f);
close(fd);
g_tree_traverse (ib->files, free_file, G_IN_ORDER, NULL);
g_tree_destroy (ib->files);
g_hash_table_foreach (ib->words, free_word, NULL);