Changeset 18ad56a8 in mainline

Timestamp:

2018-06-07T15:45:56Z (6 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

75701004

Parents:

24fda5e

Message:

more elegant way of keeping the state of the archive extraction

File:

• uspace/app/untar/main.c (modified) (3 diffs)

uspace/app/untar/main.c

@@ -37 +37 @@
 #include <untar.h>
 
-const char *filename;
+typedef struct {
+        const char *filename;
+        FILE *file;
+} tar_state_t;
 
 static int tar_open(tar_file_t *tar)
 {
-        FILE *file = fopen(filename, "rb");
-        if (file == NULL)
+        tar_state_t *state = (tar_state_t *) tar->data;
+
+        state->file = fopen(state->filename, "rb");
+        if (state->file == NULL)
                 return errno;
 
-        tar->data = (void *) file;
         return EOK;
 }
@@ -51 +55 @@
 static void tar_close(tar_file_t *tar)
 {
-        FILE *file = (FILE *) tar->data;
-        fclose(file);
+        tar_state_t *state = (tar_state_t *) tar->data;
+        fclose(state->file);
 }
 
 static size_t tar_read(tar_file_t *tar, void *data, size_t size)
 {
-        FILE *file = (FILE *) tar->data;
-        return fread(data, 1, size, file);
+        tar_state_t *state = (tar_state_t *) tar->data;
+        return fread(data, 1, size, state->file);
 }
 
@@ -81 +85 @@
         }
 
-        filename = argv[1];
+        tar_state_t state;
+        state.filename = argv[1];
+
+        tar.data = (void *) &state;
         return untar(&tar);
 }