Skip to content

Add count constants to NAIX files #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ravepossum wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add count constants to NAIX files #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions cli/src/narc_create.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ static int pack(struct options *opts);
static struct strvec *build_pack_list(DIR *dir, const char *dir_name, const char *order_fname, const char *ignore_fname);
static struct strbuild *start_index(const char *target_fname, char **out_guard);
static void add_to_index(struct strbuild *index, const char *fname, const size_t i);
static void finish_index(struct strbuild *index, const char *guard);
static void finish_index(struct strbuild *index, const char *guard, const size_t count);

int create(int argc, const char **argv)
{
Expand Down Expand Up @@ -195,7 +195,8 @@ static int pack(struct options *opts)

chdir(opts->input);
ctx = narc_pack_start();
for (size_t i = 0; i < to_pack->count; i++) {
size_t i;
for (i = 0; i < to_pack->count; i++) {
FILE *f = fopen(to_pack->s[i], "rb");
if (f == NULL) {
FAIL("narc create: error while opening file “%s” for reading: %s\n", to_pack->s[i], strerror(errno));
Expand All @@ -216,7 +217,7 @@ static int pack(struct options *opts)
fclose(f);
}
narc = narc_pack(ctx);
finish_index(index, guard);
finish_index(index, guard, i);
chdir(cwd);

if (opts->naix) {
Expand Down Expand Up @@ -385,7 +386,11 @@ static void add_to_index(struct strbuild *index, const char *fname, const size_t
strbuild_sprintf(index, naix_member, def_name, i);
}

static void finish_index(struct strbuild *index, const char *guard)
static void finish_index(struct strbuild *index, const char *guard, const size_t count)
{
char count_name[256];
strncpy(count_name, guard, strlen(guard) - 6); // copy without "NAIX_H"
strcat(count_name, "COUNT");
strbuild_sprintf(index, naix_member, count_name, count);
strbuild_sprintf(index, naix_footer, guard);
}