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
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
|
$NetBSD: patch-ac,v 1.2 2008/07/28 02:45:56 dholland Exp $
--- xphoon.c.orig 1991-09-18 15:57:37.000000000 -0400
+++ xphoon.c 2008-07-27 22:02:33.000000000 -0400
@@ -31,22 +31,22 @@ static char rcsid[] =
/* Externals. */
-extern char* malloc();
-extern long time();
-extern long random();
-
-extern void getbits();
-extern double jtime();
-extern double phase();
+#include <stdlib.h>
+#include <time.h>
+#include "xphoon.h"
/* Forward routines. */
-static void xinit();
-static void make_star_tiles();
-static void hack_bits();
-static void set_root();
-static void cleanup();
+static void xinit(char *display_name);
+static void make_star_tiles(void);
+static void hack_bits(struct tws *t,
+ int bits_w, int bits_h,
+ char *bits,
+ int cx, int cy, int r,
+ int blackflag, int demoflag);
+static void set_root(int bits_w, int bits_h, char *bits, int cx, int cy, int r);
+static void cleanup(void);
/* Routines. */
@@ -54,7 +54,7 @@ static void cleanup();
static char* argv0;
static int seed;
-void
+int
main( argc, argv )
int argc;
char** argv;
@@ -65,7 +65,7 @@ main( argc, argv )
int blackflag, demoflag;
int printpid;
char* display_name;
- long clock;
+ time_t clock;
int pid, tty;
int size;
char* mooncopy;
@@ -190,6 +190,7 @@ usage:
(void) fflush( stdout );
/* Go stealth (ditch our controlling tty). */
+#ifdef TIOCNOTTY
tty = open( "/dev/tty", 0 );
if ( tty < 0 )
{
@@ -207,6 +208,9 @@ usage:
}
(void) close( tty );
}
+#else
+ setsid();
+#endif
}
size = BitmapSize( moon_w, moon_h );
@@ -246,8 +250,7 @@ static GC copygc;
static GC clipgc;
static void
-xinit( display_name )
- char* display_name;
+xinit( char *display_name )
{
Pixmap temp_pixmap;
@@ -333,7 +336,7 @@ static Pixmap star_tile[NUM_TILES];
static int star_tiles_made = 0;
static void
-make_star_tiles()
+make_star_tiles(void)
{
int i, j, k, r, x, y;
int total_prob;
@@ -410,12 +413,11 @@ char *shades[16] = {
Tennessee */
static void
-hack_bits( t, bits_w, bits_h, bits, cx, cy, r, blackflag, demoflag )
- struct tws* t;
- int bits_w, bits_h;
- char* bits;
- int cx, cy, r;
- int blackflag, demoflag;
+hack_bits(struct tws *t,
+ int bits_w, int bits_h,
+ char *bits,
+ int cx, int cy, int r,
+ int blackflag, int demoflag)
{
double jd, angphase, cphase, aom, cdist, cangdia, csund, csuang;
int i;
@@ -492,10 +494,7 @@ hack_bits( t, bits_w, bits_h, bits, cx,
/* set_root - set the root bitmap */
static void
-set_root( bits_w, bits_h, bits, cx, cy, r )
- int bits_w, bits_h;
- char* bits;
- int cx, cy, r;
+set_root(int bits_w, int bits_h, char *bits, int cx, int cy, int r)
{
Pixmap moon_bitmap;
Pixmap mask_bitmap;
@@ -586,7 +585,7 @@ set_root( bits_w, bits_h, bits, cx, cy,
}
static void
-cleanup()
+cleanup(void)
{
int i;
|
