Page MenuHomeFreeBSD
Differential D23133

lang/rust-bootstrap: Cross-compile Rust bootstraps for all archs
ClosedPublic
Actions

Authored by tobik on Jan 11 2020, 9:09 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Mar 28, 7:15 PM
Unknown Object (File)
Mon, Mar 24, 4:36 PM
Unknown Object (File)
Mon, Mar 17, 8:04 AM
Unknown Object (File)
Mar 6 2025, 9:15 AM
Unknown Object (File)
Feb 26 2025, 4:07 PM
Unknown Object (File)
Feb 26 2025, 3:55 PM
Unknown Object (File)
Feb 26 2025, 3:47 PM
Unknown Object (File)
Feb 26 2025, 3:41 PM
View All Files
Subscribers
garga
mat
mikael
pkubaj

Details

Reviewers
pkubaj
jbeich
mikael
Group Reviewers
rust
portmgr
Commits
rP527099: New port: lang/rust-bootstrap
Summary

Goals are:

  1. Putting the cost of building them on the FreeBSD project instead of volunteers
  2. Creating bootstraps for only supported releases instead of using whatever upstream builds them on (currently 10.3-RELEASE)
  3. Having the ability to easily patch them when it becomes necessary

Adding portmgr for approval of flavors.

Test Plan

Does lang/rust build with the new bootstraps?

amd64, i386: yes, tested by @tobik
aarch64: yes, tested by @garga (thanks!)
armv7: yes, tested by @mikael.urankar_gmail.com (thanks!)
armv6: untested
powerpc64 elfv1: yes. tested on ref12-ppc64 by @tobik, also tested by @pkubaj
powerpc64 elfv2: yes, tested by @pkubaj (thanks!)

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 28996
Build 26970: arc lint + arc unit

Event Timeline

tobik created this revision.Jan 11 2020, 9:09 AM
Herald added a subscriber: mat. · View Herald TranscriptJan 11 2020, 9:09 AM
Harbormaster completed remote builds in B28605: Diff 66615.Jan 11 2020, 9:09 AM
tobik updated this revision to Diff 66616.Jan 11 2020, 9:09 AM
  • Remove empty dir...
Harbormaster completed remote builds in B28606: Diff 66616.Jan 11 2020, 9:09 AM
tobik updated this revision to Diff 66617.Jan 11 2020, 9:16 AM
  • Drop unused compiler-rt from distinfo
Harbormaster completed remote builds in B28607: Diff 66617.Jan 11 2020, 9:16 AM
tobik updated this revision to Diff 66619.Jan 11 2020, 9:20 AM
  • Rebase
Harbormaster completed remote builds in B28608: Diff 66619.Jan 11 2020, 9:21 AM
pkubaj accepted this revision.Jan 14 2020, 2:23 PM

Tested to build on both elfv1 and elfv2.

This revision is now accepted and ready to land.Jan 14 2020, 2:23 PM
mikael accepted this revision.Jan 14 2020, 2:35 PM

They finally fixed their cross-compile issue, I hope it won't break in the future.
It's ok on armv7, I'm afraid I won't have time to test on armv6 or aarch64 (but I see no reason it would break).

tobik edited the test plan for this revision. (Show Details)Jan 16 2020, 9:20 AM
garga added a subscriber: garga.Jan 16 2020, 1:32 PM
garga added a comment.Jan 17 2020, 3:31 PM

I tried to build lang/rust on native aarch64 builder with this patch applied, under a 11.3-STABLE jail and got:

running: /wrkdirs/usr/ports/lang/rust/work/rustc-1.40.0-src/build/aarch64-unknown-freebsd/stage0/bin/cargo build --manifest-path /wrkdirs/usr/ports/lang/rust/work/rustc-1.40.0-src/src/bootstrap/Cargo.toml --verbose --frozen
/wrkdirs/usr/ports/lang/rust/work/rustc-1.40.0-src/build/aarch64-unknown-freebsd/stage0/bin/cargo: Undefined symbol "lstat@FBSD_1.5"
Traceback (most recent call last):
  File "/wrkdirs/usr/ports/lang/rust/work/rustc-1.40.0-src/x.py", line 11, in <module>
    bootstrap.main()
  File "/wrkdirs/usr/ports/lang/rust/work/rustc-1.40.0-src/src/bootstrap/bootstrap.py", line 909, in main
    bootstrap(help_triggered)
  File "/wrkdirs/usr/ports/lang/rust/work/rustc-1.40.0-src/src/bootstrap/bootstrap.py", line 880, in bootstrap
    build.build_bootstrap()
  File "/wrkdirs/usr/ports/lang/rust/work/rustc-1.40.0-src/src/bootstrap/bootstrap.py", line 675, in build_bootstrap
    run(args, env=env, verbose=self.verbose)
  File "/wrkdirs/usr/ports/lang/rust/work/rustc-1.40.0-src/src/bootstrap/bootstrap.py", line 141, in run
    raise RuntimeError(err)
RuntimeError: failed to run: /wrkdirs/usr/ports/lang/rust/work/rustc-1.40.0-src/build/aarch64-unknown-freebsd/stage0/bin/cargo build --manifest-path /wrkdirs/usr/ports/lang/rust/work/rustc-1.40.0-src/src/bootstrap/Cargo.toml --verbose --frozen
*** Error code 1

Would it be possible to have a bootstrap compatible with FreeBSD 11?

mikael added a comment.Jan 18 2020, 8:36 AM
In D23133#509306, @garga wrote:

Would it be possible to have a bootstrap compatible with FreeBSD 11?

You'll need to change _RUST_FBSD_VER_aarch64 to 11.3. Be aware that there are bugs in rtld on aarch64 11.3 (not sure if the bug is fixed in 11-stable), you'll need a ld-elf.so.1 from 12.1 or 12.stable (see bug https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=228892 for details)

tobik updated this revision to Diff 66963.Jan 18 2020, 9:34 AM
  • aarch64: Target 11.3-RELEASE (bootstrap already updated but give it an hour to appear on mirrors)
  • Add COMPAT_FREEBSD11 canary to lang/rust-bootstrap too
This revision now requires review to proceed.Jan 18 2020, 9:34 AM
Harbormaster completed remote builds in B28753: Diff 66963.Jan 18 2020, 9:34 AM
tobik updated this revision to Diff 66964.Jan 18 2020, 9:57 AM
  • Rebase
Harbormaster completed remote builds in B28754: Diff 66964.Jan 18 2020, 9:57 AM
tobik added a comment.Jan 23 2020, 9:16 AM

@garga So is it ok for you now?

garga added a comment.Jan 23 2020, 12:45 PM
In D23133#511441, @tobik wrote:

@garga So is it ok for you now?

Unfortunately our ThunderX builder is out of service for maintenance and I won't be able to test it until next week. It is still broken for crossbuild, right?

tobik added a comment.Jan 23 2020, 12:55 PM
In D23133#511524, @garga wrote:
In D23133#511441, @tobik wrote:

@garga So is it ok for you now?

Unfortunately our ThunderX builder is out of service for maintenance and I won't be able to test it until next week.

Ok. Let me know how it goes.

It is still broken for crossbuild, right?

Yes, unfortunately the build will just hang with qemu-user-static at some point.

tobik mentioned this in rP524013: lang/rust: Apply some of the patches for lang/rust-bootstrap (D23133).Jan 25 2020, 5:41 AM
tobik updated this revision to Diff 67274.Jan 25 2020, 5:44 AM
  • Rebase
Harbormaster completed remote builds in B28908: Diff 67274.Jan 25 2020, 5:44 AM
tobik updated this revision to Diff 67276.Jan 25 2020, 5:47 AM

...

Harbormaster completed remote builds in B28909: Diff 67276.Jan 25 2020, 5:47 AM
tobik mentioned this in D23385: lang/rust: Update to 1.41.0.Jan 27 2020, 9:27 PM
mikael added a comment.Jan 28 2020, 6:09 PM

It fails on armv6, 11.3-RELEASE. I used to build the bootstrap for 11.3, it's 12.1 with this port. I'm not against it but we should restrict lang/rust accordingly. I'd prefer keeping support for 11.3 though.

running: /usr/ports/lang/rust/work/rustc-1.41.0-src/build/armv6-unknown-freebsd/stage0/bin/cargo build --manifest-path /usr/ports/lang/rust/work/rustc-1.41.0-src/src/bootstrap/Cargo.toml --verbose --frozen
/usr/ports/lang/rust/work/rustc-1.41.0-src/build/armv6-unknown-freebsd/stage0/bin/cargo: Undefined symbol "lstat@FBSD_1.5"
/usr/ports/lang/rust/work/rustc-1.41.0-src/build/armv6-unknown-freebsd/stage0/bin/cargo: ELF 32-bit LSB shared object, ARM, EABI5 version 1 (FreeBSD), dynamically linked, interpreter /libexec/ld-elf.so.1, for FreeBSD 12.1, FreeBSD-style, with debug_info, not stripped
mikael added a comment.Jan 28 2020, 6:35 PM

Something is odd, it seems the armv6 sysroot is for armv7:

readelf -A /usr/ports/lang/rust-bootstrap/work-armv6/lib/libcrypt.so.5
Attribute Section: aeabi
File Attributes
  Tag_CPU_arch: ARM v7
  Tag_CPU_arch_profile: Application Profile
  Tag_ARM_ISA_use: Yes
  Tag_THUMB_ISA_use: 32-bit Thumb
  Tag_FP_arch: VFPv3
  Tag_Advanced_SIMD_arch: NEONv1
  Tag_CPU_unaligned_access: Not allowed
tobik added a comment.Jan 28 2020, 6:40 PM

Yeah, FreeBSD-11.3-RELEASE-arm-armv6.tar.xz and FreeBSD-12.1-RELEASE-arm-armv7.tar.xz were accidentally the same file... I'm rebuilding the armv6 bootstrap now.

tobik updated this revision to Diff 67430.Jan 28 2020, 7:48 PM
  • Actually build armv6 bootstrap for armv6
Harbormaster completed remote builds in B28996: Diff 67430.Jan 28 2020, 7:48 PM
garga added a comment.Jan 28 2020, 10:23 PM
In D23133#511525, @tobik wrote:
In D23133#511524, @garga wrote:
In D23133#511441, @tobik wrote:

@garga So is it ok for you now?

Unfortunately our ThunderX builder is out of service for maintenance and I won't be able to test it until next week.

Ok. Let me know how it goes.

It built fine! Thanks!

tobik edited the test plan for this revision. (Show Details)Jan 29 2020, 8:25 AM
tobik updated this revision to Diff 67528.Jan 30 2020, 8:07 PM
  • Rebase and update to 1.41.0
Harbormaster completed remote builds in B29051: Diff 67528.Jan 30 2020, 8:07 PM
tobik updated this revision to Diff 67529.Jan 30 2020, 8:09 PM
  • Lock lang/rust version to same version as lang/rust-bootstrap
Harbormaster completed remote builds in B29052: Diff 67529.Jan 30 2020, 8:09 PM
tobik added a comment.Feb 15 2020, 3:12 PM

Can someone from portmgr approve the flavors? It would be nice if this could be committed before Rust 1.42.0 (2020-03-12).

tobik added a comment.Feb 23 2020, 9:37 AM

Ping?

mat added a comment.Feb 25 2020, 2:36 PM

So, this needs lang/rust to build, and, lang/rust needs it to build? Isn't there some sort of circular dependency?

lang/rust-bootstrap/Makefile
81

To be honest, I would rather you used a few .if than this hardly readable magic.

95–97

There are no patches, is this needed? Also, could the patch be named just like the flavor, it would be much more simpler.

tobik added a comment.Feb 25 2020, 2:58 PM
In D23133#523804, @mat wrote:

So, this needs lang/rust to build, and, lang/rust needs it to build? Isn't there some sort of circular dependency?

Yes, but there is no circular dependency in the ports tree sense. rust-bootstrap creates the bootstraps used for building the next stable release of lang/rust. I then upload the binaries somewhere before the next Rust release, so that lang/rust can fetch and use them. lang/rust will never depend directly on lang/rust-bootstrap.

lang/rust-bootstrap/Makefile
81

Fair enough. Would you also be fine with something like

_RUST_LLVM_TARGET= ${_RUST_LLVM_TARGET_${FLAVOR}}
_RUST_LLVM_TARGET_armv6= ARM
_RUST_LLVM_TARGET_armv7= ARM
...
95–97

There are patches. It reuses the ones from lang/rust.

tobik updated this revision to Diff 68806.Feb 25 2020, 3:23 PM
  • Make _RUST_LLVM_TARGET more readable
Harbormaster completed remote builds in B29604: Diff 68806.Feb 25 2020, 3:23 PM
mat accepted this revision as: portmgr.Feb 25 2020, 4:24 PM

Accept the flavors, while I am here.

This revision was not accepted when it landed; it landed in state Needs Review.Feb 25 2020, 6:18 PM
Closed by commit rP527099: New port: lang/rust-bootstrap (authored by tobik). · Explain Why
This revision was automatically updated to reflect the committed changes.
tobik added a commit: rP527099: New port: lang/rust-bootstrap.

Revision Contents
Changeset List

PathSize
lang/
1 line
223 lines
19 lines
7 lines
rust/
6 lines
86 lines

Diff 67430

View Options

lang/Makefile

  • This file was added.
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2023 Dave Cottlehuber <dch@FreeBSD.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <errno.h>
#include <sys/param.h>
#include <stdio.h>
#include <string.h>
#include <fetch.h>
#include <lua.h>
#include "lauxlib.h"
#include "lfetch.h"
/*
* Minimal implementation of libfetch
*/
static int
lfetch_parse_url(lua_State *L)
{
const char *url = luaL_checkstring(L, 1);
struct url *u;
u = fetchParseURL(url);
if (u == NULL) {
lua_pushnil(L);
lua_pushstring(L, "Failed to parse URL");
return (2);
}
lua_newtable(L);
lua_pushstring(L, u->scheme);
lua_setfield(L, -2, "scheme");
lua_pushstring(L, u->user);
lua_setfield(L, -2, "user");
lua_pushstring(L, u->pwd);
lua_setfield(L, -2, "password");
lua_pushstring(L, u->host);
lua_setfield(L, -2, "host");
/* if port is not explicitly set, it defaults to 0, not scheme */
kevansUnsubmitted
Done
Inline Actions

My gut reaction to this is that we probably shouldn't expose the port at all if it's not explicitly set, just leave it nil in this table to allow for more idiomatic usage where you can simply test the port as truthy before using it.f

kevans: My gut reaction to this is that we probably shouldn't expose the port at all if it's not…
lua_pushinteger(L, u->port);
lua_setfield(L, -2, "port");
/* doc is also known as the query string for http(s) */
lua_pushstring(L, u->doc);
lua_setfield(L, -2, "doc");
fetchFreeURL(u);
return (1);
}
static int
lfetch_get_url(lua_State *L) {
kevansUnsubmitted
Done
Inline Actions

Brace on its own line

kevans: Brace on its own line
const char *url = luaL_checkstring(L, 1);
const char *out = luaL_checkstring(L, 2);
struct url *u;
kevansUnsubmitted
Done
Inline Actions

This should move up above the blank line

kevans: This should move up above the blank line
u = fetchParseURL(url);
if (u == NULL) {
lua_pushnil(L);
lua_pushstring(L, "Failed to parse URL");
return (2);
}
FILE *file = fopen(out, "wb");
kevansUnsubmitted
Done
Inline Actions

IIRC style(9) still doesn't allow declarations mid-block, it would need to be at the top of this function.

kevans: IIRC style(9) still doesn't allow declarations mid-block, it would need to be at the top of…
if (file == NULL) {
lua_pushnil(L);
lua_pushfstring(L, "Failed to open output file: %s", strerror(errno));
return 2;
}
FILE *fetch = fetchGet(u, "");
if (fetch == NULL) {
lua_pushnil(L);
lua_pushfstring(L, "Failed to read from URL: %s", strerror(errno));
return 2;
kevansUnsubmitted
Done
Inline Actions

Leaks file

kevans: Leaks `file`
}
int chunk_size = 4096;
kevansUnsubmitted
Done
Inline Actions

Ditto for these declarations; chunk_size I'd probably just make a #define since we're not going to be altering it

kevans: Ditto for these declarations; chunk_size I'd probably just make a `#define` since we're not…
char buf[chunk_size];
size_t bytes;
while ((bytes = fread(buf, 1, chunk_size, fetch)) > 0) {
if (fwrite(buf, 1, bytes, file) != bytes) {
lua_pushnil(L);
lua_pushfstring(L, "Failed to write to file: %s", strerror(errno));
fclose(file);
kevansUnsubmitted
Done
Inline Actions

Leaks fetch

kevans: Leaks `fetch`
dchAuthorUnsubmitted
Done
Inline Actions

If I fclose(fetch); here, this segfaults:

Lua 5.4.4 Copyright (C) 1994-2022 Lua.org, PUC-Rio

f.get_url("https://invalid.site/", "/tmp/i")

fish: Job 1, '/usr/libexec/flua $argv' terminated by signal SIGSEGV (Address boundary error)

(lldb) thr backtrace all
* thread #1, name = 'flua', stop reason = signal SIGSEGV
  * frame #0: 0x00001252697ad0f9
    frame #1: 0xffadb0abacff9a89
dch: If I `fclose(fetch);` here, this segfaults: Lua 5.4.4 Copyright (C) 1994-2022 Lua.org, PUC…
kevansUnsubmitted
Done
Inline Actions

The context for this one has changed, the comment was originally down in the error path in the loop. This branch looks fine

kevans: The context for this one has changed, the comment was originally down in the error path in the…
return 2;
}
}
fclose(fetch);
fclose(file);
fetchFreeURL(u);
lua_pushboolean(L, 1);
return 1;
}
static const struct
luaL_Reg fetchlib[] = {
{"parse_url", lfetch_parse_url},
{"get_url", lfetch_get_url},
{NULL, NULL}
};
int
luaopen_fetch(lua_State *L)
{
luaL_newlib(L, fetchlib);
return (1);
}
View Options

lang/rust-bootstrap/

  • This file was added.
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2023 Dave Cottlehuber <dch@FreeBSD.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <errno.h>
#include <sys/param.h>
#include <stdio.h>
#include <string.h>
#include <fetch.h>
#include <lua.h>
#include "lauxlib.h"
#include "lfetch.h"
/*
* Minimal implementation of libfetch
*/
static int
lfetch_parse_url(lua_State *L)
{
const char *url = luaL_checkstring(L, 1);
struct url *u;
u = fetchParseURL(url);
if (u == NULL) {
lua_pushnil(L);
lua_pushstring(L, "Failed to parse URL");
return (2);
}
lua_newtable(L);
lua_pushstring(L, u->scheme);
lua_setfield(L, -2, "scheme");
lua_pushstring(L, u->user);
lua_setfield(L, -2, "user");
lua_pushstring(L, u->pwd);
lua_setfield(L, -2, "password");
lua_pushstring(L, u->host);
lua_setfield(L, -2, "host");
/* if port is not explicitly set, it defaults to 0, not scheme */
kevansUnsubmitted
Done
Inline Actions

My gut reaction to this is that we probably shouldn't expose the port at all if it's not explicitly set, just leave it nil in this table to allow for more idiomatic usage where you can simply test the port as truthy before using it.f

kevans: My gut reaction to this is that we probably shouldn't expose the port at all if it's not…
lua_pushinteger(L, u->port);
lua_setfield(L, -2, "port");
/* doc is also known as the query string for http(s) */
lua_pushstring(L, u->doc);
lua_setfield(L, -2, "doc");
fetchFreeURL(u);
return (1);
}
static int
lfetch_get_url(lua_State *L) {
kevansUnsubmitted
Done
Inline Actions

Brace on its own line

kevans: Brace on its own line
const char *url = luaL_checkstring(L, 1);
const char *out = luaL_checkstring(L, 2);
struct url *u;
kevansUnsubmitted
Done
Inline Actions

This should move up above the blank line

kevans: This should move up above the blank line
u = fetchParseURL(url);
if (u == NULL) {
lua_pushnil(L);
lua_pushstring(L, "Failed to parse URL");
return (2);
}
FILE *file = fopen(out, "wb");
kevansUnsubmitted
Done
Inline Actions

IIRC style(9) still doesn't allow declarations mid-block, it would need to be at the top of this function.

kevans: IIRC style(9) still doesn't allow declarations mid-block, it would need to be at the top of…
if (file == NULL) {
lua_pushnil(L);
lua_pushfstring(L, "Failed to open output file: %s", strerror(errno));
return 2;
}
FILE *fetch = fetchGet(u, "");
if (fetch == NULL) {
lua_pushnil(L);
lua_pushfstring(L, "Failed to read from URL: %s", strerror(errno));
return 2;
kevansUnsubmitted
Done
Inline Actions

Leaks file

kevans: Leaks `file`
}
int chunk_size = 4096;
kevansUnsubmitted
Done
Inline Actions

Ditto for these declarations; chunk_size I'd probably just make a #define since we're not going to be altering it

kevans: Ditto for these declarations; chunk_size I'd probably just make a `#define` since we're not…
char buf[chunk_size];
size_t bytes;
while ((bytes = fread(buf, 1, chunk_size, fetch)) > 0) {
if (fwrite(buf, 1, bytes, file) != bytes) {
lua_pushnil(L);
lua_pushfstring(L, "Failed to write to file: %s", strerror(errno));
fclose(file);
kevansUnsubmitted
Done
Inline Actions

Leaks fetch

kevans: Leaks `fetch`
dchAuthorUnsubmitted
Done
Inline Actions

If I fclose(fetch); here, this segfaults:

Lua 5.4.4 Copyright (C) 1994-2022 Lua.org, PUC-Rio

f.get_url("https://invalid.site/", "/tmp/i")

fish: Job 1, '/usr/libexec/flua $argv' terminated by signal SIGSEGV (Address boundary error)

(lldb) thr backtrace all
* thread #1, name = 'flua', stop reason = signal SIGSEGV
  * frame #0: 0x00001252697ad0f9
    frame #1: 0xffadb0abacff9a89
dch: If I `fclose(fetch);` here, this segfaults: Lua 5.4.4 Copyright (C) 1994-2022 Lua.org, PUC…
kevansUnsubmitted
Done
Inline Actions

The context for this one has changed, the comment was originally down in the error path in the loop. This branch looks fine

kevans: The context for this one has changed, the comment was originally down in the error path in the…
return 2;
}
}
fclose(fetch);
fclose(file);
fetchFreeURL(u);
lua_pushboolean(L, 1);
return 1;
}
static const struct
luaL_Reg fetchlib[] = {
{"parse_url", lfetch_parse_url},
{"get_url", lfetch_get_url},
{NULL, NULL}
};
int
luaopen_fetch(lua_State *L)
{
luaL_newlib(L, fetchlib);
return (1);
}
View Options

lang/rust-bootstrap/Makefile

  • This file was added.
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2023 Dave Cottlehuber <dch@FreeBSD.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <errno.h>
#include <sys/param.h>
#include <stdio.h>
#include <string.h>
#include <fetch.h>
#include <lua.h>
#include "lauxlib.h"
#include "lfetch.h"
/*
* Minimal implementation of libfetch
*/
static int
lfetch_parse_url(lua_State *L)
{
const char *url = luaL_checkstring(L, 1);
struct url *u;
u = fetchParseURL(url);
if (u == NULL) {
lua_pushnil(L);
lua_pushstring(L, "Failed to parse URL");
return (2);
}
lua_newtable(L);
lua_pushstring(L, u->scheme);
lua_setfield(L, -2, "scheme");
lua_pushstring(L, u->user);
lua_setfield(L, -2, "user");
lua_pushstring(L, u->pwd);
lua_setfield(L, -2, "password");
lua_pushstring(L, u->host);
lua_setfield(L, -2, "host");
/* if port is not explicitly set, it defaults to 0, not scheme */
kevansUnsubmitted
Done
Inline Actions

My gut reaction to this is that we probably shouldn't expose the port at all if it's not explicitly set, just leave it nil in this table to allow for more idiomatic usage where you can simply test the port as truthy before using it.f

kevans: My gut reaction to this is that we probably shouldn't expose the port at all if it's not…
lua_pushinteger(L, u->port);
lua_setfield(L, -2, "port");
/* doc is also known as the query string for http(s) */
lua_pushstring(L, u->doc);
lua_setfield(L, -2, "doc");
fetchFreeURL(u);
return (1);
}
static int
lfetch_get_url(lua_State *L) {
kevansUnsubmitted
Done
Inline Actions

Brace on its own line

kevans: Brace on its own line
const char *url = luaL_checkstring(L, 1);
const char *out = luaL_checkstring(L, 2);
struct url *u;
kevansUnsubmitted
Done
Inline Actions

This should move up above the blank line

kevans: This should move up above the blank line
u = fetchParseURL(url);
if (u == NULL) {
lua_pushnil(L);
lua_pushstring(L, "Failed to parse URL");
return (2);
}
FILE *file = fopen(out, "wb");
kevansUnsubmitted
Done
Inline Actions

IIRC style(9) still doesn't allow declarations mid-block, it would need to be at the top of this function.

kevans: IIRC style(9) still doesn't allow declarations mid-block, it would need to be at the top of…
if (file == NULL) {
lua_pushnil(L);
lua_pushfstring(L, "Failed to open output file: %s", strerror(errno));
return 2;
}
FILE *fetch = fetchGet(u, "");
if (fetch == NULL) {
lua_pushnil(L);
lua_pushfstring(L, "Failed to read from URL: %s", strerror(errno));
return 2;
kevansUnsubmitted
Done
Inline Actions

Leaks file

kevans: Leaks `file`
}
int chunk_size = 4096;
kevansUnsubmitted
Done
Inline Actions

Ditto for these declarations; chunk_size I'd probably just make a #define since we're not going to be altering it

kevans: Ditto for these declarations; chunk_size I'd probably just make a `#define` since we're not…
char buf[chunk_size];
size_t bytes;
while ((bytes = fread(buf, 1, chunk_size, fetch)) > 0) {
if (fwrite(buf, 1, bytes, file) != bytes) {
lua_pushnil(L);
lua_pushfstring(L, "Failed to write to file: %s", strerror(errno));
fclose(file);
kevansUnsubmitted
Done
Inline Actions

Leaks fetch

kevans: Leaks `fetch`
dchAuthorUnsubmitted
Done
Inline Actions

If I fclose(fetch); here, this segfaults:

Lua 5.4.4 Copyright (C) 1994-2022 Lua.org, PUC-Rio

f.get_url("https://invalid.site/", "/tmp/i")

fish: Job 1, '/usr/libexec/flua $argv' terminated by signal SIGSEGV (Address boundary error)

(lldb) thr backtrace all
* thread #1, name = 'flua', stop reason = signal SIGSEGV
  * frame #0: 0x00001252697ad0f9
    frame #1: 0xffadb0abacff9a89
dch: If I `fclose(fetch);` here, this segfaults: Lua 5.4.4 Copyright (C) 1994-2022 Lua.org, PUC…
kevansUnsubmitted
Done
Inline Actions

The context for this one has changed, the comment was originally down in the error path in the loop. This branch looks fine

kevans: The context for this one has changed, the comment was originally down in the error path in the…
return 2;
}
}
fclose(fetch);
fclose(file);
fetchFreeURL(u);
lua_pushboolean(L, 1);
return 1;
}
static const struct
luaL_Reg fetchlib[] = {
{"parse_url", lfetch_parse_url},
{"get_url", lfetch_get_url},
{NULL, NULL}
};
int
luaopen_fetch(lua_State *L)
{
luaL_newlib(L, fetchlib);
return (1);
}
View Options

lang/rust-bootstrap/distinfo

  • This file was added.
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2023 Dave Cottlehuber <dch@FreeBSD.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <errno.h>
#include <sys/param.h>
#include <stdio.h>
#include <string.h>
#include <fetch.h>
#include <lua.h>
#include "lauxlib.h"
#include "lfetch.h"
/*
* Minimal implementation of libfetch
*/
static int
lfetch_parse_url(lua_State *L)
{
const char *url = luaL_checkstring(L, 1);
struct url *u;
u = fetchParseURL(url);
if (u == NULL) {
lua_pushnil(L);
lua_pushstring(L, "Failed to parse URL");
return (2);
}
lua_newtable(L);
lua_pushstring(L, u->scheme);
lua_setfield(L, -2, "scheme");
lua_pushstring(L, u->user);
lua_setfield(L, -2, "user");
lua_pushstring(L, u->pwd);
lua_setfield(L, -2, "password");
lua_pushstring(L, u->host);
lua_setfield(L, -2, "host");
/* if port is not explicitly set, it defaults to 0, not scheme */
kevansUnsubmitted
Done
Inline Actions

My gut reaction to this is that we probably shouldn't expose the port at all if it's not explicitly set, just leave it nil in this table to allow for more idiomatic usage where you can simply test the port as truthy before using it.f

kevans: My gut reaction to this is that we probably shouldn't expose the port at all if it's not…
lua_pushinteger(L, u->port);
lua_setfield(L, -2, "port");
/* doc is also known as the query string for http(s) */
lua_pushstring(L, u->doc);
lua_setfield(L, -2, "doc");
fetchFreeURL(u);
return (1);
}
static int
lfetch_get_url(lua_State *L) {
kevansUnsubmitted
Done
Inline Actions

Brace on its own line

kevans: Brace on its own line
const char *url = luaL_checkstring(L, 1);
const char *out = luaL_checkstring(L, 2);
struct url *u;
kevansUnsubmitted
Done
Inline Actions

This should move up above the blank line

kevans: This should move up above the blank line
u = fetchParseURL(url);
if (u == NULL) {
lua_pushnil(L);
lua_pushstring(L, "Failed to parse URL");
return (2);
}
FILE *file = fopen(out, "wb");
kevansUnsubmitted
Done
Inline Actions

IIRC style(9) still doesn't allow declarations mid-block, it would need to be at the top of this function.

kevans: IIRC style(9) still doesn't allow declarations mid-block, it would need to be at the top of…
if (file == NULL) {
lua_pushnil(L);
lua_pushfstring(L, "Failed to open output file: %s", strerror(errno));
return 2;
}
FILE *fetch = fetchGet(u, "");
if (fetch == NULL) {
lua_pushnil(L);
lua_pushfstring(L, "Failed to read from URL: %s", strerror(errno));
return 2;
kevansUnsubmitted
Done
Inline Actions

Leaks file

kevans: Leaks `file`
}
int chunk_size = 4096;
kevansUnsubmitted
Done
Inline Actions

Ditto for these declarations; chunk_size I'd probably just make a #define since we're not going to be altering it

kevans: Ditto for these declarations; chunk_size I'd probably just make a `#define` since we're not…
char buf[chunk_size];
size_t bytes;
while ((bytes = fread(buf, 1, chunk_size, fetch)) > 0) {
if (fwrite(buf, 1, bytes, file) != bytes) {
lua_pushnil(L);
lua_pushfstring(L, "Failed to write to file: %s", strerror(errno));
fclose(file);
kevansUnsubmitted
Done
Inline Actions

Leaks fetch

kevans: Leaks `fetch`
dchAuthorUnsubmitted
Done
Inline Actions

If I fclose(fetch); here, this segfaults:

Lua 5.4.4 Copyright (C) 1994-2022 Lua.org, PUC-Rio

f.get_url("https://invalid.site/", "/tmp/i")

fish: Job 1, '/usr/libexec/flua $argv' terminated by signal SIGSEGV (Address boundary error)

(lldb) thr backtrace all
* thread #1, name = 'flua', stop reason = signal SIGSEGV
  * frame #0: 0x00001252697ad0f9
    frame #1: 0xffadb0abacff9a89
dch: If I `fclose(fetch);` here, this segfaults: Lua 5.4.4 Copyright (C) 1994-2022 Lua.org, PUC…
kevansUnsubmitted
Done
Inline Actions

The context for this one has changed, the comment was originally down in the error path in the loop. This branch looks fine

kevans: The context for this one has changed, the comment was originally down in the error path in the…
return 2;
}
}
fclose(fetch);
fclose(file);
fetchFreeURL(u);
lua_pushboolean(L, 1);
return 1;
}
static const struct
luaL_Reg fetchlib[] = {
{"parse_url", lfetch_parse_url},
{"get_url", lfetch_get_url},
{NULL, NULL}
};
int
luaopen_fetch(lua_State *L)
{
luaL_newlib(L, fetchlib);
return (1);
}
View Options

lang/rust-bootstrap/pkg-descr

Loading...
View Options

lang/rust/Makefile

Loading...
View Options

lang/rust/distinfo

Loading...