diff options
author | Norbert Preining <norbert@preining.info> | 2021-02-07 03:00:48 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2021-02-07 03:00:48 +0000 |
commit | e068841d2fc2976d094b382e4dd5e4d6df455506 (patch) | |
tree | a10b009fa5e01a531fa1eb92723f24ae05ba6d4e /fonts/utilities/ps2pk/ps2pk.c | |
parent | 27accb929aa8061d3aea791560a1bffd3876f0c7 (diff) |
CTAN sync 202102070300
Diffstat (limited to 'fonts/utilities/ps2pk/ps2pk.c')
-rw-r--r-- | fonts/utilities/ps2pk/ps2pk.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/fonts/utilities/ps2pk/ps2pk.c b/fonts/utilities/ps2pk/ps2pk.c index c59d9a7f82..b4c7a05c9f 100644 --- a/fonts/utilities/ps2pk/ps2pk.c +++ b/fonts/utilities/ps2pk/ps2pk.c @@ -269,7 +269,7 @@ int main(int argc, char *argv[]) if (*++argv[0] == '\0') { argc--; argv++; } - if (argv[0] == '\0') goto invalid; + if (argv[0] == NULL) goto invalid; afmname = argv[0]; done = 1; break; @@ -280,7 +280,7 @@ int main(int argc, char *argv[]) if (*++argv[0] == '\0') { argc--; argv++; } - if (argv[0] == '\0') goto invalid; + if (argv[0] == NULL) goto invalid; encname = argv[0]; add_option("-e", encname); done = 1; @@ -289,7 +289,7 @@ int main(int argc, char *argv[]) if (*++argv[0] == '\0') { argc--; argv++; } - if (argv[0] == '\0') goto invalid; + if (argv[0] == NULL) goto invalid; efactor = atof(argv[0]); add_option("-E", argv[0]); done = 1; @@ -302,7 +302,7 @@ int main(int argc, char *argv[]) if (*++argv[0] == '\0') { argc--; argv++; } - if (argv[0] == '\0') goto invalid; + if (argv[0] == NULL) goto invalid; pointsize = atof(argv[0]); add_option("-P", argv[0]); done = 1; @@ -311,7 +311,7 @@ int main(int argc, char *argv[]) if (*++argv[0] == '\0') { argc--; argv++; } - if (argv[0] == '\0') goto invalid; + if (argv[0] == NULL) goto invalid; base_resolution = atoi(argv[0]); add_option("-R", argv[0]); done = 1; @@ -320,7 +320,7 @@ int main(int argc, char *argv[]) if (*++argv[0] == '\0') { argc--; argv++; } - if (argv[0] == '\0') goto invalid; + if (argv[0] == NULL) goto invalid; slant = atof(argv[0]); add_option("-S", argv[0]); done = 1; @@ -329,7 +329,7 @@ int main(int argc, char *argv[]) if (*++argv[0] == '\0') { argc--; argv++; } - if (argv[0] == '\0') goto invalid; + if (argv[0] == NULL) goto invalid; x_resolution = atoi(argv[0]); done = 1; if (y_resolution == 0) y_resolution = x_resolution; add_option("-X", argv[0]); @@ -338,7 +338,7 @@ int main(int argc, char *argv[]) if (*++argv[0] == '\0') { argc--; argv++; } - if (argv[0] == '\0') goto invalid; + if (argv[0] == NULL) goto invalid; y_resolution = atoi(argv[0]); done = 1; if (x_resolution == 0) x_resolution = y_resolution; add_option("-Y", argv[0]); @@ -353,10 +353,11 @@ invalid: } if (argc < 1 || argc >2) { - msg ("ps2pk version " PACKAGE_VERSION " (1992-2016)\n"); + msg ("ps2pk version " PACKAGE_VERSION " (" TL_VERSION ")\n"); msg ("Usage: %s [options] type1font [pkname]\n", myname); msg ("options: -d -v -e<enc> -X<xres> -E<expansion> -S<slant>\n"); - fatal("options: -O -P<pointsize> -Y<yres> -a<AFM> -R<baseres>\n"); + msg ("options: -O -P<pointsize> -Y<yres> -a<AFM> -R<baseres>\n"); + fatal("\nEmail bug reports to %s.\n", PACKAGE_BUGREPORT); } psname = argv[0]; argc--; argv++; |