aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-08-02 09:58:41 +0000
committerEric Andersen <andersen@codepoet.org>2001-08-02 09:58:41 +0000
commit23b1e5c7df2e619654d0a53785fcdef5072b40ed (patch)
tree5a9f3f41d2c985f341ad8842ec688d28c6cb9613
parent879d6c85af32a368feae1625b38716ea493de699 (diff)
downloadbusybox-w32-23b1e5c7df2e619654d0a53785fcdef5072b40ed.tar.gz
busybox-w32-23b1e5c7df2e619654d0a53785fcdef5072b40ed.tar.bz2
busybox-w32-23b1e5c7df2e619654d0a53785fcdef5072b40ed.zip
Some libc5 cleanups
-rw-r--r--libbb/unarchive.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libbb/unarchive.c b/libbb/unarchive.c
index ca654a6ca..91db2e3b1 100644
--- a/libbb/unarchive.c
+++ b/libbb/unarchive.c
@@ -188,7 +188,7 @@ char *extract_archive(FILE *src_stream, FILE *out_stream, const file_header_t *f
188 * file pointed to, so dont try and change the date or mode, lchown does 188 * file pointed to, so dont try and change the date or mode, lchown does
189 * does the right thing, but isnt available in older versions of libc */ 189 * does the right thing, but isnt available in older versions of libc */
190 if (S_ISLNK(file_entry->mode)) { 190 if (S_ISLNK(file_entry->mode)) {
191#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) 191#if (__GLIBC__ > 2) && (__GLIBC_MINOR__ > 1)
192 lchown(full_name, file_entry->uid, file_entry->gid); 192 lchown(full_name, file_entry->uid, file_entry->gid);
193#endif 193#endif
194 } else { 194 } else {
@@ -392,7 +392,8 @@ file_header_t *get_header_cpio(FILE *src_stream)
392 case '1': /* "newc" header format */ 392 case '1': /* "newc" header format */
393 cpio_entry = (file_header_t *) xcalloc(1, sizeof(file_header_t)); 393 cpio_entry = (file_header_t *) xcalloc(1, sizeof(file_header_t));
394 sscanf(cpio_header, "%6c%8x%8x%8x%8x%8x%8lx%8lx%16c%8x%8x%8x%8c", 394 sscanf(cpio_header, "%6c%8x%8x%8x%8x%8x%8lx%8lx%16c%8x%8x%8x%8c",
395 dummy, &inode, &cpio_entry->mode, &cpio_entry->uid, &cpio_entry->gid, 395 dummy, &inode, (unsigned int*)&cpio_entry->mode,
396 (unsigned int*)&cpio_entry->uid, (unsigned int*)&cpio_entry->gid,
396 &nlink, &cpio_entry->mtime, &cpio_entry->size, 397 &nlink, &cpio_entry->mtime, &cpio_entry->size,
397 dummy, &major, &minor, &namesize, dummy); 398 dummy, &major, &minor, &namesize, dummy);
398 399