From 820fd62a86a88b3c53d5ebe1939e4dc51cc8bcdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C3=A9cureuil?= Date: Fri, 9 Nov 2012 20:44:52 +0000 Subject: Do not mix tabs and spaces --- mdk-stage1/probing.c | 1421 +++++++++++++++++++++++++------------------------- 1 file changed, 713 insertions(+), 708 deletions(-) (limited to 'mdk-stage1/probing.c') diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c index 5f9983efb..4f96c6e6d 100644 --- a/mdk-stage1/probing.c +++ b/mdk-stage1/probing.c @@ -63,29 +63,29 @@ struct media_info { - char * name; - char * model; - enum media_type type; + char * name; + char * model; + enum media_type type; }; static void warning_insmod_failed(enum insmod_return r) { - if (IS_AUTOMATIC && r == INSMOD_FAILED_FILE_NOT_FOUND) - return; - if (r != INSMOD_OK) { - if (r == INSMOD_FAILED_FILE_NOT_FOUND) - stg1_error_message("This floppy doesn't contain the driver."); - else - stg1_error_message("Warning, installation of driver failed. (please include msg from for bugreports)"); - } + if (IS_AUTOMATIC && r == INSMOD_FAILED_FILE_NOT_FOUND) + return; + if (r != INSMOD_OK) { + if (r == INSMOD_FAILED_FILE_NOT_FOUND) + stg1_error_message("This floppy doesn't contain the driver."); + else + stg1_error_message("Warning, installation of driver failed. (please include msg from for bugreports)"); + } } #ifndef DISABLE_NETWORK struct net_description_elem { - char * intf_name; - char * intf_description; + char * intf_name; + char * intf_description; }; static struct net_description_elem net_descriptions[50]; static int net_descr_number = 0; @@ -95,52 +95,52 @@ static int net_intf_too_early_number = 0; static int net_intf_too_early_ptr = 0; const char * safe_descr(const char * text) { - return text ? text : "unknown"; + return text ? text : "unknown"; } void prepare_intf_descr(const char * intf_descr) { - intf_descr_for_discover = strdup(intf_descr); + intf_descr_for_discover = strdup(intf_descr); } void net_discovered_interface(char * intf_name) { - if (!intf_descr_for_discover) { - net_intf_too_early_name[net_intf_too_early_number++] = strdup(intf_name); - return; - } - if (!intf_name) { - if (net_intf_too_early_ptr >= net_intf_too_early_number) { - log_message("NET: was expecting another network interface (broken net module?)"); - return; - } - net_descriptions[net_descr_number].intf_name = net_intf_too_early_name[net_intf_too_early_ptr++]; - } - else - net_descriptions[net_descr_number].intf_name = strdup(intf_name); - net_descriptions[net_descr_number].intf_description = strdup(intf_descr_for_discover); - intf_descr_for_discover = NULL; - net_descr_number++; + if (!intf_descr_for_discover) { + net_intf_too_early_name[net_intf_too_early_number++] = strdup(intf_name); + return; + } + if (!intf_name) { + if (net_intf_too_early_ptr >= net_intf_too_early_number) { + log_message("NET: was expecting another network interface (broken net module?)"); + return; + } + net_descriptions[net_descr_number].intf_name = net_intf_too_early_name[net_intf_too_early_ptr++]; + } + else + net_descriptions[net_descr_number].intf_name = strdup(intf_name); + net_descriptions[net_descr_number].intf_description = strdup(intf_descr_for_discover); + intf_descr_for_discover = NULL; + net_descr_number++; } char * get_net_intf_description(char * intf_name) { - int i; - for (i = 0; i < net_descr_number ; i++) - if (!strcmp(net_descriptions[i].intf_name, intf_name)) - return net_descriptions[i].intf_description; - return strdup("unknown"); + int i; + for (i = 0; i < net_descr_number ; i++) + if (!strcmp(net_descriptions[i].intf_name, intf_name)) + return net_descriptions[i].intf_description; + return strdup("unknown"); } #endif static int device_match_modules_list(struct pciusb_entry *e, char **modules, unsigned int modules_len) { - int i; - if (!e->module) - return 0; - for (i = 0; i < modules_len; i++) - if (!strcmp(modules[i], e->module)) - return 1; - return 0; + int i; + if (!e->module) + return 0; + for (i = 0; i < modules_len; i++) + if (!strcmp(modules[i], e->module)) + return 1; + return 0; } struct pcitable_entry *detected_devices = NULL; @@ -148,171 +148,171 @@ int detected_devices_len = 0; static void detected_devices_destroy(void) { - if (detected_devices) - free(detected_devices); + if (detected_devices) + free(detected_devices); } static struct pcitable_entry *detected_device_new(void) { - static int detected_devices_maxlen = 0; - if (detected_devices_len >= detected_devices_maxlen) { - detected_devices_maxlen += 32; - if (detected_devices == NULL) - detected_devices = malloc(detected_devices_maxlen * sizeof(*detected_devices)); - else - detected_devices = realloc(detected_devices, detected_devices_maxlen * sizeof(*detected_devices)); - if (detected_devices == NULL) - log_perror("detected_device_new: could not (re)allocate table. Let it crash, sorry"); - } - return &detected_devices[detected_devices_len++]; + static int detected_devices_maxlen = 0; + if (detected_devices_len >= detected_devices_maxlen) { + detected_devices_maxlen += 32; + if (detected_devices == NULL) + detected_devices = malloc(detected_devices_maxlen * sizeof(*detected_devices)); + else + detected_devices = realloc(detected_devices, detected_devices_maxlen * sizeof(*detected_devices)); + if (detected_devices == NULL) + log_perror("detected_device_new: could not (re)allocate table. Let it crash, sorry"); + } + return &detected_devices[detected_devices_len++]; } /* FIXME: factorize with probe_that_type() */ static void add_detected_device(unsigned short vendor, unsigned short device, unsigned int subvendor, unsigned int subdevice, const char *name, const char *module) { - struct pcitable_entry *dev = detected_device_new(); - dev->vendor = vendor; - dev->device = device; - dev->subvendor = subvendor; - dev->subdevice = subdevice; - strncpy(dev->module, module, sizeof(dev->module) - 1); - dev->module[sizeof(dev->module) - 1] = '\0'; - strncpy(dev->description, safe_descr(name), sizeof(dev->description) - 1); - dev->description[sizeof(dev->description) - 1] = '\0'; - log_message("detected device (%04x, %04x, %04x, %04x, %s, %s)", vendor, device, subvendor, subdevice, name, module); + struct pcitable_entry *dev = detected_device_new(); + dev->vendor = vendor; + dev->device = device; + dev->subvendor = subvendor; + dev->subdevice = subdevice; + strncpy(dev->module, module, sizeof(dev->module) - 1); + dev->module[sizeof(dev->module) - 1] = '\0'; + strncpy(dev->description, safe_descr(name), sizeof(dev->description) - 1); + dev->description[sizeof(dev->description) - 1] = '\0'; + log_message("detected device (%04x, %04x, %04x, %04x, %s, %s)", vendor, device, subvendor, subdevice, name, module); } static int add_detected_device_if_match(struct pciusb_entry *e, char **modules, unsigned int modules_len) { - int ret = device_match_modules_list(e, modules, modules_len); - if (ret) - add_detected_device(e->vendor, e->device, e->subvendor, e->subdevice, - e->text, e->module); - return ret; + int ret = device_match_modules_list(e, modules, modules_len); + if (ret) + add_detected_device(e->vendor, e->device, e->subvendor, e->subdevice, + e->text, e->module); + return ret; } void probing_detect_devices() { static int already_detected_devices = 0; - struct pciusb_entries entries; - int i; + struct pciusb_entries entries; + int i; - if (already_detected_devices) - return; + if (already_detected_devices) + return; - entries = pci_probe(); - for (i = 0; i < entries.nb; i++) { - struct pciusb_entry *e = &entries.entries[i]; + entries = pci_probe(); + for (i = 0; i < entries.nb; i++) { + struct pciusb_entry *e = &entries.entries[i]; #ifndef DISABLE_PCIADAPTERS #ifndef DISABLE_MEDIAS - if (add_detected_device_if_match(e, medias_ide_pci_modules, medias_ide_pci_modules_len)) - continue; - if (add_detected_device_if_match(e, medias_other_pci_modules, medias_other_pci_modules_len)) - continue; + if (add_detected_device_if_match(e, medias_ide_pci_modules, medias_ide_pci_modules_len)) + continue; + if (add_detected_device_if_match(e, medias_other_pci_modules, medias_other_pci_modules_len)) + continue; #endif #ifndef DISABLE_NETWORK - if (add_detected_device_if_match(e, network_pci_modules, network_pci_modules_len)) - continue; + if (add_detected_device_if_match(e, network_pci_modules, network_pci_modules_len)) + continue; #endif #ifdef ENABLE_USB - if (add_detected_device_if_match(e, usb_controller_modules, usb_controller_modules_len)) - continue; + if (add_detected_device_if_match(e, usb_controller_modules, usb_controller_modules_len)) + continue; #endif #endif - /* device can't be found in built-in pcitables, but keep it */ - add_detected_device(e->vendor, e->device, e->subvendor, e->subdevice, e->text, e->module); - } - pciusb_free(&entries); + /* device can't be found in built-in pcitables, but keep it */ + add_detected_device(e->vendor, e->device, e->subvendor, e->subdevice, e->text, e->module); + } + pciusb_free(&entries); - already_detected_devices = 1; + already_detected_devices = 1; } void probing_destroy(void) { - detected_devices_destroy(); + detected_devices_destroy(); } #ifndef DISABLE_MEDIAS static const char * get_alternate_module(const char * name) { - struct alternate_mapping { - const char * a; - const char * b; - }; - static struct alternate_mapping mappings[] = { + struct alternate_mapping { + const char * a; + const char * b; + }; + static struct alternate_mapping mappings[] = { { "ahci", "ata_piix" }, }; - int mappings_nb = sizeof(mappings) / sizeof(struct alternate_mapping); + int mappings_nb = sizeof(mappings) / sizeof(struct alternate_mapping); int i; - for (i=0; ivendor, e->device, e->subvendor, e->subdevice, safe_descr(e->text), e->module); - discovered_device(type, e->text, e->module); - } - } - pciusb_free(&entries); + struct pciusb_entries entries; + int i; + + entries = pci_probe(); + for (i = 0; i < entries.nb; i++) { + struct pciusb_entry *e = &entries.entries[i]; + if (device_match_modules_list(e, pci_modules, pci_modules_len)) { + log_message("PCI: device %04x %04x %04x %04x is \"%s\", driver is %s", + e->vendor, e->device, e->subvendor, e->subdevice, safe_descr(e->text), e->module); + discovered_device(type, e->text, e->module); + } + } + pciusb_free(&entries); } /** Loads modules for known virtio devices @@ -325,46 +325,46 @@ void probe_pci_modules(enum driver_type type, char **pci_modules, unsigned int */ void probe_virtio_modules(void) { - struct pciusb_entries entries; - int i; - char *name; - char *options; - int loaded_pci = 0; - - entries = pci_probe(); - for (i = 0; i < entries.nb; i++) { - struct pciusb_entry *e = &entries.entries[i]; - if (e->vendor == VIRTIO_PCI_VENDOR) { - if (!loaded_pci) { - log_message("loading virtio-pci"); - my_insmod("virtio_pci", ANY_DRIVER_TYPE, NULL, 0); - loaded_pci = 1; - } - - name = NULL; - options = NULL; - - switch (e->subdevice) { - case VIRTIO_ID_NET: - name = "virtio_net"; - options = "csum=0"; - break; - case VIRTIO_ID_BLOCK: - name = "virtio_blk"; - break; - case VIRTIO_ID_BALLOON: - name = "virtio_balloon"; - break; - default: - log_message("warning: unknown virtio device %04x", e->device); - } - if (name) { - log_message("virtio: loading %s", name); - my_insmod(name, ANY_DRIVER_TYPE, options, 0); - } - } - } - pciusb_free(&entries); + struct pciusb_entries entries; + int i; + char *name; + char *options; + int loaded_pci = 0; + + entries = pci_probe(); + for (i = 0; i < entries.nb; i++) { + struct pciusb_entry *e = &entries.entries[i]; + if (e->vendor == VIRTIO_PCI_VENDOR) { + if (!loaded_pci) { + log_message("loading virtio-pci"); + my_insmod("virtio_pci", ANY_DRIVER_TYPE, NULL, 0); + loaded_pci = 1; + } + + name = NULL; + options = NULL; + + switch (e->subdevice) { + case VIRTIO_ID_NET: + name = "virtio_net"; + options = "csum=0"; + break; + case VIRTIO_ID_BLOCK: + name = "virtio_blk"; + break; + case VIRTIO_ID_BALLOON: + name = "virtio_balloon"; + break; + default: + log_message("warning: unknown virtio device %04x", e->device); + } + if (name) { + log_message("virtio: loading %s", name); + my_insmod(name, ANY_DRIVER_TYPE, options, 0); + } + } + } + pciusb_free(&entries); } #ifdef ENABLE_USB @@ -377,167 +377,172 @@ void probe_that_type(enum driver_type type, enum media_bus bus __attribute__ ((u static int already_loaded_usb_scsi = 0; static int already_probed_virtio_devices = 0; - /* ---- PCI probe ---------------------------------------------- */ - if (bus != BUS_USB) { - switch (type) { + /* ---- PCI probe ---------------------------------------------- */ + if (bus != BUS_USB) { + switch (type) { #ifndef DISABLE_PCIADAPTERS #ifndef DISABLE_MEDIAS - static int already_probed_media_adapters = 0; - case MEDIA_ADAPTERS: - if (already_probed_media_adapters) - break; - already_probed_media_adapters = 1; - probe_pci_modules(type, medias_ide_pci_modules, medias_ide_pci_modules_len); - probe_pci_modules(type, medias_other_pci_modules, medias_other_pci_modules_len); - break; + static int already_probed_media_adapters = 0; + case MEDIA_ADAPTERS: + if (already_probed_media_adapters) + break; + already_probed_media_adapters = 1; + probe_pci_modules(type, medias_ide_pci_modules, medias_ide_pci_modules_len); + probe_pci_modules(type, medias_other_pci_modules, medias_other_pci_modules_len); + break; #endif #ifndef DISABLE_NETWORK - case NETWORK_DEVICES: - probe_pci_modules(type, network_pci_modules, network_pci_modules_len); - break; + case NETWORK_DEVICES: + probe_pci_modules(type, network_pci_modules, network_pci_modules_len); + break; #endif #endif #ifdef ENABLE_USB - case USB_CONTROLLERS: - if (already_probed_usb_controllers || IS_NOAUTO) - break; - already_probed_usb_controllers = 1; - probe_pci_modules(type, usb_controller_modules, usb_controller_modules_len); - break; + case USB_CONTROLLERS: + if (already_probed_usb_controllers || IS_NOAUTO) + break; + already_probed_usb_controllers = 1; + probe_pci_modules(type, usb_controller_modules, usb_controller_modules_len); + break; #endif - case VIRTIO_DEVICES: - if (already_probed_virtio_devices) - break; - probe_virtio_modules(); - already_probed_virtio_devices = 1; - break; - default: - break; - } - } + case VIRTIO_DEVICES: + if (already_probed_virtio_devices) + break; + probe_virtio_modules(); + already_probed_virtio_devices = 1; + break; + default: + break; + } + } #ifdef ENABLE_USB - /* ---- USB probe ---------------------------------------------- */ - if ((bus == BUS_USB || bus == BUS_ANY) && !(IS_NOAUTO)) { - static int already_mounted_usbdev = 0; - struct pciusb_entries entries; - int i; - - if (!already_probed_usb_controllers) - probe_that_type(USB_CONTROLLERS, BUS_ANY); - - if (!already_mounted_usbdev) { - already_mounted_usbdev = 1; - wait_message("Detecting USB devices."); - sleep(4); /* sucking background work */ - my_insmod("usbhid", ANY_DRIVER_TYPE, NULL, 0); - remove_wait_message(); - } - - if (type != NETWORK_DEVICES) - goto end_usb_probe; - - entries = usb_probe(); - for (i = 0; i < entries.nb; i++) { - struct pciusb_entry *e = &entries.entries[i]; - if (device_match_modules_list(e, usb_modules, usb_modules_len)) { - log_message("USB: device %04x %04x is \"%s\" (%s)", e->vendor, e->device, safe_descr(e->text), e->module); - discovered_device(type, e->text, e->module); - } - } - pciusb_free(&entries); - end_usb_probe:; - } + /* ---- USB probe ---------------------------------------------- */ + if ((bus == BUS_USB || bus == BUS_ANY) && !(IS_NOAUTO)) { + static int already_mounted_usbdev = 0; + struct pciusb_entries entries; + int i; + + if (!already_probed_usb_controllers) + probe_that_type(USB_CONTROLLERS, BUS_ANY); + + if (!already_mounted_usbdev) { + already_mounted_usbdev = 1; + if (mount("none", "/proc/bus/usb", "usbfs", 0, NULL) && + mount("none", "/proc/bus/usb", "usbdevfs", 0, NULL)) { + log_message("USB: couldn't mount /proc/bus/usb"); + goto end_usb_probe; + } + wait_message("Detecting USB devices."); + sleep(4); /* sucking background work */ + my_insmod("usbhid", ANY_DRIVER_TYPE, NULL, 0); + remove_wait_message(); + } + + if (type != NETWORK_DEVICES) + goto end_usb_probe; + + entries = usb_probe(); + for (i = 0; i < entries.nb; i++) { + struct pciusb_entry *e = &entries.entries[i]; + if (device_match_modules_list(e, usb_modules, usb_modules_len)) { + log_message("USB: device %04x %04x is \"%s\" (%s)", e->vendor, e->device, safe_descr(e->text), e->module); + discovered_device(type, e->text, e->module); + } + } + pciusb_free(&entries); + end_usb_probe:; + } #endif #ifdef ENABLE_PCMCIA - /* ---- PCMCIA probe ---------------------------------------------- */ - if ((bus == BUS_PCMCIA || bus == BUS_ANY) && !(IS_NOAUTO)) { - struct pcmcia_alias * pcmciadb = NULL; - unsigned int len = 0; - char *base = "/sys/bus/pcmcia/devices"; - DIR *dir; - struct dirent *dent; - - dir = opendir(base); - if (dir == NULL) - goto end_pcmcia_probe; - - switch (type) { + /* ---- PCMCIA probe ---------------------------------------------- */ + if ((bus == BUS_PCMCIA || bus == BUS_ANY) && !(IS_NOAUTO)) { + struct pcmcia_alias * pcmciadb = NULL; + unsigned int len = 0; + char *base = "/sys/bus/pcmcia/devices"; + DIR *dir; + struct dirent *dent; + + dir = opendir(base); + if (dir == NULL) + goto end_pcmcia_probe; + + switch (type) { #ifndef DISABLE_MEDIAS - case MEDIA_ADAPTERS: - pcmciadb = medias_pcmcia_ids; - len = medias_pcmcia_num_ids; - break; + case MEDIA_ADAPTERS: + pcmciadb = medias_pcmcia_ids; + len = medias_pcmcia_num_ids; + break; #endif #ifndef DISABLE_NETWORK - case NETWORK_DEVICES: - pcmciadb = network_pcmcia_ids; - len = network_pcmcia_num_ids; - break; + case NETWORK_DEVICES: + pcmciadb = network_pcmcia_ids; + len = network_pcmcia_num_ids; + break; #endif - default: - goto end_pcmcia_probe; + default: + goto end_pcmcia_probe; } for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) { - struct sysfs_attribute *modalias_attr; - char keyfile[256]; - int i, id; - - if (dent->d_name[0] == '.') - continue; - - log_message("PCMCIA: device found %s", dent->d_name); - - snprintf(keyfile, sizeof(keyfile)-1, "%s/%s/modalias", base, dent->d_name); - modalias_attr = sysfs_open_attribute(keyfile); - if (!modalias_attr) - continue; - if (sysfs_read_attribute(modalias_attr) != 0 || !modalias_attr->value) { - sysfs_close_attribute(modalias_attr); - continue; - } - - log_message("PCMCIA: device found %s", modalias_attr->value); - - for (i = 0; i < len; i++) { - if (!fnmatch(pcmciadb[i].modalias, modalias_attr->value, 0)) { - char product[256]; - - log_message("PCMCIA: device found %s (%s)", pcmciadb[i].modalias, pcmciadb[i].module); - strcpy(product, ""); - for (id = 1; id <= 4; id++) { - struct sysfs_attribute *product_attr; - snprintf(keyfile, sizeof(keyfile)-1, "%s/%s/prod_id%d", base, dent->d_name, id); - product_attr = sysfs_open_attribute(keyfile); - if (!product_attr) - continue; - if (sysfs_read_attribute(product_attr) || !product_attr->value) { - sysfs_close_attribute(product_attr); - continue; - } - snprintf(product + strlen(product), sizeof(product)-strlen(product)-1, "%s%s", product[0] ? " " : "", product_attr->value); - if (product[strlen(product)-1] == '\n') - product[strlen(product)-1] = '\0'; - sysfs_close_attribute(product_attr); - } - - if (!product[0]) - strcpy(product, "PCMCIA device"); - - log_message("PCMCIA: device found %s (%s)", product, pcmciadb[i].module); - discovered_device(type, product, pcmciadb[i].module); - } - } - - sysfs_close_attribute(modalias_attr); - } - end_pcmcia_probe:; - if (dir) - closedir(dir); - } + struct sysfs_attribute *modalias_attr; + char keyfile[256]; + int i, id; + + if (dent->d_name[0] == '.') + continue; + + log_message("PCMCIA: device found %s", dent->d_name); + + snprintf(keyfile, sizeof(keyfile)-1, "%s/%s/modalias", base, dent->d_name); + modalias_attr = sysfs_open_attribute(keyfile); + if (!modalias_attr) + continue; + if (sysfs_read_attribute(modalias_attr) != 0 || !modalias_attr->value) { + sysfs_close_attribute(modalias_attr); + continue; + } + + log_message("PCMCIA: device found %s", modalias_attr->value); + + for (i = 0; i < len; i++) { + if (!fnmatch(pcmciadb[i].modalias, modalias_attr->value, 0)) { + char product[256]; + + log_message("PCMCIA: device found %s (%s)", pcmciadb[i].modalias, pcmciadb[i].module); + strcpy(product, ""); + for (id = 1; id <= 4; id++) { + struct sysfs_attribute *product_attr; + snprintf(keyfile, sizeof(keyfile)-1, "%s/%s/prod_id%d", base, dent->d_name, id); + product_attr = sysfs_open_attribute(keyfile); + if (!product_attr) + continue; + if (sysfs_read_attribute(product_attr) || !product_attr->value) { + sysfs_close_attribute(product_attr); + continue; + } + snprintf(product + strlen(product), sizeof(product)-strlen(product)-1, "%s%s", product[0] ? " " : "", product_attr->value); + if (product[strlen(product)-1] == '\n') + product[strlen(product)-1] = '\0'; + sysfs_close_attribute(product_attr); + } + + if (!product[0]) + strcpy(product, "PCMCIA device"); + + log_message("PCMCIA: device found %s (%s)", product, pcmciadb[i].module); + discovered_device(type, product, pcmciadb[i].module); + } + } + + sysfs_close_attribute(modalias_attr); + } + end_pcmcia_probe:; + if (dir) + closedir(dir); + } #endif /* be sure to load usb-storage after media adapters, so that they are in @@ -562,202 +567,202 @@ static struct media_info * medias = NULL; void find_media(enum media_bus bus) { - char b[50]; - char buf[5000]; - struct media_info tmp[50]; - int count = 0; + char b[50]; + char buf[5000]; + struct media_info tmp[50]; + int count = 0; int fd; - if (medias) - free(medias); /* that does not free the strings, by the way */ - - log_message("looking for media adapters"); - probe_that_type(MEDIA_ADAPTERS, bus); - - /* ----------------------------------------------- */ - if (bus != BUS_IDE && bus != BUS_ANY) - goto find_media_after_ide; - log_message("looking for ide media"); - - strcpy(b, "/proc/ide/hd"); - for (b[12] = 'a'; b[12] <= 't'; b[12]++) { - int i; - char ide_disk[] = "disk"; - char ide_cdrom[] = "cdrom"; - char ide_tape[] = "tape"; - char ide_floppy[] = "floppy"; - - /* first, test if file exists (will tell if attached medium exists) */ - b[13] = '\0'; - if (access(b, R_OK)) - continue; - - tmp[count].name = strdup("hda"); - tmp[count].name[2] = b[12]; - - /* media type */ - strcpy(b + 13, "/media"); - fd = open(b, O_RDONLY); - if (fd == -1) { - log_message("failed to open %s for reading", b); - continue; - } - - i = read(fd, buf, sizeof(buf)); - if (i == -1) { - log_message("failed to read %s", b); - continue; - } - buf[i] = '\0'; - close(fd); - - if (ptr_begins_static_str(buf, ide_disk)) - tmp[count].type = DISK; - else if (ptr_begins_static_str(buf, ide_cdrom)) - tmp[count].type = CDROM; - else if (ptr_begins_static_str(buf, ide_tape)) - tmp[count].type = TAPE; - else if (ptr_begins_static_str(buf, ide_floppy)) - tmp[count].type = FLOPPY; - else - tmp[count].type = UNKNOWN_MEDIA; - - /* media model */ - strcpy(b + 13, "/model"); - fd = open(b, O_RDONLY); - if (fd == -1) { - log_message("failed to open %s for reading", b); - continue; - } - - i = read(fd, buf, sizeof(buf)); - if (i <= 0) { - log_message("failed to read %s", b); - tmp[count].model = strdup("(none)"); - } - else { - buf[i-1] = '\0'; /* eat the \n */ - tmp[count].model = strdup(buf); - } - close(fd); - - log_message("IDE/%d: %s is a %s", tmp[count].type, tmp[count].name, tmp[count].model); - count++; - } + if (medias) + free(medias); /* that does not free the strings, by the way */ + + log_message("looking for media adapters"); + probe_that_type(MEDIA_ADAPTERS, bus); + + /* ----------------------------------------------- */ + if (bus != BUS_IDE && bus != BUS_ANY) + goto find_media_after_ide; + log_message("looking for ide media"); + + strcpy(b, "/proc/ide/hd"); + for (b[12] = 'a'; b[12] <= 't'; b[12]++) { + int i; + char ide_disk[] = "disk"; + char ide_cdrom[] = "cdrom"; + char ide_tape[] = "tape"; + char ide_floppy[] = "floppy"; + + /* first, test if file exists (will tell if attached medium exists) */ + b[13] = '\0'; + if (access(b, R_OK)) + continue; + + tmp[count].name = strdup("hda"); + tmp[count].name[2] = b[12]; + + /* media type */ + strcpy(b + 13, "/media"); + fd = open(b, O_RDONLY); + if (fd == -1) { + log_message("failed to open %s for reading", b); + continue; + } + + i = read(fd, buf, sizeof(buf)); + if (i == -1) { + log_message("failed to read %s", b); + continue; + } + buf[i] = '\0'; + close(fd); + + if (ptr_begins_static_str(buf, ide_disk)) + tmp[count].type = DISK; + else if (ptr_begins_static_str(buf, ide_cdrom)) + tmp[count].type = CDROM; + else if (ptr_begins_static_str(buf, ide_tape)) + tmp[count].type = TAPE; + else if (ptr_begins_static_str(buf, ide_floppy)) + tmp[count].type = FLOPPY; + else + tmp[count].type = UNKNOWN_MEDIA; + + /* media model */ + strcpy(b + 13, "/model"); + fd = open(b, O_RDONLY); + if (fd == -1) { + log_message("failed to open %s for reading", b); + continue; + } + + i = read(fd, buf, sizeof(buf)); + if (i <= 0) { + log_message("failed to read %s", b); + tmp[count].model = strdup("(none)"); + } + else { + buf[i-1] = '\0'; /* eat the \n */ + tmp[count].model = strdup(buf); + } + close(fd); + + log_message("IDE/%d: %s is a %s", tmp[count].type, tmp[count].name, tmp[count].model); + count++; + } find_media_after_ide: - /* ----------------------------------------------- */ - if (bus != BUS_SCSI && bus != BUS_USB && bus != BUS_PCMCIA && bus != BUS_ANY) - goto find_media_after_scsi; - log_message("looking for scsi media"); + /* ----------------------------------------------- */ + if (bus != BUS_SCSI && bus != BUS_USB && bus != BUS_PCMCIA && bus != BUS_ANY) + goto find_media_after_scsi; + log_message("looking for scsi media"); - fd = open("/proc/scsi/scsi", O_RDONLY); - if (fd != -1) { + fd = open("/proc/scsi/scsi", O_RDONLY); + if (fd != -1) { FILE * f; - enum { SCSI_TOP, SCSI_HOST, SCSI_VENDOR, SCSI_TYPE } state = SCSI_TOP; - char * start, * chptr, * next, * end; - char scsi_disk_count = 'a'; - char scsi_cdrom_count = '0'; - char scsi_tape_count = '0'; - - char scsi_no_devices[] = "Attached devices: none"; - char scsi_some_devices[] = "Attached devices:"; - char scsi_host[] = "Host: "; - char scsi_vendor[] = " Vendor: "; - - int i = read(fd, &buf, sizeof(buf)-1); - if (i < 1) { - close(fd); - goto end_scsi; - } - close(fd); - buf[i] = '\0'; - - if (ptr_begins_static_str(buf, scsi_no_devices)) - goto end_scsi; - - start = buf; - while (*start) { - char tmp_model[50]; - char tmp_name[10]; - - chptr = start; - while (*chptr != '\n') chptr++; - *chptr = '\0'; - next = chptr + 1; - - switch (state) { - case SCSI_TOP: - if (!ptr_begins_static_str(start, scsi_some_devices)) - goto end_scsi; - state = SCSI_HOST; - break; - - case SCSI_HOST: - if (!ptr_begins_static_str(start, scsi_host)) - goto end_scsi; - state = SCSI_VENDOR; - break; - - case SCSI_VENDOR: - if (!ptr_begins_static_str(start, scsi_vendor)) - goto end_scsi; - - /* (1) Grab Vendor info */ - start += 10; - end = chptr = strstr(start, "Model:"); - if (!chptr) - goto end_scsi; - - chptr--; - while (*chptr == ' ') - chptr--; - if (*chptr == ':') { - chptr++; - *(chptr + 1) = '\0'; - strcpy(tmp_model,"(unknown)"); - } else { - *(chptr + 1) = '\0'; - strcpy(tmp_model, start); - } - - /* (2) Grab Model info */ - start = end; - start += 7; - - chptr = strstr(start, "Rev:"); - if (!chptr) - goto end_scsi; - - chptr--; - while (*chptr == ' ') chptr--; - *(chptr + 1) = '\0'; - - strcat(tmp_model, " "); - strcat(tmp_model, start); - - tmp[count].model = strdup(tmp_model); - - state = SCSI_TYPE; - - break; - - case SCSI_TYPE: - if (strncmp(" Type:", start, 7)) - goto end_scsi; - *tmp_name = '\0'; - - if (strstr(start, "Direct-Access")) { - sprintf(tmp_name, "sd%c", scsi_disk_count++); - tmp[count].type = DISK; - } else if (strstr(start, "Sequential-Access")) { - sprintf(tmp_name, "st%c", scsi_tape_count++); - tmp[count].type = TAPE; - } else if (strstr(start, "CD-ROM")) { - sprintf(tmp_name, "sr%c", scsi_cdrom_count++); - tmp[count].type = CDROM; - } + enum { SCSI_TOP, SCSI_HOST, SCSI_VENDOR, SCSI_TYPE } state = SCSI_TOP; + char * start, * chptr, * next, * end; + char scsi_disk_count = 'a'; + char scsi_cdrom_count = '0'; + char scsi_tape_count = '0'; + + char scsi_no_devices[] = "Attached devices: none"; + char scsi_some_devices[] = "Attached devices:"; + char scsi_host[] = "Host: "; + char scsi_vendor[] = " Vendor: "; + + int i = read(fd, &buf, sizeof(buf)-1); + if (i < 1) { + close(fd); + goto end_scsi; + } + close(fd); + buf[i] = '\0'; + + if (ptr_begins_static_str(buf, scsi_no_devices)) + goto end_scsi; + + start = buf; + while (*start) { + char tmp_model[50]; + char tmp_name[10]; + + chptr = start; + while (*chptr != '\n') chptr++; + *chptr = '\0'; + next = chptr + 1; + + switch (state) { + case SCSI_TOP: + if (!ptr_begins_static_str(start, scsi_some_devices)) + goto end_scsi; + state = SCSI_HOST; + break; + + case SCSI_HOST: + if (!ptr_begins_static_str(start, scsi_host)) + goto end_scsi; + state = SCSI_VENDOR; + break; + + case SCSI_VENDOR: + if (!ptr_begins_static_str(start, scsi_vendor)) + goto end_scsi; + + /* (1) Grab Vendor info */ + start += 10; + end = chptr = strstr(start, "Model:"); + if (!chptr) + goto end_scsi; + + chptr--; + while (*chptr == ' ') + chptr--; + if (*chptr == ':') { + chptr++; + *(chptr + 1) = '\0'; + strcpy(tmp_model,"(unknown)"); + } else { + *(chptr + 1) = '\0'; + strcpy(tmp_model, start); + } + + /* (2) Grab Model info */ + start = end; + start += 7; + + chptr = strstr(start, "Rev:"); + if (!chptr) + goto end_scsi; + + chptr--; + while (*chptr == ' ') chptr--; + *(chptr + 1) = '\0'; + + strcat(tmp_model, " "); + strcat(tmp_model, start); + + tmp[count].model = strdup(tmp_model); + + state = SCSI_TYPE; + + break; + + case SCSI_TYPE: + if (strncmp(" Type:", start, 7)) + goto end_scsi; + *tmp_name = '\0'; + + if (strstr(start, "Direct-Access")) { + sprintf(tmp_name, "sd%c", scsi_disk_count++); + tmp[count].type = DISK; + } else if (strstr(start, "Sequential-Access")) { + sprintf(tmp_name, "st%c", scsi_tape_count++); + tmp[count].type = TAPE; + } else if (strstr(start, "CD-ROM")) { + sprintf(tmp_name, "sr%c", scsi_cdrom_count++); + tmp[count].type = CDROM; + } if (!(f = fopen("/proc/partitions", "rb")) || !fgets(buf, sizeof(buf), f) || !fgets(buf, sizeof(buf), f)) { log_message("Couldn't open /proc/partitions"); @@ -778,7 +783,7 @@ void find_media(enum media_bus bus) if (stat(name, &statbuf)) mkdir(name, 0755); *ptr = '/'; - } + } if (stat(name, &statbuf) && mknod(name, S_IFBLK | 0600, makedev(major, minor))) { log_perror(name); } @@ -786,219 +791,219 @@ void find_media(enum media_bus bus) fclose(f); } - if (*tmp_name) { - tmp[count].name = strdup(tmp_name); - log_message("SCSI/%d: %s is a %s", tmp[count].type, tmp[count].name, tmp[count].model); - count++; - } - - state = SCSI_HOST; - } - - start = next; - } - - end_scsi:; - } - - /* ----------------------------------------------- */ - log_message("looking for Compaq Smart Array media"); - { - char * procfiles[] = { "/proc/driver/cpqarray/ida0", "/proc/driver/cciss/cciss0", // 2.4 style - "/proc/array/ida", "/proc/cciss/cciss", // 2.2 style - NULL }; - static char cpq_descr[] = "Compaq RAID logical disk"; - char ** procfile; - FILE * f; - - for (procfile = procfiles; procfile && *procfile; procfile++) { - if((f = fopen(*procfile, "rb"))) { - while (fgets(buf, sizeof(buf), f)) { - if (ptr_begins_static_str(buf, "ida/") || ptr_begins_static_str(buf, "cciss/")) { - char * end = strchr(buf, ':'); - if (!end) - log_message("Inconsistency in %s, line:\n%s", *procfile, buf); - else { - *end = '\0'; - tmp[count].name = strdup(buf); - tmp[count].type = DISK; - tmp[count].model = cpq_descr; - log_message("CPQ: found %s", tmp[count].name); - count++; - } - } - } - fclose(f); - } - } - } - - /* ----------------------------------------------- */ - log_message("looking for DAC960"); - { - FILE * f; - if ((f = fopen("/tmp/syslog", "rb"))) { - while (fgets(buf, sizeof(buf), f)) { - char * start; - if ((start = strstr(buf, "/dev/rd/"))) { - char * end = strchr(start, ':'); - if (!end) - log_message("Inconsistency in syslog, line:\n%s", buf); - else { - *end = '\0'; - tmp[count].name = strdup(start+5); - tmp[count].type = DISK; - start = end + 2; - end = strchr(start, ','); - if (end) { - *end = '\0'; - tmp[count].model = strdup(start); - } else - tmp[count].model = "(unknown)"; - log_message("DAC960: found %s (%s)", tmp[count].name, tmp[count].model); - count++; - } - } - } - fclose(f); - } - } - /* ----------------------------------------------- */ - log_message("looking for VirtIO"); - { - int fd, i; - char b[50]; - char *name = b+11; - strcpy(b, "/sys/block/vd"); - for (b[13] = 'a'; b[13] <= 'c'; b[13]++) { - /* first, test if file exists (will tell if attached medium exists) */ - b[14] = '\0'; - if (access(b, R_OK)) - continue; - - tmp[count].name = strdup(name); - tmp[count].type = DISK; //UNKNOWN_MEDIA; - tmp[count].model = strdup("VirtIO disk"); - - /* media type */ - strcpy(b + 14, "/capability"); - fd = open(b, O_RDONLY); - if (fd == -1) { - log_message("failed to open %s for reading", b); - //continue; - } - i = read(fd, buf, sizeof(buf)); - if (i == -1) { - log_message("Couldn't read capabilities file (%s)", b); - } else { - if (!strcmp(buf, "10")) - tmp[count].type = DISK; - } - - count++; - } - } + if (*tmp_name) { + tmp[count].name = strdup(tmp_name); + log_message("SCSI/%d: %s is a %s", tmp[count].type, tmp[count].name, tmp[count].model); + count++; + } + + state = SCSI_HOST; + } + + start = next; + } + + end_scsi:; + } + + /* ----------------------------------------------- */ + log_message("looking for Compaq Smart Array media"); + { + char * procfiles[] = { "/proc/driver/cpqarray/ida0", "/proc/driver/cciss/cciss0", // 2.4 style + "/proc/array/ida", "/proc/cciss/cciss", // 2.2 style + NULL }; + static char cpq_descr[] = "Compaq RAID logical disk"; + char ** procfile; + FILE * f; + + for (procfile = procfiles; procfile && *procfile; procfile++) { + if((f = fopen(*procfile, "rb"))) { + while (fgets(buf, sizeof(buf), f)) { + if (ptr_begins_static_str(buf, "ida/") || ptr_begins_static_str(buf, "cciss/")) { + char * end = strchr(buf, ':'); + if (!end) + log_message("Inconsistency in %s, line:\n%s", *procfile, buf); + else { + *end = '\0'; + tmp[count].name = strdup(buf); + tmp[count].type = DISK; + tmp[count].model = cpq_descr; + log_message("CPQ: found %s", tmp[count].name); + count++; + } + } + } + fclose(f); + } + } + } + + /* ----------------------------------------------- */ + log_message("looking for DAC960"); + { + FILE * f; + if ((f = fopen("/tmp/syslog", "rb"))) { + while (fgets(buf, sizeof(buf), f)) { + char * start; + if ((start = strstr(buf, "/dev/rd/"))) { + char * end = strchr(start, ':'); + if (!end) + log_message("Inconsistency in syslog, line:\n%s", buf); + else { + *end = '\0'; + tmp[count].name = strdup(start+5); + tmp[count].type = DISK; + start = end + 2; + end = strchr(start, ','); + if (end) { + *end = '\0'; + tmp[count].model = strdup(start); + } else + tmp[count].model = "(unknown)"; + log_message("DAC960: found %s (%s)", tmp[count].name, tmp[count].model); + count++; + } + } + } + fclose(f); + } + } + /* ----------------------------------------------- */ + log_message("looking for VirtIO"); + { + int fd, i; + char b[50]; + char *name = b+11; + strcpy(b, "/sys/block/vd"); + for (b[13] = 'a'; b[13] <= 'c'; b[13]++) { + /* first, test if file exists (will tell if attached medium exists) */ + b[14] = '\0'; + if (access(b, R_OK)) + continue; + + tmp[count].name = strdup(name); + tmp[count].type = DISK; //UNKNOWN_MEDIA; + tmp[count].model = strdup("VirtIO disk"); + + /* media type */ + strcpy(b + 14, "/capability"); + fd = open(b, O_RDONLY); + if (fd == -1) { + log_message("failed to open %s for reading", b); + //continue; + } + i = read(fd, buf, sizeof(buf)); + if (i == -1) { + log_message("Couldn't read capabilities file (%s)", b); + } else { + if (!strcmp(buf, "10")) + tmp[count].type = DISK; + } + + count++; + } + } find_media_after_scsi: - /* ----------------------------------------------- */ - tmp[count].name = NULL; - count++; + /* ----------------------------------------------- */ + tmp[count].name = NULL; + count++; - medias = _memdup(tmp, sizeof(struct media_info) * count); + medias = _memdup(tmp, sizeof(struct media_info) * count); } /* Finds by media */ void get_medias(enum media_type media, char *** names, char *** models, enum media_bus bus) { - struct media_info * m; - char * tmp_names[50]; - char * tmp_models[50]; - int count; - - find_media(bus); - - m = medias; - - count = 0; - while (m && m->name) { - if (m->type == media) { - tmp_names[count] = strdup(m->name); - tmp_models[count++] = strdup(m->model); - } - m++; - } - tmp_names[count] = NULL; - tmp_models[count++] = NULL; - - *names = _memdup(tmp_names, sizeof(char *) * count); - *models = _memdup(tmp_models, sizeof(char *) * count); + struct media_info * m; + char * tmp_names[50]; + char * tmp_models[50]; + int count; + + find_media(bus); + + m = medias; + + count = 0; + while (m && m->name) { + if (m->type == media) { + tmp_names[count] = strdup(m->name); + tmp_models[count++] = strdup(m->model); + } + m++; + } + tmp_names[count] = NULL; + tmp_models[count++] = NULL; + + *names = _memdup(tmp_names, sizeof(char *) * count); + *models = _memdup(tmp_models, sizeof(char *) * count); } #ifndef DISABLE_NETWORK static int is_net_interface_blacklisted(char *intf) { - /* see detect_devicess::is_lan_interface() */ - char * blacklist[] = { "lo", "ippp", "isdn", "plip", "ppp", "wifi", "sit", NULL }; - char ** ptr = blacklist; + /* see detect_devicess::is_lan_interface() */ + char * blacklist[] = { "lo", "ippp", "isdn", "plip", "ppp", "wifi", "sit", NULL }; + char ** ptr = blacklist; - while (ptr && *ptr) { - if (!strncmp(intf, *ptr, strlen(*ptr))) - return 1; - ptr++; - } + while (ptr && *ptr) { + if (!strncmp(intf, *ptr, strlen(*ptr))) + return 1; + ptr++; + } - return 0; + return 0; } char ** get_net_devices(void) { - char * tmp[50]; - static int already_probed = 0; - FILE * f; - int i = 0; - - if (!already_probed) { - already_probed = 1; /* cut off loop brought by: probe_that_type => my_insmod => get_net_devices */ - probe_that_type(NETWORK_DEVICES, BUS_ANY); - } - - /* use /proc/net/dev since SIOCGIFCONF doesn't work with some drivers (rt2500) */ - f = fopen("/proc/net/dev", "rb"); - if (f) { - char line[128]; - - /* skip the two first lines */ - fgets(line, sizeof(line), f); - fgets(line, sizeof(line), f); - - while (1) { - char *start, *end; - if (!fgets(line, sizeof(line), f)) - break; - start = line; - while (*start == ' ') - start++; - end = strchr(start, ':'); - if (end) - end[0] = '\0'; - if (!is_net_interface_blacklisted(start)) { - log_message("found net interface %s", start); - tmp[i++] = strdup(start); - } else { - log_message("found net interface %s, but blacklisted", start); - } - } - - fclose(f); - } else { - log_message("net: could not open devices file"); - } - - tmp[i++] = NULL; - - return _memdup(tmp, sizeof(char *) * i); + char * tmp[50]; + static int already_probed = 0; + FILE * f; + int i = 0; + + if (!already_probed) { + already_probed = 1; /* cut off loop brought by: probe_that_type => my_insmod => get_net_devices */ + probe_that_type(NETWORK_DEVICES, BUS_ANY); + } + + /* use /proc/net/dev since SIOCGIFCONF doesn't work with some drivers (rt2500) */ + f = fopen("/proc/net/dev", "rb"); + if (f) { + char line[128]; + + /* skip the two first lines */ + fgets(line, sizeof(line), f); + fgets(line, sizeof(line), f); + + while (1) { + char *start, *end; + if (!fgets(line, sizeof(line), f)) + break; + start = line; + while (*start == ' ') + start++; + end = strchr(start, ':'); + if (end) + end[0] = '\0'; + if (!is_net_interface_blacklisted(start)) { + log_message("found net interface %s", start); + tmp[i++] = strdup(start); + } else { + log_message("found net interface %s, but blacklisted", start); + } + } + + fclose(f); + } else { + log_message("net: could not open devices file"); + } + + tmp[i++] = NULL; + + return _memdup(tmp, sizeof(char *) * i); } #endif /* DISABLE_NETWORK */ -- cgit v1.2.1