Page MenuHomeFreeBSD
Differential D24020

lang/rust: Update to 1.42.0
ClosedPublic
Actions

Authored by tobik on Mar 10 2020, 8:05 PM.
Tags
None
Referenced Files
Unknown Object (File)
Feb 23 2025, 9:24 PM
Unknown Object (File)
Feb 16 2025, 4:16 PM
Unknown Object (File)
Dec 30 2024, 11:04 PM
Unknown Object (File)
Nov 30 2024, 1:50 AM
Unknown Object (File)
Nov 29 2024, 7:38 AM
Unknown Object (File)
Nov 25 2024, 3:52 PM
Unknown Object (File)
Nov 24 2024, 6:56 PM
Unknown Object (File)
Nov 24 2024, 9:07 AM
View All Files
Subscribers
mat
mikael

Details

Reviewers
None
Group Reviewers
rust
O5: Ports Framework(Owns No Changed Paths)
portmgr
Commits
rP528318: lang/rust: Update to 1.42.0
Summary

Scheduled to be released on 2020-03-12.

https://internals.rust-lang.org/t/rust-1-42-0-pre-release-testing/11949
https://github.com/rust-lang/rust/blob/stable/RELEASES.md#version-1420-2020-03-12

Test Plan

11.3 amd64 ok
11.3 i386 ok, consumers ok
12.1 amd64 ok, consumers ok
12.1 i386 ok
13.0 amd64 ok
13.0 i386 ok

arm64 ?
armv6 ok
armv7 ok
ppc64 elfv1 ok
ppc64 elfv2 ok

Diff Detail

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

Event Timeline

tobik created this revision.Mar 10 2020, 8:05 PM
Owners added a reviewer: O5: Ports Framework.Mar 10 2020, 8:05 PM
Herald added a reviewer: portmgr. · View Herald TranscriptMar 10 2020, 8:05 PM
Herald added a subscriber: mat. · View Herald Transcript
Harbormaster completed remote builds in B29872: Diff 69375.Mar 10 2020, 8:05 PM
tobik edited the test plan for this revision. (Show Details)Mar 11 2020, 8:06 AM
mikael added a subscriber: mikael.Mar 11 2020, 10:05 AM

I have 2 errors with lang/rust-bootstrap:

error: unnecessary parentheses around block return value
    --> src/bootstrap/lib.rs:1029:9
     |
1029 |         (target.contains("linux-gnu") || target.contains("apple-darwin"))
     |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove these parentheses
     |
     = note: `-D unused-parens` implied by `-D warnings`


error: unused extern crate
 --> src/librustc_macros/src/lib.rs:4:1
  |
4 | extern crate proc_macro;
  | ^^^^^^^^^^^^^^^^^^^^^^^^ help: remove it
  |
  = note: `-D unused-extern-crates` implied by `-D warnings`
tobik updated this revision to Diff 69388.Mar 11 2020, 10:29 AM
  • Attempt to unbreak rust-bootstrap by turning off deny-warnings
Harbormaster completed remote builds in B29875: Diff 69388.Mar 11 2020, 10:30 AM
mikael added a comment.Mar 11 2020, 12:56 PM
In D24020#528288, @tobik wrote:
  • Attempt to unbreak rust-bootstrap by turning off deny-warnings

That fixed the issue, thanks.

mikael added a comment.EditedMar 11 2020, 7:28 PM

OK on 13amd64, 13i386, armv7 and ppc64 elfv2. I'll have the result for other arches tomorrow.

edit: ok on armv6 and ppc64 elfv1
I have a problem on aarch64:

command did not execute successfully: "/usr/ports/lang/rust/work/rustc-1.42.0-src/build/aarch64-unknown-freebsd/stage0/bin/cargo" "build" "-Zconfig-profile" "--target" "aarch64-unknown-freebsd" "-Zbinary-dep-de
pinfo" "-j" "4" "-v" "--release" "--frozen" "--manifest-path" "/usr/ports/lang/rust/work/rustc-1.42.0-src/src/tools/miri/Cargo.toml" "--message-format" "json-render-diagnostics"
expected success, got: signal: 11
      < ToolBuild { compiler: Compiler { stage: 2, host: "aarch64-unknown-freebsd" }, target: "aarch64-unknown-freebsd", tool: "cargo-miri", path: "src/tools/miri", mode: ToolRustc, is_optional_tool: true, sour
ce_type: Submodule, extra_features: [] }
    < CargoMiri { compiler: Compiler { stage: 2, host: "aarch64-unknown-freebsd" }, target: "aarch64-unknown-freebsd", extra_features: [] }
thread 'main' panicked at 'Unable to build cargo miri', src/bootstrap/dist.rs:65:9
tobik edited the test plan for this revision. (Show Details)Mar 12 2020, 10:00 AM
tobik added a comment.Mar 12 2020, 10:04 AM
In D24020#528377, @mikael wrote:

I have a problem on aarch64:

command did not execute successfully: "/usr/ports/lang/rust/work/rustc-1.42.0-src/build/aarch64-unknown-freebsd/stage0/bin/cargo" "build" "-Zconfig-profile" "--target" "aarch64-unknown-freebsd" "-Zbinary-dep-de
pinfo" "-j" "4" "-v" "--release" "--frozen" "--manifest-path" "/usr/ports/lang/rust/work/rustc-1.42.0-src/src/tools/miri/Cargo.toml" "--message-format" "json-render-diagnostics"
expected success, got: signal: 11
      < ToolBuild { compiler: Compiler { stage: 2, host: "aarch64-unknown-freebsd" }, target: "aarch64-unknown-freebsd", tool: "cargo-miri", path: "src/tools/miri", mode: ToolRustc, is_optional_tool: true, sour
ce_type: Submodule, extra_features: [] }
    < CargoMiri { compiler: Compiler { stage: 2, host: "aarch64-unknown-freebsd" }, target: "aarch64-unknown-freebsd", extra_features: [] }
thread 'main' panicked at 'Unable to build cargo miri', src/bootstrap/dist.rs:65:9

Do you have a full log?

tobik edited the test plan for this revision. (Show Details)Mar 12 2020, 10:05 AM
mikael added a comment.Mar 12 2020, 5:49 PM
In D24020#528541, @tobik wrote:
In D24020#528377, @mikael wrote:

I have a problem on aarch64:

command did not execute successfully: "/usr/ports/lang/rust/work/rustc-1.42.0-src/build/aarch64-unknown-freebsd/stage0/bin/cargo" "build" "-Zconfig-profile" "--target" "aarch64-unknown-freebsd" "-Zbinary-dep-de
pinfo" "-j" "4" "-v" "--release" "--frozen" "--manifest-path" "/usr/ports/lang/rust/work/rustc-1.42.0-src/src/tools/miri/Cargo.toml" "--message-format" "json-render-diagnostics"
expected success, got: signal: 11
      < ToolBuild { compiler: Compiler { stage: 2, host: "aarch64-unknown-freebsd" }, target: "aarch64-unknown-freebsd", tool: "cargo-miri", path: "src/tools/miri", mode: ToolRustc, is_optional_tool: true, sour
ce_type: Submodule, extra_features: [] }
    < CargoMiri { compiler: Compiler { stage: 2, host: "aarch64-unknown-freebsd" }, target: "aarch64-unknown-freebsd", extra_features: [] }
thread 'main' panicked at 'Unable to build cargo miri', src/bootstrap/dist.rs:65:9

Do you have a full log?

No, it's probably a problem on my board. I'm rebuilding it.

mikael added a comment.Mar 12 2020, 7:07 PM

It's ok on aarch64

This revision was not accepted when it landed; it landed in state Needs Review.Mar 12 2020, 7:39 PM
Closed by commit rP528318: lang/rust: Update to 1.42.0 (authored by tobik). · Explain Why
This revision was automatically updated to reflect the committed changes.
tobik added a commit: rP528318: lang/rust: Update to 1.42.0.

Revision Contents
Changeset List

PathSize
Mk/
Uses/
2 lines
audio/
ncspot/
2 lines
spotify-tui/
1 line
spotifyd/
2 lines
benchmarks/
hyperfine/
2 lines
devel/
bingrep/
2 lines
cargo-c/
2 lines
cargo-tree/
1 line
git-absorb/
2 lines
git-delta/
2 lines
interactive_rebase_tool/
2 lines
pijul/
2 lines
racer/
2 lines
rust-bindgen/
2 lines
rust-cbindgen/
2 lines
sccache/
2 lines
tokei/
2 lines
dns/
doh-proxy/
2 lines
editors/
kak-lsp/
2 lines
parinfer-rust/
1 line
xi-core/
2 lines
xi-term/
2 lines
games/
dose-response/
2 lines
genact/
2 lines
jaggedalliance2/
2 lines
veloren/
2 lines
graphics/
librsvg2-rust/
2 lines
pastel/
1 line
rx/
2 lines
svgbob/
2 lines
lang/
rust-bootstrap/
2 lines
6 lines
rust/
10 lines
90 lines
files/
20 lines
13 lines
powerpc64-elfv2/
6 lines
mail/
thunderbird/
2 lines
misc/
broot/
1 line
multimedia/
librav1e/
2 lines
rav1e/
2 lines
termplay/
2 lines
net-im/
fractal/
2 lines
net-p2p/
parity-ethereum/
2 lines
net/
boringtun/
2 lines
findomain/
1 line
proby/
2 lines
rabbiteer/
2 lines
routinator/
2 lines
security/
acmed/
2 lines
cargo-audit/
2 lines
cloak/
2 lines
suricata/
2 lines
suricata5/
2 lines
shells/
ion/
2 lines
starship/
2 lines
sysutils/
dua-cli/
1 line
exa/
2 lines
fd/
2 lines
flowgger/
2 lines
fselect/
1 line
fusefs-sandboxfs/
2 lines
hexyl/
2 lines
potnet/
2 lines
tealdeer/
1 line
vector/
2 lines
textproc/
bat/
2 lines
ripgrep/
2 lines
sd/
2 lines
sonic/
2 lines
xsv-rs/
2 lines
www/
cliqz/
2 lines
ffsend/
2 lines
firefox-esr/
2 lines
firefox/
2 lines
geckodriver/
2 lines
jwt-cli/
2 lines
miniserve/
2 lines
newsboat/
2 lines
websocat/
2 lines
zola/
2 lines
x11/
admiral/
2 lines
alacritty/
2 lines
squeekboard/
2 lines

Diff 69375

View Options

Mk/Uses/cargo.mk

  • 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

audio/ncspot/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

audio/spotify-tui/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

audio/spotifyd/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

benchmarks/hyperfine/Makefile

Loading...
View Options

devel/bingrep/Makefile

Loading...
View Options

devel/cargo-c/Makefile

Loading...
View Options

devel/cargo-tree/Makefile

Loading...
View Options

devel/git-absorb/Makefile

Loading...
View Options

devel/git-delta/Makefile

Loading...
View Options

devel/interactive_rebase_tool/Makefile

Loading...
View Options

devel/pijul/Makefile

Loading...
View Options

devel/racer/Makefile

Loading...
View Options

devel/rust-bindgen/Makefile

Loading...
View Options

devel/rust-cbindgen/Makefile

Loading...
View Options

devel/sccache/Makefile

Loading...
View Options

devel/tokei/Makefile

Loading...
View Options

dns/doh-proxy/Makefile

Loading...
View Options

editors/kak-lsp/Makefile

Loading...
View Options

editors/parinfer-rust/Makefile

Loading...
View Options

editors/xi-core/Makefile

Loading...
View Options

editors/xi-term/Makefile

Loading...
View Options

games/dose-response/Makefile

Loading...
View Options

games/genact/Makefile

Loading...
View Options

games/jaggedalliance2/Makefile

Loading...
View Options

games/veloren/Makefile

Loading...
View Options

graphics/librsvg2-rust/Makefile

Loading...
View Options

graphics/pastel/Makefile

Loading...
View Options

graphics/rx/Makefile

Loading...
View Options

graphics/svgbob/Makefile

Loading...
View Options

lang/rust-bootstrap/Makefile

Loading...
View Options

lang/rust-bootstrap/distinfo

Loading...
View Options

lang/rust/Makefile

Loading...
View Options

lang/rust/distinfo

Loading...
View Options

lang/rust/files/patch-src_bootstrap_native.rs

Loading...
View Options

lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs

Loading...
View Options

lang/rust/files/powerpc64-elfv2/patch-src_librustc__target_abi_call_powerpc64.rs

Loading...
View Options

mail/thunderbird/Makefile

Loading...
View Options

misc/broot/Makefile

Loading...
View Options

multimedia/librav1e/Makefile

Loading...
View Options

multimedia/rav1e/Makefile

Loading...
View Options

multimedia/termplay/Makefile

Loading...
View Options

net-im/fractal/Makefile

Loading...
View Options

net-p2p/parity-ethereum/Makefile

Loading...
View Options

net/boringtun/Makefile

Loading...
View Options

net/findomain/Makefile

Loading...
View Options

net/proby/Makefile

Loading...
View Options

net/rabbiteer/Makefile

Loading...
View Options

net/routinator/Makefile

Loading...
View Options

security/acmed/Makefile

Loading...
View Options

security/cargo-audit/Makefile

Loading...
View Options

security/cloak/Makefile

Loading...
View Options

security/suricata/Makefile

Loading...
View Options

security/suricata5/Makefile

Loading...
View Options

shells/ion/Makefile

Loading...
View Options

shells/starship/Makefile

Loading...
View Options

sysutils/dua-cli/Makefile

Loading...
View Options

sysutils/exa/Makefile

Loading...
View Options

sysutils/fd/Makefile

Loading...
View Options

sysutils/flowgger/Makefile

Loading...
View Options

sysutils/fselect/Makefile

Loading...
View Options

sysutils/fusefs-sandboxfs/Makefile

Loading...
View Options

sysutils/hexyl/Makefile

Loading...
View Options

sysutils/potnet/Makefile

Loading...
View Options

sysutils/tealdeer/Makefile

Loading...
View Options

sysutils/vector/Makefile

Loading...
View Options

textproc/bat/Makefile

Loading...
View Options

textproc/ripgrep/Makefile

Loading...
View Options

textproc/sd/Makefile

Loading...
View Options

textproc/sonic/Makefile

Loading...
View Options

textproc/xsv-rs/Makefile

Loading...
View Options

www/cliqz/Makefile

Loading...
View Options

www/ffsend/Makefile

Loading...
View Options

www/firefox-esr/Makefile

Loading...
View Options

www/firefox/Makefile

Loading...
View Options

www/geckodriver/Makefile

Loading...
View Options

www/jwt-cli/Makefile

Loading...
View Options

www/miniserve/Makefile

Loading...
View Options

www/newsboat/Makefile

Loading...
View Options

www/websocat/Makefile

Loading...
View Options

www/zola/Makefile

Loading...
View Options

x11/admiral/Makefile

Loading...
View Options

x11/alacritty/Makefile

Loading...
View Options

x11/squeekboard/Makefile

Loading...