cpio/cpio.patch@9dacbd1d1aa2 (annotated)
cpio/cpio.patch
Fri, 07 Sep 2012 19:08:07 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Fri, 07 Sep 2012 19:08:07 +0200
- changeset 667
- 9dacbd1d1aa2
- permissions
- -rw-r--r--
Correct build configuration in Solaris subdir, correct english grammar,
remove irrelevant strip notice, introduce custom CFLAG logic, facilitate
use of Solaris Studio compiler with needed build configuration
adjustments, conditionally build 64 bit position independent code,
and accommodate tun(7) in newer Solaris releases by renaming driver
and module from conflicting 'tun' to 'vtun'. These changes include
some nonstandard 'I give up' logic causing out of tree builds by
manipulating the PATH, for example.
| michael@612 | 1 | Index: lib/rtapelib.c |
| michael@612 | 2 | --- lib/rtapelib.c.orig 2009-03-19 12:47:19 +0100 |
| michael@612 | 3 | +++ lib/rtapelib.c 2009-06-20 17:36:22 +0200 |
| michael@612 | 4 | @@ -628,7 +628,7 @@ |
| michael@612 | 5 | { |
| michael@612 | 6 | char command_buffer[COMMAND_BUFFER_SIZE]; |
| michael@612 | 7 | char operand_buffer[UINTMAX_STRSIZE_BOUND]; |
| michael@612 | 8 | - uintmax_t u = offset < 0 ? - (uintmax_t) offset : (uintmax_t) offset; |
| michael@612 | 9 | + unsigned long u = offset < 0 ? - (unsigned long) offset : (unsigned long) offset; |
| michael@612 | 10 | char *p = operand_buffer + sizeof operand_buffer; |
| michael@612 | 11 | |
| michael@612 | 12 | *--p = 0; |
| michael@612 | 13 | @@ -670,9 +670,9 @@ |
| michael@612 | 14 | { |
| michael@612 | 15 | char command_buffer[COMMAND_BUFFER_SIZE]; |
| michael@612 | 16 | char operand_buffer[UINTMAX_STRSIZE_BOUND]; |
| michael@612 | 17 | - uintmax_t u = (((struct mtop *) argument)->mt_count < 0 |
| michael@612 | 18 | - ? - (uintmax_t) ((struct mtop *) argument)->mt_count |
| michael@612 | 19 | - : (uintmax_t) ((struct mtop *) argument)->mt_count); |
| michael@612 | 20 | + unsigned long u = (((struct mtop *) argument)->mt_count < 0 |
| michael@612 | 21 | + ? - (unsigned long) ((struct mtop *) argument)->mt_count |
| michael@612 | 22 | + : (unsigned long) ((struct mtop *) argument)->mt_count); |
| michael@612 | 23 | char *p = operand_buffer + sizeof operand_buffer; |
| michael@612 | 24 | |
| michael@612 | 25 | *--p = 0; |
| michael@612 | 26 | Index: lib/system.h |
| michael@612 | 27 | --- lib/system.h.orig 2009-06-20 10:29:22 +0200 |
| michael@612 | 28 | +++ lib/system.h 2009-06-20 17:36:22 +0200 |
| michael@612 | 29 | @@ -425,7 +425,7 @@ |
| michael@612 | 30 | |
| michael@612 | 31 | #include <intprops.h> |
| michael@612 | 32 | |
| michael@612 | 33 | -#define UINTMAX_STRSIZE_BOUND INT_BUFSIZE_BOUND (uintmax_t) |
| michael@612 | 34 | +#define UINTMAX_STRSIZE_BOUND INT_BUFSIZE_BOUND (unsigned long) |
| michael@612 | 35 | |
| michael@612 | 36 | /* Prototypes for external functions. */ |
| michael@612 | 37 | |
| michael@612 | 38 | Index: src/userspec.c |
| michael@612 | 39 | --- src/userspec.c.orig 2009-02-14 19:15:50 +0100 |
| michael@612 | 40 | +++ src/userspec.c 2009-06-20 17:41:54 +0200 |
| michael@612 | 41 | @@ -20,7 +20,6 @@ |
| michael@612 | 42 | /* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */ |
| michael@612 | 43 | |
| michael@612 | 44 | #include <system.h> |
| michael@612 | 45 | -#include <alloca.h> |
| michael@612 | 46 | #include <stdio.h> |
| michael@612 | 47 | #include <ctype.h> |
| michael@612 | 48 | #include <sys/types.h> |
