git://git.camperquake.de
/
zfs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fb5c53e
)
Use setmntent() OR fopen()
author
Turbo Fredriksson
<turbo@bayour.com>
Tue, 4 Jun 2013 01:55:28 +0000
(
03:55
+0200)
committer
Brian Behlendorf
<behlendorf1@llnl.gov>
Thu, 15 Aug 2013 17:09:09 +0000
(10:09 -0700)
For the same reasons it's used in libzfs_init(), this was just
overlooked because zinject gets minimal use.
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #1498
cmd/zinject/translate.c
patch
|
blob
|
history
diff --git
a/cmd/zinject/translate.c
b/cmd/zinject/translate.c
index
fc16127
..
b2ccb67
100644
(file)
--- a/
cmd/zinject/translate.c
+++ b/
cmd/zinject/translate.c
@@
-115,7
+115,11
@@
parse_pathname(const char *inpath, char *dataset, char *relpath,
return (-1);
}
+#ifdef HAVE_SETMNTENT
+ if ((fp = setmntent(MNTTAB, "r")) == NULL) {
+#else
if ((fp = fopen(MNTTAB, "r")) == NULL) {
+#endif
(void) fprintf(stderr, "cannot open /etc/mtab\n");
return (-1);
}