blob: d21fab8774ebbed539ce691d88239cb64e38a85b (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
--- pstops.c.orig 1997-03-12 07:53:04.000000000 +0900
+++ pstops.c 2012-03-03 03:04:32.000000000 +0900
@@ -13,6 +13,10 @@
#include "pserror.h"
#include "patchlev.h"
+#if defined(LIBPAPER)
+#include <paper.h>
+#endif
+
char *program ;
int pages ;
int verbose ;
@@ -112,19 +116,27 @@
return (head);
}
-void main(int argc, char *argv[])
+int main(int argc, char *argv[])
{
PageSpec *specs = NULL;
int nobinding = 0;
double draw = 0;
Paper *paper;
+ char *name;
+#if defined(LIBPAPER)
+ name = (char *)systempapername();
+ if (name == NULL)
+ name = (char *)defaultpapername();
+#else
#ifdef PAPER
- if ( (paper = findpaper(PAPER)) != (Paper *)0 ) {
- width = (double)PaperWidth(paper);
- height = (double)PaperHeight(paper);
- }
+ name = PAPER;
+#endif
#endif
+ if ((paper = findpaper(name)) != NULL) {
+ width = (double)PaperWidth(paper);
+ height = (double)PaperHeight(paper);
+ }
infile = stdin;
outfile = stdout;
@@ -194,5 +206,5 @@
pstops(modulo, pagesperspec, nobinding, specs, draw);
- exit(0);
+ return (0);
}
|
