Lines 1-81
Link Here
|
1 |
--- crypt/getsysnoise.C.orig 2005-11-01 16:20:36.000000000 +0000 |
|
|
2 |
+++ crypt/getsysnoise.C 2007-07-12 22:38:59.000000000 +0000 |
3 |
@@ -27,57 +27,57 @@ |
4 |
#include <sys/resource.h> |
5 |
|
6 |
char *const noiseprogs[][5] = { |
7 |
- { PATH_PS, "laxwww" }, |
8 |
- { PATH_PS, "-al" }, |
9 |
- { PATH_LS, "-nfail", "/tmp/." }, |
10 |
+ { (char *)PATH_PS, (char *)"laxwww" }, |
11 |
+ { (char *)PATH_PS, (char *)"-al" }, |
12 |
+ { (char *)PATH_LS, (char *)"-nfail", (char *)"/tmp/." }, |
13 |
#ifdef PATH_NETSTAT |
14 |
- { PATH_NETSTAT, "-s" }, |
15 |
- { PATH_NETSTAT, "-an" }, |
16 |
- { PATH_NETSTAT, "-in" }, |
17 |
+ { (char *)PATH_NETSTAT, (char *)"-s" }, |
18 |
+ { (char *)PATH_NETSTAT, (char *)"-an" }, |
19 |
+ { (char *)PATH_NETSTAT, (char *)"-in" }, |
20 |
#endif /* PATH_NETSTAT */ |
21 |
#ifdef PATH_NTPQ |
22 |
- { PATH_NTPQ, "-np" }, |
23 |
+ { (char *)PATH_NTPQ, (char *)"-np" }, |
24 |
#endif /* PATH_NTPQ */ |
25 |
#ifdef PATH_W |
26 |
- { PATH_W }, |
27 |
+ { (char *)PATH_W }, |
28 |
#endif /* PATH_W */ |
29 |
#ifdef PATH_NFSSTAT |
30 |
- { PATH_NFSSTAT }, |
31 |
+ { (char *)PATH_NFSSTAT }, |
32 |
#endif /* PATH_NFSSTAT */ |
33 |
#ifdef PATH_VNSTAT |
34 |
- { PATH_VMSTAT }, |
35 |
- { PATH_VMSTAT, "-i" }, |
36 |
- { PATH_VMSTAT, "-s" }, |
37 |
+ { (char *)PATH_VMSTAT }, |
38 |
+ { (char *)PATH_VMSTAT, (char *)"-i" }, |
39 |
+ { (char *)PATH_VMSTAT, (char *)"-s" }, |
40 |
#endif /* PATH_VNSTAT */ |
41 |
#ifdef PATH_IOSTAT |
42 |
#if defined (__linux__) || defined (__osf__) |
43 |
- { PATH_IOSTAT }, |
44 |
+ { (char *)PATH_IOSTAT }, |
45 |
#else /* not linux or osf */ |
46 |
- { PATH_IOSTAT, "-I" }, |
47 |
+ { (char *)PATH_IOSTAT, (char *)"-I" }, |
48 |
#endif /* not linux or osf */ |
49 |
#endif /* PATH_IOSTAT */ |
50 |
#ifdef PATH_LSOF |
51 |
- { PATH_LSOF, "-bwn", |
52 |
+ { (char *)PATH_LSOF, (char *)"-bwn", |
53 |
# ifdef LSOF_DEVCACHE |
54 |
- "-Di" |
55 |
+ (char *)"-Di" |
56 |
# endif /* LSOF_DEVCACHE */ |
57 |
}, |
58 |
#else /* no lsof */ |
59 |
# ifdef PATH_FSTAT |
60 |
- { PATH_FSTAT }, |
61 |
+ { (char *)PATH_FSTAT }, |
62 |
# endif /* PATH_FSTAT */ |
63 |
# ifdef PATH_PSTAT |
64 |
- { PATH_PSTAT, "-f" }, |
65 |
+ { (char *)PATH_PSTAT, (char *)"-f" }, |
66 |
# endif /* PATH_PSTAT */ |
67 |
#endif /* no lsof */ |
68 |
#ifdef PATH_PSTAT |
69 |
- { PATH_PSTAT, "-t" }, |
70 |
+ { (char *)PATH_PSTAT, (char *)"-t" }, |
71 |
# if defined (__OpenBSD__) || defined (__NetBSD__) || defined (__FreeBSD__) |
72 |
- { PATH_PSTAT, "-v" }, |
73 |
+ { (char *)PATH_PSTAT, (char *)"-v" }, |
74 |
# endif /* open/net/freebsd */ |
75 |
#endif /* PATH_PSTAT */ |
76 |
#ifdef PATH_NFSSTAT |
77 |
- { PATH_NFSSTAT }, |
78 |
+ { (char *)PATH_NFSSTAT }, |
79 |
#endif /* PATH_NFSSTAT */ |
80 |
#if 0 |
81 |
{ PATH_RUP }, |