Skip to content

Commit

Permalink
update ar header
Browse files Browse the repository at this point in the history
  • Loading branch information
konoui committed Jul 25, 2024
1 parent f2ad60a commit 87a694d
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 6 deletions.
53 changes: 47 additions & 6 deletions pkg/ar/ar.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ import (
"errors"
"fmt"
"io"
"io/fs"
"strconv"
"strings"
"time"
)

const (
Expand All @@ -29,6 +31,10 @@ type File struct {
type Header struct {
Name string
Size int64
ModTime time.Time
UID int
GID int
Mode fs.FileMode
nameSize int64
}

Expand Down Expand Up @@ -112,12 +118,35 @@ func (r *Reader) readHeader() (*Header, error) {
}

name := TrimTailSpace(header[0:16])
// mTime := header[16:18]
// uid, gid := header[28:34], buf[34:40]
// perm := header[40:48]
size, err := strconv.ParseInt(TrimTailSpace(header[48:58]), 10, 64)

parsedMTime, err := parseInt64(TrimTailSpace(header[16:28]))
if err != nil {
return nil, fmt.Errorf("parse mtime: %w", err)
}
modTime := time.Unix(parsedMTime, 0)

parsedUID, err := parseInt64(TrimTailSpace(header[28:34]))
if err != nil {
return nil, fmt.Errorf("parse uid: %w", err)
}

parsedGID, err := parseInt64(TrimTailSpace(header[34:40]))
if err != nil {
return nil, fmt.Errorf("parse size value of name: %v", err)
return nil, fmt.Errorf("parse gid: %w", err)
}

uid, gid := int(parsedUID), int(parsedGID)

parsedPerm, err := parseOctal(TrimTailSpace(header[40:48]))
if err != nil {
return nil, fmt.Errorf("parse mode: %w", err)
}

perm := fs.FileMode(parsedPerm)

size, err := parseInt64(TrimTailSpace(header[48:58]))
if err != nil {
return nil, fmt.Errorf("parse size value of name: %w", err)
}

endChars := header[58:60]
Expand All @@ -132,7 +161,7 @@ func (r *Reader) readHeader() (*Header, error) {
// handle BSD variant
if strings.HasPrefix(name, "#1/") {
trimmedSize := strings.TrimPrefix(name, "#1/")
parsedSize, err := strconv.ParseInt(trimmedSize, 10, 64)
parsedSize, err := parseInt64(trimmedSize)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -165,11 +194,23 @@ func (r *Reader) readHeader() (*Header, error) {
h := &Header{
Size: size,
Name: name,
ModTime: modTime,
GID: gid,
UID: uid,
Mode: perm,
nameSize: nameSize,
}
return h, nil
}

func parseInt64(s string) (int64, error) {
return strconv.ParseInt(s, 10, 64)
}

func parseOctal(s string) (int64, error) {
return strconv.ParseInt(s, 8, 64)
}

func TrimTailSpace(b []byte) string {
return strings.TrimRight(string(b), " ")
}
16 changes: 16 additions & 0 deletions pkg/ar/ar_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"debug/macho"
"encoding/hex"
"io"
"io/fs"
"os"
"path/filepath"
"reflect"
Expand Down Expand Up @@ -69,6 +70,21 @@ func TestNew(t *testing.T) {
continue
}

if tt.filename == "arm64-func1.a" && file.Name == "arm64-func1.o" {
if file.UID != 501 {
t.Errorf("[%s] uid: want %d, got %d\n", file.Name, 501, file.UID)
}
if file.GID != 20 {
t.Errorf("[%s] gid: want %d, got %d\n", file.Name, 20, file.GID)
}
if file.ModTime.Unix() != 1697716653 {
t.Errorf("[%s] modtime: want %v, got %v\n", file.Name, 1697716653, file.ModTime.Unix())
}
if file.Mode.Perm() != fs.FileMode(0644) {
t.Errorf("[%s] mode: want %d, got %d\n", file.Name, fs.FileMode(0644), file.Mode)
}
}

got = append(got, file.Name)

machoBuf := &bytes.Buffer{}
Expand Down

0 comments on commit 87a694d

Please sign in to comment.