mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-09-13 18:29:47 +02:00
05b555d12b
Both programs got the "magic" string wrong, causing standard-conforming tar implementations to believe the output was just legacy tar format without any POSIX extensions. This doesn't actually matter that much, especially since pg_dump failed to fill the POSIX fields anyway, but still there is little point in emitting tar format if we can't be compliant with the standard. In addition, pg_dump failed to write the EOF marker correctly (there should be 2 blocks of zeroes not just one), pg_basebackup put the numeric group ID in the wrong place, and both programs had a pretty brain-dead idea of how to compute the checksum. Fix all that and improve the comments a bit. pg_restore is modified to accept either the correct POSIX-compliant "magic" string or the previous value. This part of the change will need to be back-patched to avoid an unnecessary compatibility break when a previous version tries to read tar-format output from 9.3 pg_dump. Brian Weaver and Tom Lane
38 lines
1.6 KiB
C
38 lines
1.6 KiB
C
/*
|
|
* src/bin/pg_dump/pg_backup_tar.h
|
|
*
|
|
* TAR Header (see "ustar interchange format" in POSIX 1003.1)
|
|
*
|
|
* Offset Length Contents
|
|
* 0 100 bytes File name ('\0' terminated, 99 maximum length)
|
|
* 100 8 bytes File mode (in octal ascii)
|
|
* 108 8 bytes User ID (in octal ascii)
|
|
* 116 8 bytes Group ID (in octal ascii)
|
|
* 124 12 bytes File size (in octal ascii)
|
|
* 136 12 bytes Modify time (Unix timestamp in octal ascii)
|
|
* 148 8 bytes Header checksum (in octal ascii)
|
|
* 156 1 bytes Type flag (see below)
|
|
* 157 100 bytes Linkname, if symlink ('\0' terminated, 99 maximum length)
|
|
* 257 6 bytes Magic ("ustar\0")
|
|
* 263 2 bytes Version ("00")
|
|
* 265 32 bytes User name ('\0' terminated, 31 maximum length)
|
|
* 297 32 bytes Group name ('\0' terminated, 31 maximum length)
|
|
* 329 8 bytes Major device ID (in octal ascii)
|
|
* 337 8 bytes Minor device ID (in octal ascii)
|
|
* 345 155 bytes File name prefix (not used in our implementation)
|
|
* 500 12 bytes Padding
|
|
*
|
|
* 512 (s+p)bytes File contents, padded out to 512-byte boundary
|
|
*/
|
|
|
|
/* The type flag defines the type of file */
|
|
#define LF_OLDNORMAL '\0' /* Normal disk file, Unix compatible */
|
|
#define LF_NORMAL '0' /* Normal disk file */
|
|
#define LF_LINK '1' /* Link to previously dumped file */
|
|
#define LF_SYMLINK '2' /* Symbolic link */
|
|
#define LF_CHR '3' /* Character special file */
|
|
#define LF_BLK '4' /* Block special file */
|
|
#define LF_DIR '5' /* Directory */
|
|
#define LF_FIFO '6' /* FIFO special file */
|
|
#define LF_CONTIG '7' /* Contiguous file */
|