From: Turbo Fredriksson Date: Tue, 4 Jun 2013 01:55:28 +0000 (+0200) Subject: Use setmntent() OR fopen() X-Git-Url: https://git.camperquake.de/gitweb.cgi?p=zfs.git;a=commitdiff_plain;h=f9e459d1435832caa69fdaf236ebaeacd93f1b3e Use setmntent() OR fopen() For the same reasons it's used in libzfs_init(), this was just overlooked because zinject gets minimal use. Signed-off-by: Brian Behlendorf Issue #1498 --- diff --git a/cmd/zinject/translate.c b/cmd/zinject/translate.c index fc16127..b2ccb67 100644 --- 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); }