Changeset 78f771c881f9ef27ca4a35b3fc9efc407edba665

Timestamp:

11/01/09 05:32:26 (2 years ago)

Author:

Pierre-Alexandre Meyer <pierre@…>

Children:

6e20c10dbc1b6740f94a01f74d6eeda8bb3a7ca4

Parents:

111fe227a44f170e91f2d6f57dd6ce285b67a56a

git-committer:

Pierre-Alexandre Meyer <pierre@mouraf.org> / 2009-10-31T22:32:26Z-0700

Message:

hdt: change remaining printf to more_printf (CLI)

A lot of places still had printf() instead of more_printf().
This patch does a bulk update and add missing reset_more_printf(),
used to reset the pager counter between each command call.

This also changes the more_printf() routine to delete the "--More--"
line while scrolling.

Signed-off-by: Pierre-Alexandre Meyer <pierre@…>

Location:

com32/hdt

Files:

• hdt-cli-disk.c (modified) (3 diffs)
• hdt-cli-dmi.c (modified) (15 diffs)
• hdt-cli-hdt.c (modified) (9 diffs)
• hdt-cli-kernel.c (modified) (4 diffs)
• hdt-cli-memory.c (modified) (1 diff)
• hdt-cli-pci.c (modified) (6 diffs)
• hdt-cli-pxe.c (modified) (2 diffs)
• hdt-cli-syslinux.c (modified) (1 diff)
• hdt-cli-vesa.c (modified) (3 diffs)
• hdt-cli-vpd.c (modified) (1 diff)
• hdt-common.h (modified) (1 diff)

com32/hdt/hdt-cli-disk.c

@@ -63 +63 @@
         int i = nb_partitions_seen;
 
+    reset_more_printf();
+
         start = partition_offset;
         end = start + ptab->length - 1;
@@ -115 +117 @@
 
         detect_disks(hardware);
+    reset_more_printf();
+
         if (!hardware->disk_info[i].cbios)
                 return; /* Invalid geometry */
@@ -158 +162 @@
         detect_disks(hardware);
 
-        int first_one = 0;
+    int first_one = 0;
         for (int drive = 0x80; drive < 0xff; drive++) {
                 if (hardware->disk_info[drive - 0x80].cbios) {
-                        if (!first_one) {
-                                first_one = 1;
-                        } else {
-                                pause_printf();
-                        }
+            if (!first_one) {
+                    first_one = 1;
+            } else {
+                    pause_printf();
+            }
                         char buf[5] = "";
                         sprintf(buf, "0x%x", drive);

com32/hdt/hdt-cli-dmi.c

@@ -39 +39 @@
 {
   char available_dmi_commands[1024];
+  reset_more_printf();
   memset(available_dmi_commands, 0, sizeof(available_dmi_commands));
 
-  printf("Available DMI modules on your system:\n");
+  more_printf("Available DMI modules on your system:\n");
         if (hardware->dmi.base_board.filled == true)
-                printf("\t%s\n", CLI_DMI_BASE_BOARD);
+                more_printf("\t%s\n", CLI_DMI_BASE_BOARD);
         if (hardware->dmi.battery.filled == true)
-                printf("\t%s\n", CLI_DMI_BATTERY);
+                more_printf("\t%s\n", CLI_DMI_BATTERY);
         if (hardware->dmi.bios.filled == true)
-                printf("\t%s\n", CLI_DMI_BIOS);
+                more_printf("\t%s\n", CLI_DMI_BIOS);
         if (hardware->dmi.chassis.filled == true)
-                printf("\t%s\n", CLI_DMI_CHASSIS);
+                more_printf("\t%s\n", CLI_DMI_CHASSIS);
         for (int i = 0; i < hardware->dmi.memory_count; i++) {
                 if (hardware->dmi.memory[i].filled == true) {
-                        printf("\tbank <number>\n");
+                        more_printf("\tbank <number>\n");
                         break;
                 }
@@ -58 +59 @@
         for (int i = 0; i < hardware->dmi.memory_module_count; i++) {
                 if (hardware->dmi.memory_module[i].filled == true) {
-                        printf("\tmodule <number>\n");
+                        more_printf("\tmodule <number>\n");
                         break;
                 }
         }
         if (hardware->dmi.processor.filled == true)
-                printf("\t%s\n", CLI_DMI_PROCESSOR);
+                more_printf("\t%s\n", CLI_DMI_PROCESSOR);
         if (hardware->dmi.system.filled == true)
-                printf("\t%s\n", CLI_DMI_SYSTEM);
+                more_printf("\t%s\n", CLI_DMI_SYSTEM);
         if (hardware->dmi.ipmi.filled == true)
-                printf("\t%s\n", CLI_DMI_IPMI);
+                more_printf("\t%s\n", CLI_DMI_IPMI);
         if (hardware->dmi.cache_count)
-                printf("\t%s\n", CLI_DMI_CACHE);
+                more_printf("\t%s\n", CLI_DMI_CACHE);
         if (strlen(hardware->dmi.oem_strings))
                 more_printf("\t%s\n", CLI_DMI_OEM);
         if (hardware->dmi.hardware_security.filled)
-                printf("\t%s\n", CLI_DMI_SECURITY);
+                more_printf("\t%s\n", CLI_DMI_SECURITY);
 }
 
@@ -80 +81 @@
 {
   if (hardware->dmi.base_board.filled == false) {
-    printf("base_board information not found on your system, see "
+    more_printf("base_board information not found on your system, see "
            "`show list' to see which module is available.\n");
     return;
@@ -115 +116 @@
 {
   if (hardware->dmi.system.filled == false) {
-    printf("system information not found on your system, see "
+    more_printf("system information not found on your system, see "
            "`show list' to see which module is available.\n");
     return;
   }
-  printf("System\n");
-  printf(" Manufacturer : %s\n", hardware->dmi.system.manufacturer);
-  printf(" Product Name : %s\n", hardware->dmi.system.product_name);
-  printf(" Version      : %s\n", hardware->dmi.system.version);
-  printf(" Serial       : %s\n", hardware->dmi.system.serial);
-  printf(" UUID         : %s\n", hardware->dmi.system.uuid);
-  printf(" Wakeup Type  : %s\n", hardware->dmi.system.wakeup_type);
-  printf(" SKU Number   : %s\n", hardware->dmi.system.sku_number);
-  printf(" Family       : %s\n", hardware->dmi.system.family);
+  reset_more_printf();
+  more_printf("System\n");
+  more_printf(" Manufacturer : %s\n", hardware->dmi.system.manufacturer);
+  more_printf(" Product Name : %s\n", hardware->dmi.system.product_name);
+  more_printf(" Version      : %s\n", hardware->dmi.system.version);
+  more_printf(" Serial       : %s\n", hardware->dmi.system.serial);
+  more_printf(" UUID         : %s\n", hardware->dmi.system.uuid);
+  more_printf(" Wakeup Type  : %s\n", hardware->dmi.system.wakeup_type);
+  more_printf(" SKU Number   : %s\n", hardware->dmi.system.sku_number);
+  more_printf(" Family       : %s\n", hardware->dmi.system.family);
 
   if (strlen(hardware->dmi.system.configuration_options)) {
-    printf("System Configuration Options\n");
-    printf("%s\n", hardware->dmi.system.configuration_options);
+    more_printf("System Configuration Options\n");
+    more_printf("%s\n", hardware->dmi.system.configuration_options);
   }
 
   if (hardware->dmi.system.system_reset.filled) {
-    printf("System Reset\n");
-    printf("  Status               : %s\n",
+    more_printf("System Reset\n");
+    more_printf("  Status               : %s\n",
            (hardware->dmi.system.system_reset.status ? "Enabled" : "Disabled"));
-    printf("  Watchdog Timer       : %s\n",
+    more_printf("  Watchdog Timer       : %s\n",
            (hardware->dmi.system.system_reset.watchdog ? "Present" : "Not Present"));
     if (strlen(hardware->dmi.system.system_reset.boot_option))
-      printf("  Boot Option          : %s\n", hardware->dmi.system.system_reset.boot_option);
+      more_printf("  Boot Option          : %s\n", hardware->dmi.system.system_reset.boot_option);
     if (strlen(hardware->dmi.system.system_reset.boot_option_on_limit))
-      printf("  Boot Option On Limit : %s\n", hardware->dmi.system.system_reset.boot_option_on_limit);
+      more_printf("  Boot Option On Limit : %s\n", hardware->dmi.system.system_reset.boot_option_on_limit);
     if (strlen(hardware->dmi.system.system_reset.reset_count))
-      printf("  Reset Count          : %s\n", hardware->dmi.system.system_reset.reset_count);
+      more_printf("  Reset Count          : %s\n", hardware->dmi.system.system_reset.reset_count);
     if (strlen(hardware->dmi.system.system_reset.reset_limit))
-      printf("  Reset Limit          : %s\n", hardware->dmi.system.system_reset.reset_limit);
+      more_printf("  Reset Limit          : %s\n", hardware->dmi.system.system_reset.reset_limit);
     if (strlen(hardware->dmi.system.system_reset.timer_interval))
-      printf("  Timer Interval       : %s\n", hardware->dmi.system.system_reset.timer_interval);
+      more_printf("  Timer Interval       : %s\n", hardware->dmi.system.system_reset.timer_interval);
     if (strlen(hardware->dmi.system.system_reset.timeout))
-      printf("  Timeout              : %s\n", hardware->dmi.system.system_reset.timeout);
-  }
-
-  printf("System Boot Information\n");
-  printf(" Status       : %s\n", hardware->dmi.system.system_boot_status);
+      more_printf("  Timeout              : %s\n", hardware->dmi.system.system_reset.timeout);
+  }
+
+  more_printf("System Boot Information\n");
+  more_printf(" Status       : %s\n", hardware->dmi.system.system_boot_status);
 }
 
@@ -162 +164 @@
 {
   if (hardware->dmi.bios.filled == false) {
-    printf("bios information not found on your system, see "
+    more_printf("bios information not found on your system, see "
            "`show list' to see which module is available.\n");
     return;
@@ -214 +216 @@
     return;
   }
-  printf("Chassis\n");
-  printf(" Manufacturer       : %s\n",
+  reset_more_printf();
+  more_printf("Chassis\n");
+  more_printf(" Manufacturer       : %s\n",
         hardware->dmi.chassis.manufacturer);
-  printf(" Type               : %s\n", hardware->dmi.chassis.type);
-  printf(" Lock               : %s\n", hardware->dmi.chassis.lock);
-  printf(" Version            : %s\n",
+  more_printf(" Type               : %s\n", hardware->dmi.chassis.type);
+  more_printf(" Lock               : %s\n", hardware->dmi.chassis.lock);
+  more_printf(" Version            : %s\n",
         hardware->dmi.chassis.version);
-  printf(" Serial             : %s\n", hardware->dmi.chassis.serial);
-  printf(" Asset Tag          : %s\n",
+  more_printf(" Serial             : %s\n", hardware->dmi.chassis.serial);
+  more_printf(" Asset Tag          : %s\n",
         del_multi_spaces(hardware->dmi.chassis.asset_tag));
-  printf(" Boot up state      : %s\n",
+  more_printf(" Boot up state      : %s\n",
         hardware->dmi.chassis.boot_up_state);
-  printf(" Power supply state : %s\n",
+  more_printf(" Power supply state : %s\n",
         hardware->dmi.chassis.power_supply_state);
-  printf(" Thermal state      : %s\n",
+  more_printf(" Thermal state      : %s\n",
         hardware->dmi.chassis.thermal_state);
-  printf(" Security Status    : %s\n",
+  more_printf(" Security Status    : %s\n",
         hardware->dmi.chassis.security_status);
-  printf(" OEM Information    : %s\n",
+  more_printf(" OEM Information    : %s\n",
         hardware->dmi.chassis.oem_information);
-  printf(" Height             : %u\n", hardware->dmi.chassis.height);
-  printf(" NB Power Cords     : %u\n",
+  more_printf(" Height             : %u\n", hardware->dmi.chassis.height);
+  more_printf(" NB Power Cords     : %u\n",
         hardware->dmi.chassis.nb_power_cords);
 }
@@ -246 +249 @@
     return;
   }
-  printf("IPMI\n");
-  printf(" Interface Type     : %s\n",
+  reset_more_printf();
+  more_printf("IPMI\n");
+  more_printf(" Interface Type     : %s\n",
         hardware->dmi.ipmi.interface_type);
-  printf(" Specification Ver. : %u.%u\n",
+  more_printf(" Specification Ver. : %u.%u\n",
         hardware->dmi.ipmi.major_specification_version,
         hardware->dmi.ipmi.minor_specification_version);
-  printf(" I2C Slave Address  : 0x%02x\n",
+  more_printf(" I2C Slave Address  : 0x%02x\n",
         hardware->dmi.ipmi.I2C_slave_address);
-  printf(" Nv Storage Address : %u\n",
+  more_printf(" Nv Storage Address : %u\n",
         hardware->dmi.ipmi.nv_address);
   uint32_t high = hardware->dmi.ipmi.base_address >> 32;
   uint32_t low  = hardware->dmi.ipmi.base_address & 0xFFFF;
-  printf(" Base Address       : %08X%08X\n",
+  more_printf(" Base Address       : %08X%08X\n",
         high,(low & ~1));
-  printf(" IRQ                : %d\n",
+  more_printf(" IRQ                : %d\n",
         hardware->dmi.ipmi.irq);
 }
@@ -268 +272 @@
 {
   if (hardware->dmi.battery.filled == false) {
-    printf("battery information not found on your system, see "
+    more_printf("battery information not found on your system, see "
            "`show list' to see which module is available.\n");
     return;
   }
-  printf("Battery \n");
-  printf(" Vendor             : %s\n",
+  reset_more_printf();
+  more_printf("Battery \n");
+  more_printf(" Vendor             : %s\n",
         hardware->dmi.battery.manufacturer);
-  printf(" Manufacture Date   : %s\n",
+  more_printf(" Manufacture Date   : %s\n",
         hardware->dmi.battery.manufacture_date);
-  printf(" Serial             : %s\n", hardware->dmi.battery.serial);
-  printf(" Name               : %s\n", hardware->dmi.battery.name);
-  printf(" Chemistry          : %s\n",
+  more_printf(" Serial             : %s\n", hardware->dmi.battery.serial);
+  more_printf(" Name               : %s\n", hardware->dmi.battery.name);
+  more_printf(" Chemistry          : %s\n",
         hardware->dmi.battery.chemistry);
-  printf(" Design Capacity    : %s\n",
+  more_printf(" Design Capacity    : %s\n",
         hardware->dmi.battery.design_capacity);
-  printf(" Design Voltage     : %s\n",
+  more_printf(" Design Voltage     : %s\n",
         hardware->dmi.battery.design_voltage);
-  printf(" SBDS               : %s\n", hardware->dmi.battery.sbds);
-  printf(" SBDS Manuf. Date   : %s\n",
+  more_printf(" SBDS               : %s\n", hardware->dmi.battery.sbds);
+  more_printf(" SBDS Manuf. Date   : %s\n",
         hardware->dmi.battery.sbds_manufacture_date);
-  printf(" SBDS Chemistry     : %s\n",
+  more_printf(" SBDS Chemistry     : %s\n",
         hardware->dmi.battery.sbds_chemistry);
-  printf(" Maximum Error      : %s\n",
+  more_printf(" Maximum Error      : %s\n",
         hardware->dmi.battery.maximum_error);
-  printf(" OEM Info           : %s\n",
+  more_printf(" OEM Info           : %s\n",
         hardware->dmi.battery.oem_info);
 }
@@ -300 +305 @@
 {
   if (hardware->dmi.processor.filled == false) {
-    printf("processor information not found on your system, see "
+    more_printf("processor information not found on your system, see "
            "`show list' to see which module is available.\n");
     return;
@@ -364 +369 @@
 
   if (errno == ERANGE || bank < 0) {
-    printf("This bank number is incorrect\n");
+    more_printf("This bank number is incorrect\n");
     return;
   }
 
   if ((bank >= hardware->dmi.memory_count) || (bank < 0)) {
-    printf("Bank %d number doesn't exist\n", bank);
+    more_printf("Bank %d number doesn't exist\n", bank);
     return;
   }
   if (hardware->dmi.memory[bank].filled == false) {
-    printf("Bank %d doesn't contain any information\n", bank);
-    return;
-  }
-
-  printf("Memory Bank %d\n", bank);
-  printf(" Form Factor  : %s\n",
+    more_printf("Bank %d doesn't contain any information\n", bank);
+    return;
+  }
+
+  reset_more_printf();
+  more_printf("Memory Bank %d\n", bank);
+  more_printf(" Form Factor  : %s\n",
         hardware->dmi.memory[bank].form_factor);
-  printf(" Type         : %s\n", hardware->dmi.memory[bank].type);
-  printf(" Type Detail  : %s\n",
+  more_printf(" Type         : %s\n", hardware->dmi.memory[bank].type);
+  more_printf(" Type Detail  : %s\n",
         hardware->dmi.memory[bank].type_detail);
-  printf(" Speed        : %s\n", hardware->dmi.memory[bank].speed);
-  printf(" Size         : %s\n", hardware->dmi.memory[bank].size);
-  printf(" Device Set   : %s\n",
+  more_printf(" Speed        : %s\n", hardware->dmi.memory[bank].speed);
+  more_printf(" Size         : %s\n", hardware->dmi.memory[bank].size);
+  more_printf(" Device Set   : %s\n",
         hardware->dmi.memory[bank].device_set);
-  printf(" Device Loc.  : %s\n",
+  more_printf(" Device Loc.  : %s\n",
         hardware->dmi.memory[bank].device_locator);
-  printf(" Bank Locator : %s\n",
+  more_printf(" Bank Locator : %s\n",
         hardware->dmi.memory[bank].bank_locator);
-  printf(" Total Width  : %s\n",
+  more_printf(" Total Width  : %s\n",
         hardware->dmi.memory[bank].total_width);
-  printf(" Data Width   : %s\n",
+  more_printf(" Data Width   : %s\n",
         hardware->dmi.memory[bank].data_width);
-  printf(" Error        : %s\n", hardware->dmi.memory[bank].error);
-  printf(" Vendor       : %s\n",
+  more_printf(" Error        : %s\n", hardware->dmi.memory[bank].error);
+  more_printf(" Vendor       : %s\n",
         hardware->dmi.memory[bank].manufacturer);
-  printf(" Serial       : %s\n", hardware->dmi.memory[bank].serial);
-  printf(" Asset Tag    : %s\n",
+  more_printf(" Serial       : %s\n", hardware->dmi.memory[bank].serial);
+  more_printf(" Asset Tag    : %s\n",
         hardware->dmi.memory[bank].asset_tag);
-  printf(" Part Number  : %s\n",
+  more_printf(" Part Number  : %s\n",
         hardware->dmi.memory[bank].part_number);
 }
@@ -409 +415 @@
 {
         if (!hardware->dmi.cache_count) {
-                printf("cache information not found on your system, see "
+                more_printf("cache information not found on your system, see "
                        "`show list' to see which module is available.\n");
                 return;
@@ -417 +423 @@
 
         if (argc != 1 || cache > hardware->dmi.cache_count) {
-                printf("show cache [0-%d]\n", hardware->dmi.cache_count-1);
+                more_printf("show cache [0-%d]\n", hardware->dmi.cache_count-1);
                 return;
         }
@@ -465 +471 @@
 
         if (errno == ERANGE || module < 0) {
-                printf("This module number is incorrect\n");
+                more_printf("This module number is incorrect\n");
                 return;
         }
 
         if ((module >= hardware->dmi.memory_module_count) || (module < 0)) {
-                printf("Module number %d doesn't exist\n", module);
+                more_printf("Module number %d doesn't exist\n", module);
                 return;
         }
 
         if (hardware->dmi.memory_module[module].filled == false) {
-                printf("Module %d doesn't contain any information\n", module);
+                more_printf("Module %d doesn't contain any information\n", module);
                 return;
         }
 
-        printf("Memory Module %d\n", module);
-        printf(" Socket Designation : %s\n",
+  reset_more_printf();
+        more_printf("Memory Module %d\n", module);
+        more_printf(" Socket Designation : %s\n",
                 hardware->dmi.memory_module[module].socket_designation);
-        printf(" Bank Connections   : %s\n",
+        more_printf(" Bank Connections   : %s\n",
                 hardware->dmi.memory_module[module].bank_connections);
-        printf(" Current Speed      : %s\n",
+        more_printf(" Current Speed      : %s\n",
                 hardware->dmi.memory_module[module].speed);
-        printf(" Type               : %s\n",
+        more_printf(" Type               : %s\n",
                 hardware->dmi.memory_module[module].type);
-        printf(" Installed Size     : %s\n",
+        more_printf(" Installed Size     : %s\n",
                 hardware->dmi.memory_module[module].installed_size);
-        printf(" Enabled Size       : %s\n",
+        more_printf(" Enabled Size       : %s\n",
                 hardware->dmi.memory_module[module].enabled_size);
-        printf(" Error Status       : %s\n",
+        more_printf(" Error Status       : %s\n",
                 hardware->dmi.memory_module[module].error_status);
 }
@@ -503 +510 @@
 
   if (hardware->is_dmi_valid == false) {
-    printf("No valid DMI table found, exiting.\n");
-    return;
-  }
-  printf("DMI Table version %u.%u found\n",
+    more_printf("No valid DMI table found, exiting.\n");
+    return;
+  }
+  reset_more_printf();
+  more_printf("DMI Table version %u.%u found\n",
          hardware->dmi.dmitable.major_version,
          hardware->dmi.dmitable.minor_version);
@@ -537 +545 @@
   }
 
+  reset_more_printf();
   more_printf("Memory Banks\n");
   for (int i = 0; i < hardware->dmi.memory_count; i++) {

com32/hdt/hdt-cli-hdt.c

@@ -53 +53 @@
         int i = 0;
 
-        printf("Available modes:\n");
+    reset_more_printf();
+        more_printf("Available modes:\n");
         while (list_modes[i]) {
-                printf("%s ", list_modes[i]->name);
+                more_printf("%s ", list_modes[i]->name);
                 i++;
         }
-        printf("\n");
+        more_printf("\n");
 }
 
@@ -71 +72 @@
         cli_mode_t new_mode;
 
+    reset_more_printf();
         if (argc <= 0) {
-                printf("Which mode?\n");
+                more_printf("Which mode?\n");
                 return;
         }
@@ -118 +120 @@
         find_cli_mode_descr(hdt_cli.mode, &current_mode);
 
-        printf("Available commands are:\n");
+    reset_more_printf();
+        more_printf("Available commands are:\n");
 
         /* List first default modules of the mode */
@@ -124 +127 @@
             current_mode->default_modules->modules) {
                 while (current_mode->default_modules->modules[j].name) {
-                        printf("%s ",
+                        more_printf("%s ",
                                current_mode->default_modules->modules[j].name);
                         j++;
                 }
-                printf("\n");
+                more_printf("\n");
         }
 
@@ -134 +137 @@
         if (current_mode->show_modules &&
             current_mode->show_modules->modules) {
-                printf("\nshow commands:\n");
+                more_printf("\nshow commands:\n");
                 j = 0;
                 while (current_mode->show_modules->modules[j].name) {
-                        printf("%s ",
+                        more_printf("%s ",
                                current_mode->show_modules->modules[j].name);
                         j++;
                 }
-                printf("\n");
+                more_printf("\n");
         }
 
@@ -147 +150 @@
         if (current_mode->set_modules &&
             current_mode->set_modules->modules) {
-                printf("\nset commands:\n");
+                more_printf("\nset commands:\n");
                 j = 0;
                 while (current_mode->set_modules->modules[j].name) {
-                        printf("%s ",
+                        more_printf("%s ",
                                current_mode->set_modules->modules[j].name);
                         j++;
                 }
-                printf("\n");
+                more_printf("\n");
         }
 
@@ -174 +177 @@
                                              &associated_module);
                         if (associated_module == NULL)
-                                printf("%s ",
+                                more_printf("%s ",
                                        hdt_mode.default_modules->modules[j].name);
                         j++;
                 }
-                printf("\n");
-        }
-
-        printf("\n");
+                more_printf("\n");
+        }
+
+        more_printf("\n");
         main_show_modes(argc, argv, hardware);
 }
@@ -207 +210 @@
         detect_dmi(hardware);
         cpu_detect(hardware);
+    reset_more_printf();
         clear_screen();
         main_show_cpu(argc, argv, hardware);
@@ -237 +241 @@
                    struct s_hardware *hardware __unused)
 {
-        printf("HDT\n");
-        printf(" Product     : %s\n", PRODUCT_NAME);
-        printf(" Version     : %s\n", VERSION);
-        printf(" Author      : %s\n", AUTHOR);
-        printf(" Contact     : %s\n", CONTACT);
+    reset_more_printf();
+        more_printf("HDT\n");
+        more_printf(" Product     : %s\n", PRODUCT_NAME);
+        more_printf(" Version     : %s\n", VERSION);
+        more_printf(" Author      : %s\n", AUTHOR);
+        more_printf(" Contact     : %s\n", CONTACT);
         char *contributors[NB_CONTRIBUTORS] = CONTRIBUTORS;
         for (int c = 0; c < NB_CONTRIBUTORS; c++) {
-                printf(" Contributor : %s\n", contributors[c]);
+                more_printf(" Contributor : %s\n", contributors[c]);
         }
 }

com32/hdt/hdt-cli-kernel.c

@@ -47 +47 @@
 
         detect_pci(hardware);
+    reset_more_printf();
         more_printf("Kernel modules\n");
 
@@ -106 +107 @@
         if (hardware->pci_ids_return_code == -ENOPCIIDS) {
                 nopciids = true;
-                printf(" Missing pci.ids, we can't compute the list\n");
+                more_printf(" Missing pci.ids, we can't compute the list\n");
                 return;
         }
@@ -112 +113 @@
         if (hardware->modules_pcimap_return_code == -ENOMODULESPCIMAP) {
                 nomodulespcimap = true;
-                printf
+                more_printf
                     (" Missing modules.pcimap, we can't compute the list\n");
                 return;
         }
 
+    reset_more_printf();
         for_each_pci_func(pci_device, hardware->pci_domain) {
                 memset(kernel_modules, 0, sizeof kernel_modules);
@@ -141 +143 @@
         for (int i = 0; i < MAX_PCI_CLASSES; i++) {
                 if (strlen(category_name[i]) > 1) {
-                        printf("%s : %s\n", category_name[i], modules[i]);
+                        more_printf("%s : %s\n", category_name[i], modules[i]);
                 }
         }

com32/hdt/hdt-cli-memory.c

@@ -42 +42 @@
 
         detect_memory_e820(map, E820MAX, &count);
-        printf("BIOS-provided physical RAM e820 map:\n");
         reset_more_printf();
+        more_printf("BIOS-provided physical RAM e820 map:\n");
         for (int i = 0; i < count; i++) {
                 get_type(map[i].type, type, 14);

com32/hdt/hdt-cli-pci.c

@@ -38 +38 @@
 {
         cli_detect_pci(hardware);
-
+    reset_more_printf();
         more_printf("PCI\n");
         more_printf(" NB Devices   : %d\n", hardware->nb_pci_devices);
@@ -57 +57 @@
         int bus = 0, slot = 0, func = 0;
 
+    reset_more_printf();
         /* Sanitize arguments */
         if (argc <= 0) {
-                printf("show device <number>\n");
+                more_printf("show device <number>\n");
                 return;
         } else
@@ -65 +66 @@
 
         if (errno == ERANGE) {
-                printf("This PCI device number is incorrect\n");
+                more_printf("This PCI device number is incorrect\n");
                 return;
         }
         if ((pcidev > hardware->nb_pci_devices) || (pcidev <= 0)) {
-                printf("PCI device %d doesn't exist\n", pcidev);
+                more_printf("PCI device %d doesn't exist\n", pcidev);
                 return;
         }
@@ -93 +94 @@
 
         if (pci_device == NULL) {
-                printf("We were enabled to find PCI device %d\n", pcidev);
+                more_printf("We were enabled to find PCI device %d\n", pcidev);
                 return;
         }
@@ -110 +111 @@
                 strlcpy(kernel_modules, "unknown", 7);
 
-        printf("PCI Device %d\n", pcidev);
+        more_printf("PCI Device %d\n", pcidev);
 
         if (nopciids == false) {
-                printf("Vendor Name   : %s\n",
+                more_printf("Vendor Name   : %s\n",
                             pci_device->dev_info->vendor_name);
-                printf("Product Name  : %s\n",
+                more_printf("Product Name  : %s\n",
                             pci_device->dev_info->product_name);
-                printf("Class Name    : %s\n",
+                more_printf("Class Name    : %s\n",
                             pci_device->dev_info->class_name);
         }
 
         if (nomodulesfiles == false) {
-                printf("Kernel module : %s\n", kernel_modules);
-        }
-
-        printf("Vendor ID     : %04x\n", pci_device->vendor);
-        printf("Product ID    : %04x\n", pci_device->product);
-        printf("SubVendor ID  : %04x\n", pci_device->sub_vendor);
-        printf("SubProduct ID : %04x\n", pci_device->sub_product);
-        printf("Class ID      : %02x.%02x.%02x\n", pci_device->class[2],
+                more_printf("Kernel module : %s\n", kernel_modules);
+        }
+
+        more_printf("Vendor ID     : %04x\n", pci_device->vendor);
+        more_printf("Product ID    : %04x\n", pci_device->product);
+        more_printf("SubVendor ID  : %04x\n", pci_device->sub_vendor);
+        more_printf("SubProduct ID : %04x\n", pci_device->sub_product);
+        more_printf("Class ID      : %02x.%02x.%02x\n", pci_device->class[2],
                     pci_device->class[1], pci_device->class[0]);
-        printf("Revision      : %02x\n", pci_device->revision);
+        more_printf("Revision      : %02x\n", pci_device->revision);
         if ((pci_device->dev_info->irq > 0)
             && (pci_device->dev_info->irq < 255))
                 more_printf("IRQ           : %0d\n", pci_device->dev_info->irq);
-        printf("Latency       : %0d\n", pci_device->dev_info->latency);
-        printf("PCI Bus       : %02d\n", bus);
-        printf("PCI Slot      : %02d\n", slot);
-        printf("PCI Func      : %02d\n", func);
+        more_printf("Latency       : %0d\n", pci_device->dev_info->latency);
+        more_printf("PCI Bus       : %02d\n", bus);
+        more_printf("PCI Slot      : %02d\n", slot);
+        more_printf("PCI Func      : %02d\n", func);
 
         if (hardware->is_pxe_valid == true) {
                 if ((hardware->pxe.pci_device != NULL)
                     && (hardware->pxe.pci_device == pci_device)) {
-                        printf("Mac Address   : %s\n", hardware->pxe.mac_addr);
-                        printf("PXE           : Current boot device\n");
+                        more_printf("Mac Address   : %s\n", hardware->pxe.mac_addr);
+                        more_printf("PXE           : Current boot device\n");
                 }
         }
@@ -306 +307 @@
                 detect_pci(hardware);
                 if (hardware->pci_ids_return_code == -ENOPCIIDS) {
-                        printf
+                        more_printf
                             ("The pci.ids file is missing, device names can't be computed.\n");
-                        printf("Please put one in same dir as hdt\n");
+                        more_printf("Please put one in same dir as hdt\n");
                         error = true;
                 }
                 if ((hardware->modules_pcimap_return_code == -ENOMODULESPCIMAP) &&
                         (hardware->modules_alias_return_code == -ENOMODULESALIAS)) {
-                        printf
+                        more_printf
                             ("The modules.pcimap or modules.alias files are missing, device names can't be computed.\n");
-                        printf("Please put one of them in same dir as hdt\n");
+                        more_printf("Please put one of them in same dir as hdt\n");
                         error = true;
                 }
                 if (error == true) {
                         char tempbuf[10];
-                        printf("Press enter to continue\n");
+                        more_printf("Press enter to continue\n");
                         fgets(tempbuf, sizeof(tempbuf), stdin);
                 }

com32/hdt/hdt-cli-pxe.c

@@ -42 +42 @@
         char buffer[81];
         memset(buffer, 0, sizeof(81));
+    reset_more_printf();
         if (hardware->sv->filesystem != SYSLINUX_FS_PXELINUX) {
-                printf("You are not currently using PXELINUX\n");
+                more_printf("You are not currently using PXELINUX\n");
                 return;
         }
 
         detect_pxe(hardware);
-        printf("PXE\n");
+        more_printf("PXE\n");
         if (hardware->is_pxe_valid == false) {
-                printf(" No valid PXE ROM found\n");
+                more_printf(" No valid PXE ROM found\n");
                 return;
         }
 
         struct s_pxe *p = &hardware->pxe;
-        printf(" PCI device no: %d \n", p->pci_device_pos);
+        more_printf(" PCI device no: %d \n", p->pci_device_pos);
 
         if (hardware->pci_ids_return_code == -ENOPCIIDS ||
@@ -66 +67 @@
                          " PCI Bus pos. : %02x:%02x.%02x\n", p->pci_bus,
                          p->pci_dev, p->pci_func);
-                printf(buffer);
+                more_printf(buffer);
         } else {
                 snprintf(buffer, sizeof(buffer), " Manufacturer : %s \n",
                          p->pci_device->dev_info->vendor_name);
-                printf(buffer);
+                more_printf(buffer);
                 snprintf(buffer, sizeof(buffer), " Product      : %s \n",
                          p->pci_device->dev_info->product_name);
-                printf(buffer);
+                more_printf(buffer);
         }
-        printf(" Addresses    : %d.%d.%d.%d @ %s\n", p->ip_addr[0],
+        more_printf(" Addresses    : %d.%d.%d.%d @ %s\n", p->ip_addr[0],
                     p->ip_addr[1], p->ip_addr[2], p->ip_addr[3], p->mac_addr);
 }

com32/hdt/hdt-cli-syslinux.c

@@ -40 +40 @@
                         struct s_hardware *hardware)
 {
-  printf("SYSLINUX\n");
-  printf(" Bootloader : %s\n", hardware->syslinux_fs);
-  printf(" Version    : %s\n", hardware->sv->version_string + 2);
-  printf(" Version    : %u\n", hardware->sv->version);
-  printf(" Max API    : %u\n", hardware->sv->max_api);
-  printf(" Copyright  : %s\n", hardware->sv->copyright_string + 1);
+  reset_more_printf();
+  more_printf("SYSLINUX\n");
+  more_printf(" Bootloader : %s\n", hardware->syslinux_fs);
+  more_printf(" Version    : %s\n", hardware->sv->version_string + 2);
+  more_printf(" Version    : %u\n", hardware->sv->version);
+  more_printf(" Max API    : %u\n", hardware->sv->max_api);
+  more_printf(" Copyright  : %s\n", hardware->sv->copyright_string + 1);
 }
 

com32/hdt/hdt-cli-vesa.c

@@ -37 +37 @@
                     struct s_hardware *hardware)
 {
+    reset_more_printf();
         detect_vesa(hardware);
         if (hardware->is_vesa_valid == false) {
-                printf("No VESA BIOS detected\n");
+                more_printf("No VESA BIOS detected\n");
                 return;
         }
-        printf("VESA\n");
-        printf(" Vesa version : %d.%d\n", hardware->vesa.major_version,
+        more_printf("VESA\n");
+        more_printf(" Vesa version : %d.%d\n", hardware->vesa.major_version,
                     hardware->vesa.minor_version);
-        printf(" Vendor       : %s\n", hardware->vesa.vendor);
-        printf(" Product      : %s\n", hardware->vesa.product);
-        printf(" Product rev. : %s\n", hardware->vesa.product_revision);
-        printf(" Software rev.: %d\n", hardware->vesa.software_rev);
-        printf(" Memory (KB)  : %d\n", hardware->vesa.total_memory * 64);
-        printf(" Modes        : %d\n", hardware->vesa.vmi_count);
+        more_printf(" Vendor       : %s\n", hardware->vesa.vendor);
+        more_printf(" Product      : %s\n", hardware->vesa.product);
+        more_printf(" Product rev. : %s\n", hardware->vesa.product_revision);
+        more_printf(" Software rev.: %d\n", hardware->vesa.software_rev);
+        more_printf(" Memory (KB)  : %d\n", hardware->vesa.total_memory * 64);
+        more_printf(" Modes        : %d\n", hardware->vesa.vmi_count);
 }
 
@@ -57 +58 @@
 {
         detect_vesa(hardware);
+        reset_more_printf();
         if (hardware->is_vesa_valid == false) {
-                printf("No VESA BIOS detected\n");
+                more_printf("No VESA BIOS detected\n");
                 return;
         }
-        reset_more_printf();
-        printf(" ResH. x ResV x Bits : vga= : Vesa Mode\n");
-        printf("----------------------------------------\n");
+        more_printf(" ResH. x ResV x Bits : vga= : Vesa Mode\n");
+        more_printf("----------------------------------------\n");
 
         for (int i = 0; i < hardware->vesa.vmi_count; i++) {
@@ -72 +73 @@
                  */
                 if ((mi->h_res == 0) || (mi->v_res == 0)) continue;
-                printf("%5u %5u    %3u     %3d     0x%04x\n",
+                more_printf("%5u %5u    %3u     %3d     0x%04x\n",
                             mi->h_res, mi->v_res, mi->bpp,
                             hardware->vesa.vmi[i].mode + 0x200,

com32/hdt/hdt-cli-vpd.c

@@ -40 +40 @@
 
         if (!hardware->is_vpd_valid) {
-                printf("No VPD structure detected.\n");
+                more_printf("No VPD structure detected.\n");
                 return;
         }
 
-        printf("VPD present at address : 0x%s\n", hardware->vpd.base_address);
+        more_printf("VPD present at address : 0x%s\n", hardware->vpd.base_address);
         if (strlen(hardware->vpd.bios_build_id) > 0)
                 more_printf("Bios Build ID                 : %s\n", hardware->vpd.bios_build_id);

com32/hdt/hdt-common.h

@@ -61 +61 @@
 
 #define pause_printf() do {\
-        printf("--More--");\
-        get_key(stdin, 0);\
-        printf("\n");\
+       printf("--More--");\
+       get_key(stdin, 0);\
+       printf("\033[2K\033[1G\033[1F\n");\
 } while (0);
 
 #define more_printf(...) do {\
  if (display_line_nb == 20) {\
-   printf("\nPress any key to continue");\
+   printf("\n--More--");\
    display_line_nb=0;\
    get_key(stdin, 0);\
+   printf("\033[2K\033[1G\033[1F");\
  }\
- printf ( __VA_ARGS__);\
+ printf(__VA_ARGS__);\
  display_line_nb++; \
 } while (0);