summaryrefslogtreecommitdiff
path: root/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.cc
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/lcdf-typetools/t1testpage/t1testpage.cc')
-rw-r--r--Build/source/texk/lcdf-typetools/t1testpage/t1testpage.cc32
1 files changed, 16 insertions, 16 deletions
diff --git a/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.cc b/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.cc
index e857a7ce157..139dc569dc8 100644
--- a/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.cc
+++ b/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.cc
@@ -52,11 +52,11 @@ using namespace Efont;
#define GLYPH_OPT 304
#define SMOKE_OPT 305
-Clp_Option options[] = {
+const Clp_Option options[] = {
{ "help", 'h', HELP_OPT, 0, 0 },
- { "output", 'o', OUTPUT_OPT, Clp_ArgString, 0 },
+ { "output", 'o', OUTPUT_OPT, Clp_ValString, 0 },
{ "version", 0, VERSION_OPT, 0, 0 },
- { "glyph", 'g', GLYPH_OPT, Clp_ArgString, 0 },
+ { "glyph", 'g', GLYPH_OPT, Clp_ValString, 0 },
{ "smoke", 's', SMOKE_OPT, 0, Clp_Negate }
};
@@ -422,7 +422,7 @@ click_strcmp(PermString a, PermString b)
const char *bd = b.c_str(), *be = b.c_str() + b.length();
while (ad < ae && bd < be) {
- if (isdigit(*ad) && isdigit(*bd)) {
+ if (isdigit((unsigned char) *ad) && isdigit((unsigned char) *bd)) {
// compare the two numbers, but don't treat them as numbers in
// case of overflow
// first, skip initial '0's
@@ -434,9 +434,9 @@ click_strcmp(PermString a, PermString b)
int longer_zeros = (ad - iad) - (bd - ibd);
// skip to end of number
const char *nad = ad, *nbd = bd;
- while (ad < ae && isdigit(*ad))
+ while (ad < ae && isdigit((unsigned char) *ad))
ad++;
- while (bd < be && isdigit(*bd))
+ while (bd < be && isdigit((unsigned char) *bd))
bd++;
// longer number must be larger
if ((ad - nad) != (bd - nbd))
@@ -448,12 +448,12 @@ click_strcmp(PermString a, PermString b)
// finally, longer string of initial '0's wins
if (longer_zeros != 0)
return longer_zeros;
- } else if (isdigit(*ad))
- return (isalpha(*bd) ? -1 : 1);
- else if (isdigit(*bd))
- return (isalpha(*ad) ? 1 : -1);
+ } else if (isdigit((unsigned char) *ad))
+ return (isalpha((unsigned char) *bd) ? -1 : 1);
+ else if (isdigit((unsigned char) *bd))
+ return (isalpha((unsigned char) *ad) ? 1 : -1);
else {
- int d = tolower(*ad) - tolower(*bd);
+ int d = tolower((unsigned char) *ad) - tolower((unsigned char) *bd);
if (d != 0)
return d;
ad++;
@@ -535,12 +535,12 @@ main(int argc, char *argv[])
switch (opt) {
case GLYPH_OPT: {
- const char* s = clp->arg, *end = s + strlen(s);
+ const char* s = clp->vstr, *end = s + strlen(s);
while (s < end) {
- while (s < end && isspace(*s))
+ while (s < end && isspace((unsigned char) *s))
s++;
const char* word = s;
- while (s < end && !isspace(*s))
+ while (s < end && !isspace((unsigned char) *s))
s++;
if (word < s)
glyph_patterns.push_back(String(word, s - word));
@@ -555,7 +555,7 @@ main(int argc, char *argv[])
case OUTPUT_OPT:
if (output_file)
errh->fatal("output file already specified");
- output_file = clp->arg;
+ output_file = clp->vstr;
break;
case VERSION_OPT:
@@ -575,7 +575,7 @@ particular purpose.\n");
case Clp_NotOption:
if (font)
errh->fatal("font already specified");
- do_file(clp->arg, psres, errh);
+ do_file(clp->vstr, psres, errh);
break;
case Clp_Done: