Page MenuHomeFreeBSD
Differential D18793

Implement support for "/SYM64/" archives in ar
ClosedPublic
Actions

Authored by aryeeteygerald_rogers.com on Jan 9 2019, 5:01 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, May 15, 10:12 AM
Unknown Object (File)
Sun, May 12, 5:56 PM
Unknown Object (File)
Sun, May 12, 5:56 PM
Unknown Object (File)
Sun, May 12, 5:56 PM
Unknown Object (File)
Sun, May 12, 5:56 PM
Unknown Object (File)
Thu, May 9, 7:12 PM
Unknown Object (File)
Wed, May 1, 2:38 PM
Unknown Object (File)
Apr 23 2024, 9:58 AM
View All 84 Files
Subscribers
imp

Details

Reviewers
emaste
kaiw
markj
jkoshy_users.sourceforge.net
imp
Commits
rS346079: ar: implement support for /SYM64/ 64-bit archives
Summary

Changes to ar and libarchive to support 64-bit archives

Allows archives greater than 4GB to be created.

PR: 234454

Test Plan

Created 10 object files of 512M (using a global array of 512 million chars) and created an archive.

Also combined a 5 of these files to ensure regular archives still work.

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

aryeeteygerald_rogers.com created this revision.Jan 9 2019, 5:01 PM
emaste added a subscriber: imp.Jan 9 2019, 5:36 PM
emaste added a comment.Jan 9 2019, 7:12 PM

We can submit the libarchive changes directly upstream at https://github.com/libarchive/libarchive

emaste added a comment.Jan 11 2019, 9:40 PM
In D18793#401206, @emaste wrote:

We can submit the libarchive changes directly upstream at https://github.com/libarchive/libarchive

Gerald submitted https://github.com/libarchive/libarchive/pull/1116

emaste added a comment.Jan 21 2019, 9:16 PM

GitHub pull request 1116 has been merged, and I'm hopeful it will come back into a libarchive update in the near future.

emaste added reviewers: kaiw, markj, jkoshy_users.sourceforge.net.Feb 25 2019, 9:09 PM
aryeeteygerald_rogers.com updated this revision to Diff 56004.Apr 9 2019, 4:15 PM
aryeeteygerald_rogers.com edited the test plan for this revision. (Show Details)

Rebase changes to reflect upstream update to libarchive

Harbormaster completed remote builds in B23596: Diff 56004.Apr 9 2019, 4:15 PM
imp accepted this revision.Apr 9 2019, 5:28 PM

Couple of minor style nits, but the code looks good to my brain.

usr.bin/ar/write.c
710

Any chance you could snug the w_sz onto the prior line? Then the line break is at an operator with a lower order of precedence which is more natural.

937

This may be too wide.

This revision is now accepted and ready to land.Apr 9 2019, 5:28 PM
emaste added inline comments.Apr 9 2019, 7:37 PM
usr.bin/ar/write.c
678

this line is > 80 cols but is hard to wrap at fewer...

Maybe:

if (w_sz == sizeof(uint32_t))
        *(bsdar->s_so + i) = 
            (uint64_t)htobe32((uint32_t)(*(bsdar->s_so +
            i)) + pm_sz);
else
        *(bsdar->s_so + i) = 
            htobe64(*(bsdar->s_so + i) + pm_sz);
681

the final + here is col 81

723

, is col 81

emaste added a comment.Apr 9 2019, 11:22 PM

Some proposed style(9) fixups in https://github.com/emaste/freebsd/commit/8506f5949cb13d54a688414c5aae3f696e33db42

usr.bin/ar/write.c
713–724

style(9) nit here, space between if and (

emaste added inline comments.Apr 10 2019, 1:04 PM
usr.bin/ar/write.c
936–937

Also these casts are not necessary.

Closed by commit rS346079: ar: implement support for /SYM64/ 64-bit archives (authored by emaste). · Explain WhyApr 10 2019, 1:13 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
contrib/
libarchive/
libarchive/
5 lines
5 lines
usr.bin/
ar/
6 lines
3 lines
60 lines

Diff 52700

View Options

contrib/libarchive/libarchive/archive_read_support_format_ar.c

Loading...
View Options

contrib/libarchive/libarchive/archive_write_set_format_ar.c

Loading...
View Options

usr.bin/ar/ar.h

Loading...
View Options

usr.bin/ar/read.c

Loading...
View Options

usr.bin/ar/write.c

Loading...