]>
Commit | Line | Data |
---|---|---|
1da91fce | 1 | --- enscript-1.6.2.orig/compat/regex.c |
2 | +++ enscript-1.6.2/compat/regex.c | |
3 | @@ -2400,11 +2400,13 @@ | |
4 | case ')': | |
5 | if (syntax & RE_NO_BK_PARENS) goto normal_backslash; | |
6 | ||
7 | - if (COMPILE_STACK_EMPTY) | |
8 | - if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD) | |
9 | + if (COMPILE_STACK_EMPTY) { | |
10 | + if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD) { | |
11 | goto normal_backslash; | |
12 | - else | |
13 | + } else { | |
14 | FREE_STACK_RETURN (REG_ERPAREN); | |
15 | + } | |
16 | + } | |
17 | ||
18 | handle_close: | |
19 | if (fixup_alt_jump) | |
20 | @@ -2420,11 +2422,13 @@ | |
21 | } | |
22 | ||
23 | /* See similar code for backslashed left paren above. */ | |
24 | - if (COMPILE_STACK_EMPTY) | |
25 | - if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD) | |
26 | + if (COMPILE_STACK_EMPTY) { | |
27 | + if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD) { | |
28 | goto normal_char; | |
29 | - else | |
30 | + } else { | |
31 | FREE_STACK_RETURN (REG_ERPAREN); | |
32 | + } | |
33 | + } | |
34 | ||
35 | /* Since we just checked for an empty stack above, this | |
36 | ``can't happen''. */ | |
37 | --- enscript-1.6.2.orig/lib/enscript.cfg.in | |
38 | +++ enscript-1.6.2/lib/enscript.cfg.in | |
39 | @@ -48,7 +48,7 @@ | |
40 | DefaultFancyHeader: enscript | |
41 | ||
42 | # Default output media. | |
43 | -DefaultMedia: @media@ | |
44 | +# DefaultMedia: @media@ | |
45 | ||
46 | # Where output goes as a default: `printer' or `stdout' | |
47 | DefaultOutputMethod: printer | |
a478bed1 JB |
48 | @@ -91,6 +91,11 @@ |
49 | Media: A5 420 595 24 24 396 571 | |
50 | Media: Legal 612 1008 24 24 588 984 | |
51 | Media: Letter 612 792 38 24 574 768 | |
1da91fce | 52 | +Media: a3 842 1190 24 24 818 1166 |
53 | +Media: a4 595 842 24 24 571 818 | |
54 | +Media: a5 420 595 24 24 396 571 | |
55 | +Media: legal 612 1008 24 24 588 984 | |
56 | +Media: letter 612 792 38 24 574 768 | |
57 | ||
58 | # HP DeskJet media (DeskJet can't print on the bottom 1/2" of the paper). | |
59 | Media: A4dj 595 842 24 50 571 818 | |
60 | --- enscript-1.6.2.orig/src/psgen.c | |
61 | +++ enscript-1.6.2/src/psgen.c | |
62 | @@ -2472,7 +2472,7 @@ | |
63 | read_float (InputStream *is, int units, int horizontal) | |
64 | { | |
65 | char buf[256]; | |
66 | - int i, ch; | |
67 | + int i, ch = 0; | |
68 | double val; | |
69 | ||
70 | for (i = 0; (i < sizeof (buf) - 1 | |
71 | @@ -2696,31 +2696,15 @@ | |
72 | static void | |
73 | divert () | |
74 | { | |
75 | - char *cp; | |
76 | - | |
77 | assert (divertfp == NULL); | |
78 | ||
79 | /* Open divert file. */ | |
80 | ||
81 | - cp = tempnam (NULL, "ens"); | |
82 | - if (cp == NULL) | |
83 | - FATAL ((stderr, _("couldn't create divert file name: %s"), | |
84 | - strerror (errno))); | |
85 | - | |
86 | - strcpy (divertfname, cp); | |
87 | - | |
88 | - divertfp = fopen (divertfname, "w+b"); | |
89 | + divertfp = tmpfile (); | |
90 | if (divertfp == NULL) | |
91 | FATAL ((stderr, _("couldn't create divert file \"%s\": %s"), divertfname, | |
92 | strerror (errno))); | |
93 | ||
94 | - if (remove (divertfname) == 0) | |
95 | - /* Remove successfull, no need to remove file in undivert(). */ | |
96 | - divertfname[0] = '\0'; | |
97 | - | |
98 | - /* Free the buffer allocated by tempnam(). */ | |
99 | - free (cp); | |
100 | - | |
101 | cofp = divertfp; | |
102 | } | |
103 | ||
104 | @@ -2774,10 +2758,6 @@ | |
105 | ||
106 | fclose (divertfp); | |
107 | divertfp = NULL; | |
108 | - | |
109 | - /* Do we have to remove the divert file? */ | |
110 | - if (divertfname[0]) | |
111 | - (void) remove (divertfname); | |
112 | ||
113 | cofp = ofp; | |
114 | } | |
115 | --- enscript-1.6.2.orig/tests/Makefile.in | |
116 | +++ enscript-1.6.2/tests/Makefile.in | |
117 | @@ -131,7 +131,7 @@ | |
118 | EXTRA_DIST = defs $(TESTS) | |
119 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | |
120 | CONFIG_HEADER = ../config.h | |
121 | -CONFIG_CLEAN_FILES = | |
122 | +CONFIG_CLEAN_FILES = testout.ps | |
123 | DIST_COMMON = ChangeLog Makefile.am Makefile.in | |
124 | ||
125 | ||
126 | --- enscript-1.6.2.orig/docs/Makefile.in | |
127 | +++ enscript-1.6.2/docs/Makefile.in | |
128 | @@ -280,7 +280,7 @@ | |
129 | enscript.fns enscript.ky enscript.kys enscript.ps \ | |
130 | enscript.log enscript.pg enscript.toc enscript.tp \ | |
131 | enscript.tps enscript.vr enscript.vrs enscript.op enscript.tr \ | |
132 | - enscript.cv enscript.cn | |
133 | + enscript.cv enscript.cn enscript.1 states.1 | |
134 | ||
135 | clean-aminfo: | |
136 |