diff options
| author | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2004-07-26 09:11:12 +0000 |
|---|---|---|
| committer | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2004-07-26 09:11:12 +0000 |
| commit | 9cdf461f9fa82384c18bc1e149fb70d4243995f4 (patch) | |
| tree | 46c3a59fa158ebbd7303454f2657c330abfc24fe /archival | |
| parent | 9d39a896a95f562a8229c88ed1fdeaa929a06010 (diff) | |
| download | busybox-w32-9cdf461f9fa82384c18bc1e149fb70d4243995f4.tar.gz busybox-w32-9cdf461f9fa82384c18bc1e149fb70d4243995f4.tar.bz2 busybox-w32-9cdf461f9fa82384c18bc1e149fb70d4243995f4.zip | |
BusyBox has no business hard coding the number of major and minor bits for a
dev_t. This is especially important now that the user space concept of a dev_t
and the kernel concept of a dev_t are divergant. The only bit of user space
allowed to know the number of major and minor bits is include/sys/sysmacros.h
(i.e. part of libc). When used with a current C library and a 2.6.x kernel,
this fix should allow BusyBox to support wide device major/minor numbers.
-Erik
git-svn-id: svn://busybox.net/trunk/busybox@9015 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'archival')
| -rw-r--r-- | archival/libunarchive/get_header_cpio.c | 3 | ||||
| -rw-r--r-- | archival/libunarchive/get_header_tar.c | 4 | ||||
| -rw-r--r-- | archival/tar.c | 14 |
3 files changed, 9 insertions, 12 deletions
diff --git a/archival/libunarchive/get_header_cpio.c b/archival/libunarchive/get_header_cpio.c index f72c37634..11925c4e3 100644 --- a/archival/libunarchive/get_header_cpio.c +++ b/archival/libunarchive/get_header_cpio.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <stdlib.h> | 18 | #include <stdlib.h> |
| 19 | #include <string.h> | 19 | #include <string.h> |
| 20 | #include <unistd.h> | 20 | #include <unistd.h> |
| 21 | #include <sys/sysmacros.h> /* major() and minor() */ | ||
| 21 | #include "unarchive.h" | 22 | #include "unarchive.h" |
| 22 | #include "libbb.h" | 23 | #include "libbb.h" |
| 23 | 24 | ||
| @@ -143,7 +144,7 @@ extern char get_header_cpio(archive_handle_t *archive_handle) | |||
| 143 | } | 144 | } |
| 144 | } | 145 | } |
| 145 | } | 146 | } |
| 146 | file_header->device = (major << 8) | minor; | 147 | file_header->device = makedev(major, minor); |
| 147 | 148 | ||
| 148 | if (archive_handle->filter(archive_handle) == EXIT_SUCCESS) { | 149 | if (archive_handle->filter(archive_handle) == EXIT_SUCCESS) { |
| 149 | archive_handle->action_data(archive_handle); | 150 | archive_handle->action_data(archive_handle); |
diff --git a/archival/libunarchive/get_header_tar.c b/archival/libunarchive/get_header_tar.c index 33f19c60a..1ad9ac5e5 100644 --- a/archival/libunarchive/get_header_tar.c +++ b/archival/libunarchive/get_header_tar.c | |||
| @@ -121,8 +121,8 @@ extern char get_header_tar(archive_handle_t *archive_handle) | |||
| 121 | file_header->mtime = strtol(tar.formated.mtime, NULL, 8); | 121 | file_header->mtime = strtol(tar.formated.mtime, NULL, 8); |
| 122 | file_header->link_name = (tar.formated.linkname[0] != '\0') ? | 122 | file_header->link_name = (tar.formated.linkname[0] != '\0') ? |
| 123 | bb_xstrdup(tar.formated.linkname) : NULL; | 123 | bb_xstrdup(tar.formated.linkname) : NULL; |
| 124 | file_header->device = (dev_t) ((strtol(tar.formated.devmajor, NULL, 8) << 8) + | 124 | file_header->device = makedev(strtol(tar.formated.devmajor, NULL, 8), |
| 125 | strtol(tar.formated.devminor, NULL, 8)); | 125 | strtol(tar.formated.devminor, NULL, 8)); |
| 126 | 126 | ||
| 127 | /* Set bits 0-11 of the files mode */ | 127 | /* Set bits 0-11 of the files mode */ |
| 128 | file_header->mode = 07777 & strtol(tar.formated.mode, NULL, 8); | 128 | file_header->mode = 07777 & strtol(tar.formated.mode, NULL, 8); |
diff --git a/archival/tar.c b/archival/tar.c index 2de6454e7..689dd1424 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
| @@ -49,6 +49,7 @@ | |||
| 49 | #include <signal.h> | 49 | #include <signal.h> |
| 50 | #include <sys/wait.h> | 50 | #include <sys/wait.h> |
| 51 | #include <sys/socket.h> | 51 | #include <sys/socket.h> |
| 52 | #include <sys/sysmacros.h> /* major() and minor() */ | ||
| 52 | #include "unarchive.h" | 53 | #include "unarchive.h" |
| 53 | #include "busybox.h" | 54 | #include "busybox.h" |
| 54 | 55 | ||
| @@ -58,11 +59,6 @@ | |||
| 58 | # define TAR_MAGIC "ustar" /* ustar and a null */ | 59 | # define TAR_MAGIC "ustar" /* ustar and a null */ |
| 59 | # define TAR_VERSION " " /* Be compatable with GNU tar format */ | 60 | # define TAR_VERSION " " /* Be compatable with GNU tar format */ |
| 60 | 61 | ||
| 61 | # ifndef MAJOR | ||
| 62 | # define MAJOR(dev) (((dev)>>8)&0xff) | ||
| 63 | # define MINOR(dev) ((dev)&0xff) | ||
| 64 | # endif | ||
| 65 | |||
| 66 | static const int TAR_BLOCK_SIZE = 512; | 62 | static const int TAR_BLOCK_SIZE = 512; |
| 67 | static const int TAR_MAGIC_LEN = 6; | 63 | static const int TAR_MAGIC_LEN = 6; |
| 68 | static const int TAR_VERSION_LEN = 2; | 64 | static const int TAR_VERSION_LEN = 2; |
| @@ -262,15 +258,15 @@ static inline int writeTarHeader(struct TarBallInfo *tbInfo, | |||
| 262 | } else if (S_ISCHR(statbuf->st_mode)) { | 258 | } else if (S_ISCHR(statbuf->st_mode)) { |
| 263 | header.typeflag = CHRTYPE; | 259 | header.typeflag = CHRTYPE; |
| 264 | putOctal(header.devmajor, sizeof(header.devmajor), | 260 | putOctal(header.devmajor, sizeof(header.devmajor), |
| 265 | MAJOR(statbuf->st_rdev)); | 261 | major(statbuf->st_rdev)); |
| 266 | putOctal(header.devminor, sizeof(header.devminor), | 262 | putOctal(header.devminor, sizeof(header.devminor), |
| 267 | MINOR(statbuf->st_rdev)); | 263 | minor(statbuf->st_rdev)); |
| 268 | } else if (S_ISBLK(statbuf->st_mode)) { | 264 | } else if (S_ISBLK(statbuf->st_mode)) { |
| 269 | header.typeflag = BLKTYPE; | 265 | header.typeflag = BLKTYPE; |
| 270 | putOctal(header.devmajor, sizeof(header.devmajor), | 266 | putOctal(header.devmajor, sizeof(header.devmajor), |
| 271 | MAJOR(statbuf->st_rdev)); | 267 | major(statbuf->st_rdev)); |
| 272 | putOctal(header.devminor, sizeof(header.devminor), | 268 | putOctal(header.devminor, sizeof(header.devminor), |
| 273 | MINOR(statbuf->st_rdev)); | 269 | minor(statbuf->st_rdev)); |
| 274 | } else if (S_ISFIFO(statbuf->st_mode)) { | 270 | } else if (S_ISFIFO(statbuf->st_mode)) { |
| 275 | header.typeflag = FIFOTYPE; | 271 | header.typeflag = FIFOTYPE; |
| 276 | } else if (S_ISREG(statbuf->st_mode)) { | 272 | } else if (S_ISREG(statbuf->st_mode)) { |