1 diff -ur fortune-mod-9708/fortune/fortune.c fortune-mod-9708-/fortune/fortune.c
2 --- fortune-mod-9708/fortune/fortune.c Thu Aug 28 21:43:52 1997
3 +++ fortune-mod-9708-/fortune/fortune.c Tue Jun 4 17:20:25 2002
5 #define MINW 6 /* minimum wait if desired */
6 #define CPERS 20 /* # of chars for each sec */
8 -#define POS_UNKNOWN ((off_t) -1) /* pos for file unknown */
9 +#define POS_UNKNOWN ((uint32_t) -1) /* pos for file unknown */
10 #define NO_PROB (-1) /* no prob specified for file */
23 Num_files, Num_kids, /* totals of files and children. */
24 SLEN = 160; /* max. characters in a "short" fortune */
26 -off_t Seekpts[2]; /* seek pointers to fortunes */
27 +uint32_t Seekpts[2]; /* seek pointers to fortunes */
29 FILEDESC *File_list = NULL, /* Head of file list */
30 *File_tail = NULL; /* Tail of file list */
31 diff -ur fortune-mod-9708/util/strfile.c fortune-mod-9708-/util/strfile.c
32 --- fortune-mod-9708/util/strfile.c Thu May 1 06:24:01 1997
33 +++ fortune-mod-9708-/util/strfile.c Tue Jun 4 17:11:34 2002
44 int Xflag = FALSE; /* set rotated bit */
45 long Num_pts = 0; /* number of pointers/strings */
50 FILE *Sort_1, *Sort_2; /* pointers for sorting */
54 * Add an offset to the list, or write it out, as appropriate.
56 -void add_offset(FILE * fp, off_t off)
57 +void add_offset(FILE * fp, uint32_t off)
66 * Used when we have two separators in a row.
68 -void fix_last_offset(FILE * fp, off_t off)
69 +void fix_last_offset(FILE * fp, uint32_t off)
81 + register uint32_t *lp;
84 Sort_1 = fopen(Infile, "r");
91 + register uint32_t tmp;
92 + register uint32_t *sp;
93 extern time_t time(time_t *);
95 srandom((int) (time((time_t *) NULL) + getpid()));
98 register unsigned char *sp;
99 register FILE *inf, *outf;
100 - register off_t last_off, length, pos, *p;
101 + register uint32_t last_off, length, pos, *p;
102 register int first, cnt;
105 diff -ur fortune-mod-9708/util/strfile.h fortune-mod-9708-/util/strfile.h
106 --- fortune-mod-9708/util/strfile.h Thu Mar 23 12:04:08 1995
107 +++ fortune-mod-9708-/util/strfile.h Tue Jun 4 17:04:32 2002
109 #define STR_ENDSTRING(line,tbl) \
110 ((line)[0] == (tbl).str_delim && (line)[1] == '\n')
112 +#include <inttypes.h>
114 typedef struct { /* information table */
116 - unsigned long str_version; /* version number */
117 - unsigned long str_numstr; /* # of strings in the file */
118 - unsigned long str_longlen; /* length of longest string */
119 - unsigned long str_shortlen; /* length of shortest string */
120 + uint32_t str_version; /* version number */
121 + uint32_t str_numstr; /* # of strings in the file */
122 + uint32_t str_longlen; /* length of longest string */
123 + uint32_t str_shortlen; /* length of shortest string */
124 #define STR_RANDOM 0x1 /* randomized pointers */
125 #define STR_ORDERED 0x2 /* ordered pointers */
126 #define STR_ROTATED 0x4 /* rot-13'd text */
127 - unsigned long str_flags; /* bit field for flags */
128 + uint32_t str_flags; /* bit field for flags */
129 unsigned char stuff[4]; /* long aligned space */
130 #define str_delim stuff[0] /* delimiting character */
132 diff -ur fortune-mod-9708/util/unstr.c fortune-mod-9708-/util/unstr.c
133 --- fortune-mod-9708/util/unstr.c Fri Apr 18 08:27:01 1997
134 +++ fortune-mod-9708-/util/unstr.c Tue Jun 4 17:18:25 2002
138 register unsigned char *sp;
144 diff -ur fortune-mod-9708-/util/strfile.8 fortune-mod-9708/util/strfile.8
145 --- fortune-mod-9708-/util/strfile.8 Thu Mar 23 12:04:07 1995
146 +++ fortune-mod-9708/util/strfile.8 Tue Jun 4 17:28:16 2002
147 @@ -104,18 +104,19 @@
148 The format of the header is:
151 -unsigned long str_version; /* version number */
152 -unsigned long str_numstr; /* # of strings in the file */
153 -unsigned long str_longlen; /* length of longest string */
154 -unsigned long str_shortlen; /* length of shortest string */
155 +uint32_t str_version; /* version number */
156 +uint32_t str_numstr; /* # of strings in the file */
157 +uint32_t str_longlen; /* length of longest string */
158 +uint32_t str_shortlen; /* length of shortest string */
159 #define STR_RANDOM 0x1 /* randomized pointers */
160 #define STR_ORDERED 0x2 /* ordered pointers */
161 #define STR_ROTATED 0x4 /* rot-13'd text */
162 -unsigned long str_flags; /* bit field for flags */
163 +uint32_t str_flags; /* bit field for flags */
164 char str_delim; /* delimiting character */
167 -All fields are written in network byte order.
168 +All fields are written in network byte order. uint32_t is 32-bit wide
169 +unsigned integer, as defined in <inttypes.h>.