Date: Fri, 20 Sep 2024 15:04:34 +0100 From: Nuno Teixeira <eduardo@freebsd.org> To: Baptiste Daroussin <bapt@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: cd5e0d8a5152 - main - deskutils/i3status: fix disk size computation Message-ID: <CAFDf7UJEBGx0b6KqjP=NYtn%2B1YGZsk89fQvQo=WjYFF5Q5GobA@mail.gmail.com> In-Reply-To: <202409200958.48K9w1ZH033587@gitrepo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] Hello, Thank you for fast fix. It's working fine now. Cheers, Baptiste Daroussin <bapt@freebsd.org> escreveu (sexta, 20/09/2024 à(s) 10:58): > The branch main has been updated by bapt: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=cd5e0d8a5152961e09d29f3adfc0aec0c3a0d840 > > commit cd5e0d8a5152961e09d29f3adfc0aec0c3a0d840 > Author: Baptiste Daroussin <bapt@FreeBSD.org> > AuthorDate: 2024-09-20 09:53:59 +0000 > Commit: Baptiste Daroussin <bapt@FreeBSD.org> > CommitDate: 2024-09-20 09:55:04 +0000 > > deskutils/i3status: fix disk size computation > --- > deskutils/i3status/Makefile | 1 + > .../i3status/files/patch-src_print__disk__info.c | 27 > ++++++++++++++++++++++ > 2 files changed, 28 insertions(+) > > diff --git a/deskutils/i3status/Makefile b/deskutils/i3status/Makefile > index ac092d08f292..147ff2732704 100644 > --- a/deskutils/i3status/Makefile > +++ b/deskutils/i3status/Makefile > @@ -1,5 +1,6 @@ > PORTNAME= i3status > PORTVERSION= 2.15 > +PORTREVISION= 1 > CATEGORIES= deskutils > MASTER_SITES= http://i3wm.org/i3status/ > > diff --git a/deskutils/i3status/files/patch-src_print__disk__info.c > b/deskutils/i3status/files/patch-src_print__disk__info.c > new file mode 100644 > index 000000000000..e81b89e4e05d > --- /dev/null > +++ b/deskutils/i3status/files/patch-src_print__disk__info.c > @@ -0,0 +1,27 @@ > +--- src/print_disk_info.c.orig 2024-08-19 16:28:44 UTC > ++++ src/print_disk_info.c > +@@ -73,13 +73,13 @@ static bool below_threshold(struct statvfs buf, const > + } else if (strcasecmp(threshold_type, "percentage_avail") == 0) { > + return 100.0 * (double)buf.f_bavail / (double)buf.f_blocks < > low_threshold; > + } else if (strcasecmp(threshold_type, "bytes_free") == 0) { > +-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || > defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) > ++#if defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) > + return (double)buf.f_bsize * (double)buf.f_bfree < low_threshold; > + #else > + return (double)buf.f_frsize * (double)buf.f_bfree < > low_threshold; > + #endif > + } else if (strcasecmp(threshold_type, "bytes_avail") == 0) { > +-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || > defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) > ++#if defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) > + return (double)buf.f_bsize * (double)buf.f_bavail < > low_threshold; > + #else > + return (double)buf.f_frsize * (double)buf.f_bavail < > low_threshold; > +@@ -198,7 +198,7 @@ void print_disk_info(disk_info_ctx_t *ctx) { > + char string_percentage_used[STRING_SIZE]; > + char string_percentage_avail[STRING_SIZE]; > + > +-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || > defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) > ++#if defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) > + print_bytes_human(string_free, (uint64_t)buf.f_bsize * > (uint64_t)buf.f_bfree, ctx->prefix_type); > + print_bytes_human(string_used, (uint64_t)buf.f_bsize * > ((uint64_t)buf.f_blocks - (uint64_t)buf.f_bfree), ctx->prefix_type); > + print_bytes_human(string_total, (uint64_t)buf.f_bsize * > (uint64_t)buf.f_blocks, ctx->prefix_type); > -- Nuno Teixeira FreeBSD UNIX: <eduardo@FreeBSD.org> Web: https://FreeBSD.org [-- Attachment #2 --] <div dir="ltr"><div>Hello,</div><div><br></div><div>Thank you for fast fix. It's working fine now.</div><div><br></div><div>Cheers,<br></div><div><br></div><div><br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Baptiste Daroussin <<a href="mailto:bapt@freebsd.org">bapt@freebsd.org</a>> escreveu (sexta, 20/09/2024 à(s) 10:58):<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The branch main has been updated by bapt:<br> <br> URL: <a href="https://cgit.FreeBSD.org/ports/commit/?id=cd5e0d8a5152961e09d29f3adfc0aec0c3a0d840" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/ports/commit/?id=cd5e0d8a5152961e09d29f3adfc0aec0c3a0d840</a><br>; <br> commit cd5e0d8a5152961e09d29f3adfc0aec0c3a0d840<br> Author: Baptiste Daroussin <bapt@FreeBSD.org><br> AuthorDate: 2024-09-20 09:53:59 +0000<br> Commit: Baptiste Daroussin <bapt@FreeBSD.org><br> CommitDate: 2024-09-20 09:55:04 +0000<br> <br> deskutils/i3status: fix disk size computation<br> ---<br> deskutils/i3status/Makefile | 1 +<br> .../i3status/files/patch-src_print__disk__info.c | 27 ++++++++++++++++++++++<br> 2 files changed, 28 insertions(+)<br> <br> diff --git a/deskutils/i3status/Makefile b/deskutils/i3status/Makefile<br> index ac092d08f292..147ff2732704 100644<br> --- a/deskutils/i3status/Makefile<br> +++ b/deskutils/i3status/Makefile<br> @@ -1,5 +1,6 @@<br> PORTNAME= i3status<br> PORTVERSION= 2.15<br> +PORTREVISION= 1<br> CATEGORIES= deskutils<br> MASTER_SITES= <a href="http://i3wm.org/i3status/" rel="noreferrer" target="_blank">http://i3wm.org/i3status/</a><br>; <br> diff --git a/deskutils/i3status/files/patch-src_print__disk__info.c b/deskutils/i3status/files/patch-src_print__disk__info.c<br> new file mode 100644<br> index 000000000000..e81b89e4e05d<br> --- /dev/null<br> +++ b/deskutils/i3status/files/patch-src_print__disk__info.c<br> @@ -0,0 +1,27 @@<br> +--- src/print_disk_info.c.orig 2024-08-19 16:28:44 UTC<br> ++++ src/print_disk_info.c<br> +@@ -73,13 +73,13 @@ static bool below_threshold(struct statvfs buf, const <br> + } else if (strcasecmp(threshold_type, "percentage_avail") == 0) {<br> + return 100.0 * (double)buf.f_bavail / (double)buf.f_blocks < low_threshold;<br> + } else if (strcasecmp(threshold_type, "bytes_free") == 0) {<br> +-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__)<br> ++#if defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__)<br> + return (double)buf.f_bsize * (double)buf.f_bfree < low_threshold;<br> + #else<br> + return (double)buf.f_frsize * (double)buf.f_bfree < low_threshold;<br> + #endif<br> + } else if (strcasecmp(threshold_type, "bytes_avail") == 0) {<br> +-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__)<br> ++#if defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__)<br> + return (double)buf.f_bsize * (double)buf.f_bavail < low_threshold;<br> + #else<br> + return (double)buf.f_frsize * (double)buf.f_bavail < low_threshold;<br> +@@ -198,7 +198,7 @@ void print_disk_info(disk_info_ctx_t *ctx) {<br> + char string_percentage_used[STRING_SIZE];<br> + char string_percentage_avail[STRING_SIZE];<br> + <br> +-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__)<br> ++#if defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__)<br> + print_bytes_human(string_free, (uint64_t)buf.f_bsize * (uint64_t)buf.f_bfree, ctx->prefix_type);<br> + print_bytes_human(string_used, (uint64_t)buf.f_bsize * ((uint64_t)buf.f_blocks - (uint64_t)buf.f_bfree), ctx->prefix_type);<br> + print_bytes_human(string_total, (uint64_t)buf.f_bsize * (uint64_t)buf.f_blocks, ctx->prefix_type);<br> </blockquote></div><br clear="all"><br><span class="gmail_signature_prefix">-- </span><br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div><font color="#888888">Nuno Teixeira</font></div><div><div><font color="#888888"> FreeBSD UNIX: <eduardo@FreeBSD.org> Web: <a href="https://FreeBSD.org" rel="noreferrer" target="_blank">https://FreeBSD.org</a><br></font></div></div></div></div>;home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFDf7UJEBGx0b6KqjP=NYtn%2B1YGZsk89fQvQo=WjYFF5Q5GobA>