summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2019-02-18mkfontdir: R6.6 is the Xorg base-lineKaleb Keithley1-0/+100
2019-01-06Clear some -Wshorten-64-to-32 warnings from clang 6Alan Coopersmith2-14/+16
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>
2019-01-06Clear some -Wsign-compare warnings from gcc 7Alan Coopersmith1-6/+6
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>
2019-01-06Add new ConstList functions and use them.Thomas Klausner4-11/+143
Gets rid of lots of const warnings. Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
2018-11-21Update configure.ac bug URL for gitlab migrationAlan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2018-11-16Update README for gitlab migrationAlan Coopersmith3-26/+20
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2018-10-01Stop shadowing 'found' in checkExtraEncoding()Alan Coopersmith1-3/+3
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>
2018-10-01Rename variable 'n' to avoid shadowing another 'n' in doDirectoryAlan Coopersmith1-5/+5
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>
2018-10-01Use vasprintf(), if available, to implement dsprintf()Alan Coopersmith2-0/+13
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2018-10-01Replace dsprintf("%s", s) with strdup(s)Alan Coopersmith1-4/+4
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>
2018-10-01Remove last use of strcatAlan Coopersmith1-2/+3
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>
2018-09-10Sort input file listBernhard M. Wiedemann1-8/+10
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>
2018-03-06mkfontscale 1.1.3mkfontscale-1.1.3Alan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2017-01-26autogen: add default patch prefixMihail Konev1-0/+3
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-26autogen.sh: use quoted string variablesEmil Velikov1-4/+4
Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent fall-outs, when they contain space. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2017-01-26autogen.sh: use exec instead of waiting for configure to finishPeter Hutterer1-1/+1
Syncs the invocation of configure with the one from the server. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
2016-09-18mkfontscale: Avoid a buffer underrunJeremy Huddleston Sequoia1-1/+1
https://bugs.freedesktop.org/show_bug.cgi?id=96905 ================================================================= ==3068==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x60300000de6f at pc 0x000109df79d1 bp 0x7fff55e37d90 sp 0x7fff55e37550 READ of size 1 at 0x60300000de6f thread T0 #0 0x109df79d0 in wrap_strcmp (libclang_rt.asan_osx_dynamic.dylib+0xe9d0) #1 0x109dc8ef7 in fontFileOpen (mkfontscale+0x100001ef7) #2 0x109dc8e0b in bitmapIdentify (mkfontscale+0x100001e0b) #3 0x109dcc874 in doDirectory (mkfontscale+0x100005874) #4 0x109dcbc78 in main (mkfontscale+0x100004c78) #5 0x7fff9083f5ac in start (libdyld.dylib+0x35ac) #6 0x3 (<unknown module>) 0x60300000de6f is located 1 bytes to the left of 20-byte region [0x60300000de70,0x60300000de84) allocated by thread T0 here: #0 0x109e34570 in wrap_malloc (libclang_rt.asan_osx_dynamic.dylib+0x4b570) #1 0x109dca92a in dsprintf (mkfontscale+0x10000392a) #2 0x109dcc788 in doDirectory (mkfontscale+0x100005788) #3 0x109dcbc78 in main (mkfontscale+0x100004c78) #4 0x7fff9083f5ac in start (libdyld.dylib+0x35ac) #5 0x3 (<unknown module>) Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2016-05-10fix handling of Type1 fonts without /FamilyName and/or /FullNameStefan Dirsch1-3/+6
https://bugzilla.opensuse.org/show_bug.cgi?id=918466 Signed-off-by: Stefan Dirsch <sndirsch@suse.de> Reviewed-by: Adam Jackson <ajax@redhat.com>
2015-01-16mkfontscale 1.1.2mkfontscale-1.1.2Alan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2014-07-06Remove extraneous duplicate checks for -r & -n optionsAlan Coopersmith1-4/+0
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>
2014-06-02autogen.sh: Honor NOCONFIGURE=1Alan Coopersmith1-2/+3
See http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2014-06-02configure: Drop AM_MAINTAINER_MODEAlan Coopersmith2-2/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2014-03-19Only include config.h if it exists.Thomas Klausner2-0/+4
Reviewed-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
2014-01-02Fix possible malloc allocation error found by clang static analysisJeremy Huddleston Sequoia1-1/+6
list.c:238:23: warning: Call to 'malloc' has an allocation size of 0 bytes ListPtr *sorted = malloc(l * sizeof(ListPtr)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2014-01-02Plug a memory leak found by clang static analysisJeremy Huddleston Sequoia1-8/+16
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>
2013-11-22Print which option was in error along with usage messageAlan Coopersmith1-7/+18
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2013-11-22Make usage() always exit(1)Alan Coopersmith2-10/+4
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>
2013-11-22Add -v flag to print program versionAlan Coopersmith2-1/+9
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2013-11-22Add missing newline to usage outputAlan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2013-07-16mkfontscale 1.1.1mkfontscale-1.1.1Alan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-06-06Protect config.h inclusion like usual.Thomas Klausner1-0/+2
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-05-22Document -u/-U options in man pagePeter Hutterer1-0/+6
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-01-19Replace malloc(strlen);strcpy() calls with strdupAlan Coopersmith4-19/+17
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-01-19Since hash() returns unsigned int, store results in unsigned intsAlan Coopersmith1-2/+2
Clears clang warnings: hash.c:82:13: warning: implicit conversion changes signedness: 'unsigned int' to 'int' [-Wsign-conversion] int i = hash(key); ~ ^~~~~~~~~ hash.c:94:13: warning: implicit conversion changes signedness: 'unsigned int' to 'int' [-Wsign-conversion] int i = hash(key); ~ ^~~~~~~~~ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-01-11Fix compilation for MinGWEgbert Eich1-0/+4
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>
2013-01-10Prefer original file over symlink (v2)Egbert Eich1-3/+21
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>
2012-02-10mkfontscale 1.1.0mkfontscale-1.1.0Alan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-10-20mkfontscale: fix Culmus entries to precede URWMaxim Iorsh1-4/+4
Culmus must precede URW and Bitstream in notice list, since its fonts are based on URW/Bitstream sometimes. Signed-off-by: Maxim Iorsh <iorsh@users.sourceforge.net> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-10-18Add Culmus foundry to the vendor list for TrueType & Type1 fontsMaxim Iorsh1-1/+4
Maps fonts produced by the Culmus project <http://culmus.sourceforge.net> to the XLFD foundry name "culmus" For TrueType fonts, maps the vendor code "CLM" from the TrueType vendor id field. For Type1 fonts, which use heuristics to guess mappings to XLFD foundries from words in the copyright notice, add the names of the main contributors to the Culmus product to recognize the fonts under their copyright. Signed-off-by: Maxim Iorsh <iorsh@users.sourceforge.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-10-04Strip trailing whitespaceAlan Coopersmith6-42/+42
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>
2011-10-04Add const attributes to fix gcc -Wwrite-strings warningsAlan Coopersmith6-34/+34
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>
2011-10-04Mark format string argument to dsprintf as const char *Alan Coopersmith2-2/+2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-10-04mkfontscale: Support FontForge weight designations.Maxim Iorsh1-0/+4
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>
2011-06-29mkfontscale 1.0.9mkfontscale-1.0.9Alan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-05-25Add _X_ATTRIBUTE_PRINTF to functions taking printf format argumentsAlan Coopersmith1-3/+5
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-08Dead code removalJeremy Huddleston1-3/+1
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>
2011-03-01makeList: free partially allocated list on failureAlan Coopersmith1-1/+3
Error: Memory leak (CWE 401) Memory leak of pointer 'first' allocated with malloc(8) at line 192 of list.c in function 'makeList'. 'first' allocated at line 181 with malloc(8). first leaks when next == 0 at line 191. [ 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>
2011-03-01Leave room for null terminator in file & font name arraysAlan Coopersmith1-1/+1
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>
2011-02-14Sort contents of encodings.dirAlan Coopersmith3-0/+36
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>
2011-01-19config: move man pages into their own directoryGaetan Nadon4-15/+17
Use services provided by XORG_MANPAGE_SECTIONS. Use standard Makefile for man pages. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-28 06:21:34 +0000