| 1 |
< |
/* |
| 2 |
< |
* i-scream central monitoring system |
| 1 |
> |
/* |
| 2 |
> |
* i-scream libstatgrab |
| 3 |
|
* http://www.i-scream.org |
| 4 |
< |
* Copyright (C) 2000-2003 i-scream |
| 4 |
> |
* Copyright (C) 2000-2004 i-scream |
| 5 |
|
* |
| 6 |
< |
* This program is free software; you can redistribute it and/or |
| 7 |
< |
* modify it under the terms of the GNU General Public License |
| 8 |
< |
* as published by the Free Software Foundation; either version 2 |
| 9 |
< |
* of the License, or (at your option) any later version. |
| 6 |
> |
* This library is free software; you can redistribute it and/or |
| 7 |
> |
* modify it under the terms of the GNU Lesser General Public |
| 8 |
> |
* License as published by the Free Software Foundation; either |
| 9 |
> |
* version 2.1 of the License, or (at your option) any later version. |
| 10 |
|
* |
| 11 |
< |
* This program is distributed in the hope that it will be useful, |
| 11 |
> |
* This library is distributed in the hope that it will be useful, |
| 12 |
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 13 |
< |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 14 |
< |
* GNU General Public License for more details. |
| 13 |
> |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 14 |
> |
* Lesser General Public License for more details. |
| 15 |
|
* |
| 16 |
< |
* You should have received a copy of the GNU General Public License |
| 17 |
< |
* along with this program; if not, write to the Free Software |
| 18 |
< |
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
| 16 |
> |
* You should have received a copy of the GNU Lesser General Public |
| 17 |
> |
* License along with this library; if not, write to the Free Software |
| 18 |
> |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA |
| 19 |
> |
* 02111-1307 USA |
| 20 |
> |
* |
| 21 |
> |
* $Id$ |
| 22 |
|
*/ |
| 23 |
|
|
| 24 |
|
#ifdef HAVE_CONFIG_H |
| 28 |
|
#include <stdio.h> |
| 29 |
|
#include <string.h> |
| 30 |
|
#include <stdlib.h> |
| 31 |
+ |
#include <unistd.h> |
| 32 |
|
#include <sys/types.h> |
| 33 |
|
#include <regex.h> |
| 34 |
|
#ifdef ALLBSD |
| 35 |
|
#include <fcntl.h> |
| 36 |
+ |
#endif |
| 37 |
+ |
#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD) |
| 38 |
|
#include <kvm.h> |
| 39 |
+ |
#include <paths.h> |
| 40 |
|
#endif |
| 41 |
< |
#ifdef NETBSD |
| 41 |
> |
#if defined(NETBSD) || defined(OPENBSD) |
| 42 |
|
#include <uvm/uvm_extern.h> |
| 43 |
+ |
#include <sys/param.h> |
| 44 |
+ |
#include <sys/sysctl.h> |
| 45 |
|
#endif |
| 46 |
|
|
| 47 |
|
#include "tools.h" |
| 48 |
+ |
#include "statgrab.h" |
| 49 |
|
|
| 50 |
|
#ifdef SOLARIS |
| 51 |
+ |
#ifdef HAVE_LIBDEVINFO_H |
| 52 |
|
#include <libdevinfo.h> |
| 53 |
+ |
#endif |
| 54 |
|
#include <kstat.h> |
| 55 |
|
#include <unistd.h> |
| 56 |
|
#include <ctype.h> |
| 62 |
|
#include <dirent.h> |
| 63 |
|
#endif |
| 64 |
|
|
| 65 |
< |
#ifdef SOLARIS |
| 65 |
> |
#if defined(SOLARIS) && defined(HAVE_LIBDEVINFO_H) |
| 66 |
|
struct map{ |
| 67 |
|
char *bsd; |
| 68 |
|
char *svr; |
| 72 |
|
typedef struct map mapping_t; |
| 73 |
|
|
| 74 |
|
static mapping_t *mapping = NULL; |
| 75 |
+ |
#endif |
| 76 |
|
|
| 77 |
< |
char *get_svr_from_bsd(char *bsd){ |
| 77 |
> |
#ifdef SOLARIS |
| 78 |
> |
const char *sg_get_svr_from_bsd(const char *bsd){ |
| 79 |
> |
#ifdef HAVE_LIBDEVINFO_H |
| 80 |
|
mapping_t *map_ptr; |
| 81 |
|
for(map_ptr = mapping; map_ptr != NULL; map_ptr = map_ptr->next) |
| 82 |
|
if(!strcmp(map_ptr->bsd, bsd)) return map_ptr->svr; |
| 83 |
< |
|
| 83 |
> |
#endif |
| 84 |
|
return bsd; |
| 85 |
|
} |
| 86 |
+ |
#endif |
| 87 |
|
|
| 88 |
< |
void add_mapping(char *bsd, char *svr){ |
| 88 |
> |
#if defined(SOLARIS) && defined(HAVE_LIBDEVINFO_H) |
| 89 |
> |
static void add_mapping(char *bsd, char *svr){ |
| 90 |
|
mapping_t *map_ptr; |
| 91 |
|
mapping_t *map_end_ptr; |
| 92 |
|
|
| 76 |
– |
bsd = strdup(bsd); |
| 77 |
– |
svr = strdup(svr); |
| 78 |
– |
|
| 93 |
|
if (mapping == NULL){ |
| 94 |
< |
printf("New malloc\n"); |
| 81 |
< |
mapping = malloc(sizeof(mapping_t)); |
| 94 |
> |
mapping = sg_malloc(sizeof(mapping_t)); |
| 95 |
|
if (mapping == NULL) return; |
| 96 |
|
map_ptr = mapping; |
| 97 |
|
}else{ |
| 98 |
|
/* See if its already been added */ |
| 99 |
|
for(map_ptr = mapping; map_ptr != NULL; map_ptr = map_ptr->next){ |
| 100 |
|
if( (!strcmp(map_ptr->bsd, bsd)) || (!strcmp(map_ptr->svr, svr)) ){ |
| 88 |
– |
printf("%s matches %s\n", map_ptr->bsd, bsd); |
| 101 |
|
return; |
| 102 |
|
} |
| 103 |
|
map_end_ptr = map_ptr; |
| 106 |
|
/* We've reached end of list and not found the entry.. So we need to malloc |
| 107 |
|
* new mapping_t |
| 108 |
|
*/ |
| 109 |
< |
map_end_ptr->next = malloc(sizeof(mapping_t)); |
| 98 |
< |
printf("Second malloc\n"); |
| 109 |
> |
map_end_ptr->next = sg_malloc(sizeof(mapping_t)); |
| 110 |
|
if (map_end_ptr->next == NULL) return; |
| 111 |
|
map_ptr = map_end_ptr->next; |
| 112 |
|
} |
| 113 |
|
|
| 103 |
– |
printf("Adding %s\n", bsd); |
| 114 |
|
map_ptr->next = NULL; |
| 115 |
< |
map_ptr->bsd = bsd; |
| 116 |
< |
map_ptr->svr = svr; |
| 115 |
> |
map_ptr->bsd = NULL; |
| 116 |
> |
map_ptr->svr = NULL; |
| 117 |
> |
if (sg_update_string(&map_ptr->bsd, bsd) < 0 |
| 118 |
> |
|| sg_update_string(&map_ptr->svr, svr) < 0) { |
| 119 |
> |
return; |
| 120 |
> |
} |
| 121 |
|
|
| 122 |
|
return; |
| 123 |
|
} |
| 124 |
|
|
| 125 |
< |
char *read_dir(char *disk_path){ |
| 125 |
> |
|
| 126 |
> |
static char *read_dir(char *disk_path){ |
| 127 |
|
DIR *dirp; |
| 128 |
< |
struct dirent *dp; |
| 129 |
< |
struct stat stbuf; |
| 130 |
< |
char *svr_name; |
| 131 |
< |
char current_dir[MAXPATHLEN]; |
| 132 |
< |
char file_name[MAXPATHLEN]; |
| 133 |
< |
char temp_name[MAXPATHLEN]; |
| 134 |
< |
char dir_dname[MAXPATHLEN]; |
| 128 |
> |
struct dirent *dp; |
| 129 |
> |
struct stat stbuf; |
| 130 |
> |
char *svr_name = NULL; |
| 131 |
> |
char current_dir[MAXPATHLEN]; |
| 132 |
> |
char file_name[MAXPATHLEN]; |
| 133 |
> |
char temp_name[MAXPATHLEN]; |
| 134 |
> |
char dir_dname[MAXPATHLEN]; |
| 135 |
|
char *dsk_dir; |
| 136 |
|
int x; |
| 137 |
|
|
| 138 |
|
dsk_dir = "/dev/osa/dev/dsk"; |
| 139 |
< |
strncpy(current_dir, dsk_dir, sizeof current_dir); |
| 140 |
< |
if ((dirp = opendir(current_dir)) == NULL){ |
| 139 |
> |
strncpy(current_dir, dsk_dir, sizeof current_dir); |
| 140 |
> |
if ((dirp = opendir(current_dir)) == NULL){ |
| 141 |
|
dsk_dir = "/dev/dsk"; |
| 142 |
|
snprintf(current_dir, sizeof current_dir, "%s", dsk_dir); |
| 143 |
|
if ((dirp = opendir(current_dir)) == NULL){ |
| 145 |
|
} |
| 146 |
|
} |
| 147 |
|
|
| 148 |
< |
while ((dp = readdir(dirp)) != NULL){ |
| 148 |
> |
while ((dp = readdir(dirp)) != NULL){ |
| 149 |
|
snprintf(temp_name, sizeof temp_name, "../..%s", disk_path); |
| 150 |
|
snprintf(dir_dname, sizeof dir_dname, "%s/%s", dsk_dir, dp->d_name); |
| 151 |
|
stat(dir_dname,&stbuf); |
| 154 |
|
x = readlink(dir_dname, file_name, sizeof(file_name)); |
| 155 |
|
file_name[x] = '\0'; |
| 156 |
|
if (strcmp(file_name, temp_name) == 0) { |
| 157 |
< |
svr_name = strdup(dp->d_name); |
| 157 |
> |
if (sg_update_string(&svr_name, |
| 158 |
> |
dp->d_name) < 0) { |
| 159 |
> |
return NULL; |
| 160 |
> |
} |
| 161 |
|
closedir(dirp); |
| 162 |
|
return svr_name; |
| 163 |
|
} |
| 164 |
|
} |
| 147 |
– |
closedir(dirp); |
| 165 |
|
} |
| 166 |
+ |
closedir(dirp); |
| 167 |
|
return NULL; |
| 168 |
|
} |
| 169 |
|
|
| 170 |
|
|
| 171 |
< |
|
| 154 |
< |
int get_alias(char *alias){ |
| 171 |
> |
static int get_alias(char *alias){ |
| 172 |
|
char file[MAXPATHLEN]; |
| 173 |
|
di_node_t root_node; |
| 174 |
|
di_node_t node; |
| 179 |
|
char *value; |
| 180 |
|
int instance; |
| 181 |
|
if ((root_node = di_init("/", DINFOCPYALL)) == DI_NODE_NIL) { |
| 182 |
< |
fprintf(stderr, "di_init() failed\n"); |
| 166 |
< |
exit(1); |
| 182 |
> |
return -1; |
| 183 |
|
} |
| 184 |
|
node = di_drv_first_node(alias, root_node); |
| 185 |
|
while (node != DI_NODE_NIL) { |
| 189 |
|
minor_name = di_minor_name(minor); |
| 190 |
|
strcpy(tmpnode, alias); |
| 191 |
|
sprintf(tmpnode, "%s%d", tmpnode, instance); |
| 192 |
< |
strcpy(file, "/devices"); |
| 193 |
< |
strcat(file, phys_path); |
| 194 |
< |
strcat(file, ":"); |
| 195 |
< |
strcat(file, minor_name); |
| 192 |
> |
sg_strlcpy(file, "/devices", sizeof file); |
| 193 |
> |
sg_strlcat(file, phys_path, sizeof file); |
| 194 |
> |
sg_strlcat(file, ":", sizeof file); |
| 195 |
> |
sg_strlcat(file, minor_name, sizeof file); |
| 196 |
|
value = read_dir(file); |
| 197 |
|
if (value != NULL){ |
| 198 |
|
add_mapping(tmpnode, value); |
| 202 |
|
}else{ |
| 203 |
|
node = di_drv_next_node(node); |
| 204 |
|
} |
| 205 |
< |
} /* End of the while loop */ |
| 205 |
> |
} |
| 206 |
|
di_fini(root_node); |
| 207 |
< |
return (-1); |
| 207 |
> |
return 0; |
| 208 |
|
} |
| 209 |
|
|
| 210 |
< |
void build_mapping(){ |
| 211 |
< |
char device_name[512]; |
| 210 |
> |
|
| 211 |
> |
#define BIG_ENOUGH 512 |
| 212 |
> |
static int build_mapping(){ |
| 213 |
> |
char device_name[BIG_ENOUGH]; |
| 214 |
|
int x; |
| 215 |
< |
kstat_ctl_t *kc; |
| 216 |
< |
kstat_t *ksp; |
| 217 |
< |
kstat_io_t kios; |
| 215 |
> |
kstat_ctl_t *kc; |
| 216 |
> |
kstat_t *ksp; |
| 217 |
> |
kstat_io_t kios; |
| 218 |
|
|
| 219 |
+ |
char driver_list[BIG_ENOUGH][BIG_ENOUGH]; |
| 220 |
+ |
int list_entries = 0; |
| 221 |
+ |
int found; |
| 222 |
+ |
|
| 223 |
|
if ((kc = kstat_open()) == NULL) { |
| 224 |
< |
return NULL; |
| 225 |
< |
} |
| 224 |
> |
return -1; |
| 225 |
> |
} |
| 226 |
|
|
| 227 |
< |
for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) { |
| 228 |
< |
if (!strcmp(ksp->ks_class, "disk")) { |
| 229 |
< |
|
| 230 |
< |
if(ksp->ks_type != KSTAT_TYPE_IO) continue; |
| 231 |
< |
/* We dont want metadevices appearins as num_diskio */ |
| 232 |
< |
if(strcmp(ksp->ks_module, "md")==0) continue; |
| 211 |
< |
if((kstat_read(kc, ksp, &kios))==-1) continue; |
| 227 |
> |
for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) { |
| 228 |
> |
if (!strcmp(ksp->ks_class, "disk")) { |
| 229 |
> |
if(ksp->ks_type != KSTAT_TYPE_IO) continue; |
| 230 |
> |
/* We dont want metadevices appearing as num_diskio */ |
| 231 |
> |
if(strcmp(ksp->ks_module, "md")==0) continue; |
| 232 |
> |
if((kstat_read(kc, ksp, &kios))==-1) continue; |
| 233 |
|
strncpy(device_name, ksp->ks_name, sizeof device_name); |
| 234 |
|
for(x=0;x<(sizeof device_name);x++){ |
| 235 |
|
if( isdigit((int)device_name[x]) ) break; |
| 236 |
|
} |
| 237 |
|
if(x == sizeof device_name) x--; |
| 238 |
|
device_name[x] = '\0'; |
| 239 |
< |
get_alias(device_name); |
| 240 |
< |
} |
| 239 |
> |
|
| 240 |
> |
/* Check if we've not already looked it up */ |
| 241 |
> |
found = 0; |
| 242 |
> |
for(x=0;x<list_entries;x++){ |
| 243 |
> |
if (x>=BIG_ENOUGH){ |
| 244 |
> |
/* We've got bigger than we thought was massive */ |
| 245 |
> |
/* If we hit this.. Make big enough bigger */ |
| 246 |
> |
return -1; |
| 247 |
> |
} |
| 248 |
> |
if( !strncmp(driver_list[x], device_name, BIG_ENOUGH)){ |
| 249 |
> |
found = 1; |
| 250 |
> |
break; |
| 251 |
> |
} |
| 252 |
> |
} |
| 253 |
> |
|
| 254 |
> |
if(!found){ |
| 255 |
> |
if((get_alias(device_name)) != 0){ |
| 256 |
> |
return -1; |
| 257 |
> |
} |
| 258 |
> |
strncpy(driver_list[x], device_name, BIG_ENOUGH); |
| 259 |
> |
list_entries++; |
| 260 |
> |
} |
| 261 |
> |
} |
| 262 |
|
} |
| 263 |
< |
|
| 264 |
< |
return; |
| 263 |
> |
|
| 264 |
> |
return 0; |
| 265 |
|
} |
| 266 |
|
|
| 267 |
|
#endif |
| 268 |
|
|
| 269 |
|
|
| 270 |
|
|
| 271 |
< |
char *f_read_line(FILE *f, const char *string){ |
| 271 |
> |
char *sg_f_read_line(FILE *f, const char *string){ |
| 272 |
|
/* Max line length. 8k should be more than enough */ |
| 273 |
|
static char line[8192]; |
| 274 |
|
|
| 281 |
|
return NULL; |
| 282 |
|
} |
| 283 |
|
|
| 284 |
< |
char *get_string_match(char *line, regmatch_t *match){ |
| 284 |
> |
char *sg_get_string_match(char *line, regmatch_t *match){ |
| 285 |
|
int len=match->rm_eo - match->rm_so; |
| 286 |
< |
char *match_string=malloc(len+1); |
| 286 |
> |
char *match_string=sg_malloc(len+1); |
| 287 |
|
|
| 288 |
|
match_string=strncpy(match_string, line+match->rm_so, len); |
| 289 |
|
match_string[len]='\0'; |
| 313 |
|
} |
| 314 |
|
#endif |
| 315 |
|
|
| 316 |
< |
long long get_ll_match(char *line, regmatch_t *match){ |
| 316 |
> |
/* $OpenBSD: strlcpy.c,v 1.8 2003/06/17 21:56:24 millert Exp $ */ |
| 317 |
> |
|
| 318 |
> |
/* |
| 319 |
> |
* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> |
| 320 |
> |
* |
| 321 |
> |
* Permission to use, copy, modify, and distribute this software for any |
| 322 |
> |
* purpose with or without fee is hereby granted, provided that the above |
| 323 |
> |
* copyright notice and this permission notice appear in all copies. |
| 324 |
> |
* |
| 325 |
> |
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES |
| 326 |
> |
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
| 327 |
> |
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR |
| 328 |
> |
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
| 329 |
> |
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
| 330 |
> |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
| 331 |
> |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
| 332 |
> |
*/ |
| 333 |
> |
|
| 334 |
> |
/* |
| 335 |
> |
* Copy src to string dst of size siz. At most siz-1 characters |
| 336 |
> |
* will be copied. Always NUL terminates (unless siz == 0). |
| 337 |
> |
* Returns strlen(src); if retval >= siz, truncation occurred. |
| 338 |
> |
*/ |
| 339 |
> |
size_t sg_strlcpy(char *dst, const char *src, size_t siz){ |
| 340 |
> |
register char *d = dst; |
| 341 |
> |
register const char *s = src; |
| 342 |
> |
register size_t n = siz; |
| 343 |
> |
|
| 344 |
> |
/* Copy as many bytes as will fit */ |
| 345 |
> |
if (n != 0 && --n != 0) { |
| 346 |
> |
do { |
| 347 |
> |
if ((*d++ = *s++) == 0) |
| 348 |
> |
break; |
| 349 |
> |
} while (--n != 0); |
| 350 |
> |
} |
| 351 |
> |
|
| 352 |
> |
/* Not enough room in dst, add NUL and traverse rest of src */ |
| 353 |
> |
if (n == 0) { |
| 354 |
> |
if (siz != 0) |
| 355 |
> |
*d = '\0'; /* NUL-terminate dst */ |
| 356 |
> |
while (*s++) |
| 357 |
> |
; |
| 358 |
> |
} |
| 359 |
> |
|
| 360 |
> |
return(s - src - 1); /* count does not include NUL */ |
| 361 |
> |
} |
| 362 |
> |
|
| 363 |
> |
/* $OpenBSD: strlcat.c,v 1.11 2003/06/17 21:56:24 millert Exp $ */ |
| 364 |
> |
|
| 365 |
> |
/* |
| 366 |
> |
* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> |
| 367 |
> |
* |
| 368 |
> |
* Permission to use, copy, modify, and distribute this software for any |
| 369 |
> |
* purpose with or without fee is hereby granted, provided that the above |
| 370 |
> |
* copyright notice and this permission notice appear in all copies. |
| 371 |
> |
* |
| 372 |
> |
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES |
| 373 |
> |
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
| 374 |
> |
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR |
| 375 |
> |
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
| 376 |
> |
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
| 377 |
> |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
| 378 |
> |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
| 379 |
> |
*/ |
| 380 |
> |
|
| 381 |
> |
/* |
| 382 |
> |
* Appends src to string dst of size siz (unlike strncat, siz is the |
| 383 |
> |
* full size of dst, not space left). At most siz-1 characters |
| 384 |
> |
* will be copied. Always NUL terminates (unless siz <= strlen(dst)). |
| 385 |
> |
* Returns strlen(src) + MIN(siz, strlen(initial dst)). |
| 386 |
> |
* If retval >= siz, truncation occurred. |
| 387 |
> |
*/ |
| 388 |
> |
size_t sg_strlcat(char *dst, const char *src, size_t siz){ |
| 389 |
> |
register char *d = dst; |
| 390 |
> |
register const char *s = src; |
| 391 |
> |
register size_t n = siz; |
| 392 |
> |
size_t dlen; |
| 393 |
> |
|
| 394 |
> |
/* Find the end of dst and adjust bytes left but don't go past end */ |
| 395 |
> |
while (n-- != 0 && *d != '\0') |
| 396 |
> |
d++; |
| 397 |
> |
dlen = d - dst; |
| 398 |
> |
n = siz - dlen; |
| 399 |
> |
|
| 400 |
> |
if (n == 0) |
| 401 |
> |
return(dlen + strlen(s)); |
| 402 |
> |
while (*s != '\0') { |
| 403 |
> |
if (n != 1) { |
| 404 |
> |
*d++ = *s; |
| 405 |
> |
n--; |
| 406 |
> |
} |
| 407 |
> |
s++; |
| 408 |
> |
} |
| 409 |
> |
*d = '\0'; |
| 410 |
> |
|
| 411 |
> |
return(dlen + (s - src)); /* count does not include NUL */ |
| 412 |
> |
} |
| 413 |
> |
|
| 414 |
> |
int sg_update_string(char **dest, const char *src) { |
| 415 |
> |
char *new; |
| 416 |
> |
|
| 417 |
> |
if (src == NULL) { |
| 418 |
> |
/* We're being told to set it to NULL. */ |
| 419 |
> |
free(*dest); |
| 420 |
> |
*dest = NULL; |
| 421 |
> |
return 0; |
| 422 |
> |
} |
| 423 |
> |
|
| 424 |
> |
new = sg_realloc(*dest, strlen(src) + 1); |
| 425 |
> |
if (new == NULL) { |
| 426 |
> |
return -1; |
| 427 |
> |
} |
| 428 |
> |
|
| 429 |
> |
strcpy(new, src); |
| 430 |
> |
*dest = new; |
| 431 |
> |
return 0; |
| 432 |
> |
} |
| 433 |
> |
|
| 434 |
> |
long long sg_get_ll_match(char *line, regmatch_t *match){ |
| 435 |
|
char *ptr; |
| 436 |
|
long long num; |
| 437 |
|
|
| 441 |
|
return num; |
| 442 |
|
} |
| 443 |
|
|
| 444 |
< |
#ifdef ALLBSD |
| 445 |
< |
kvm_t *get_kvm() { |
| 444 |
> |
#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD) |
| 445 |
> |
kvm_t *sg_get_kvm() { |
| 446 |
|
static kvm_t *kvmd = NULL; |
| 447 |
|
|
| 448 |
|
if (kvmd != NULL) { |
| 452 |
|
kvmd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, NULL); |
| 453 |
|
return kvmd; |
| 454 |
|
} |
| 295 |
– |
#endif |
| 455 |
|
|
| 456 |
< |
#ifdef NETBSD |
| 457 |
< |
struct uvmexp *get_uvmexp() { |
| 458 |
< |
static u_long addr = 0; |
| 300 |
< |
static struct uvmexp uvm; |
| 301 |
< |
kvm_t *kvmd = get_kvm(); |
| 456 |
> |
/* Can't think of a better name for this function */ |
| 457 |
> |
kvm_t *sg_get_kvm2() { |
| 458 |
> |
static kvm_t *kvmd2 = NULL; |
| 459 |
|
|
| 460 |
< |
if (kvmd == NULL) { |
| 461 |
< |
return NULL; |
| 460 |
> |
if (kvmd2 != NULL) { |
| 461 |
> |
return kvmd2; |
| 462 |
|
} |
| 463 |
|
|
| 464 |
< |
if (addr == 0) { |
| 465 |
< |
struct nlist symbols[] = { |
| 466 |
< |
{ "_uvmexp" }, |
| 467 |
< |
{ NULL } |
| 311 |
< |
}; |
| 464 |
> |
kvmd2 = kvm_openfiles(_PATH_DEVNULL, _PATH_DEVNULL, NULL, O_RDONLY, NULL); |
| 465 |
> |
return kvmd2; |
| 466 |
> |
} |
| 467 |
> |
#endif |
| 468 |
|
|
| 469 |
< |
if (kvm_nlist(kvmd, symbols) != 0) { |
| 470 |
< |
return NULL; |
| 471 |
< |
} |
| 472 |
< |
addr = symbols[0].n_value; |
| 473 |
< |
} |
| 469 |
> |
#if defined(NETBSD) || defined(OPENBSD) |
| 470 |
> |
struct uvmexp *sg_get_uvmexp() { |
| 471 |
> |
int mib[2]; |
| 472 |
> |
size_t size = sizeof(struct uvmexp); |
| 473 |
> |
static struct uvmexp uvm; |
| 474 |
> |
struct uvmexp *new; |
| 475 |
|
|
| 476 |
< |
if (kvm_read(kvmd, addr, &uvm, sizeof uvm) != sizeof uvm) { |
| 476 |
> |
mib[0] = CTL_VM; |
| 477 |
> |
mib[1] = VM_UVMEXP; |
| 478 |
> |
|
| 479 |
> |
if (sysctl(mib, 2, &uvm, &size, NULL, 0) < 0) { |
| 480 |
|
return NULL; |
| 481 |
|
} |
| 482 |
+ |
|
| 483 |
|
return &uvm; |
| 484 |
|
} |
| 485 |
|
#endif |
| 486 |
|
|
| 487 |
< |
int statgrab_init(){ |
| 488 |
< |
#ifdef ALLBSD |
| 489 |
< |
{ |
| 490 |
< |
kvm_t *kvmd = get_kvm(); |
| 330 |
< |
if (kvmd == NULL) return 1; |
| 487 |
> |
int sg_init(){ |
| 488 |
> |
#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD) |
| 489 |
> |
if (sg_get_kvm() == NULL) { |
| 490 |
> |
return -1; |
| 491 |
|
} |
| 492 |
< |
#endif |
| 493 |
< |
#ifdef NETBSD |
| 334 |
< |
{ |
| 335 |
< |
struct uvmexp *uvm = get_uvmexp(); |
| 336 |
< |
if (uvm == NULL) return 1; |
| 492 |
> |
if (sg_get_kvm2() == NULL) { |
| 493 |
> |
return -1; |
| 494 |
|
} |
| 495 |
|
#endif |
| 496 |
|
#ifdef SOLARIS |
| 497 |
+ |
/* On solaris 7, this will fail if you are not root. But, everything |
| 498 |
+ |
* will still work, just no disk mappings. So we will ignore the exit |
| 499 |
+ |
* status of this, and carry on merrily. |
| 500 |
+ |
*/ |
| 501 |
+ |
#ifdef HAVE_LIBDEVINFO_H |
| 502 |
|
build_mapping(); |
| 503 |
|
#endif |
| 504 |
+ |
#endif |
| 505 |
|
return 0; |
| 506 |
|
} |
| 507 |
+ |
|
| 508 |
+ |
int sg_drop_privileges() { |
| 509 |
+ |
if (setegid(getgid()) != 0) return -1; |
| 510 |
+ |
if (seteuid(getuid()) != 0) return -1; |
| 511 |
+ |
return 0; |
| 512 |
+ |
} |
| 513 |
+ |
|
| 514 |
+ |
void *sg_realloc(void *ptr, size_t size) { |
| 515 |
+ |
void *tmp = NULL; |
| 516 |
+ |
tmp = realloc(ptr, size); |
| 517 |
+ |
if(tmp == NULL) { |
| 518 |
+ |
sg_set_error(SG_ERROR_MALLOC_FAILED, NULL); |
| 519 |
+ |
} |
| 520 |
+ |
return tmp; |
| 521 |
+ |
} |
| 522 |
+ |
|
