mirror of
https://git.code.sf.net/p/zint/code
synced 2025-05-12 22:25:59 -04:00
eci.c: replace libiconv-adapted code with own implementations so
as to fully comply with BSD license (for why Library GPL 2+ not compatible see https://opensource.stackexchange.com/a/6701), ~3% slower (maybe), +~6K extra in data (gb18030.c, gb2313.c & sjis.c removed, mapping .TXT files moved to backend/tools/data & extra ones added, 2 new PHP generators) GUI: CODE39/EXCODE39: show/hide HIBC check digit option in addition to enable/disable (less confusing) CLI: batch: pedantic check for EOF using intChar in newline fgetc() loop test_args.c: don't use WIFEXITED(), WEXITSTATUS() on Windows manual: lessen some copy/paste verbiage by referring back, other small tweaks/typos
This commit is contained in:
parent
d9f2e85246
commit
ab3cf4f395
69 changed files with 61287 additions and 11905 deletions
|
@ -842,7 +842,10 @@ static int batch_process(struct zint_symbol *symbol, const char *filename, const
|
|||
fprintf(stderr, "On line %d: Error 103: Input data too long\n", line_count);
|
||||
fflush(stderr);
|
||||
do {
|
||||
character = fgetc(file);
|
||||
if ((intChar = fgetc(file)) == EOF) {
|
||||
break;
|
||||
}
|
||||
character = (unsigned char) intChar;
|
||||
} while ((!feof(file)) && (character != '\n'));
|
||||
}
|
||||
} while ((!feof(file)) && (line_count < 2000000000));
|
||||
|
|
|
@ -112,18 +112,22 @@ static char *exec(const char *cmd, char *buf, int buf_size, int debug, int index
|
|||
fprintf(stderr, "exec: failed to read full stream (%s)\n", cmd);
|
||||
exit_status = testutil_pclose(fp);
|
||||
if (p_exit_status) {
|
||||
#ifndef _WIN32
|
||||
if (WIFEXITED(exit_status)) {
|
||||
exit_status = WEXITSTATUS(exit_status);
|
||||
}
|
||||
#endif
|
||||
*p_exit_status = exit_status;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
exit_status = testutil_pclose(fp);
|
||||
if (p_exit_status) {
|
||||
#ifndef _WIN32
|
||||
if (WIFEXITED(exit_status)) {
|
||||
exit_status = WEXITSTATUS(exit_status);
|
||||
}
|
||||
#endif
|
||||
*p_exit_status = exit_status;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue