From c622ac2513325658785b47d4fadc1d514952a226 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Sat, 17 Jan 2015 13:55:39 -0800 Subject: [PATCH 01/16] Revert "Tile %smsm, replaced instance in ames with ++hard call" Kept the %ames part. This reverts commit 3dcf69e125a12518e6d0d30a50e3ef79d8819048. Conflicts: urb/urbit.pill urb/zod/arvo/hoon.hoon urb/zod/main/app/bang/core.hook urb/zod/main/app/cat/core.hook --- j/f/ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/j/f/ap.c b/j/f/ap.c index 162c9db4b..8b4ea64d4 100644 --- a/j/f/ap.c +++ b/j/f/ap.c @@ -721,7 +721,7 @@ u3nt(c3__tsls, u3nt(c3__ktts, c3__a, u3nt(c3__tsgr, u3nc(c3__cnzy, c3__v), - u3nc(c3__bccm, u3k(p_gen)))), + u3k(p_gen))), u3nt(c3__tsls, u3nt(c3__ktts, c3__b, u3nt(c3__tsgr, From f081dd273fdb3fc25b2b8db575d3670b50206e1c Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Wed, 21 Jan 2015 19:31:17 -0800 Subject: [PATCH 02/16] Twitter daemon v1: auth, tweeting --- j/f/ap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/j/f/ap.c b/j/f/ap.c index 162c9db4b..1491cc0e0 100644 --- a/j/f/ap.c +++ b/j/f/ap.c @@ -556,6 +556,7 @@ u3nc(c3__germ, u3k(p_gen)), u3k(q_gen)); } +#if 0 _open_do_pq(sgbr) // ~| { return u3nt @@ -563,6 +564,7 @@ u3nc(c3__mean, u3k(p_gen)), u3k(q_gen)); } +#endif _open_do_pq(sggl) // ~> { return u3nt @@ -831,7 +833,7 @@ _open_pq (kthp); _open_pq (sgts); - _open_pq (sgbr); +// _open_pq (sgbr); _open_pq (sggl); _open_pq (sgbc); _open_pq (sgcb); From 28d1fc478ca7379a4d31532ce5d33c539e18d3ec Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Mon, 26 Jan 2015 15:38:34 -0800 Subject: [PATCH 03/16] Revert "Breach compatibility rc2", "Revert "Tile %smsm, replaced instance in ames with ++hard call"" This reverts commit 66e94bd04b9333fd7cdafaacc1714d69b3cab059. This reverts commit d3ac409e27bafe7fc2074be71eaf86a6d97f887c. --- j/f/ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/j/f/ap.c b/j/f/ap.c index 8b4ea64d4..162c9db4b 100644 --- a/j/f/ap.c +++ b/j/f/ap.c @@ -721,7 +721,7 @@ u3nt(c3__tsls, u3nt(c3__ktts, c3__a, u3nt(c3__tsgr, u3nc(c3__cnzy, c3__v), - u3k(p_gen))), + u3nc(c3__bccm, u3k(p_gen)))), u3nt(c3__tsls, u3nt(c3__ktts, c3__b, u3nt(c3__tsgr, From b568763116bc1ef718c18c033c44f0da571aed1b Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Mon, 26 Jan 2015 16:25:27 -0800 Subject: [PATCH 04/16] Stage down to 163. --- j/tree.c | 4 ++-- v/sist.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/j/tree.c b/j/tree.c index e214abdf4..e360d8f04 100644 --- a/j/tree.c +++ b/j/tree.c @@ -487,13 +487,13 @@ static u3j_core _mood_d[] = {} }; -static u3j_core _k164_d[] = +static u3j_core _k163_d[] = { { "mood", 0, _mood_d }, {} }; static u3j_core _d[] = { - { "k164", 0, _k164_d}, + { "k163", 0, _k163_d}, {} }; diff --git a/v/sist.c b/v/sist.c index 54beee180..48b4f1a8f 100644 --- a/v/sist.c +++ b/v/sist.c @@ -612,7 +612,7 @@ _sist_zest() u3_uled led_u; led_u.mag_l = u3r_mug('g'); - led_u.kno_w = 164; + led_u.kno_w = 163; if ( 0 == u3A->key ) { led_u.key_l = 0; @@ -871,12 +871,12 @@ _sist_rest() u3_lo_bail(); } - if ( led_u.kno_w != 164 ) { + if ( led_u.kno_w != 163 ) { // XX perhaps we should actually do something here // uL(fprintf(uH, "rest: (not) translating events (old %d, now %d)\n", led_u.kno_w, - 164)); + 163)); } sev_l = led_u.sev_l; sal_l = led_u.sal_l; @@ -1178,7 +1178,7 @@ _sist_rest() led_u.sal_l = sal_l; led_u.sev_l = u3A->sev_l; led_u.key_l = u3A->key ? u3r_mug(u3A->key) : 0; - led_u.kno_w = 164; // may need actual translation! + led_u.kno_w = 163; // may need actual translation! led_u.tno_l = 1; if ( (-1 == lseek64(fid_i, 0, SEEK_SET)) || From cc1a5a9cd7843e275062a974ebedab4e51d1d3ee Mon Sep 17 00:00:00 2001 From: Shane Wilton Date: Wed, 28 Jan 2015 00:24:23 -0800 Subject: [PATCH 05/16] Add cmake to the list of OS X dependencies --- README.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.markdown b/README.markdown index de47833cd..0f02a0a80 100644 --- a/README.markdown +++ b/README.markdown @@ -56,10 +56,10 @@ Otherwise, install XCode: `https://developer.apple.com/xcode/`, with the command To install dependencies pick either one of Homebrew or Macports, but not both: Homebrew - - `brew install git gmp libsigsegv openssl libtool autoconf automake` + `brew install git gmp libsigsegv openssl libtool autoconf automake cmake` Macports - - `sudo port install git gmp libsigsegv openssl autoconf automake` + `sudo port install git gmp libsigsegv openssl autoconf automake cmake` Although automake/autoconf/libtool are generally installed by default, some have reported needing to uninstall and reinstall those three packages, at least From 1194bb48bf311257bea2955b2a7971ac6816cd98 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Thu, 29 Jan 2015 18:35:30 -0800 Subject: [PATCH 06/16] License file --- LICENSE | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..a84c39566 --- /dev/null +++ b/LICENSE @@ -0,0 +1,25 @@ +This is free and unencumbered software released into the public domain. + +Anyone is free to copy, modify, publish, use, compile, sell, or +distribute this software, either in source code form or as a compiled +binary, for any purpose, commercial or non-commercial, and by any +means. + +In jurisdictions that recognize copyright laws, the author or authors +of this software dedicate any and all copyright interest in the +software to the public domain. We make this dedication for the benefit +of the public at large and to the detriment of our heirs and +successors. We intend this dedication to be an overt act of +relinquishment in perpetuity of all present and future rights to this +software under copyright law. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +For more information, please refer to + From 1f73bb3fe40ea54bd0e461596fda6d93f3ff19f9 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Thu, 29 Jan 2015 18:38:13 -0800 Subject: [PATCH 07/16] Revert "License file" pending outside/ directory review This reverts commit 6e28dcd7fa238fb70dda9a3b5598c3ae351152aa. --- LICENSE | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 LICENSE diff --git a/LICENSE b/LICENSE deleted file mode 100644 index a84c39566..000000000 --- a/LICENSE +++ /dev/null @@ -1,25 +0,0 @@ -This is free and unencumbered software released into the public domain. - -Anyone is free to copy, modify, publish, use, compile, sell, or -distribute this software, either in source code form or as a compiled -binary, for any purpose, commercial or non-commercial, and by any -means. - -In jurisdictions that recognize copyright laws, the author or authors -of this software dedicate any and all copyright interest in the -software to the public domain. We make this dedication for the benefit -of the public at large and to the detriment of our heirs and -successors. We intend this dedication to be an overt act of -relinquishment in perpetuity of all present and future rights to this -software under copyright law. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -For more information, please refer to - From 5d707603c4357bdba2e2e3b2beb9dd987a0f0e20 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Mon, 2 Feb 2015 11:03:14 -0800 Subject: [PATCH 08/16] Fix out of memory on stack overflow. --- n/m.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/n/m.c b/n/m.c index 08a09326c..891f0518c 100644 --- a/n/m.c +++ b/n/m.c @@ -188,6 +188,47 @@ _cm_signal_reset(void) u3R->kid_u = 0; } +/* _cm_stack_recover(): recover stack trace, with lacunae. +*/ +static u3_noun +_cm_stack_recover(u3a_road* rod_u) +{ + c3_w len_w; + + len_w = 0; + { + u3_noun tax = rod_u->bug.tax; + + while ( tax ) { + len_w++; + tax = u3t(tax); + } + + if ( len_w < 4096 ) { + return u3a_take(rod_u->bug.tax); + } + else { + u3_noun beg, fin; + c3_w i_w; + + tax = rod_u->bug.tax; + beg = u3_nul; + for ( i_w = 0; i_w < 2048; i_w++ ) { + beg = u3nc(u3a_take(u3h(tax)), beg); + tax = u3t(tax); + } + beg = u3kb_flop(beg); + + for ( i_w = 0; i_w < (len_w - 4096); i_w++ ) { + tax = u3t(tax); + } + fin = u3nc(u3nc(c3__lose, c3__over), u3a_take(tax)); + + return u3kb_weld(beg, fin); + } + } +} + /* _cm_signal_recover(): recover from a deep signal, after longjmp. Free arg. */ static u3_noun @@ -235,9 +276,13 @@ _cm_signal_recover(c3_l sig_l, u3_noun arg) u3R = &(u3H->rod_u); rod_u = u3R; - + while ( rod_u->kid_u ) { - tax = u3kb_weld(u3a_take(rod_u->kid_u->bug.tax), tax); +#if 0 + fprintf(stderr, "collecting %d frames\r\n", + u3kb_lent(rod_u->kid_u->bug.tax)); +#endif + tax = u3kb_weld(_cm_stack_recover(rod_u->kid_u), tax); rod_u = rod_u->kid_u; } } From cde77dc068c583ab1f51541035d8afff1f4f8d3b Mon Sep 17 00:00:00 2001 From: Henry Ault Date: Tue, 10 Feb 2015 12:19:37 -0800 Subject: [PATCH 09/16] MIT LICENSE --- LICENSE.txt | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 000000000..6404c00fb --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2015 Urbit + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file From fd490917559f98d98d2aea2f8efbe843d48026b0 Mon Sep 17 00:00:00 2001 From: Henry Ault Date: Tue, 10 Feb 2015 15:13:17 -0800 Subject: [PATCH 10/16] licensing and such --- j/a/add.c | 1 - j/a/dec.c | 1 - j/a/div.c | 1 - j/a/gte.c | 1 - j/a/gth.c | 1 - j/a/lte.c | 1 - j/a/lth.c | 1 - j/a/mod.c | 1 - j/a/mul.c | 1 - j/a/sub.c | 1 - j/b/bind.c | 1 - j/b/clap.c | 1 - j/b/drop.c | 1 - j/b/flop.c | 1 - j/b/lent.c | 1 - j/b/levy.c | 1 - j/b/lien.c | 1 - j/b/need.c | 1 - j/b/reel.c | 1 - j/b/roll.c | 1 - j/b/scag.c | 1 - j/b/skim.c | 1 - j/b/skip.c | 1 - j/b/slag.c | 1 - j/b/snag.c | 1 - j/b/sort.c | 1 - j/b/turn.c | 1 - j/b/weld.c | 1 - j/c/bex.c | 1 - j/c/can.c | 1 - j/c/cap.c | 1 - j/c/cat.c | 1 - j/c/con.c | 1 - j/c/cut.c | 1 - j/c/dis.c | 1 - j/c/dor.c | 1 - j/c/end.c | 1 - j/c/gor.c | 1 - j/c/hor.c | 1 - j/c/lsh.c | 1 - j/c/mas.c | 1 - j/c/met.c | 1 - j/c/mix.c | 1 - j/c/mug.c | 1 - j/c/peg.c | 1 - j/c/po.c | 1 - j/c/rap.c | 1 - j/c/rip.c | 1 - j/c/rsh.c | 1 - j/c/vor.c | 1 - j/d/by_gas.c | 1 - j/d/by_get.c | 1 - j/d/by_has.c | 1 - j/d/by_int.c | 1 - j/d/by_put.c | 1 - j/d/by_uni.c | 1 - j/d/in_gas.c | 1 - j/d/in_has.c | 1 - j/d/in_int.c | 1 - j/d/in_mer.c | 1 - j/d/in_put.c | 1 - j/d/in_tap.c | 1 - j/d/in_uni.c | 1 - j/e/aesc.c | 1 - j/e/cue.c | 1 - j/e/ed_puck.c | 1 - j/e/ed_sign.c | 1 - j/e/ed_veri.c | 1 - j/e/jam.c | 1 - j/e/lore.c | 1 - j/e/loss.c | 1 - j/e/mat.c | 1 - j/e/mink.c | 1 - j/e/mule.c | 1 - j/e/parse.c | 1 - j/e/rd.c | 1 - j/e/repg.c | 1 - j/e/rexp.c | 1 - j/e/rub.c | 1 - j/e/shax.c | 1 - j/e/tape.c | 1 - j/e/trip.c | 1 - j/f/al.c | 1 - j/f/ap.c | 1 - j/f/bull.c | 1 - j/f/cell.c | 1 - j/f/comb.c | 1 - j/f/cons.c | 1 - j/f/core.c | 1 - j/f/cube.c | 1 - j/f/face.c | 1 - j/f/fine.c | 1 - j/f/fitz.c | 1 - j/f/flan.c | 1 - j/f/flay.c | 1 - j/f/flip.c | 1 - j/f/flor.c | 1 - j/f/fork.c | 1 - j/f/hike.c | 1 - j/f/look.c | 1 - j/f/slot.c | 1 - j/f/type.c | 1 - j/f/ut.c | 1 - j/f/ut_burn.c | 1 - j/f/ut_busk.c | 1 - j/f/ut_bust.c | 1 - j/f/ut_conk.c | 1 - j/f/ut_crop.c | 1 - j/f/ut_cull.c | 1 - j/f/ut_find.c | 1 - j/f/ut_fink.c | 1 - j/f/ut_fire.c | 1 - j/f/ut_firm.c | 1 - j/f/ut_fish.c | 1 - j/f/ut_fuse.c | 1 - j/f/ut_gain.c | 1 - j/f/ut_heal.c | 1 - j/f/ut_lose.c | 1 - j/f/ut_mint.c | 1 - j/f/ut_mull.c | 1 - j/f/ut_nest.c | 1 - j/f/ut_park.c | 1 - j/f/ut_peek.c | 1 - j/f/ut_play.c | 1 - j/f/ut_repo.c | 1 - j/f/ut_rest.c | 1 - j/f/ut_seek.c | 1 - j/f/ut_sift.c | 1 - j/f/ut_swab.c | 1 - j/f/ut_tack.c | 1 - j/f/ut_tock.c | 1 - j/f/ut_wrap.c | 1 - j/g/dawn.c | 1 - j/g/sqar.c | 1 - j/tree.c | 1 - n/a.c | 1 - n/e.c | 1 - n/h.c | 1 - n/i.c | 1 - n/j.c | 1 - n/m.c | 1 - n/n.c | 1 - n/r.c | 1 - n/t.c | 1 - n/v.c | 1 - n/x.c | 1 - n/z.c | 1 - v/ames.c | 1 - v/cttp.c | 1 - v/http.c | 1 - v/loop.c | 1 - v/main.c | 1 - v/raft.c | 1 - v/save.c | 1 - v/sist.c | 1 - v/term.c | 1 - w/kjet.c | 1 - w/test.c | 1 - 158 files changed, 158 deletions(-) diff --git a/j/a/add.c b/j/a/add.c index 11d2424ee..a38e93b8c 100644 --- a/j/a/add.c +++ b/j/a/add.c @@ -1,6 +1,5 @@ /* j/1/add.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/a/dec.c b/j/a/dec.c index 2767a180d..67eeae9ca 100644 --- a/j/a/dec.c +++ b/j/a/dec.c @@ -1,6 +1,5 @@ /* j/1/dec.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/a/div.c b/j/a/div.c index 0c5460e96..5a54d9481 100644 --- a/j/a/div.c +++ b/j/a/div.c @@ -1,6 +1,5 @@ /* j/1/div.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/a/gte.c b/j/a/gte.c index 255c0b7a9..eb7d742ac 100644 --- a/j/a/gte.c +++ b/j/a/gte.c @@ -1,6 +1,5 @@ /* j/1/gte.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/a/gth.c b/j/a/gth.c index a8125270d..b7bd176bb 100644 --- a/j/a/gth.c +++ b/j/a/gth.c @@ -1,6 +1,5 @@ /* j/1/gth.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/a/lte.c b/j/a/lte.c index 6c6b51588..3a1d57969 100644 --- a/j/a/lte.c +++ b/j/a/lte.c @@ -1,6 +1,5 @@ /* j/1/lte.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/a/lth.c b/j/a/lth.c index 5dec0205c..dc83ee693 100644 --- a/j/a/lth.c +++ b/j/a/lth.c @@ -1,6 +1,5 @@ /* j/1/lth.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/a/mod.c b/j/a/mod.c index e537dc1ee..2e1ecb9e9 100644 --- a/j/a/mod.c +++ b/j/a/mod.c @@ -1,6 +1,5 @@ /* j/1/mod.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/a/mul.c b/j/a/mul.c index 5164ff583..7bd1ca0ac 100644 --- a/j/a/mul.c +++ b/j/a/mul.c @@ -1,6 +1,5 @@ /* j/1/mul.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/a/sub.c b/j/a/sub.c index a5e380756..83ac7ff42 100644 --- a/j/a/sub.c +++ b/j/a/sub.c @@ -1,6 +1,5 @@ /* j/1/sub.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/b/bind.c b/j/b/bind.c index 4d88c9d7b..d3c31e66f 100644 --- a/j/b/bind.c +++ b/j/b/bind.c @@ -1,6 +1,5 @@ /* j/2/bind.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/b/clap.c b/j/b/clap.c index 231bd6830..1b76ca648 100644 --- a/j/b/clap.c +++ b/j/b/clap.c @@ -1,6 +1,5 @@ /* j/2/clap.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/b/drop.c b/j/b/drop.c index 38f6dda55..2048210c3 100644 --- a/j/b/drop.c +++ b/j/b/drop.c @@ -1,6 +1,5 @@ /* j/2/drop.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/b/flop.c b/j/b/flop.c index 8032a83fe..b6fb03f8d 100644 --- a/j/b/flop.c +++ b/j/b/flop.c @@ -1,6 +1,5 @@ /* j/2/flop.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/b/lent.c b/j/b/lent.c index 28b5f772b..e228e6e61 100644 --- a/j/b/lent.c +++ b/j/b/lent.c @@ -1,6 +1,5 @@ /* j/2/lent.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/b/levy.c b/j/b/levy.c index 01899e293..e41db6dc0 100644 --- a/j/b/levy.c +++ b/j/b/levy.c @@ -1,6 +1,5 @@ /* j/2/levy.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/b/lien.c b/j/b/lien.c index 35611091b..082bc0cc0 100644 --- a/j/b/lien.c +++ b/j/b/lien.c @@ -1,6 +1,5 @@ /* j/2/lien.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/b/need.c b/j/b/need.c index a9f407df7..2b607eca1 100644 --- a/j/b/need.c +++ b/j/b/need.c @@ -1,6 +1,5 @@ /* j/2/need.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/b/reel.c b/j/b/reel.c index 8f439cfd5..e1392b88a 100644 --- a/j/b/reel.c +++ b/j/b/reel.c @@ -1,6 +1,5 @@ /* j/2/reel.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/b/roll.c b/j/b/roll.c index 44d741cc0..278d5320a 100644 --- a/j/b/roll.c +++ b/j/b/roll.c @@ -1,6 +1,5 @@ /* j/2/roll.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/b/scag.c b/j/b/scag.c index af408377d..15e5dc6df 100644 --- a/j/b/scag.c +++ b/j/b/scag.c @@ -1,6 +1,5 @@ /* j/2/scag.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/b/skim.c b/j/b/skim.c index 2e5f4cc94..8c933915f 100644 --- a/j/b/skim.c +++ b/j/b/skim.c @@ -1,6 +1,5 @@ /* j/2/skim.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/b/skip.c b/j/b/skip.c index 9dbb6f21c..15294ff53 100644 --- a/j/b/skip.c +++ b/j/b/skip.c @@ -1,6 +1,5 @@ /* j/2/skip.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/b/slag.c b/j/b/slag.c index 33ccd8404..93736b65e 100644 --- a/j/b/slag.c +++ b/j/b/slag.c @@ -1,6 +1,5 @@ /* j/2/slag.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/b/snag.c b/j/b/snag.c index 36faceaa5..fc2bdb81d 100644 --- a/j/b/snag.c +++ b/j/b/snag.c @@ -1,6 +1,5 @@ /* j/2/snag.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/b/sort.c b/j/b/sort.c index d5264de5d..cb7ca49a2 100644 --- a/j/b/sort.c +++ b/j/b/sort.c @@ -1,6 +1,5 @@ /* j/2/sort.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/b/turn.c b/j/b/turn.c index 052707c24..5489325f1 100644 --- a/j/b/turn.c +++ b/j/b/turn.c @@ -1,6 +1,5 @@ /* j/2/turn.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/b/weld.c b/j/b/weld.c index 030f38ddd..53fbce2b2 100644 --- a/j/b/weld.c +++ b/j/b/weld.c @@ -1,6 +1,5 @@ /* j/2/weld.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/c/bex.c b/j/c/bex.c index fce8e9309..d07d05070 100644 --- a/j/c/bex.c +++ b/j/c/bex.c @@ -1,6 +1,5 @@ /* j/3/bex.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/c/can.c b/j/c/can.c index c738564c4..ec54397a3 100644 --- a/j/c/can.c +++ b/j/c/can.c @@ -1,6 +1,5 @@ /* j/3/can.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/c/cap.c b/j/c/cap.c index 9fd7437da..12bc537ee 100644 --- a/j/c/cap.c +++ b/j/c/cap.c @@ -1,6 +1,5 @@ /* j/3/cap.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/c/cat.c b/j/c/cat.c index faf481b40..973119ba9 100644 --- a/j/c/cat.c +++ b/j/c/cat.c @@ -1,6 +1,5 @@ /* j/3/cat.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/c/con.c b/j/c/con.c index 2351f4fcb..044ce4a6f 100644 --- a/j/c/con.c +++ b/j/c/con.c @@ -1,6 +1,5 @@ /* j/3/con.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/c/cut.c b/j/c/cut.c index 0d5b04ba1..52a10c654 100644 --- a/j/c/cut.c +++ b/j/c/cut.c @@ -1,6 +1,5 @@ /* j/3/cut.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/c/dis.c b/j/c/dis.c index 67fed8823..71356b749 100644 --- a/j/c/dis.c +++ b/j/c/dis.c @@ -1,6 +1,5 @@ /* j/3/dis.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/c/dor.c b/j/c/dor.c index 1be4203a6..025f65177 100644 --- a/j/c/dor.c +++ b/j/c/dor.c @@ -1,6 +1,5 @@ /* j/3/dor.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/c/end.c b/j/c/end.c index 4dde2a479..9ee0f7051 100644 --- a/j/c/end.c +++ b/j/c/end.c @@ -1,6 +1,5 @@ /* j/3/end.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/c/gor.c b/j/c/gor.c index 248f9bc28..88fffb367 100644 --- a/j/c/gor.c +++ b/j/c/gor.c @@ -1,6 +1,5 @@ /* j/3/gor.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/c/hor.c b/j/c/hor.c index b343d2638..2d5d5a333 100644 --- a/j/c/hor.c +++ b/j/c/hor.c @@ -1,6 +1,5 @@ /* j/3/hor.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/c/lsh.c b/j/c/lsh.c index 12d644cce..bdbdb2f8c 100644 --- a/j/c/lsh.c +++ b/j/c/lsh.c @@ -1,6 +1,5 @@ /* j/3/lsh.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/c/mas.c b/j/c/mas.c index e4232fea5..81ee41407 100644 --- a/j/c/mas.c +++ b/j/c/mas.c @@ -1,6 +1,5 @@ /* j/3/mas.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/c/met.c b/j/c/met.c index 283f21387..17bbf6770 100644 --- a/j/c/met.c +++ b/j/c/met.c @@ -1,6 +1,5 @@ /* j/3/met.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/c/mix.c b/j/c/mix.c index 785dcc745..a5c027b18 100644 --- a/j/c/mix.c +++ b/j/c/mix.c @@ -1,6 +1,5 @@ /* j/3/mix.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/c/mug.c b/j/c/mug.c index 4c4b40463..22aceee01 100644 --- a/j/c/mug.c +++ b/j/c/mug.c @@ -1,6 +1,5 @@ /* j/3/mug.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/c/peg.c b/j/c/peg.c index 97ad4dbc5..b7cc1f3bd 100644 --- a/j/c/peg.c +++ b/j/c/peg.c @@ -1,6 +1,5 @@ /* j/3/peg.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/c/po.c b/j/c/po.c index 3eac77408..479fe87c2 100644 --- a/j/c/po.c +++ b/j/c/po.c @@ -1,6 +1,5 @@ /* j/3/po.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/c/rap.c b/j/c/rap.c index ce0a8348b..746428862 100644 --- a/j/c/rap.c +++ b/j/c/rap.c @@ -1,6 +1,5 @@ /* j/3/rap.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/c/rip.c b/j/c/rip.c index 6fb63e6b0..0b781918b 100644 --- a/j/c/rip.c +++ b/j/c/rip.c @@ -1,6 +1,5 @@ /* j/3/rip.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/c/rsh.c b/j/c/rsh.c index ba3573abd..750af82e7 100644 --- a/j/c/rsh.c +++ b/j/c/rsh.c @@ -1,6 +1,5 @@ /* j/3/rsh.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/c/vor.c b/j/c/vor.c index d60524416..c5fef3cf6 100644 --- a/j/c/vor.c +++ b/j/c/vor.c @@ -1,6 +1,5 @@ /* j/3/vor.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/d/by_gas.c b/j/d/by_gas.c index 3f0e14302..826a1d9da 100644 --- a/j/d/by_gas.c +++ b/j/d/by_gas.c @@ -1,6 +1,5 @@ /* j/4/gas.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/d/by_get.c b/j/d/by_get.c index 2403fbb16..5a97bd860 100644 --- a/j/d/by_get.c +++ b/j/d/by_get.c @@ -1,6 +1,5 @@ /* j/4/by_get.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/d/by_has.c b/j/d/by_has.c index 95e9b573b..1a42abb2b 100644 --- a/j/d/by_has.c +++ b/j/d/by_has.c @@ -1,6 +1,5 @@ /* j/4/by_has.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/d/by_int.c b/j/d/by_int.c index 440684e0d..8ac214037 100644 --- a/j/d/by_int.c +++ b/j/d/by_int.c @@ -1,6 +1,5 @@ /* j/4/by_int.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/d/by_put.c b/j/d/by_put.c index dd5b23300..3d712d94a 100644 --- a/j/d/by_put.c +++ b/j/d/by_put.c @@ -1,6 +1,5 @@ /* j/4/put.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/d/by_uni.c b/j/d/by_uni.c index 3e11a2a13..1944650c3 100644 --- a/j/d/by_uni.c +++ b/j/d/by_uni.c @@ -1,6 +1,5 @@ /* j/4/by_uni.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/d/in_gas.c b/j/d/in_gas.c index 6db7b7c48..fccbf5c65 100644 --- a/j/d/in_gas.c +++ b/j/d/in_gas.c @@ -1,6 +1,5 @@ /* j/4/gas.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/d/in_has.c b/j/d/in_has.c index 68d2645c8..0911d9f77 100644 --- a/j/d/in_has.c +++ b/j/d/in_has.c @@ -1,6 +1,5 @@ /* j/4/in_has.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/d/in_int.c b/j/d/in_int.c index b5e713c92..fcf854d68 100644 --- a/j/d/in_int.c +++ b/j/d/in_int.c @@ -1,6 +1,5 @@ /* j/4/in_int.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/d/in_mer.c b/j/d/in_mer.c index 798b82103..191b9075e 100644 --- a/j/d/in_mer.c +++ b/j/d/in_mer.c @@ -1,6 +1,5 @@ /* j/4/in_mer.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/d/in_put.c b/j/d/in_put.c index bd139244c..8711e4062 100644 --- a/j/d/in_put.c +++ b/j/d/in_put.c @@ -1,6 +1,5 @@ /* j/4/in_put.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/d/in_tap.c b/j/d/in_tap.c index 1bb91703a..e6b3f1470 100644 --- a/j/d/in_tap.c +++ b/j/d/in_tap.c @@ -1,6 +1,5 @@ /* j/4/in_tap.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/d/in_uni.c b/j/d/in_uni.c index 8e0bc1e01..23cb36e22 100644 --- a/j/d/in_uni.c +++ b/j/d/in_uni.c @@ -1,6 +1,5 @@ /* j/4/in_uni.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/e/aesc.c b/j/e/aesc.c index c605637a1..78f44fc8c 100644 --- a/j/e/aesc.c +++ b/j/e/aesc.c @@ -1,6 +1,5 @@ /* j/5/aes.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/e/cue.c b/j/e/cue.c index 7500cb77e..e5eeacfcd 100644 --- a/j/e/cue.c +++ b/j/e/cue.c @@ -1,6 +1,5 @@ /* j/5/cue.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/e/ed_puck.c b/j/e/ed_puck.c index ec1937b97..781899784 100644 --- a/j/e/ed_puck.c +++ b/j/e/ed_puck.c @@ -1,6 +1,5 @@ /* gen164/5/ed_puck.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/e/ed_sign.c b/j/e/ed_sign.c index bc5c1255e..f9b144c74 100644 --- a/j/e/ed_sign.c +++ b/j/e/ed_sign.c @@ -1,6 +1,5 @@ /* gen164/5/ed_sign.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/e/ed_veri.c b/j/e/ed_veri.c index 6ffb48526..a6ba6fef2 100644 --- a/j/e/ed_veri.c +++ b/j/e/ed_veri.c @@ -1,6 +1,5 @@ /* gen164/5/ed_veri.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/e/jam.c b/j/e/jam.c index 643479b88..d72cdc3e5 100644 --- a/j/e/jam.c +++ b/j/e/jam.c @@ -1,6 +1,5 @@ /* j/5/jam.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/e/lore.c b/j/e/lore.c index 5d4270cfe..dce64cbfa 100644 --- a/j/e/lore.c +++ b/j/e/lore.c @@ -1,6 +1,5 @@ /* j/5/lore.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/e/loss.c b/j/e/loss.c index 3b99ac1f9..5eabe67f6 100644 --- a/j/e/loss.c +++ b/j/e/loss.c @@ -1,6 +1,5 @@ /* j/5/loss.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/e/mat.c b/j/e/mat.c index cb9b00973..c1cc91060 100644 --- a/j/e/mat.c +++ b/j/e/mat.c @@ -1,6 +1,5 @@ /* j/3/mat.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/e/mink.c b/j/e/mink.c index 2d30d1e3a..ffa8ddad3 100644 --- a/j/e/mink.c +++ b/j/e/mink.c @@ -1,6 +1,5 @@ /* j/5/mink.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/e/mule.c b/j/e/mule.c index 06a9c363f..99afc0d34 100644 --- a/j/e/mule.c +++ b/j/e/mule.c @@ -1,6 +1,5 @@ /* j/5/mule.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/e/parse.c b/j/e/parse.c index 5b6f18ce0..ad1f636a2 100644 --- a/j/e/parse.c +++ b/j/e/parse.c @@ -1,6 +1,5 @@ /* j/5/parse.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/e/rd.c b/j/e/rd.c index 8a1cbd464..41ddab211 100644 --- a/j/e/rd.c +++ b/j/e/rd.c @@ -1,6 +1,5 @@ /* j/5/aes.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/e/repg.c b/j/e/repg.c index fcc3d33e5..75e57b4c9 100644 --- a/j/e/repg.c +++ b/j/e/repg.c @@ -1,6 +1,5 @@ /* j/5/repg.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/e/rexp.c b/j/e/rexp.c index a169e7910..726bcdcee 100644 --- a/j/e/rexp.c +++ b/j/e/rexp.c @@ -1,6 +1,5 @@ /* j/5/rexp.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/e/rub.c b/j/e/rub.c index 84c93c84f..24f318272 100644 --- a/j/e/rub.c +++ b/j/e/rub.c @@ -1,6 +1,5 @@ /* j/3/rub.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/e/shax.c b/j/e/shax.c index 8d345781a..6c5e78b99 100644 --- a/j/e/shax.c +++ b/j/e/shax.c @@ -1,6 +1,5 @@ /* j/5/shax.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/e/tape.c b/j/e/tape.c index a3a5d6356..e96b1b655 100644 --- a/j/e/tape.c +++ b/j/e/tape.c @@ -1,6 +1,5 @@ /* j/3/tape.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/e/trip.c b/j/e/trip.c index 2ea24f4cc..2c37aa274 100644 --- a/j/e/trip.c +++ b/j/e/trip.c @@ -1,6 +1,5 @@ /* j/5/trip.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/al.c b/j/f/al.c index 9528ecf2f..d3f5732d8 100644 --- a/j/f/al.c +++ b/j/f/al.c @@ -1,6 +1,5 @@ /* j/6/al.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ap.c b/j/f/ap.c index 1491cc0e0..cd2c796e0 100644 --- a/j/f/ap.c +++ b/j/f/ap.c @@ -1,6 +1,5 @@ /* j/6/ap.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/bull.c b/j/f/bull.c index 09ffdcb0d..57c070db4 100644 --- a/j/f/bull.c +++ b/j/f/bull.c @@ -1,6 +1,5 @@ /* j/6/bull.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/cell.c b/j/f/cell.c index d586a6331..e7a69be9f 100644 --- a/j/f/cell.c +++ b/j/f/cell.c @@ -1,6 +1,5 @@ /* j/6/cell.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/comb.c b/j/f/comb.c index 12b767026..5614c081b 100644 --- a/j/f/comb.c +++ b/j/f/comb.c @@ -1,6 +1,5 @@ /* j/6/comb.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/cons.c b/j/f/cons.c index dcf05812e..f7f4ad386 100644 --- a/j/f/cons.c +++ b/j/f/cons.c @@ -1,6 +1,5 @@ /* j/6/cons.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/core.c b/j/f/core.c index e149f6807..3fcadc788 100644 --- a/j/f/core.c +++ b/j/f/core.c @@ -1,6 +1,5 @@ /* j/6/core.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/cube.c b/j/f/cube.c index 8955a866c..cd60ccf15 100644 --- a/j/f/cube.c +++ b/j/f/cube.c @@ -1,6 +1,5 @@ /* j/6/cube.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/face.c b/j/f/face.c index 21eb80993..8ca3130b6 100644 --- a/j/f/face.c +++ b/j/f/face.c @@ -1,6 +1,5 @@ /* j/6/face.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/fine.c b/j/f/fine.c index 9478cfce7..44c991391 100644 --- a/j/f/fine.c +++ b/j/f/fine.c @@ -1,6 +1,5 @@ /* j/6/fine.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/fitz.c b/j/f/fitz.c index f69c55c37..008ceb3be 100644 --- a/j/f/fitz.c +++ b/j/f/fitz.c @@ -1,6 +1,5 @@ /* j/6/fitz.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/flan.c b/j/f/flan.c index a8dcc6ce9..8e19f4f23 100644 --- a/j/f/flan.c +++ b/j/f/flan.c @@ -1,6 +1,5 @@ /* j/6/flan.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/flay.c b/j/f/flay.c index 226c77066..2420c869e 100644 --- a/j/f/flay.c +++ b/j/f/flay.c @@ -1,6 +1,5 @@ /* j/6/flay.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/flip.c b/j/f/flip.c index e812d3749..fe0c5e6d4 100644 --- a/j/f/flip.c +++ b/j/f/flip.c @@ -1,6 +1,5 @@ /* j/6/flip.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/flor.c b/j/f/flor.c index 4217be627..26a614627 100644 --- a/j/f/flor.c +++ b/j/f/flor.c @@ -1,6 +1,5 @@ /* j/6/flor.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/fork.c b/j/f/fork.c index c5346c5c3..6b4d051be 100644 --- a/j/f/fork.c +++ b/j/f/fork.c @@ -1,6 +1,5 @@ /* j/6/fork.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/hike.c b/j/f/hike.c index 3ee3d769f..d39fc4a90 100644 --- a/j/f/hike.c +++ b/j/f/hike.c @@ -1,6 +1,5 @@ /* j/6/hike.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/look.c b/j/f/look.c index ec8ad33db..aeb5768a7 100644 --- a/j/f/look.c +++ b/j/f/look.c @@ -1,6 +1,5 @@ /* j/6/look.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/slot.c b/j/f/slot.c index 6a0ee3af2..686f14966 100644 --- a/j/f/slot.c +++ b/j/f/slot.c @@ -1,6 +1,5 @@ /* j/6/slot.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/type.c b/j/f/type.c index d779d4cfa..f36b813e5 100644 --- a/j/f/type.c +++ b/j/f/type.c @@ -1,6 +1,5 @@ /* j/6/type.c ** -** This file is in the public domain. */ /* new template for type switching diff --git a/j/f/ut.c b/j/f/ut.c index c07970c7d..d43a844d0 100644 --- a/j/f/ut.c +++ b/j/f/ut.c @@ -1,6 +1,5 @@ /* j/6/ut.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_burn.c b/j/f/ut_burn.c index b286c3160..fb2e2432a 100644 --- a/j/f/ut_burn.c +++ b/j/f/ut_burn.c @@ -1,6 +1,5 @@ /* j/6/ut_burn.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_busk.c b/j/f/ut_busk.c index 0bdd3eb9f..599bb72c1 100644 --- a/j/f/ut_busk.c +++ b/j/f/ut_busk.c @@ -1,6 +1,5 @@ /* j/6/ut_busk.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_bust.c b/j/f/ut_bust.c index a5b5407ea..5fb3d989a 100644 --- a/j/f/ut_bust.c +++ b/j/f/ut_bust.c @@ -1,6 +1,5 @@ /* j/6/bust.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_conk.c b/j/f/ut_conk.c index ad7f6fc05..5871f51b0 100644 --- a/j/f/ut_conk.c +++ b/j/f/ut_conk.c @@ -1,6 +1,5 @@ /* j/6/ut_conk.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_crop.c b/j/f/ut_crop.c index 334840bf0..a0c80a737 100644 --- a/j/f/ut_crop.c +++ b/j/f/ut_crop.c @@ -1,6 +1,5 @@ /* j/6/crop.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_cull.c b/j/f/ut_cull.c index 5b0f9903b..1e209c268 100644 --- a/j/f/ut_cull.c +++ b/j/f/ut_cull.c @@ -1,6 +1,5 @@ /* j/6/cull.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_find.c b/j/f/ut_find.c index 83a69e91e..557484b32 100644 --- a/j/f/ut_find.c +++ b/j/f/ut_find.c @@ -1,6 +1,5 @@ /* j/6/find.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_fink.c b/j/f/ut_fink.c index f3d74aac9..85577bbc6 100644 --- a/j/f/ut_fink.c +++ b/j/f/ut_fink.c @@ -1,6 +1,5 @@ /* j/6/fink.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_fire.c b/j/f/ut_fire.c index b5c9b763d..a018bc74b 100644 --- a/j/f/ut_fire.c +++ b/j/f/ut_fire.c @@ -1,6 +1,5 @@ /* j/6/fire.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_firm.c b/j/f/ut_firm.c index be93af747..0da8f873b 100644 --- a/j/f/ut_firm.c +++ b/j/f/ut_firm.c @@ -1,6 +1,5 @@ /* j/6/firm.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_fish.c b/j/f/ut_fish.c index 321756865..ea66c559f 100644 --- a/j/f/ut_fish.c +++ b/j/f/ut_fish.c @@ -1,6 +1,5 @@ /* j/6/fish.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_fuse.c b/j/f/ut_fuse.c index ecb5bbf9f..08676e7ec 100644 --- a/j/f/ut_fuse.c +++ b/j/f/ut_fuse.c @@ -1,6 +1,5 @@ /* j/6/fuse.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_gain.c b/j/f/ut_gain.c index 9158df42c..e79172fe2 100644 --- a/j/f/ut_gain.c +++ b/j/f/ut_gain.c @@ -1,6 +1,5 @@ /* j/6/gain.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_heal.c b/j/f/ut_heal.c index f6862d504..3a79b476c 100644 --- a/j/f/ut_heal.c +++ b/j/f/ut_heal.c @@ -1,6 +1,5 @@ /* j/6/heal.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_lose.c b/j/f/ut_lose.c index 18b044b7a..0c6f9fac5 100644 --- a/j/f/ut_lose.c +++ b/j/f/ut_lose.c @@ -1,6 +1,5 @@ /* j/6/lose.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_mint.c b/j/f/ut_mint.c index 212ff5fa6..e16c813b3 100644 --- a/j/f/ut_mint.c +++ b/j/f/ut_mint.c @@ -1,6 +1,5 @@ /* j/6/mint.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_mull.c b/j/f/ut_mull.c index 60cf7e20c..c87ad3059 100644 --- a/j/f/ut_mull.c +++ b/j/f/ut_mull.c @@ -1,6 +1,5 @@ /* j/6/mull.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_nest.c b/j/f/ut_nest.c index 5dc866cb0..a1a3e1a0e 100644 --- a/j/f/ut_nest.c +++ b/j/f/ut_nest.c @@ -1,6 +1,5 @@ /* j/6/ut_nest.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_park.c b/j/f/ut_park.c index 685334022..4c9463a9b 100644 --- a/j/f/ut_park.c +++ b/j/f/ut_park.c @@ -1,6 +1,5 @@ /* j/6/ut_park.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_peek.c b/j/f/ut_peek.c index 2e121fa23..a05a587e1 100644 --- a/j/f/ut_peek.c +++ b/j/f/ut_peek.c @@ -1,6 +1,5 @@ /* j/6/peek.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_play.c b/j/f/ut_play.c index 90582c55f..5b2976727 100644 --- a/j/f/ut_play.c +++ b/j/f/ut_play.c @@ -1,6 +1,5 @@ /* j/6/play.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_repo.c b/j/f/ut_repo.c index 04dd59ada..c082ad351 100644 --- a/j/f/ut_repo.c +++ b/j/f/ut_repo.c @@ -1,6 +1,5 @@ /* j/6/ut_repo.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_rest.c b/j/f/ut_rest.c index 2c10c5ebe..669027add 100644 --- a/j/f/ut_rest.c +++ b/j/f/ut_rest.c @@ -1,6 +1,5 @@ /* j/6/ut_rest.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_seek.c b/j/f/ut_seek.c index 816f8921e..d219768a8 100644 --- a/j/f/ut_seek.c +++ b/j/f/ut_seek.c @@ -1,6 +1,5 @@ /* j/6/seek.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_sift.c b/j/f/ut_sift.c index e16cb25ba..c59dca7fd 100644 --- a/j/f/ut_sift.c +++ b/j/f/ut_sift.c @@ -1,6 +1,5 @@ /* j/6/sift.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_swab.c b/j/f/ut_swab.c index 02f6b292a..93db0a3e6 100644 --- a/j/f/ut_swab.c +++ b/j/f/ut_swab.c @@ -1,6 +1,5 @@ /* j/6/swab.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_tack.c b/j/f/ut_tack.c index 01b16f646..53e6a70f6 100644 --- a/j/f/ut_tack.c +++ b/j/f/ut_tack.c @@ -1,6 +1,5 @@ /* j/6/tack.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_tock.c b/j/f/ut_tock.c index 78b42a874..e7fa01b57 100644 --- a/j/f/ut_tock.c +++ b/j/f/ut_tock.c @@ -1,6 +1,5 @@ /* j/6/tock.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/f/ut_wrap.c b/j/f/ut_wrap.c index a95560c7c..55f1ca9ab 100644 --- a/j/f/ut_wrap.c +++ b/j/f/ut_wrap.c @@ -1,6 +1,5 @@ /* j/6/wrap.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/g/dawn.c b/j/g/dawn.c index f7922f4f6..e503a81c6 100644 --- a/j/g/dawn.c +++ b/j/g/dawn.c @@ -1,6 +1,5 @@ /* j/g/dawn.c ** -** This file is in the public domain. */ #include "all.h" #include diff --git a/j/g/sqar.c b/j/g/sqar.c index ad22dfade..eaf4ab680 100644 --- a/j/g/sqar.c +++ b/j/g/sqar.c @@ -1,6 +1,5 @@ /* j/1/sqgr.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/j/tree.c b/j/tree.c index e360d8f04..253cd511d 100644 --- a/j/tree.c +++ b/j/tree.c @@ -1,6 +1,5 @@ /* j/dash.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/n/a.c b/n/a.c index 68a102b0b..798966168 100644 --- a/n/a.c +++ b/n/a.c @@ -1,6 +1,5 @@ /* g/a.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/n/e.c b/n/e.c index 4d165ce84..6f800716e 100644 --- a/n/e.c +++ b/n/e.c @@ -1,6 +1,5 @@ /* g/e.c ** -** This file is in the public domain. */ #include #include diff --git a/n/h.c b/n/h.c index 7833bcf57..698c2f29d 100644 --- a/n/h.c +++ b/n/h.c @@ -1,6 +1,5 @@ /* g/h.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/n/i.c b/n/i.c index cfc010e03..5a887e649 100644 --- a/n/i.c +++ b/n/i.c @@ -1,6 +1,5 @@ /* g/i.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/n/j.c b/n/j.c index 470d20f8f..0e6db22b2 100644 --- a/n/j.c +++ b/n/j.c @@ -1,6 +1,5 @@ /* g/j.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/n/m.c b/n/m.c index 08a09326c..cef93736f 100644 --- a/n/m.c +++ b/n/m.c @@ -1,6 +1,5 @@ /* g/m.c ** -** This file is in the public domain. */ #include #include diff --git a/n/n.c b/n/n.c index ba5e3ddc4..ceed42d74 100644 --- a/n/n.c +++ b/n/n.c @@ -1,6 +1,5 @@ /* g/n.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/n/r.c b/n/r.c index 8480944de..1ce9ae1cc 100644 --- a/n/r.c +++ b/n/r.c @@ -1,6 +1,5 @@ /* g/r.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/n/t.c b/n/t.c index a2e8dc3a9..84eb5858b 100644 --- a/n/t.c +++ b/n/t.c @@ -1,6 +1,5 @@ /* g/t.c ** -** This file is in the public domain. */ #include "all.h" #include diff --git a/n/v.c b/n/v.c index 45a2c9d8d..a9a6bef88 100644 --- a/n/v.c +++ b/n/v.c @@ -1,6 +1,5 @@ /* g/v.c ** -** This file is in the public domain. */ #include #include "all.h" diff --git a/n/x.c b/n/x.c index 62f9f8a61..ef769bb85 100644 --- a/n/x.c +++ b/n/x.c @@ -1,6 +1,5 @@ /* g/x.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/n/z.c b/n/z.c index 7d56d2d71..96cff8545 100644 --- a/n/z.c +++ b/n/z.c @@ -1,6 +1,5 @@ /* g/z.c ** -** This file is in the public domain. */ #include "all.h" diff --git a/v/ames.c b/v/ames.c index 78b31a852..c349d2a8a 100644 --- a/v/ames.c +++ b/v/ames.c @@ -1,6 +1,5 @@ /* v/http.c ** -** This file is in the public domain. */ #include #include diff --git a/v/cttp.c b/v/cttp.c index b121e45b7..aa843ea29 100644 --- a/v/cttp.c +++ b/v/cttp.c @@ -1,6 +1,5 @@ /* v/http.c ** -** This file is in the public domain. */ #include #include diff --git a/v/http.c b/v/http.c index 8b180da39..32216ac85 100644 --- a/v/http.c +++ b/v/http.c @@ -1,6 +1,5 @@ /* v/http.c ** -** This file is in the public domain. */ #include #include diff --git a/v/loop.c b/v/loop.c index f0c5326cb..60f4a3059 100644 --- a/v/loop.c +++ b/v/loop.c @@ -1,6 +1,5 @@ /* v/loop.c ** -** This file is in the public domain. */ #include #include diff --git a/v/main.c b/v/main.c index c90b77835..37bafcb34 100644 --- a/v/main.c +++ b/v/main.c @@ -1,6 +1,5 @@ /* v/main.c ** -** This file is in the public domain. */ #include #include diff --git a/v/raft.c b/v/raft.c index 026641683..852c02e68 100644 --- a/v/raft.c +++ b/v/raft.c @@ -1,6 +1,5 @@ /* v/raft.c ** -** This file is in the public domain. */ #include #include diff --git a/v/save.c b/v/save.c index 39bde24f9..7583d1ba9 100644 --- a/v/save.c +++ b/v/save.c @@ -1,6 +1,5 @@ /* v/save.c ** -** This file is in the public domain. */ #include #include diff --git a/v/sist.c b/v/sist.c index 48b4f1a8f..b3655f5ff 100644 --- a/v/sist.c +++ b/v/sist.c @@ -1,6 +1,5 @@ /* v/sist.c ** -** This file is in the public domain. */ #include #include diff --git a/v/term.c b/v/term.c index 8114e165c..59c60c848 100644 --- a/v/term.c +++ b/v/term.c @@ -1,6 +1,5 @@ /* v/term.c ** -** This file is in the public domain. */ #include #include diff --git a/w/kjet.c b/w/kjet.c index a56e92401..8803ad5b8 100644 --- a/w/kjet.c +++ b/w/kjet.c @@ -1,6 +1,5 @@ /* f/meme.c ** -** This file is in the public domain. */ #include "f/meme.h" diff --git a/w/test.c b/w/test.c index 7f8414d2f..48a78b18e 100644 --- a/w/test.c +++ b/w/test.c @@ -1,6 +1,5 @@ /* w/test.c ** -** This file is in the public domain. */ #define C3_GLOBAL From 25839ecd9f357dc2ff7b86f7105bfb341a4fa12f Mon Sep 17 00:00:00 2001 From: Galen Wolfe-Pauly Date: Wed, 18 Feb 2015 09:03:18 -0800 Subject: [PATCH 11/16] no node_modules --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 70e61a4f0..a0385c97d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /vere.pkg /.MAKEFILE-VERSION /make.conf +node_modules/ From 31f1c2d4cd69f9b6b554f8152b7f5f93bcb9dea0 Mon Sep 17 00:00:00 2001 From: Galen Wolfe-Pauly Date: Wed, 18 Feb 2015 14:25:58 -0800 Subject: [PATCH 12/16] talk in --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 70e61a4f0..a0385c97d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /vere.pkg /.MAKEFILE-VERSION /make.conf +node_modules/ From 69f265fcd1de85e40adc862a766e1db76f7d12b4 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Thu, 19 Feb 2015 15:22:51 -0800 Subject: [PATCH 13/16] GHETTO timestamp tracing. --- n/t.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/n/t.c b/n/t.c index 84eb5858b..67552c35c 100644 --- a/n/t.c +++ b/n/t.c @@ -1,5 +1,6 @@ /* g/t.c ** +** This file is in the public domain. */ #include "all.h" #include @@ -42,6 +43,21 @@ u3_lo_tank(c3_l tab_l, u3_noun tac); void u3t_slog(u3_noun hod) { +#ifdef GHETTO + static int old; + static struct timeval b4, f2, d0; + c3_w ms_w; + + if ( old ) { + gettimeofday(&f2, 0); + timersub(&f2, &b4, &d0); + ms_w = (d0.tv_sec * 1000) + (d0.tv_usec / 1000); + printf("%d.%dms ", ms_w, (d0.tv_usec % 1000) / 10); + } + gettimeofday(&b4, 0); + old = 1; +#endif + if ( c3y == u3du(hod) ) { u3_noun pri = u3h(hod); From 6173d1577c440ffa0bd1070c07416729b9206d13 Mon Sep 17 00:00:00 2001 From: Steven Dee Date: Sun, 22 Feb 2015 19:11:46 -0500 Subject: [PATCH 14/16] Fixes for OpenBSD build --- Makefile | 4 +-- i/n/m.h | 2 +- i/v/vere.h | 15 ++++---- n/m.c | 5 ++- outside/commonmark/Makefile | 18 +++++----- outside/ed25519/src/fixedint.h | 65 ++-------------------------------- v/ames.c | 2 +- v/term.c | 18 +++++----- 8 files changed, 36 insertions(+), 93 deletions(-) diff --git a/Makefile b/Makefile index e1e95c43c..5d00048f9 100644 --- a/Makefile +++ b/Makefile @@ -86,7 +86,7 @@ CWFLAGS=-Wall \ -Wno-sign-compare \ -Wno-unused-parameter \ -Wno-missing-field-initializers \ - -Wno-error=unused-result \ + -Wno-strict-aliasing \ -Werror ifdef NO_SILENT_RULES @@ -377,7 +377,7 @@ $(LIBCOMMONMARK): $(MAKE) -C outside/commonmark $(CRE2_OFILES): outside/cre2/src/src/cre2.cpp outside/cre2/src/src/cre2.h $(LIBRE2) - $(CXX) $(CXXFLAGS) -c $< $(LIBRE2) -o $@ + $(CXX) $(CXXFLAGS) -c $< -o $@ $(V_OFILES): i/v/vere.h diff --git a/i/n/m.h b/i/n/m.h index 5e74b3a4f..158805e7c 100644 --- a/i/n/m.h +++ b/i/n/m.h @@ -24,7 +24,7 @@ ** %oops :: assertion failure */ c3_i - u3m_bail(c3_m how_m); + u3m_bail(c3_m how_m) __attribute__((noreturn)); /* u3m_file(): load file, as atom, or bail. */ diff --git a/i/v/vere.h b/i/v/vere.h index c43e60bc1..e4ebb4e12 100644 --- a/i/v/vere.h +++ b/i/v/vere.h @@ -201,12 +201,15 @@ /* u3_ames: ames networking. */ typedef struct _u3_ames { // packet network state - uv_udp_t wax_u; // socket state - uv_timer_t tim_u; // network timer - c3_o alm; // alarm on - c3_w law_w; // last wakeup, unix time - c3_s por_s; // public IPv4 port - c3_w imp_w[256]; // imperial IPs + union { + uv_udp_t wax_u; + uv_handle_t had_u; + }; + uv_timer_t tim_u; // network timer + c3_o alm; // alarm on + c3_w law_w; // last wakeup, unix time + c3_s por_s; // public IPv4 port + c3_w imp_w[256]; // imperial IPs } u3_ames; /* u3_save: checkpoint control. diff --git a/n/m.c b/n/m.c index f3824ae9e..d99f6872d 100644 --- a/n/m.c +++ b/n/m.c @@ -571,7 +571,7 @@ c3_w Exit; ** [%2 trace] ** [%3 code trace] ** == -*/ +*/ c3_i u3m_bail(u3_noun how) { @@ -636,11 +636,10 @@ u3m_bail(u3_noun how) } } } - + /* Longjmp, with an underscore. */ _longjmp(u3R->esc.buf, how); - return 0; } int c3_cooked() { return u3m_bail(c3__oops); } diff --git a/outside/commonmark/Makefile b/outside/commonmark/Makefile index 11e77342c..29b17cf50 100644 --- a/outside/commonmark/Makefile +++ b/outside/commonmark/Makefile @@ -22,7 +22,7 @@ JSMODULES=$(wildcard js/lib/*.js) .PHONY: all spec leakcheck clean fuzztest dingus upload jshint test testjs benchjs update-site upload-site check npm debug mingw archive tarball ziparchive testarchive testtarball testziparchive testlib bench apidoc all: $(BUILDDIR) - @make -C $(BUILDDIR) + @$(MAKE) -C $(BUILDDIR) @echo "Binaries can be found in $(BUILDDIR)/src" check: @@ -34,19 +34,19 @@ $(BUILDDIR): check $(SRCDIR)/html/html_unescape.h $(SRCDIR)/case_fold_switch.inc cmake .. -G "$(GENERATOR)" -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) install: $(BUILDDIR) - make -C $(BUILDDIR) install + $(MAKE) -C $(BUILDDIR) install debug: mkdir -p $(BUILDDIR); \ cd $(BUILDDIR); \ cmake .. -DCMAKE_BUILD_TYPE=Debug; \ - make + $(MAKE) mingw: mkdir -p $(MINGW_BUILDDIR); \ cd $(MINGW_BUILDDIR); \ cmake .. -DCMAKE_TOOLCHAIN_FILE=../toolchain-mingw32.cmake -DCMAKE_INSTALL_PREFIX=$(MINGW_INSTALLDIR) ;\ - make && make install + $(MAKE) && $(MAKE) install archive: spec.html $(BUILDDIR) @rm -rf $(PKGDIR); \ @@ -87,7 +87,7 @@ $(SRCDIR)/case_fold_switch.inc: $(DATADIR)/CaseFolding-3.2.0.txt perl mkcasefold.pl < $< > $@ test: $(SPEC) $(BUILDDIR) - make -C $(BUILDDIR) test ARGS="-V" + $(MAKE) -C $(BUILDDIR) test ARGS="-V" $(TARBALL): archive @@ -100,13 +100,13 @@ testtarball: $(TARBALL) rm -rf $(PKGDIR); \ tar xvzf $(TARBALL); \ cd $(PKGDIR); \ - mkdir build && cd build && cmake .. && make && ctest -V + mkdir build && cd build && cmake .. && $(MAKE) && ctest -V testziparchive: $(ZIPARCHIVE) rm -rf $(PKGDIR); \ unzip $(ZIPARCHIVE); \ cd $(PKGDIR); \ - mkdir build && cd build && cmake .. && make && ctest -V + mkdir build && cd build && cmake .. && $(MAKE) && ctest -V $(ALLTESTS): spec.txt python test/spec_tests.py --spec $< --dump-tests | python -c 'import json; import sys; tests = json.loads(sys.stdin.read()); print "\n".join([test["markdown"] for test in tests]).encode("utf-8")' > $@ @@ -188,7 +188,7 @@ spec.pdf: spec.md template.tex specfilter.hs ### Website ### update-site: spec.html js/commonmark.js - make -C $(SITE) update + $(MAKE) -C $(SITE) update upload-site: spec.html - make -C $(SITE) upload + $(MAKE) -C $(SITE) upload diff --git a/outside/ed25519/src/fixedint.h b/outside/ed25519/src/fixedint.h index d03e4bddd..d53383a97 100644 --- a/outside/ed25519/src/fixedint.h +++ b/outside/ed25519/src/fixedint.h @@ -1,70 +1,11 @@ /* Portable header to provide the 32 and 64 bits type. - - Not a compatible replacement for , do not blindly use it as such. */ -#if ((defined(__STDC__) && __STDC__ && __STDC_VERSION__ >= 199901L) || (defined(__WATCOMC__) && (defined(_STDINT_H_INCLUDED) || __WATCOMC__ >= 1250)) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_) || defined(__UINT_FAST64_TYPE__)) )) && !defined(FIXEDINT_H_INCLUDED) - #include - #define FIXEDINT_H_INCLUDED - - #if defined(__WATCOMC__) && __WATCOMC__ >= 1250 && !defined(UINT64_C) - #include - #define UINT64_C(x) (x + (UINT64_MAX - UINT64_MAX)) - #endif -#endif - - #ifndef FIXEDINT_H_INCLUDED - #define FIXEDINT_H_INCLUDED +#define FIXEDINT_H_INCLUDED - /* (u)int32_t */ - #ifndef uint32_t - #if (ULONG_MAX == 0xffffffffUL) - typedef unsigned long uint32_t; - #elif (UINT_MAX == 0xffffffffUL) - typedef unsigned int uint32_t; - #elif (USHRT_MAX == 0xffffffffUL) - typedef unsigned short uint32_t; - #endif - #endif +#include +#include - - #ifndef int32_t - #if (LONG_MAX == 0x7fffffffL) - typedef signed long int32_t; - #elif (INT_MAX == 0x7fffffffL) - typedef signed int int32_t; - #elif (SHRT_MAX == 0x7fffffffL) - typedef signed short int32_t; - #endif - #endif - - - /* (u)int64_t */ - #if (defined(__STDC__) && defined(__STDC_VERSION__) && __STDC__ && __STDC_VERSION__ >= 199901L) - typedef long long int64_t; - typedef unsigned long long uint64_t; - - #define UINT64_C(v) v ##ULL - #define INT64_C(v) v ##LL - #elif defined(__GNUC__) - __extension__ typedef long long int64_t; - __extension__ typedef unsigned long long uint64_t; - - #define UINT64_C(v) v ##ULL - #define INT64_C(v) v ##LL - #elif defined(__MWERKS__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__APPLE_CC__) || defined(_LONG_LONG) || defined(_CRAYC) - typedef long long int64_t; - typedef unsigned long long uint64_t; - - #define UINT64_C(v) v ##ULL - #define INT64_C(v) v ##LL - #elif (defined(__WATCOMC__) && defined(__WATCOM_INT64__)) || (defined(_MSC_VER) && _INTEGRAL_MAX_BITS >= 64) || (defined(__BORLANDC__) && __BORLANDC__ > 0x460) || defined(__alpha) || defined(__DECC) - typedef __int64 int64_t; - typedef unsigned __int64 uint64_t; - - #define UINT64_C(v) v ##UI64 - #define INT64_C(v) v ##I64 - #endif #endif diff --git a/v/ames.c b/v/ames.c index c349d2a8a..391032fcb 100644 --- a/v/ames.c +++ b/v/ames.c @@ -367,7 +367,7 @@ u3_ames_io_exit() { u3_ames* sam_u = &u3_Host.sam_u; - uv_close((uv_handle_t*)&sam_u->wax_u, 0); + uv_close(&sam_u->had_u, 0); } /* u3_ames_io_poll(): update ames IO state. diff --git a/v/term.c b/v/term.c index 59c60c848..6305df5b2 100644 --- a/v/term.c +++ b/v/term.c @@ -22,15 +22,15 @@ #include "all.h" #include "v/vere.h" -static void _term_read_tn_cb(uv_stream_t* tcp_u, - ssize_t siz_i, - const uv_buf_t * buf_u); -static void _term_read_cb(uv_stream_t* tcp_u, - ssize_t siz_i, - const uv_buf_t * buf_u); -static void _term_suck(u3_utty*, const c3_y*, ssize_t); -static void _tel_event(telnet_nvt*, telnet_event*); -static void _tel_opt(telnet_nvt*, telnet_byte, telnet_telopt_event*); +static void _term_read_tn_cb(uv_stream_t* tcp_u, + ssize_t siz_i, + const uv_buf_t * buf_u); +static void _term_read_cb(uv_stream_t* tcp_u, + ssize_t siz_i, + const uv_buf_t * buf_u); +static inline void _term_suck(u3_utty*, const c3_y*, ssize_t); +static void _tel_event(telnet_nvt*, telnet_event*); +static void _tel_opt(telnet_nvt*, telnet_byte, telnet_telopt_event*); #define _T_ECHO 1 // local echo #define _T_CTIM 3 // suppress GA/char-at-a-time From 63908d386edc2e9bccabcd0019466b0378698efa Mon Sep 17 00:00:00 2001 From: Steven Dee Date: Mon, 2 Mar 2015 14:04:20 -0500 Subject: [PATCH 15/16] Fix linux build --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 5d00048f9..13ec436e9 100644 --- a/Makefile +++ b/Makefile @@ -87,6 +87,7 @@ CWFLAGS=-Wall \ -Wno-unused-parameter \ -Wno-missing-field-initializers \ -Wno-strict-aliasing \ + -Wno-error=unused-result \ -Werror ifdef NO_SILENT_RULES From 21242e9c61c9b7a58605fa7be7e1b61920906864 Mon Sep 17 00:00:00 2001 From: Steven Dee Date: Mon, 2 Mar 2015 16:44:21 -0500 Subject: [PATCH 16/16] Conditionally disable unused-result on OpenBSD --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 13ec436e9..01e06c8bb 100644 --- a/Makefile +++ b/Makefile @@ -87,8 +87,10 @@ CWFLAGS=-Wall \ -Wno-unused-parameter \ -Wno-missing-field-initializers \ -Wno-strict-aliasing \ - -Wno-error=unused-result \ -Werror +ifneq ($(OS),bsd) + CWFLAGS+=-Wno-error=unused-result +endif ifdef NO_SILENT_RULES %.o: %.c $(CORE)