Skip to content

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

sdbfs/userspace: prepare gensdbfs for subdir support 

This commit doesn't change actual output for gensdbfs, but it prepares
for recursive scanning of directories. This is a separate commit to ease
my own debugging.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 613f134e
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 25 deletions
sdbfs/userspace/gensdbfs.c
View file @ c4e93fc1
...@@ -84,8 +84,13 @@ static int __fill_file(struct sdbf *f, char *dir, char *fname) ...@@ -84,8 +84,13 @@ static int __fill_file(struct sdbf *f, char *dir, char *fname)
strerror(errno)); strerror(errno));
return -1; return -1;
} }
if (!S_ISREG(f->stbuf.st_mode)) { if (S_ISDIR(f->stbuf.st_mode)) {
/* FIXME: support subdirs */ /* FIXME: support subdirs */
fprintf(stderr, "%s: ignoring subdirectory \"%s\"\n",
prgname, fn);
return 0;
}
if (!S_ISREG(f->stbuf.st_mode)) {
fprintf(stderr, "%s: ignoring non-regular \"%s\"\n", fprintf(stderr, "%s: ignoring non-regular \"%s\"\n",
prgname, fn); prgname, fn);
return 0; return 0;
...@@ -202,7 +207,9 @@ static struct sdbf *scan_input(char *name, struct sdbf *parent, FILE **cfgf) ...@@ -202,7 +207,9 @@ static struct sdbf *scan_input(char *name, struct sdbf *parent, FILE **cfgf)
fprintf(stderr, "%s: out of memory\n", prgname); fprintf(stderr, "%s: out of memory\n", prgname);
return NULL; return NULL;
} }
tree->nfiles = n; tree->nfiles = n; /* FIXME: increase this nfile according to cfg */
if (parent)
tree->level = parent->level + 1;
/* second loop: fill it */ /* second loop: fill it */
d = opendir(name); d = opendir(name);
...@@ -296,6 +303,7 @@ static struct sdbf *scan_config(struct sdbf *tree, FILE *f) ...@@ -296,6 +303,7 @@ static struct sdbf *scan_config(struct sdbf *tree, FILE *f)
/* line starts in column 0: new file name */ /* line starts in column 0: new file name */
current = find_filename(tree, s); current = find_filename(tree, s);
if (!current) { if (!current) {
/* FIXME: possibly increase nfile here */
fprintf(stderr, "%s: Warning: %s:%i: " fprintf(stderr, "%s: Warning: %s:%i: "
"\"%s\" not found\n", "\"%s\" not found\n",
prgname, CFG_NAME, lineno, s); prgname, CFG_NAME, lineno, s);
...@@ -401,7 +409,38 @@ static struct sdbf *write_sdb(struct sdbf *tree, FILE *out) ...@@ -401,7 +409,38 @@ static struct sdbf *write_sdb(struct sdbf *tree, FILE *out)
return tree; return tree;
} }
/*
* This is the main procedure for each directory, called recursively
* from scan_input() above
*/
static struct sdbf *prepare_dir(char *name, struct sdbf *parent)
{
FILE *fcfg = NULL;
struct sdbf *tree;
/* scan the whole input tree and save the information */
tree = scan_input(name, parent, &fcfg);
if (!tree)
return NULL;
/* read configuration file and save its info for each file */
if (fcfg)
tree = scan_config(tree, fcfg);
if (!tree)
return NULL;
/* allocate space in the storage */
tree = alloc_storage(tree);
if (!tree)
return NULL;
if (getenv("VERBOSE"))
dump_tree(tree);
return tree;
}
/* From now on, it's trivial main program management */
static int usage(char *prgname) static int usage(char *prgname)
{ {
fprintf(stderr, "%s: Use \"%s [<options>] <inputdir> <output>\"\n", fprintf(stderr, "%s: Use \"%s [<options>] <inputdir> <output>\"\n",
...@@ -417,7 +456,7 @@ int main(int argc, char **argv) ...@@ -417,7 +456,7 @@ int main(int argc, char **argv)
{ {
int c; int c;
struct stat stbuf; struct stat stbuf;
FILE *fcfg = NULL, *fout; FILE *fout;
char *rest; char *rest;
struct sdbf *tree; struct sdbf *tree;
...@@ -452,6 +491,7 @@ int main(int argc, char **argv) ...@@ -452,6 +491,7 @@ int main(int argc, char **argv)
exit(1); exit(1);
} }
if (!S_ISDIR(stbuf.st_mode)) { if (!S_ISDIR(stbuf.st_mode)) {
/* Recursively fill the directory */
fprintf(stderr, "%s: %s: not a directory\n", prgname, fprintf(stderr, "%s: %s: not a directory\n", prgname,
argv[optind]); argv[optind]);
exit(1); exit(1);
...@@ -463,26 +503,11 @@ int main(int argc, char **argv) ...@@ -463,26 +503,11 @@ int main(int argc, char **argv)
exit(1); exit(1);
} }
/* scan the whole input tree and save the information */ tree = prepare_dir(argv[optind], NULL /* parent */);
tree = scan_input(argv[optind], NULL /* parent */, &fcfg);
if (!tree)
exit(1);
/* read configuration file and save its info for each file */
if (fcfg)
tree = scan_config(tree, fcfg);
if (!tree) if (!tree)
exit(1); exit(1);
/* allocate space in the storage */ /* write out the whole tree, recusively */
tree = alloc_storage(tree);
if (!tree)
exit(1);
if (getenv("VERBOSE"))
dump_tree(tree);
/* write out the whole tree */
tree = write_sdb(tree, fout); tree = write_sdb(tree, fout);
if (!tree) if (!tree)
exit(1); exit(1);
......
sdbfs/userspace/gensdbfs.h
View file @ c4e93fc1
...@@ -15,12 +15,13 @@ struct sdbf { ...@@ -15,12 +15,13 @@ struct sdbf {
}; };
char *fullname; char *fullname;
char *basename; char *basename;
unsigned long astart, rstart; /* absolute, relative */ unsigned long astart, rstart; /* absolute, relative */
unsigned long size; unsigned long size;
int nfiles, totsize; /* for dirs */ int nfiles, totsize; /* for dirs */
struct sdbf *dot; /* for files, pointer to owning dir */ struct sdbf *dot; /* for files, pointer to owning dir */
struct sdbf *parent; /* for dirs, current dir in ../ */ struct sdbf *parent; /* for dirs, current dir in ../ */
int userpos; int level; /* subdir level */
int userpos; /* only allowed at level 0 */
}; };
static inline uint64_t htonll(uint64_t ll) static inline uint64_t htonll(uint64_t ll)
......
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