izaya/collapseos
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tools/blkpack: support multiple dirname arguments

Browse Source
This commit is contained in:
Virgil Dupras 2020-09-20 09:38:28 -04:00
parent e123c0e536
commit c9ce0f8cfd
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
tools/blkpack.c
View File

@ -6,24 +6,22 @@
#include <string.h> #include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
static char *buf;
static int blkcnt;
static void usage() static void usage()
{ {
fprintf(stderr, "Usage: blkpack dirname\n"); fprintf(stderr, "Usage: blkpack dirname [dirname ...]\n");
} }
int main(int argc, char *argv[]) static int spit(char *dirname)
{ {
DIR *dp; DIR *dp;
struct dirent *ep; struct dirent *ep;
char *buf = NULL;
int blkcnt = 0; dp = opendir(dirname);
if (argc != 2) {
usage();
return 1;
}
dp = opendir(argv[1]);
if (dp == NULL) { if (dp == NULL) {
fprintf(stderr, "Couldn't open directory.\n"); fprintf(stderr, "Couldn't open directory %s.\n", dirname);
return 1; return 1;
} }
while ((ep = readdir(dp))) { while ((ep = readdir(dp))) {
@ -37,11 +35,12 @@ int main(int argc, char *argv[])
memset(buf+(blkcnt*1024), 0, (newcnt-blkcnt)*1024); memset(buf+(blkcnt*1024), 0, (newcnt-blkcnt)*1024);
blkcnt = newcnt; blkcnt = newcnt;
} }
char fullpath[0x200]; char *fullpath = malloc(strlen(dirname) + MAXNAMLEN + 2);
strcpy(fullpath, argv[1]); strcpy(fullpath, dirname);
strcat(fullpath, "/"); strcat(fullpath, "/");
strcat(fullpath, ep->d_name); strcat(fullpath, ep->d_name);
FILE *fp = fopen(fullpath, "r"); FILE *fp = fopen(fullpath, "r");
free(fullpath);
if (fp == NULL) { if (fp == NULL) {
fprintf(stderr, "Could not open %s: %s\n", ep->d_name, strerror(errno)); fprintf(stderr, "Could not open %s: %s\n", ep->d_name, strerror(errno));
continue; continue;
@ -63,9 +62,25 @@ int main(int argc, char *argv[])
free(line); free(line);
fclose(fp); fclose(fp);
} }
fwrite(buf, 1024, blkcnt, stdout);
free(buf);
closedir(dp); closedir(dp);
return 0; return 0;
} }
int main(int argc, char *argv[])
{
if (argc < 2) {
usage();
return 1;
}
buf = NULL;
blkcnt = 0;
for (int i=1; i<argc; i++) {
if (spit(argv[i]) != 0) {
return 1;
}
}
fwrite(buf, 1024, blkcnt, stdout);
free(buf);
return 0;
}