diff options
Diffstat (limited to 'mdk-stage1/mar/mar-frontend.c')
| -rw-r--r-- | mdk-stage1/mar/mar-frontend.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/mdk-stage1/mar/mar-frontend.c b/mdk-stage1/mar/mar-frontend.c index 55550d8a1..79a83a1c3 100644 --- a/mdk-stage1/mar/mar-frontend.c +++ b/mdk-stage1/mar/mar-frontend.c @@ -28,7 +28,7 @@ #include "mar-extract-only.h" void -list_files(struct mar_stream *s) +mar_list_files(struct mar_stream *s) { struct mar_element * elem = s->first_element; printf("%-20s%8s\n", "FILENAME", "LENGTH"); @@ -58,7 +58,7 @@ file_size(char *filename) /* ``files'' is a NULL-terminated array of char* */ int -create_marfile(char *dest_file, char **files) +mar_create_file(char *dest_file, char **files) { int filenum = 0; int current_offset_filetable; @@ -179,27 +179,23 @@ main(int argc, char **argv) if (strcmp(argv[1], "-l") == 0) { struct mar_stream s; - if (open_marfile(argv[2], &s) != 0) + if (mar_open_file(argv[2], &s) != 0) { fprintf(stderr, "E: open-marfile-failed\n"); exit(-1); } - list_files(&s); - if (s.crc32 == calc_integrity(&s)) - printf("CRC OK\n"); - else - printf("CRC FAILED!\n"); + mar_list_files(&s); exit(0); } if ((strcmp(argv[1], "-x") == 0) && argc >= 4) { struct mar_stream s; int i = 3; - if (open_marfile(argv[2], &s) != 0) + if (mar_open_file(argv[2], &s) != 0) exit(-1); while (i < argc) { - int res = extract_file(&s, argv[i], "./"); + int res = mar_extract_file(&s, argv[i], "./"); if (res == 1) fprintf(stderr, "W: file-not-found-in-archive %s\n", argv[i]); if (res == -1) @@ -220,7 +216,7 @@ main(int argc, char **argv) files[argc-3] = NULL; { int results; - results = create_marfile(argv[2], files); + results = mar_create_file(argv[2], files); if (results != 0) fprintf(stderr, "E: create-marfile-failed\n"); exit(results); |