emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix fstabinfo for mounting /dev/shm, Gentoo #245367.

Browse Source
This commit is contained in:
Roy Marples 2008-11-03 18:00:55 +00:00
parent 282ad4bae6
commit 7467440a29
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/rc/fstabinfo.c
View File

@ -75,7 +75,8 @@
#include "rc-misc.h" #include "rc-misc.h"
#ifdef HAVE_GETMNTENT #ifdef HAVE_GETMNTENT
static struct mntent *getmntfile(const char *file) static struct mntent *
getmntfile(const char *file)
{ {
struct mntent *ent; struct mntent *ent;
FILE *fp; FILE *fp;
@ -154,7 +155,8 @@ static const char * const longopts_help[] = {
#define OUTPUT_BLOCKDEV (1 << 5) #define OUTPUT_BLOCKDEV (1 << 5)
#define OUTPUT_MOUNT (1 << 6) #define OUTPUT_MOUNT (1 << 6)
int fstabinfo(int argc, char **argv) int
fstabinfo(int argc, char **argv)
{ {
struct ENT *ent; struct ENT *ent;
int result = EXIT_SUCCESS; int result = EXIT_SUCCESS;
@ -238,7 +240,7 @@ int fstabinfo(int argc, char **argv)
} }
if (optind < argc) { if (optind < argc) {
if (files) { if (TAILQ_FIRST(files)) {
TAILQ_FOREACH_SAFE(file, files, entries, file_np) { TAILQ_FOREACH_SAFE(file, files, entries, file_np) {
for (i = optind; i < argc; i++) for (i = optind; i < argc; i++)
if (strcmp(argv[i], file->value) == 0) if (strcmp(argv[i], file->value) == 0)
@ -260,7 +262,7 @@ int fstabinfo(int argc, char **argv)
eerrorx("%s: emtpy fstab", argv[0]); eerrorx("%s: emtpy fstab", argv[0]);
} }
if (!files || !TAILQ_FIRST(files)) { if (!TAILQ_FIRST(files)) {
rc_stringlist_free(files); rc_stringlist_free(files);
return (EXIT_FAILURE); return (EXIT_FAILURE);
} }