mirrors/zint
2
0
Fork 0
mirror of https://github.com/zint/zint synced 2024-11-16 20:57:25 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugfix: Correctly handle --filetype input

Browse Source
This commit is contained in:
Robin Stuart 2016-10-30 19:22:50 +00:00
parent 3fad793aeb
commit 1bd7783968
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/main.c
View File

@ -441,7 +441,7 @@ int main(int argc, char **argv) {
my_symbol->input_mode = UNICODE_MODE; my_symbol->input_mode = UNICODE_MODE;
batch_mode = 0; batch_mode = 0;
mirror_mode = 0; mirror_mode = 0;
strcpy(filetype, "png"); filetype[0] = '\0';
if (argc == 1) { if (argc == 1) {
usage(); usage();
@ -727,6 +727,10 @@ int main(int argc, char **argv) {
case 'd': /* we have some data! */ case 'd': /* we have some data! */
if (batch_mode == 0) { if (batch_mode == 0) {
if (filetype[0] != '\0') {
strcat(my_symbol->outfile, ".");
strcat(my_symbol->outfile, filetype);
}
error_number = escape_char_process(my_symbol, (unsigned char*) optarg, strlen(optarg)); error_number = escape_char_process(my_symbol, (unsigned char*) optarg, strlen(optarg));
if (error_number == 0) { if (error_number == 0) {
error_number = ZBarcode_Print(my_symbol, rotate_angle); error_number = ZBarcode_Print(my_symbol, rotate_angle);
@ -759,6 +763,9 @@ int main(int argc, char **argv) {
} }
} else { } else {
/* Take each line of text as a separate data set */ /* Take each line of text as a separate data set */
if (filetype[0] == '\0') {
strcpy(filetype, "png");
}
error_number = batch_process(my_symbol, optarg, mirror_mode, filetype); error_number = batch_process(my_symbol, optarg, mirror_mode, filetype);
generated = 1; generated = 1;
if (error_number != 0) { if (error_number != 0) {