Skip to content

Support for specifying output file path as second argument to createicns #4

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support for specifying output file path as second argument to createicns #4

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ readicns

# Various
*.swp

*.iconset
*.icns
79 changes: 44 additions & 35 deletions createicns.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ void PrintSystemError() {
}

void PrintUsage(const char* own_path) {
fprintf(stderr, "Usage: %s [iconset]\n", own_path);
fprintf(stderr, "Usage: %s [iconset] [outfile]\n", own_path);
}

char* Basename(const char* path, char* basename) {
Expand All @@ -108,45 +108,37 @@ char* Basename(const char* path, char* basename) {
return basename;
}

const char* IconsetFromArguments(int argc, char* argv[]) {
if (argc < 2) {
PrintError("No path given to iconset directory.");
PrintUsage(argv[0]);
return NULL;
} else if (argc > 2) {
PrintError("Too many arguments.");
PrintUsage(argv[0]);
return NULL;
}

return argv[1];
}

bool WriteUint32(uint32_t to_write, FILE* file) {
uint32_t msb_first = htonl(to_write);
return fwrite(&msb_first, sizeof(msb_first), 1, file) == 1;
}

FILE* OpenIcnsFileForIconset(const char* iconset_path) {
FILE* OpenIcnsFileForIconset(const char* iconset_path, const char* outfile_path) {
char path[MAXPATHLEN];
if (!Basename(iconset_path, path)) {
PrintError("Can't determine basename for iconset");
return NULL;
}
FILE* file;

const size_t path_length = strlen(path);
const size_t extension_length = sizeof(kIconsetExtension) - 1;
const size_t base_path_length = path_length - extension_length;
if (!outfile_path) {
if (!Basename(iconset_path, path)) {
PrintError("Can't determine basename for iconset");
return NULL;
}

if (path_length <= extension_length ||
strncmp(path + base_path_length, kIconsetExtension, extension_length) !=
0) {
PrintError("Need .iconset directory as input.");
return NULL;
const size_t path_length = strlen(path);
const size_t extension_length = sizeof(kIconsetExtension) - 1;
const size_t base_path_length = path_length - extension_length;

if (path_length <= extension_length ||
strncmp(path + base_path_length, kIconsetExtension, extension_length) !=
0) {
PrintError("Need .iconset directory as input.");
return NULL;
}
memcpy(path + base_path_length, kIcnsExtension, sizeof(kIcnsExtension));
file = fopen(path, "w");
} else {
file = fopen(outfile_path, "w");
}

memcpy(path + base_path_length, kIcnsExtension, sizeof(kIcnsExtension));
FILE* file = fopen(path, "w");
if (!file) {
PrintSystemError();
return NULL;
Expand Down Expand Up @@ -241,14 +233,14 @@ bool WriteIcnsFileMetadata(FILE* file) {
return size >= 0 && fseek(file, 4L, SEEK_SET) == 0 && WriteUint32(size, file);
}

bool CreateIcnsFromIconset(const char* iconset_path) {
bool CreateIcnsFromIconset(const char* iconset_path, const char* outfile_path) {
DIR* iconset = opendir(iconset_path);
if (!iconset) {
PrintSystemError();
return false;
}

FILE* icns = OpenIcnsFileForIconset(iconset_path);
FILE* icns = OpenIcnsFileForIconset(iconset_path, outfile_path);
if (!icns)
return false;

Expand Down Expand Up @@ -280,11 +272,28 @@ bool CreateIcnsFromIconset(const char* iconset_path) {
}

int main(int argc, char* argv[]) {
const char* iconset_path = IconsetFromArguments(argc, argv);
if (!iconset_path)
const char *iconset_path = NULL;
const char *outfile_path = NULL;

if (argc < 2) {
PrintError("No path given to iconset directory.");
PrintUsage(argv[0]);
return -1;
}
if (argc > 3) {
PrintError("Too many arguments.");
PrintUsage(argv[0]);
return -1;
}
if (argc == 2) {
iconset_path = argv[1];
outfile_path = NULL;
} else if (argc == 3) {
iconset_path = argv[1];
outfile_path = argv[2];
}

if (!CreateIcnsFromIconset(iconset_path))
if (!CreateIcnsFromIconset(iconset_path, outfile_path))
return -1;

return 0;
Expand Down