| 77 |
|
svr = strdup(svr); |
| 78 |
|
|
| 79 |
|
if (mapping == NULL){ |
| 80 |
– |
printf("New malloc\n"); |
| 80 |
|
mapping = malloc(sizeof(mapping_t)); |
| 81 |
|
if (mapping == NULL) return; |
| 82 |
|
map_ptr = mapping; |
| 84 |
|
/* See if its already been added */ |
| 85 |
|
for(map_ptr = mapping; map_ptr != NULL; map_ptr = map_ptr->next){ |
| 86 |
|
if( (!strcmp(map_ptr->bsd, bsd)) || (!strcmp(map_ptr->svr, svr)) ){ |
| 88 |
– |
printf("%s matches %s\n", map_ptr->bsd, bsd); |
| 87 |
|
return; |
| 88 |
|
} |
| 89 |
|
map_end_ptr = map_ptr; |
| 93 |
|
* new mapping_t |
| 94 |
|
*/ |
| 95 |
|
map_end_ptr->next = malloc(sizeof(mapping_t)); |
| 98 |
– |
printf("Second malloc\n"); |
| 96 |
|
if (map_end_ptr->next == NULL) return; |
| 97 |
|
map_ptr = map_end_ptr->next; |
| 98 |
|
} |
| 99 |
|
|
| 103 |
– |
printf("Adding %s\n", bsd); |
| 100 |
|
map_ptr->next = NULL; |
| 101 |
|
map_ptr->bsd = bsd; |
| 102 |
|
map_ptr->svr = svr; |
| 106 |
|
|
| 107 |
|
char *read_dir(char *disk_path){ |
| 108 |
|
DIR *dirp; |
| 109 |
< |
struct dirent *dp; |
| 110 |
< |
struct stat stbuf; |
| 109 |
> |
struct dirent *dp; |
| 110 |
> |
struct stat stbuf; |
| 111 |
|
char *svr_name; |
| 112 |
< |
char current_dir[MAXPATHLEN]; |
| 113 |
< |
char file_name[MAXPATHLEN]; |
| 114 |
< |
char temp_name[MAXPATHLEN]; |
| 115 |
< |
char dir_dname[MAXPATHLEN]; |
| 112 |
> |
char current_dir[MAXPATHLEN]; |
| 113 |
> |
char file_name[MAXPATHLEN]; |
| 114 |
> |
char temp_name[MAXPATHLEN]; |
| 115 |
> |
char dir_dname[MAXPATHLEN]; |
| 116 |
|
char *dsk_dir; |
| 117 |
|
int x; |
| 118 |
|
|
| 119 |
|
dsk_dir = "/dev/osa/dev/dsk"; |
| 120 |
< |
strncpy(current_dir, dsk_dir, sizeof current_dir); |
| 121 |
< |
if ((dirp = opendir(current_dir)) == NULL){ |
| 120 |
> |
strncpy(current_dir, dsk_dir, sizeof current_dir); |
| 121 |
> |
if ((dirp = opendir(current_dir)) == NULL){ |
| 122 |
|
dsk_dir = "/dev/dsk"; |
| 123 |
|
snprintf(current_dir, sizeof current_dir, "%s", dsk_dir); |
| 124 |
|
if ((dirp = opendir(current_dir)) == NULL){ |
| 126 |
|
} |
| 127 |
|
} |
| 128 |
|
|
| 129 |
< |
while ((dp = readdir(dirp)) != NULL){ |
| 129 |
> |
while ((dp = readdir(dirp)) != NULL){ |
| 130 |
|
snprintf(temp_name, sizeof temp_name, "../..%s", disk_path); |
| 131 |
|
snprintf(dir_dname, sizeof dir_dname, "%s/%s", dsk_dir, dp->d_name); |
| 132 |
|
stat(dir_dname,&stbuf); |
| 140 |
|
return svr_name; |
| 141 |
|
} |
| 142 |
|
} |
| 147 |
– |
closedir(dirp); |
| 143 |
|
} |
| 144 |
+ |
closedir(dirp); |
| 145 |
|
return NULL; |
| 146 |
|
} |
| 147 |
|
|
| 158 |
|
char *value; |
| 159 |
|
int instance; |
| 160 |
|
if ((root_node = di_init("/", DINFOCPYALL)) == DI_NODE_NIL) { |
| 161 |
< |
fprintf(stderr, "di_init() failed\n"); |
| 166 |
< |
exit(1); |
| 161 |
> |
return 1; |
| 162 |
|
} |
| 163 |
|
node = di_drv_first_node(alias, root_node); |
| 164 |
|
while (node != DI_NODE_NIL) { |
| 168 |
|
minor_name = di_minor_name(minor); |
| 169 |
|
strcpy(tmpnode, alias); |
| 170 |
|
sprintf(tmpnode, "%s%d", tmpnode, instance); |
| 171 |
< |
strcpy(file, "/devices"); |
| 172 |
< |
strcat(file, phys_path); |
| 173 |
< |
strcat(file, ":"); |
| 174 |
< |
strcat(file, minor_name); |
| 171 |
> |
strlcpy(file, "/devices", sizeof file); |
| 172 |
> |
strlcat(file, phys_path, sizeof file); |
| 173 |
> |
strlcat(file, ":", sizeof file); |
| 174 |
> |
strlcat(file, minor_name, sizeof file); |
| 175 |
|
value = read_dir(file); |
| 176 |
|
if (value != NULL){ |
| 177 |
|
add_mapping(tmpnode, value); |
| 181 |
|
}else{ |
| 182 |
|
node = di_drv_next_node(node); |
| 183 |
|
} |
| 184 |
< |
} /* End of the while loop */ |
| 184 |
> |
} |
| 185 |
|
di_fini(root_node); |
| 186 |
< |
return (-1); |
| 186 |
> |
return 0; |
| 187 |
|
} |
| 188 |
|
|
| 189 |
< |
void build_mapping(){ |
| 189 |
> |
int build_mapping(){ |
| 190 |
|
char device_name[512]; |
| 191 |
|
int x; |
| 192 |
< |
kstat_ctl_t *kc; |
| 193 |
< |
kstat_t *ksp; |
| 194 |
< |
kstat_io_t kios; |
| 192 |
> |
kstat_ctl_t *kc; |
| 193 |
> |
kstat_t *ksp; |
| 194 |
> |
kstat_io_t kios; |
| 195 |
|
|
| 196 |
|
if ((kc = kstat_open()) == NULL) { |
| 197 |
< |
return NULL; |
| 198 |
< |
} |
| 197 |
> |
return; |
| 198 |
> |
} |
| 199 |
|
|
| 200 |
< |
for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) { |
| 201 |
< |
if (!strcmp(ksp->ks_class, "disk")) { |
| 202 |
< |
|
| 203 |
< |
if(ksp->ks_type != KSTAT_TYPE_IO) continue; |
| 204 |
< |
/* We dont want metadevices appearins as num_diskio */ |
| 205 |
< |
if(strcmp(ksp->ks_module, "md")==0) continue; |
| 211 |
< |
if((kstat_read(kc, ksp, &kios))==-1) continue; |
| 200 |
> |
for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) { |
| 201 |
> |
if (!strcmp(ksp->ks_class, "disk")) { |
| 202 |
> |
if(ksp->ks_type != KSTAT_TYPE_IO) continue; |
| 203 |
> |
/* We dont want metadevices appearing as num_diskio */ |
| 204 |
> |
if(strcmp(ksp->ks_module, "md")==0) continue; |
| 205 |
> |
if((kstat_read(kc, ksp, &kios))==-1) continue; |
| 206 |
|
strncpy(device_name, ksp->ks_name, sizeof device_name); |
| 207 |
|
for(x=0;x<(sizeof device_name);x++){ |
| 208 |
|
if( isdigit((int)device_name[x]) ) break; |
| 209 |
|
} |
| 210 |
|
if(x == sizeof device_name) x--; |
| 211 |
|
device_name[x] = '\0'; |
| 212 |
< |
get_alias(device_name); |
| 213 |
< |
} |
| 212 |
> |
if((get_alias(device_name)) != 0){ |
| 213 |
> |
return 1; |
| 214 |
> |
} |
| 215 |
> |
} |
| 216 |
|
} |
| 217 |
< |
|
| 218 |
< |
return; |
| 217 |
> |
|
| 218 |
> |
return 0; |
| 219 |
|
} |
| 220 |
|
|
| 221 |
|
#endif |
| 323 |
|
#ifdef ALLBSD |
| 324 |
|
{ |
| 325 |
|
kvm_t *kvmd = get_kvm(); |
| 326 |
< |
if (kvmd == NULL) return 1; |
| 326 |
> |
if (kvmd == NULL) return 1; |
| 327 |
|
} |
| 328 |
|
#endif |
| 329 |
|
#ifdef NETBSD |
| 333 |
|
} |
| 334 |
|
#endif |
| 335 |
|
#ifdef SOLARIS |
| 336 |
< |
build_mapping(); |
| 336 |
> |
if((build_mapping()) != 0) return 1; |
| 337 |
|
#endif |
| 338 |
|
return 0; |
| 339 |
|
} |
