tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/src/hackerlab/machine/endian.sh b/src/hackerlab/machine/endian.sh
2index 2a1c562..92bc81e 100644
3--- a/src/hackerlab/machine/endian.sh
4+++ b/src/hackerlab/machine/endian.sh
5@@ -5,8 +5,9 @@
6 CC="$1"
7
8 cat > endian-test.c << EOF
9-
10-main()
11+#include <stdlib.h>
12+
13+int main()
14 {
15 unsigned int x = 1;
16
17diff --git a/src/hackerlab/tests/rx-posix-tests/test-dbug.c b/src/hackerlab/tests/rx-posix-tests/test-dbug.c
18index 4620c31..3b7d35c 100644
19--- a/src/hackerlab/tests/rx-posix-tests/test-dbug.c
20+++ b/src/hackerlab/tests/rx-posix-tests/test-dbug.c
21@@ -124,7 +124,7 @@ main (int argc, char * argv[])
22 {
23 subexps = 0;
24 nsub = 1;
25- rx_analyze_rexp (&subexps, &nsub, exp);
26+ rx_analyze_rexp (&subexps, (size_t *)&nsub, exp);
27 rx_print_rexp (1, 256, 0, exp);
28 if (nfa)
29 {
30diff --git a/src/hackerlab/vu/vu-pathcompress.c b/src/hackerlab/vu/vu-pathcompress.c
31index 711acbe..3ea10d5 100644
32--- a/src/hackerlab/vu/vu-pathcompress.c
33+++ b/src/hackerlab/vu/vu-pathcompress.c
34@@ -86,7 +86,7 @@ void pathcompress_free_closure(void * closure)
35 vu_sys_free_closure(closure);
36 }
37
38-int pathcompress_access(int* errn, char* path, int mode, void* closure)
39+int pathcompress_access(int* errn, const char* path, int mode, void* closure)
40 {
41 int rvl;
42 char compressed_path[PATH_LEN]="";
43@@ -97,7 +97,7 @@ int pathcompress_access(int* errn, char* path, int mode, void* closure)
44 return rvl;
45 }
46
47-int pathcompress_chdir(int * errn, char * path, void * closure)
48+int pathcompress_chdir(int * errn, const char * path, void * closure)
49 {
50 int rvl;
51 char compressed_path[PATH_LEN]="";
52@@ -108,7 +108,7 @@ int pathcompress_chdir(int * errn, char * path, void * closure)
53 return rvl;
54 }
55
56-int pathcompress_chmod(int * errn, char * path, int mode, void * closure)
57+int pathcompress_chmod(int * errn, const char * path, int mode, void * closure)
58 {
59 int rvl;
60 char compressed_path[PATH_LEN]="";
61@@ -119,7 +119,7 @@ int pathcompress_chmod(int * errn, char * path, int mode, void * closure)
62 return rvl;
63 }
64
65-int pathcompress_chown(int * errn, char * path, int owner, int group, void * closure)
66+int pathcompress_chown(int * errn, const char * path, int owner, int group, void * closure)
67 {
68 int rvl;
69 char compressed_path[PATH_LEN]="";
70@@ -130,7 +130,7 @@ int pathcompress_chown(int * errn, char * path, int owner, int group, void * clo
71 return rvl;
72 }
73
74-int pathcompress_chroot(int * errn, char * path, void * closure)
75+int pathcompress_chroot(int * errn, const char * path, void * closure)
76 {
77 int rvl;
78 char compressed_path[PATH_LEN]="";
79@@ -254,7 +254,7 @@ int pathcompress_getcwd(char* cwd, size_t size)
80 return rvl;
81 }
82
83-int pathcompress_link(int * errn, char * from, char * to, void * closure)
84+int pathcompress_link(int * errn, const char * from, const char * to, void * closure)
85 {
86 int rvl;
87 char compressed_from[PATH_LEN]="";
88@@ -276,7 +276,7 @@ off_t pathcompress_lseek(int * errn, int fd, off_t offset, int whence, void * cl
89 return rvl;
90 }
91
92-int pathcompress_lstat(int * errn, char * path, struct stat * buf, void * closure)
93+int pathcompress_lstat(int * errn, const char * path, struct stat * buf, void * closure)
94 {
95 int rvl;
96 char compressed_path[PATH_LEN]="";
97@@ -293,7 +293,7 @@ int pathcompress_lstat(int * errn, char * path, struct stat * buf, void * closur
98 return rvl;
99 }
100
101-int pathcompress_mkdir(int * errn, char * path, int mode, void * closure)
102+int pathcompress_mkdir(int * errn, const char * path, int mode, void * closure)
103 {
104 int rvl;
105 char abspath[PATH_LEN]="";
106@@ -315,7 +315,7 @@ int pathcompress_mkdir(int * errn, char * path, int mode, void * closure)
107 return rvl;
108 }
109
110-int pathcompress_open(int * errn, char * path, int flags, int mode, void * closure)
111+int pathcompress_open(int * errn, const char * path, int flags, int mode, void * closure)
112 {
113 int rvl;
114 char* p;
115@@ -368,7 +368,7 @@ int pathcompress_open(int * errn, char * path, int flags, int mode, void * closu
116 return 0;
117 }
118
119-int pathcompress_opendir(int * errn, DIR ** retv, char * path, void * closure)
120+int pathcompress_opendir(int * errn, DIR ** retv, const char * path, void * closure)
121 {
122 int rvl;
123 char compressed_path[PATH_LEN]="";
124@@ -453,7 +453,7 @@ int pathcompress_readdir(int * errn, struct alloc_limits * limits, char ** file_
125 return rvl;
126 }
127
128-int pathcompress_readlink(int * errn, char * path, char * buf, int bufsize, void * closure)
129+int pathcompress_readlink(int * errn, const char * path, char * buf, int bufsize, void * closure)
130 {
131 int rvl;
132 char compressed_path[PATH_LEN]="";
133@@ -467,7 +467,7 @@ int pathcompress_readlink(int * errn, char * path, char * buf, int bufsize, void
134 return rvl;
135 }
136
137-int pathcompress_rename(int * errn, char * from, char * to, void * closure)
138+int pathcompress_rename(int * errn, const char * from, const char * to, void * closure)
139 {
140 struct stat stat;
141 int err;
142@@ -502,7 +502,7 @@ int pathcompress_rename(int * errn, char * from, char * to, void * closure)
143 return rvl;
144 }
145
146-int pathcompress_rmdir(int * errn, char * path, void * closure)
147+int pathcompress_rmdir(int * errn, const char * path, void * closure)
148 {
149 int rvl;
150 char dirnames[PATH_LEN]="";
151@@ -517,7 +517,7 @@ int pathcompress_rmdir(int * errn, char * path, void * closure)
152 return rvl;
153 }
154
155-int pathcompress_stat(int * errn, char * path, struct stat * buf, void * closure)
156+int pathcompress_stat(int * errn, const char * path, struct stat * buf, void * closure)
157 {
158 int rvl;
159 char compressed_path[PATH_LEN]="";
160@@ -537,7 +537,7 @@ int pathcompress_stat(int * errn, char * path, struct stat * buf, void * closure
161 return rvl;
162 }
163
164-int pathcompress_symlink(int * errn, char * from, char * to, void * closure)
165+int pathcompress_symlink(int * errn, const char * from, const char * to, void * closure)
166 {
167 int rvl;
168 char compressed_from[PATH_LEN]="";
169@@ -553,7 +553,7 @@ int pathcompress_symlink(int * errn, char * from, char * to, void * closure)
170 return rvl;
171 }
172
173-int pathcompress_truncate(int * errn, char * path, off_t where, void * closure)
174+int pathcompress_truncate(int * errn, const char * path, off_t where, void * closure)
175 {
176 int rvl;
177 char compressed_path[PATH_LEN]="";
178@@ -566,7 +566,7 @@ int pathcompress_truncate(int * errn, char * path, off_t where, void * closure)
179 return rvl;
180 }
181
182-int pathcompress_unlink(int * errn, char * path, void * closure)
183+int pathcompress_unlink(int * errn, const char * path, void * closure)
184 {
185 int rvl;
186 char compressed_path[PATH_LEN]="";
187@@ -578,7 +578,7 @@ int pathcompress_unlink(int * errn, char * path, void * closure)
188 return rvl;
189 }
190
191-int pathcompress_utime(int * errn, char * path, struct utimbuf * times, void * closure)
192+int pathcompress_utime(int * errn, const char * path, struct utimbuf * times, void * closure)
193 {
194 int rvl;
195 char compressed_path[PATH_LEN]="";
196@@ -590,7 +590,7 @@ int pathcompress_utime(int * errn, char * path, struct utimbuf * times, void * c
197 return rvl;
198 }
199
200-ssize_t pathcompress_write(int * errn, int fd, char * buf, size_t count, void * closure)
201+ssize_t pathcompress_write(int * errn, int fd, const char * buf, size_t count, void * closure)
202 {
203 int rvl;
204 Dprintf("pathcompress_write(%d,%p,%d)", fd, buf, count);
205diff --git a/src/tla/libarch/changeset-report.c b/src/tla/libarch/changeset-report.c
206index d3539b3..1672c2f 100644
207--- a/src/tla/libarch/changeset-report.c
208+++ b/src/tla/libarch/changeset-report.c
209@@ -630,7 +630,7 @@ print_custom_diffs (int out_fd, struct arch_changeset_report * report, t_uchar *
210 orig_path = file_name_in_vicinity(0, orig_dir, orig_part_path);
211 mod_path = file_name_in_vicinity(0, mod_dir, id2 /*report->patched_regular_files[x][0]*/);
212
213- arch_really_invoke_diff ( out_fd, orig_path, orig_part_path, mod_path, id2 /*report->patched_regular_files[x][0]*/, (char **)opts);
214+ arch_really_invoke_diff ( out_fd, orig_path, orig_part_path, mod_path, id2 /*report->patched_regular_files[x][0]*/, (const char **)opts);
215
216 rel_field_unref(key);
217 lim_free(0, mod_path);
218@@ -650,7 +650,7 @@ print_custom_diffs (int out_fd, struct arch_changeset_report * report, t_uchar *
219 {
220 t_uchar *id = str_save(0, rel_peek_str(report->added_files, x, 2));
221 t_uchar *id2 = str_save(0, rel_peek_str(report->added_files, x, 0));
222- arch_really_invoke_diff ( out_fd, "/dev/null", NULL, id /*report->added_files[x][2]*/, id2 /*report->added_files[x][0]*/, (char**)opts);
223+ arch_really_invoke_diff ( out_fd, "/dev/null", NULL, id /*report->added_files[x][2]*/, id2 /*report->added_files[x][0]*/, (const char**)opts);
224 lim_free(0, id);
225 lim_free(0, id2);
226 }
227@@ -680,7 +680,7 @@ print_removed_file_diffs (int out_fd, struct arch_changeset_report * report, t_u
228 {
229 t_uchar *id = str_save(0, rel_peek_str(report->removed_files, x, 2));
230 t_uchar *id2 = str_save(0, rel_peek_str(report->removed_files, x, 0));
231- arch_really_invoke_diff ( out_fd, id /*report->removed_files[x][2]*/, id2 /*report->removed_files[x][0]*/, "/dev/null", NULL, (char**)opts);
232+ arch_really_invoke_diff ( out_fd, id /*report->removed_files[x][2]*/, id2 /*report->removed_files[x][0]*/, "/dev/null", NULL, (const char**)opts);
233 lim_free(0, id);
234 lim_free(0, id2);
235 }
236diff --git a/src/tla/libarch/cmd-apply-delta.c b/src/tla/libarch/cmd-apply-delta.c
237index 8aebd8b..5a8615e 100644
238--- a/src/tla/libarch/cmd-apply-delta.c
239+++ b/src/tla/libarch/cmd-apply-delta.c
240@@ -31,6 +31,8 @@
241 #include "tla/libarch/cmd-get.h"
242 #include "tla/libarch/cmd-delta.h"
243 #include "tla/libarch/cmd-apply-delta.h"
244+#include "tla/libarch/cmdutils.h"
245+#include "tla/libarch/star-merge.h"
246
247
248 /* __STDC__ prototypes for static functions */
249diff --git a/src/tla/libarch/cmd-branch.c b/src/tla/libarch/cmd-branch.c
250index 6308fef..d63c75c 100644
251--- a/src/tla/libarch/cmd-branch.c
252+++ b/src/tla/libarch/cmd-branch.c
253@@ -26,6 +26,7 @@
254 #include "tla/libarch/cmd-switch.h"
255 #include "tla/libarch/cmdutils.h"
256 #include "tla/libarch/archive-setup.h"
257+#include "tla/libarch/cmd.h"
258
259
260
261diff --git a/src/tla/libarch/cmd-diff.c b/src/tla/libarch/cmd-diff.c
262index 98dbe19..4b678b0 100644
263--- a/src/tla/libarch/cmd-diff.c
264+++ b/src/tla/libarch/cmd-diff.c
265@@ -30,6 +30,7 @@
266 #include "tla/libarch/cmd-diff.h"
267 #include "tla/libarch/cmd-versions.h"
268 #include "tla/libarch/invent.h"
269+#include "tla/libarch/make-changeset-files.h"
270
271
272 /* gettext support not yet incorporated into tla, reserve the gettext notation for later */
273@@ -38,7 +39,7 @@
274
275
276 /* __STDC__ prototypes for static functions */
277-static void make_changeset_callback (void * ign, char * fmt, va_list ap);
278+static void make_changeset_callback (void * ign, const char * fmt, va_list ap);
279
280
281
282@@ -527,7 +528,7 @@ arch_cmd_diff (t_uchar * program_name, int argc, char * argv[])
283
284
285 static void
286-make_changeset_callback (void * ign, char * fmt, va_list ap)
287+make_changeset_callback (void * ign, const char * fmt, va_list ap)
288 {
289 safe_printfmt_va_list (1, fmt, ap);
290 safe_flush (1);
291diff --git a/src/tla/libarch/cmd-export.c b/src/tla/libarch/cmd-export.c
292index bfed694..24e5d6a 100644
293--- a/src/tla/libarch/cmd-export.c
294+++ b/src/tla/libarch/cmd-export.c
295@@ -35,6 +35,7 @@
296 #include "tla/libarch/cmd.h"
297 #include "tla/libarch/cmdutils.h"
298 #include "tla/libarch/cmd-export.h"
299+#include "tla/libarch/chatter.h"
300
301
302
303diff --git a/src/tla/libarch/cmdutils.c b/src/tla/libarch/cmdutils.c
304index 3aafd13..195d636 100644
305--- a/src/tla/libarch/cmdutils.c
306+++ b/src/tla/libarch/cmdutils.c
307@@ -20,6 +20,7 @@
308 #include "tla/libarch/patch-logs.h"
309 #include "tla/libarch/pfs.h"
310 #include "tla/libfsutils/dir-as-cwd.h"
311+#include "tla/libarch/local-cache.h"
312
313
314 /* __STDC__ prototypes for static functions */
315diff --git a/src/tla/libarch/diffs.c b/src/tla/libarch/diffs.c
316index dcae932..5f935ae 100644
317--- a/src/tla/libarch/diffs.c
318+++ b/src/tla/libarch/diffs.c
319@@ -230,7 +230,7 @@ arch_really_invoke_diff (int output_fd,
320 if (extraopts != NULL)
321 {
322 t_uchar ** opt;
323- for (opt = extraopts; *opt != NULL; ++opt)
324+ for (opt = (t_uchar**)extraopts; *opt != NULL; ++opt)
325 {
326 *(t_uchar **) ar_push ((void*) &argv, 0, sizeof(t_uchar*)) = *opt;
327
328diff --git a/src/tla/libarch/invent.c b/src/tla/libarch/invent.c
329index 077d776..defd2da 100644
330--- a/src/tla/libarch/invent.c
331+++ b/src/tla/libarch/invent.c
332@@ -19,6 +19,7 @@
333 #include "tla/libarch/inode-sig.h"
334 #include "tla/libarch/inv-ids.h"
335 #include "tla/libarch/invent.h"
336+#include "cmdutils.h"
337
338
339
340diff --git a/src/tla/libarch/local-cache.c b/src/tla/libarch/local-cache.c
341index 0cade1b..945cd8b 100644
342--- a/src/tla/libarch/local-cache.c
343+++ b/src/tla/libarch/local-cache.c
344@@ -24,6 +24,7 @@
345 #include "tla/libarch/library-txn.h"
346 #include "tla/libarch/local-cache.h"
347 #include "tla/libarch/namespace.h"
348+#include "project-tree.h"
349
350
351
352diff --git a/src/tla/libarch/pfs-ftp.c b/src/tla/libarch/pfs-ftp.c
353index 546c702..c457837 100644
354--- a/src/tla/libarch/pfs-ftp.c
355+++ b/src/tla/libarch/pfs-ftp.c
356@@ -12,6 +12,7 @@
357 #include <string.h>
358 #include <stdio.h>
359 #include <errno.h>
360+#include <ctype.h>
361 #include "config-options.h"
362 #include "hackerlab/bugs/panic.h"
363 #include "hackerlab/os/errno-to-string.h"
364diff --git a/src/tla/libarch/undo.c b/src/tla/libarch/undo.c
365index abc40e9..dc8e6ed 100644
366--- a/src/tla/libarch/undo.c
367+++ b/src/tla/libarch/undo.c
368@@ -19,6 +19,7 @@
369 #include "tla/libarch/apply-changeset.h"
370 #include "tla/libarch/chatter.h"
371 #include "tla/libarch/undo.h"
372+#include "tla/libarch/make-changeset-files.h"
373
374
375 /* __STDC__ prototypes for static functions */
376diff --git a/src/tla/libfsutils/tmp-files.c b/src/tla/libfsutils/tmp-files.c
377index 164acdb..1188627 100644
378--- a/src/tla/libfsutils/tmp-files.c
379+++ b/src/tla/libfsutils/tmp-files.c
380@@ -18,6 +18,8 @@
381 #include "hackerlab/fs/file-names.h"
382 #include "hackerlab/vu/safe.h"
383 #include "tla/libfsutils/tmp-files.h"
384+#include "hackerlab/fs/tmp-files.h"
385+#include "tla/libarch/cmdutils.h"
386
387
388