diff options
| author | Stacey Son <sson@FreeBSD.org> | 2009-05-27 22:41:28 +0000 |
|---|---|---|
| committer | Stacey Son <sson@FreeBSD.org> | 2009-05-27 22:41:28 +0000 |
| commit | 4fb6e7b12b3cd857c0749181bac9691d5480fb22 (patch) | |
| tree | 99db6a75a2ba5da63cc798ec477f5ed13b0f58b1 /cddl/contrib/opensolaris/cmd | |
| parent | bcc1d0716ae785211580346f522fbb2e22e5a240 (diff) | |
| download | src-4fb6e7b12b3cd857c0749181bac9691d5480fb22.tar.gz src-4fb6e7b12b3cd857c0749181bac9691d5480fb22.zip | |
Fix lockstat breakage to arm/powerpc buildworld.
Thanks to IBM char's are unsigned on arm/powerpc.
Approved by: gnn (mentor)
Notes
Notes:
svn path=/head/; revision=192937
Diffstat (limited to 'cddl/contrib/opensolaris/cmd')
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/lockstat/lockstat.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c b/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c index ab35a91fe24a..0a609d773cf6 100644 --- a/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c +++ b/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c @@ -46,14 +46,18 @@ #include <signal.h> #include <assert.h> -#if !defined(sun) -/* needed for FreeBSD */ +#if defined(sun) +#define GETOPT_EOF EOF +#else +/* FreeBSD */ #include <sys/time.h> #include <sys/resource.h> -typedef uintptr_t pc_t; -#define mergesort(a, b, c, d) lsmergesort(a, b, c, d) -#endif +#define mergesort(a, b, c, d) lsmergesort(a, b, c, d) +#define GETOPT_EOF (-1) + +typedef uintptr_t pc_t; +#endif /* defined(sun) */ #define LOCKSTAT_OPTSTR "x:bths:n:d:i:l:f:e:ckwWgCHEATID:RpPo:V" @@ -1059,7 +1063,7 @@ main(int argc, char **argv) char *data_buf; lsrec_t *lsp, **current, **first, **sort_buf, **merge_buf; FILE *out = stdout; - char c; + int c; pid_t child; int status; int i, j; @@ -1092,7 +1096,7 @@ main(int argc, char **argv) g_nrecs = DEFAULT_NRECS; - while ((c = getopt(argc, argv, LOCKSTAT_OPTSTR)) != EOF) { + while ((c = getopt(argc, argv, LOCKSTAT_OPTSTR)) != GETOPT_EOF) { switch (c) { case 'b': g_recsize = LS_BASIC; @@ -1386,7 +1390,7 @@ main(int argc, char **argv) dfail("failed to set 'statusrate'"); optind = 1; - while ((c = getopt(argc, argv, LOCKSTAT_OPTSTR)) != EOF) { + while ((c = getopt(argc, argv, LOCKSTAT_OPTSTR)) != GETOPT_EOF) { switch (c) { case 'x': if ((p = strchr(optarg, '=')) != NULL) |