mirror of
https://github.com/hsoft/collapseos.git
synced 2024-11-23 15:48:05 +11:00
Make blkpack close files when it's done reading them (#108)
* Report when a file cannot be opened * Close files when done reading them
This commit is contained in:
parent
48f371d380
commit
ae954906d8
@ -2,6 +2,7 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
|
#include <errno.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
||||||
@ -41,6 +42,10 @@ int main(int argc, char *argv[])
|
|||||||
strcat(fullpath, "/");
|
strcat(fullpath, "/");
|
||||||
strcat(fullpath, ep->d_name);
|
strcat(fullpath, ep->d_name);
|
||||||
FILE *fp = fopen(fullpath, "r");
|
FILE *fp = fopen(fullpath, "r");
|
||||||
|
if (fp == NULL) {
|
||||||
|
fprintf(stderr, "Could not open %s: %s\n", ep->d_name, strerror(errno));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
char *line = NULL;
|
char *line = NULL;
|
||||||
size_t n = 0;
|
size_t n = 0;
|
||||||
for (int i=0; i<16; i++) {
|
for (int i=0; i<16; i++) {
|
||||||
@ -56,6 +61,7 @@ int main(int argc, char *argv[])
|
|||||||
fprintf(stderr, "blk %s has more than 16 lines\n", ep->d_name);
|
fprintf(stderr, "blk %s has more than 16 lines\n", ep->d_name);
|
||||||
}
|
}
|
||||||
free(line);
|
free(line);
|
||||||
|
fclose(fp);
|
||||||
}
|
}
|
||||||
fwrite(buf, 1024, blkcnt, stdout);
|
fwrite(buf, 1024, blkcnt, stdout);
|
||||||
free(buf);
|
free(buf);
|
||||||
|
Loading…
Reference in New Issue
Block a user