update-pciids: Re-compress pci.ids if needed

[pciutils.git] / common.c

diff --git a/common.c b/common.c
index 2bfd1b8b9c17bf3821a73a7962ed1a79acf053ef..748e5a4639d8580e10beb8c270356e14ad1b6be5 100644 (file)
--- a/common.c
+++ b/common.c
@@ -1,16 +1,17 @@
 /*
  *     The PCI Utilities -- Common Functions
  *
 /*
  *     The PCI Utilities -- Common Functions
  *

- *     Copyright (c) 1997--2003 Martin Mares <mj@ucw.cz>
+ *     Copyright (c) 1997--2016 Martin Mares <mj@ucw.cz>

  *
  *

- *     Can be freely distributed and used under the terms of the GNU GPL.
+ *     Can be freely distributed and used under the terms of the GNU GPL v2+.
+ *
+ *     SPDX-License-Identifier: GPL-2.0-or-later

  */
 
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
  */
 
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>

-#include <unistd.h>

 
 #include "pciutils.h"
 
 
 #include "pciutils.h"
 


@@ -20,60 +21,114 @@ die(char *msg, ...)
   va_list args;
 
   va_start(args, msg);
   va_list args;
 
   va_start(args, msg);

-  fputs("lspci: ", stderr);
+  fprintf(stderr, "%s: ", program_name);

   vfprintf(stderr, msg, args);
   fputc('\n', stderr);
   exit(1);
 }
 
 void *
   vfprintf(stderr, msg, args);
   fputc('\n', stderr);
   exit(1);
 }
 
 void *

-xmalloc(unsigned int howmuch)
+xmalloc(size_t howmuch)

 {
   void *p = malloc(howmuch);
   if (!p)
 {
   void *p = malloc(howmuch);
   if (!p)

-    die("Unable to allocate %d bytes of memory", howmuch);
+    die("Unable to allocate %d bytes of memory", (int) howmuch);

   return p;
 }
 
 void *
   return p;
 }
 
 void *

-xrealloc(void *ptr, unsigned int howmuch)
+xrealloc(void *ptr, size_t howmuch)

 {
   void *p = realloc(ptr, howmuch);
   if (!p)
 {
   void *p = realloc(ptr, howmuch);
   if (!p)

-    die("Unable to allocate %d bytes of memory", howmuch);
+    die("Unable to allocate %d bytes of memory", (int) howmuch);

   return p;
 }
 
   return p;
 }
 

+char *
+xstrdup(const char *str)
+{
+  int len = strlen(str) + 1;
+  char *copy = xmalloc(len);
+  memcpy(copy, str, len);
+  return copy;
+}
+
+static void
+set_pci_method(struct pci_access *pacc, char *arg)
+{
+  char *name;
+  int i;
+
+  if (!strcmp(arg, "help"))
+    {
+      printf("Known PCI access methods:\n\n");
+      for (i=0; name = pci_get_method_name(i); i++)
+       if (name[0])
+         printf("%s\n", name);
+      exit(0);
+    }
+  else
+    {
+      i = pci_lookup_method(arg);
+      if (i < 0)
+       die("No such PCI access method: %s (see `-A help' for a list)", arg);
+      pacc->method = i;
+    }
+}
+
+static void
+set_pci_option(struct pci_access *pacc, char *arg)
+{
+  if (!strcmp(arg, "help"))
+    {
+      struct pci_param *p;
+      printf("Known PCI access parameters:\n\n");
+      for (p=NULL; p=pci_walk_params(pacc, p);)
+       printf("%-20s %s (%s)\n", p->param, p->help, p->value);
+      exit(0);
+    }
+  else
+    {
+      char *sep = strchr(arg, '=');
+      if (!sep)
+       die("Invalid PCI access parameter syntax: %s", arg);
+      *sep++ = 0;
+      if (pci_set_param(pacc, arg, sep) < 0)
+       die("Unrecognized PCI access parameter: %s (see `-O help' for a list)", arg);
+    }
+}
+

 int
 int

-parse_generic_option(int i, struct pci_access *pacc, char *optarg)
+parse_generic_option(int i, struct pci_access *pacc, char *arg)

 {
   switch (i)
     {
 {
   switch (i)
     {

-#ifdef PCI_HAVE_PM_LINUX_PROC
-    case 'P':
-      pacc->method_params[PCI_ACCESS_PROC_BUS_PCI] = optarg;
-      pacc->method = PCI_ACCESS_PROC_BUS_PCI;
-      break;
-#endif

 #ifdef PCI_HAVE_PM_INTEL_CONF
     case 'H':
 #ifdef PCI_HAVE_PM_INTEL_CONF
     case 'H':

-      if (!strcmp(optarg, "1"))
+      if (!strcmp(arg, "1"))

        pacc->method = PCI_ACCESS_I386_TYPE1;
        pacc->method = PCI_ACCESS_I386_TYPE1;

-      else if (!strcmp(optarg, "2"))
+      else if (!strcmp(arg, "2"))

        pacc->method = PCI_ACCESS_I386_TYPE2;
       else
        pacc->method = PCI_ACCESS_I386_TYPE2;
       else

-       die("Unknown hardware configuration type %s", optarg);
+       die("Unknown hardware configuration type %s", arg);

       break;
 #endif
 #ifdef PCI_HAVE_PM_DUMP
     case 'F':
       break;
 #endif
 #ifdef PCI_HAVE_PM_DUMP
     case 'F':

-      pacc->method_params[PCI_ACCESS_DUMP] = optarg;
+      pci_set_param(pacc, "dump.name", arg);

       pacc->method = PCI_ACCESS_DUMP;
       break;
 #endif
       pacc->method = PCI_ACCESS_DUMP;
       break;
 #endif

+    case 'A':
+      set_pci_method(pacc, arg);
+      break;

     case 'G':
       pacc->debugging++;
       break;
     case 'G':
       pacc->debugging++;
       break;

+    case 'O':
+      set_pci_option(pacc, arg);
+      break;

     default:
       return 0;
     }
     default:
       return 0;
     }