summaryrefslogtreecommitdiff
path: root/lib/fs.c
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2001-11-12 20:51:05 +0000
committerjbj <devnull@localhost>2001-11-12 20:51:05 +0000
commit21a35690b3d6e79206ae62724cb8fbd538be57cb (patch)
tree8499954cab7053994d4b5dcd176d40b8caa76eb1 /lib/fs.c
parent55ffccbddecade7b99992900cec5dd2aef3b059c (diff)
downloadlibrpm-tizen-21a35690b3d6e79206ae62724cb8fbd538be57cb.tar.gz
librpm-tizen-21a35690b3d6e79206ae62724cb8fbd538be57cb.tar.bz2
librpm-tizen-21a35690b3d6e79206ae62724cb8fbd538be57cb.zip
- commit to using rpmDepSet and TFI_t, not header.
- lclint rpmio fiddles. CVS patchset: 5177 CVS date: 2001/11/12 20:51:05
Diffstat (limited to 'lib/fs.c')
-rw-r--r--lib/fs.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/lib/fs.c b/lib/fs.c
index 1091f57f8..a1e0f5d6b 100644
--- a/lib/fs.c
+++ b/lib/fs.c
@@ -143,18 +143,11 @@ static int getFilesystemList(void)
int i;
const char * mntdir;
int rdonly = 0;
+
# if GETMNTENT_ONE || GETMNTENT_TWO
our_mntent item;
FILE * mtab;
-# elif HAVE_GETMNTINFO_R
- struct statfs * mounts = NULL;
- int mntCount = 0, bufSize = 0, flags = MNT_NOWAIT;
- int nextMount = 0;
-# endif
- rpmMessage(RPMMESS_DEBUG, _("getting list of mounted filesystems\n"));
-
-# if GETMNTENT_ONE || GETMNTENT_TWO
mtab = fopen(MOUNTED, "r");
if (!mtab) {
rpmError(RPMERR_MTAB, _("failed to open %s: %s\n"), MOUNTED,
@@ -162,6 +155,10 @@ static int getFilesystemList(void)
return 1;
}
# elif HAVE_GETMNTINFO_R
+ struct statfs * mounts = NULL;
+ int mntCount = 0, bufSize = 0, flags = MNT_NOWAIT;
+ int nextMount = 0;
+
getmntinfo_r(&mounts, flags, &mntCount, &bufSize);
# endif