Page MenuHomeFreeBSD

fparseln(3) reduce diff against NetBSD
Needs ReviewPublic

Authored by kaktus on Apr 5 2023, 8:15 PM.
Tags
None
Referenced Files
Unknown Object (File)
Nov 10 2023, 3:21 PM
Unknown Object (File)
Oct 28 2023, 7:33 AM
Unknown Object (File)
Oct 9 2023, 2:19 PM
Unknown Object (File)
Aug 29 2023, 2:55 AM
Unknown Object (File)
May 16 2023, 3:34 PM
Subscribers

Details

Reviewers
emaste
Summary

Bring us up to date with NetBSD version by applying relevant parts
of the following changesets:

de034c63154df7bfc32e47cd61231a7987491fc0
Remove 3rd and 4th clauses in christos' license. OK christos.

3f5c26a109b5c2a480691483db66c29d7d83958d

  1. reworking PR lib/40317:

libnbcompat already contains empty fparseln.lo
so previous fix doesn't work correctly.
i've just added broken fparseln check to configure script.

  1. reworking cross build breakage under FreeBSD/MacOS X.

FreeBSD/MacOS X still have public /usr/include/runetype.h
derived from 4.4BSD-Lite. so i renamed out private header from
src/lib/libc/locale/runetype.h to src/lib/libc/locale/runetype_local.h
to solve this problems.

  1. fix build breakage when CITRUS=no was set.

Obtained from: NetBSD

https://anonhg.netbsd.org/src/rev/de034c63154d
https://anonhg.netbsd.org/src/rev/3f5c26a109b5

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

kaktus requested review of this revision.Apr 5 2023, 8:15 PM
sbin/fsck/fsck.8
1 โ†—(On Diff #119919)

Do we have all of the other (applicable) changes from NetBSD between 1.19 and 1.35?

kaktus retitled this revision from libutil, fsck: reduce diff against NetBSD to fparseln(3) reduce diff against NetBSD.
kaktus edited the summary of this revision. (Show Details)
kaktus added inline comments.
sbin/fsck/fsck.8
1 โ†—(On Diff #119919)

Good call.
It seems that our man page diverged some time ago, different parts are present in fsck and fsck_ffs between systems so I'll just drop that part from this review and let the docs@ know about the change and leave them to decide what to do about it.

I think this seems fine, dropping the 3rd and 4th clauses certainly. Is there something that motivated the macro addition, or just diff reduction against NetBSD?

lib/libutil/fparseln.c
40

hmm, NetBSD's change was:

-#if ! HAVE_FPARSELN
+#if ! HAVE_FPARSELN || BROKEN_FPARSELN

but it seems we didn't have the HAVE_FPARSELN part previously.

I think this seems fine, dropping the 3rd and 4th clauses certainly. Is there something that motivated the macro addition, or just diff reduction against NetBSD?

That was part of 3f5c26a109b5c2a480691483db66c29d7d83958d and TBH I don't believe we need anyway, I added it only to get a clean diff.

I propose to focus only on de034c63154df7bfc32e47cd61231a7987491fc0 - the removal of 4th clause. Are you happy with just that change @emaste ?