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
54
55
56
57
58
59
60
61
62
63
|
--- psnup.c.orig 1997-03-12 07:53:02.000000000 +0900
+++ psnup.c 2012-03-03 03:03:01.000000000 +0900
@@ -28,6 +28,10 @@
#include "pserror.h"
#include "patchlev.h"
+#if defined(LIBPAPER)
+#include <paper.h>
+#endif
+
char *program ;
int pages ;
int verbose ;
@@ -66,12 +70,12 @@
return (0);
}
-void main(int argc, char *argv[])
+int main(int argc, char *argv[])
{
- int horiz, vert, rotate, column, flip, leftright, topbottom;
+ int horiz = 0, vert = 0, rotate = 0, column, flip, leftright, topbottom;
int nup = 1;
double draw = 0; /* draw page borders */
- double scale; /* page scale */
+ double scale = 0; /* page scale */
double uscale = 0; /* user supplied scale */
double ppwid, pphgt; /* paper dimensions */
double margin, border; /* paper & page margins */
@@ -79,13 +83,21 @@
double iwidth, iheight ; /* input paper size */
double tolerance = 100000; /* layout tolerance */
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);
+ }
margin = border = vshift = hshift = column = flip = 0;
leftright = topbottom = 1;
@@ -331,6 +343,6 @@
pstops(nup, 1, 0, specs, draw); /* do page rearrangement */
}
- exit(0);
+ return (0);
}
|
