Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-26 10:32:02 +00:00
Code Issues Projects Releases Wiki Activity

erase_mtab: do not limit ourself to 40 mtab entries

Browse Source
This commit is contained in:
Denis Vlasenko 2006-11-27 17:29:09 +00:00
parent 097c324f59
commit f1a6c6b362
1 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
libbb/mtab.c
View File

@ -7,53 +7,42 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details. * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/ */
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
#include <string.h>
#include <stdio.h>
#include <mntent.h> #include <mntent.h>
#include "libbb.h" #include "libbb.h"
#define MTAB_MAX_ENTRIES 40 #if ENABLE_FEATURE_MTAB_SUPPORT
#ifdef CONFIG_FEATURE_MTAB_SUPPORT
void erase_mtab(const char *name) void erase_mtab(const char *name)
{ {
struct mntent entries[MTAB_MAX_ENTRIES]; struct mntent *entries = NULL;
int count = 0; int i, count = 0;
FILE *mountTable = setmntent(bb_path_mtab_file, "r"); FILE *mountTable;
struct mntent *m; struct mntent *m;
/* Check if reading the mtab file failed */ mountTable = setmntent(bb_path_mtab_file, "r");
if (mountTable == 0 /* Bummer. Fall back on trying the /proc filesystem */
/* Bummer. fall back on trying the /proc filesystem */ if (!mountTable) mountTable = setmntent("/proc/mounts", "r");
&& (mountTable = setmntent("/proc/mounts", "r")) == 0) { if (!mountTable) {
bb_perror_msg(bb_path_mtab_file); bb_perror_msg(bb_path_mtab_file);
return; return;
} }
while (((m = getmntent(mountTable)) != 0) && (count < MTAB_MAX_ENTRIES)) while ((m = getmntent(mountTable)) != 0) {
{ i = count++;
entries[count].mnt_fsname = strdup(m->mnt_fsname); entries = xrealloc(entries, count * sizeof(entries[0]));
entries[count].mnt_dir = strdup(m->mnt_dir); entries[i].mnt_fsname = xstrdup(m->mnt_fsname);
entries[count].mnt_type = strdup(m->mnt_type); entries[i].mnt_dir = xstrdup(m->mnt_dir);
entries[count].mnt_opts = strdup(m->mnt_opts); entries[i].mnt_type = xstrdup(m->mnt_type);
entries[count].mnt_freq = m->mnt_freq; entries[i].mnt_opts = xstrdup(m->mnt_opts);
entries[count].mnt_passno = m->mnt_passno; entries[i].mnt_freq = m->mnt_freq;
count++; entries[i].mnt_passno = m->mnt_passno;
} }
endmntent(mountTable); endmntent(mountTable);
if ((mountTable = setmntent(bb_path_mtab_file, "w"))) {
int i;
mountTable = setmntent(bb_path_mtab_file, "w");
if (mountTable) {
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
int result = (strcmp(entries[i].mnt_fsname, name) == 0 if (strcmp(entries[i].mnt_fsname, name) != 0
|| strcmp(entries[i].mnt_dir, name) == 0); && strcmp(entries[i].mnt_dir, name) != 0)
if (result)
continue;
else
addmntent(mountTable, &entries[i]); addmntent(mountTable, &entries[i]);
} }
endmntent(mountTable); endmntent(mountTable);