| Age | Commit message (Collapse) | Author |
|---|
|
mkfontscale.c: In function ‘doDirectory’:
mkfontscale.c:810:66: warning: declaration of ‘encodingsToDo’ shadows a global declaration [-Wshadow]
810 | doDirectory(const char *dirname_given, int numEncodings, ListPtr encodingsToDo)
| ~~~~~~~~^~~~~~~~~~~~~
mkfontscale.c:117:16: note: shadowed declaration is here
117 | static ListPtr encodingsToDo;
| ^~~~~~~~~~~~~
mkfontscale.c: In function ‘readEncodings’:
mkfontscale.c:1353:23: warning: declaration of ‘encodings’ shadows a global declaration [-Wshadow]
1353 | readEncodings(ListPtr encodings, char *dirname)
| ~~~~~~~~^~~~~~~~~
mkfontscale.c:93:21: note: shadowed declaration is here
93 | static ConstListPtr encodings, extra_encodings;
| ^~~~~~~~~
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Resolves gcc analyzer warning:
mkfontscale.c: In function ‘doDirectory’:
mkfontscale.c:974:17: warning: use of possibly-NULL ‘s’ where non-null expected [CWE-690] [-Wanalyzer-possible-null-argument]
974 | memcpy(s, xlfd_name, l - 11);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Mostly via util/modular/x-indent-all.sh, plus some manual cleanup
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Used by freefonts.
Signed-off-by: Maya Rashish <maya@NetBSD.org>
|
|
Signed-off-by: Maya Rashish <maya@NetBSD.org>
|
|
ident.c:84:13: warning: implicit conversion loses integer precision:
'unsigned long' to 'int' [-Wshorten-64-to-32]
int n = strlen(filename);
~ ^~~~~~~~~~~~~~~~
ident.c:130:9: warning: implicit conversion loses integer precision:
'off64_t' (aka 'long') to 'int' [-Wshorten-64-to-32]
return gzseek(ff->f.gz, offset, whence);
~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
ident.c:140:17: warning: implicit conversion loses integer precision:
'long' to 'int' [-Wshorten-64-to-32]
n = offset - ff->pos;
~ ~~~~~~~^~~~~~~~~
ident.c:143:10: warning: implicit conversion loses integer precision:
'off_t' (aka 'long') to 'int' [-Wshorten-64-to-32]
n = offset;
~ ^~~~~~
ident.c:156:12: warning: implicit conversion loses integer precision:
'off_t' (aka 'long') to 'unsigned int' [-Wshorten-64-to-32]
ff->pos = offset;
~ ^~~~~~
ident.c:157:9: warning: implicit conversion loses integer precision:
'off_t' (aka 'long') to 'int' [-Wshorten-64-to-32]
return offset;
~~~~~~ ^~~~~~
mkfontscale.c:704:13: warning: implicit conversion loses integer precision:
'unsigned long' to 'int' [-Wshorten-64-to-32]
int n = strlen(dirname);
~ ^~~~~~~~~~~~~~~
mkfontscale.c:748:13: warning: implicit conversion loses integer precision:
'unsigned long' to 'int' [-Wshorten-64-to-32]
int n = strlen(filename);
~ ^~~~~~~~~~~~~~~~
mkfontscale.c:794:14: warning: implicit conversion loses integer precision:
'unsigned long' to 'int' [-Wshorten-64-to-32]
xl = strlen (exclusionSuffix);
~ ^~~~~~~~~~~~~~~~~~~~~~~~
mkfontscale.c:796:9: warning: implicit conversion loses integer precision:
'unsigned long' to 'int' [-Wshorten-64-to-32]
i = strlen(dirname_given);
~ ^~~~~~~~~~~~~~~~~~~~~
mkfontscale.c:858:15: warning: implicit conversion loses integer precision:
'unsigned long' to 'int' [-Wshorten-64-to-32]
int dl = strlen (entry->d_name);
~~ ^~~~~~~~~~~~~~~~~~~~~~
mkfontscale.c:930:21: warning: implicit conversion loses integer precision:
'unsigned long' to 'int' [-Wshorten-64-to-32]
int l = strlen(xlfd_name);
~ ^~~~~~~~~~~~~~~~~
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
mkfontscale.c: In function ‘getName’:
mkfontscale.c:336:22: warning: comparison between signed and unsigned
integer expressions [-Wsign-compare]
for(i = 0; i < name.string_len / 2; i++) {
^
mkfontscale.c: In function ‘nameWidth’:
mkfontscale.c:427:18: warning: comparison between signed and unsigned
integer expressions [-Wsign-compare]
for(i = 0; i < NUMWIDTHS; i++)
^
mkfontscale.c: In function ‘notice_foundry’:
mkfontscale.c:1261:18: warning: comparison between signed and unsigned
integer expressions [-Wsign-compare]
for(i = 0; i < countof(notice_foundries); i++)
^
mkfontscale.c: In function ‘vendor_foundry’:
mkfontscale.c:1285:18: warning: comparison between signed and unsigned
integer expressions [-Wsign-compare]
for(i = 0; i < countof(vendor_foundries); i++)
^
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Gets rid of lots of const warnings.
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
|
|
mkfontscale.c: In function ‘checkExtraEncoding’:
mkfontscale.c:1220:17: warning: declaration of ‘found’ shadows a parameter [-Wshadow]
int found = 0;
^~~~~
mkfontscale.c:1214:59: note: shadowed declaration is here
checkExtraEncoding(FT_Face face, char *encoding_name, int found)
^~~~~
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
mkfontscale.c: In function ‘doDirectory’:
mkfontscale.c:928:17: warning: declaration of ‘n’ shadows a previous local [-Wshadow]
int n = strlen(xlfd_name);
^
mkfontscale.c:788:12: note: shadowed declaration is here
int i, n, dirn, diri, found, rc;
^
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
dsprintf is an allocating sprintf. With a format string of "%s", it
reduces to just being a more complicated version of strdup, so lets
just use strdup instead to save time and reduce complexity.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
If getcwd returned a string that exactly filled the prefix buffer,
it could write the null terminator byte out of bounds.
Instead, since the prefix is copied to a newly allocated string and
never used again, just let the dsprintf() call take care of it.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
so that openSUSE's installation-images builds in a reproducible way
in spite of indeterministic filesystem readdir order
See https://reproducible-builds.org/ for why this is good.
Signed-off-by: Bernhard M. Wiedemann <bwiedemann@suse.de>
|
|
https://bugzilla.opensuse.org/show_bug.cgi?id=918466
Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
Reviewed-by: Adam Jackson <ajax@redhat.com>
|
|
Flagged by cppcheck 1.65:
[mkfontscale.c:247]: (style) Expression is always false because
'else if' condition matches previous condition at line 224.
[mkfontscale.c:245]: (style) Expression is always false because
'else if' condition matches previous condition at line 227.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
|
|
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
|
|
mkfontscale.c:635:25: warning: Potential leak of memory pointed to by 'notice'
foundry = notice_foundry(notice);
~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~
mkfontscale.c:640:8: warning: Potential leak of memory pointed to by 'notice'
if(strcmp(slant, "i") == 0) {
^~~~~~
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
|
|
Avoid duplicating exit(1) calls after every single call to usage()
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Fix compilation for MinGW since 9cbe3256bc932b82f2435b23cda0931f4f5f5ba2
Unfortunately, MinGW doesn't define S_ISLNK, so check for that as well.
Signed-off-by: Egbert Eich <eich@freedesktop.org>
Reviewed-by: Colin Harrison <colin.harrison at virgin.net>
|
|
If a symlink to a fontfile in the same directory exists the file
that got picked depends on the order in which readdir() picked
entries.
This patch gives the file a higher preference than the symlink to
it so it will be preferred if the xlfd entries match.
v2: Followed a suggestion by Julien Cristau <jcristau@debian.org>
to check for DT_LNK being defined instead of _BSD_SOURCE
and fall back to lstat() if d_type is DT_UNKNOWN.
Signed-off-by: Egbert Eich <eich@freedesktop.org>
|
|
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Does not fix all of them since some lists contain constant strings and
some contain dynamically allocated strings that need to be freed later.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Fontforge uses 'ExtraLight' and 'Heavy' weights in Type 1 fonts, which
should be understood by mkfontscale. Other FontForge designations are
already addressed.
Signed-off-by: Maxim Iorsh <iorsh@users.sourceforge.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
have_face is initialized to 0 at the beginning of the loop, so no need to set
it to 0 just before it goes out of scope at the end of the loop.
mkfontscale.c:945:13: warning: Value stored to 'have_face' is never read
have_face = 0;
^ ~
Found-by: clang static analyzer
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
fscanf %s arguments don't include the trailing \0 byte in their counts.
Error: Buffer overrun
Buffer overflow (CWE 120): Use of fscanf(%1024[), with buffer 'font'
Array size is 1024 bytes
at line 707 of mkfontscale.c in function 'readFontScale'.
Buffer overflow (CWE 120): Use of fscanf(%1024s), with buffer 'file'
Array size is 1024 bytes
at line 707 of mkfontscale.c in function 'readFontScale'.
[ This bug was found by the Parfait 0.3.6 bug checking tool.
For more information see http://labs.oracle.com/projects/parfait/ ]
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
|
|
Allows easier comparison between builds to detect changes.
Helps reduce deltas in packaging systems that compare old & new versions.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Clears gcc warning of:
mkfontscale.c:714: warning: format not a string literal, argument types not checked
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
|
|
|
|
|
|
The old workaround would trigger with CFF fonts with embedded bitmaps.
We now explicitly check for the font format being TrueType.
Reported by Andrey V. Panov.
|
|
|
|
This mirrors the behaviour of the old mkfontdir, which prefers pcf to
bdf fonts.
|
|
This spurious break statement disabled checking for Apple and ISO Unicode
CMaps in SFNT fonts. Thanks to Alan Coopersmith and Stefan Dirsch.
|
|
Include headers for proper prototypes and "ansify" makeHashTable.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
|
Thanks to Andrey Panov.
|
|
|
|
xc/fonts/encodings/ascii-0.enc
Adding ascii-0 font encoding which helps in cases where a font has all
ASCII chars populated but not enougth glyphs to match the requirements
for ISO8859-1 (and to add backwards compatibility to ttmkfdir).
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
