bonsai/harakit
4
4
Fork 3
Code Issues 39 Pull Requests 3 Projects 1 Releases 36 Activity

Annoying little fixes that should’ve landed by now #171

Closed
emma wants to merge 0 commits from quick-fixes into trunk
pull from: quick-fixes
merge into: bonsai:trunk
Conversation 7 Commits - Files Changed -
emma commented 2025-10-26 17:14:24 -06:00
Owner
Copy Link
No description provided.
emma added the
bug
enhancement
 labels 2025-10-26 17:14:24 -06:00
emma self-assigned this 2025-10-26 17:14:25 -06:00
emma added 1 commit 2025-10-26 17:14:27 -06:00
emma requested review from silt 2025-10-26 17:14:44 -06:00
emma requested review from trinity 2025-10-26 17:14:47 -06:00
trinity reviewed 2025-10-26 22:44:08 -06:00
trinity left a comment
Owner
Copy Link

I have some questions about certain changes.

I have some questions about certain changes.
docs/mm.1
@ -64,0 +74,4 @@
.MT trinity@trinity.moe
.ME .
.\"
.SH COPYRIGHT
trinity commented 2025-10-26 22:38:50 -06:00
Owner
Copy Link

Why the second copyright?

Why the second copyright?
emma commented 2025-10-28 14:12:30 -06:00
Author
Owner
Copy Link

mistake

mistake
emma marked this conversation as resolved
src/dj.c
@ -286,2 +287,3 @@
/* easy seeking */
if (!fdisstd(io[i].fd) && lseek(io[i].fd, io[i].seek, SEEK_SET) != -1) {
if (!fdisstd(io[i].fd) && lseek(io[i].fd, io[i].seek, SEEK_SET) != -1)
{
trinity commented 2025-10-26 22:41:45 -06:00
Owner
Copy Link

Could you explain this change?

Could you explain this change?
emma commented 2025-10-28 14:12:50 -06:00
Author
Owner
Copy Link

The line did not fit within 80 columns and there was no other good place
to break it.

The line did not fit within 80 columns and there was no other good place to break it.
emma marked this conversation as resolved
emma commented 2025-10-27 01:49:42 -06:00
Author
Owner
Copy Link

@trinity commented on this pull request.

I have some questions about certain changes.

In src/dj.c:
diff --git a/src/dj.c b/src/dj.c
--- a/src/dj.c
+++ b/src/dj.c
@@ -286,2 +287,3 @@
/* easy seeking */

  • if (!fdisstd(io[i].fd) && lseek(io[i].fd, io[i].seek, SEEK_SET) != -1)
    {
  • if (!fdisstd(io[i].fd) && lseek(io[i].fd, io[i].seek, SEEK_SET) != -1)
  • {

Could you explain this change?

The line did not fit within 80 columns and there was no other good place
to break it.

In docs/mm.1:
diff --git a/docs/mm.1 b/docs/mm.1
--- a/docs/mm.1
+++ b/docs/mm.1
@@ -64,0 +74,4 @@
+.MT trinity@trinity.moe
+.ME .
+."
+.SH COPYRIGHT

Why the second copyright?

Mistake.

> *@trinity* commented on this pull request. > > I have some questions about certain changes. > > In src/dj.c: > diff --git a/src/dj.c b/src/dj.c > --- a/src/dj.c > +++ b/src/dj.c > @@ -286,2 +287,3 @@ > /* easy seeking */ > - if (!fdisstd(io[i].fd) && lseek(io[i].fd, io[i].seek, SEEK_SET) != -1) > { > + if (!fdisstd(io[i].fd) && lseek(io[i].fd, io[i].seek, SEEK_SET) != -1) > + { > > Could you explain this change? The line did not fit within 80 columns and there was no other good place to break it. > In docs/mm.1: > diff --git a/docs/mm.1 b/docs/mm.1 > --- a/docs/mm.1 > +++ b/docs/mm.1 > @@ -64,0 +74,4 @@ > +.MT trinity@trinity.moe > +.ME . > +.\" > +.SH COPYRIGHT > > Why the second copyright? Mistake.
emma added 1 commit 2025-10-27 01:54:04 -06:00
emma added 1 commit 2025-11-02 00:31:04 -06:00
emma added 2 commits 2025-11-02 01:14:33 -06:00
trinity reviewed 2025-11-02 08:49:52 -07:00
docs/mm.1
@ -24,1 +25,3 @@
Opens outputs for appending rather than updating.
Opens outputs for appending rather than updating. Implies the
.B -t
option.
trinity commented 2025-11-02 08:49:52 -07:00
Owner
Copy Link

I don't remember this being the case, I'll have to double check.

I don't remember this being the case, I'll have to double check.
trinity commented 2025-11-02 08:57:14 -07:00
Owner
Copy Link

So, the -a option is a switch meant to bitwise-or the open(2) mode argument with O_APPEND; this lack of truncation is what the kernel does, not what the program does. -a doesn't imply -t, but -t is inconsequential when -a is already set.

So, the `-a` option is a switch meant to bitwise-or the open(2) mode argument with `O_APPEND`; this lack of truncation is what the kernel does, not what the program does. `-a` doesn't imply `-t`, but `-t` is inconsequential when `-a` is already set.
emma commented 2025-11-02 12:16:30 -07:00
Author
Owner
Copy Link

This change actually fixes a bug, without it, the program exits
unsuccessfully. The problem is that if you have truncate as true (the
default behavior) and try to append, the Rust standard library returns
an error, which makes sense.

This change actually fixes a bug, without it, the program exits unsuccessfully. The problem is that if you have truncate as true (the default behavior) and try to append, the Rust standard library returns an error, which makes sense.
trinity marked this conversation as resolved
trinity reviewed 2025-11-02 08:58:46 -07:00
docs/mm.1
@ -64,0 +71,4 @@
.BR dj (1)
utility\(cqs niche.
.\"
.SH AUTHOR
trinity commented 2025-11-02 08:58:46 -07:00
Owner
Copy Link

Emma Tebibyte should be credited here as the current in-tree mm(1) implementation was mostly faer work.

Emma Tebibyte should be credited here as the current in-tree mm(1) implementation was mostly faer work.
trinity marked this conversation as resolved
trinity reviewed 2025-11-02 09:00:22 -07:00
docs/mm.1
@ -43,9 +44,6 @@ appended to the list of files to use as outputs.
.\"
.SH DIAGNOSTICS
trinity commented 2025-11-02 09:00:22 -07:00
Owner
Copy Link

It's better, functionality wise, to quit on errorful input before the error occurs.

It's better, functionality wise, to quit on errorful input before the error occurs.
trinity marked this conversation as resolved
emma added 1 commit 2025-11-02 12:20:30 -07:00
trinity approved these changes 2025-11-04 22:36:10 -07:00
emma commented 2025-11-05 13:36:44 -07:00
Author
Owner
Copy Link

Merged.

Merged.
emma closed this pull request 2025-11-05 13:36:45 -07:00
emma deleted branch quick-fixes 2025-11-06 14:11:27 -07:00

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No Reviewers
silt
trinity
Labels
Clear labels
bug
Something is not working
duplicate
This issue or pull request already exists
enhancement
New feature
help wanted
Need some help
invalid
Something is wrong
joke
you are silly!
question
More information is needed
wontfix
This won't be fixed
No Label
bug
enhancement
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
emma nitori silt trinity
No Assignees emma
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: bonsai/harakit#171
No description provided.
Delete Branch "quick-fixes"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?