Skip to content

S
SDB - Self-describing Bus
Commit 54f73072 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

sdb-extract: support non-mmappable file (i.e. sysfs) 

Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 3032d550
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 4 deletions
sdbfs/userspace/sdb-extract.c
View file @ 54f73072
...@@ -92,7 +92,7 @@ int main(int argc, char **argv) ...@@ -92,7 +92,7 @@ int main(int argc, char **argv)
void *mapaddr; void *mapaddr;
char *fsname, *dirname; char *fsname, *dirname;
struct dirent **namelist; struct dirent **namelist;
int pagesize = getpagesize(); int i, pagesize = getpagesize();
prgname = argv[0]; prgname = argv[0];
...@@ -127,9 +127,19 @@ int main(int argc, char **argv) ...@@ -127,9 +127,19 @@ int main(int argc, char **argv)
stbuf.st_size &= ~(pagesize - 1); stbuf.st_size &= ~(pagesize - 1);
mapaddr = mmap(0, stbuf.st_size, PROT_READ, MAP_PRIVATE, fileno(f), 0); mapaddr = mmap(0, stbuf.st_size, PROT_READ, MAP_PRIVATE, fileno(f), 0);
if (mapaddr == MAP_FAILED) { if (mapaddr == MAP_FAILED) {
fprintf(stderr, "%s: mmap(%s): %s\n", prgname, fsname, /* I used to complain, but sysfs doesn't allow mmapping... */
strerror(errno)); mapaddr = malloc(stbuf.st_size);
exit(1); if (!mapaddr) {
fprintf(stderr, "%s: out of memory reading \"%s\"\n",
argv[0], fsname);
exit(1);
}
i = fread(mapaddr, 1, stbuf.st_size, f);
if (i < stbuf.st_size) {
fprintf(stderr, "%s: %s: short read\n",
argv[0], fsname);
exit(1);
}
} }
/* Check output dir is empty, open config file */ /* Check output dir is empty, open config file */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment