CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-21 03:12:48 +02:00
Code Issues Projects Releases Wiki Activity

(read_filesystem_list) [MOUNTED_GETMNTENT2]:

Browse Source 
Always close stream and file descriptor before returning.
This commit is contained in:
Jim Meyering
1998-06-30 03:56:57 +00:00
parent 3fa1d4bb24
commit 6dda2aaa52
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/mountlist.c
View File

@@ -532,6 +532,7 @@ read_filesystem_list (need_fs_type, all_fs)
FILE *fp;
int ret;
int lockfd = -1;
int fail = 0;
# if defined F_RDLCK && defined F_SETLKW
/* MNTTAB_LOCK is a macro name of our own invention; it's not present in
@@ -557,7 +558,12 @@ read_filesystem_list (need_fs_type, all_fs)
fp = fopen (table, "r");
if (fp == NULL)
return NULL;
{
/* FIXME maybe: this close could clobber errno from fopen failure. */
if (0 <= lockfd)
close (lockfd);
return NULL;
}
while ((ret = getmntent (fp, &mnt)) == 0)
{
@@ -578,10 +584,13 @@ read_filesystem_list (need_fs_type, all_fs)
}
if (ret > 0)
return NULL;
fail = 1;
if (fclose (fp) == EOF)
return NULL;
fail = 1;
if (0 <= lockfd && close (lockfd) != 0)
fail = 1;
if (fail)
return NULL;
}
#endif /* MOUNTED_GETMNTENT2. */