diff options
| author | Philip Warner <pjw@rhyme.com.au> | 2000-10-24 13:24:30 +0000 |
|---|---|---|
| committer | Philip Warner <pjw@rhyme.com.au> | 2000-10-24 13:24:30 +0000 |
| commit | 9cbb5fcd2b1aa0affc19394fd5b007ed94965ec5 (patch) | |
| tree | 408e32775b02d71cc49a40fa92e26cf5af3e9d3f /src/bin/pg_dump/pg_backup_tar.c | |
| parent | db2faa943a0d3517f9e9641b9012d81ecc870ff6 (diff) | |
Various fixes to TAR header format
Fix for endian bug in TAR output
Nicer error messages in pg_dump
Diffstat (limited to 'src/bin/pg_dump/pg_backup_tar.c')
| -rw-r--r-- | src/bin/pg_dump/pg_backup_tar.c | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c index 6a3b2122064..674c24191dc 100644 --- a/src/bin/pg_dump/pg_backup_tar.c +++ b/src/bin/pg_dump/pg_backup_tar.c @@ -673,8 +673,8 @@ static void _LoadBlobs(ArchiveHandle* AH, RestoreOptions *ropt) static int _WriteByte(ArchiveHandle* AH, const int i) { lclContext* ctx = (lclContext*)AH->formatData; - int res; - int b = i; + int res; + char b = i; /* Avoid endian problems */ res = tarWrite(&b, 1, ctx->FH); if (res != EOF) { @@ -1088,28 +1088,34 @@ static void _tarWriteHeader(TAR_MEMBER* th) sprintf(&h[100], "100600 "); /* User ID 8 */ - sprintf(&h[108], " 0 "); + sprintf(&h[108], " 04000 "); /* Group 8 */ - sprintf(&h[116], " 0 "); + sprintf(&h[116], " 02000 "); /* File size 12 */ - sprintf(&h[124], "%12o", th->fileLen); + sprintf(&h[124], "%10o ", th->fileLen); /* Mod Time 12 */ - sprintf(&h[136], "%12o", (int)time(NULL)); + sprintf(&h[136], "%10o ", (int)time(NULL)); /* Checksum 8 */ - sprintf(&h[148], "%8o", lastSum); + sprintf(&h[148], "%6o ", lastSum); - /* Link 1 */ - sprintf(&h[156], "%c", LF_NORMAL); + /* Type 1 */ + /* sprintf(&h[156], "%c", LF_NORMAL); */ + sprintf(&h[156], "0"); /* Link name 100 (NULL) */ /* Magic 8 */ sprintf(&h[257], "ustar "); + /* GNU Version... + * sprintf(&h[257], "ustar"); + * sprintf(&h[263], "00"); + */ + /* User 32 */ sprintf(&h[265], "%.31s", ""); /* How do I get username reliably? Do I need to? */ @@ -1117,15 +1123,15 @@ static void _tarWriteHeader(TAR_MEMBER* th) sprintf(&h[297], "%.31s", ""); /* How do I get group reliably? Do I need to? */ /* Maj Dev 8 */ - /* sprintf(&h[329], "%8o", 0); */ + /* sprintf(&h[329], "%6o ", 0); */ /* Min Dev */ - /* sprintf(&h[337], "%8o", 0); */ + /* sprintf(&h[337], "%6o ", 0); */ while ( (sum = _tarChecksum(h)) != lastSum) { - sprintf(&h[148], "%8o", sum); + sprintf(&h[148], "%6o ", sum); lastSum = sum; } |