summaryrefslogtreecommitdiff
path: root/Build/source/texk/psutils/paper-size.c
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/psutils/paper-size.c')
-rw-r--r--Build/source/texk/psutils/paper-size.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/Build/source/texk/psutils/paper-size.c b/Build/source/texk/psutils/paper-size.c
index 2a0ed5b3749..0f7dae01ff9 100644
--- a/Build/source/texk/psutils/paper-size.c
+++ b/Build/source/texk/psutils/paper-size.c
@@ -42,13 +42,19 @@ do_init (void)
if (!fp)
die ("can't open config file %s", CONFIG_NAME);
- while (i < MAX_PAPER - 1 &&
- (ch = fgetc (fp)) > 0 && ch != ' ' && ch != '\n' && ch != '\r')
- default_paper[i++] = ch;
+ /* In order to specify PAPER as default papersize the config file must
+ contain 'p PAPER', optionally followed by a space or end of line
+ and a comment. */
+ if (fgetc (fp) == 'p' && fgetc (fp) == ' ')
+ while (i < MAX_PAPER - 1 &&
+ (ch = fgetc (fp)) > 0 && ch != ' ' && ch != '\n' && ch != '\r')
+ default_paper[i++] = ch;
default_paper[i] = 0;
if (i == 0)
- die ("can't read default papersize from file %s", CONFIG_NAME);
+ die ("can't read default papersize from file %s", fqpn);
+ fclose (fp);
+ free (fqpn);
inited = 1;
}