* The PCI Library -- Configuration Access via /sys/bus/pci
*
* Copyright (c) 2003 Matthew Wilcox <matthew@wil.cx>
- * Copyright (c) 1997--2008 Martin Mares <mj@ucw.cz>
+ * Copyright (c) 1997--2023 Martin Mares <mj@ucw.cz>
*
* Can be freely distributed and used under the terms of the GNU GPL v2+.
*
#include <sys/types.h>
#include "internal.h"
-#include "pread.h"
static void
sysfs_config(struct pci_access *a)
return 0;
}
n = read(fd, buf, OBJBUFSIZE);
+ int read_errno = errno;
close(fd);
if (n < 0)
{
- warn("Error reading %s: %s", namebuf, strerror(errno));
+ warn("Error reading %s: %s", namebuf, strerror(read_errno));
return 0;
- }
+ }
if (n >= OBJBUFSIZE)
{
warn("Value in %s too long", namebuf);
path_canon = realpath(path_rel, NULL);
if (!path_canon || strcmp(path_canon, path_abs) != 0)
parent = NULL;
+
+ if (path_canon)
+ free(path_canon);
}
if (parent)
d->parent = parent;
else
clear_fill(d, PCI_FILL_PARENT);
+
+ if (path_abs)
+ free(path_abs);
}
}
a->fd = open(namebuf, a->fd_rw ? O_RDWR : O_RDONLY);
if (a->fd < 0)
a->warning("Cannot open %s", namebuf);
- a->fd_pos = 0;
}
return a->fd;
}
if (fd < 0)
return 0;
- res = do_read(d, fd, buf, len, pos);
+ res = pread(fd, buf, len, pos);
if (res < 0)
{
d->access->warning("sysfs_read: read failed: %s", strerror(errno));
if (fd < 0)
return 0;
- res = do_write(d, fd, buf, len, pos);
+ res = pwrite(fd, buf, len, pos);
if (res < 0)
{
d->access->warning("sysfs_write: write failed: %s", strerror(errno));
return 1;
}
-#ifdef PCI_HAVE_DO_READ
-
-/* pread() is not available and do_read() only works for a single fd, so we
- * cannot implement read_vpd properly. */
-static int sysfs_read_vpd(struct pci_dev *d, int pos, byte *buf, int len)
-{
- return 0;
-}
-
-#else /* !PCI_HAVE_DO_READ */
-
static int sysfs_read_vpd(struct pci_dev *d, int pos, byte *buf, int len)
{
int fd = sysfs_setup(d, SETUP_READ_VPD);
return 1;
}
-#endif /* PCI_HAVE_DO_READ */
-
static void sysfs_cleanup_dev(struct pci_dev *d)
{
struct pci_access *a = d->access;
}
struct pci_methods pm_linux_sysfs = {
- "linux-sysfs",
- "The sys filesystem on Linux",
- sysfs_config,
- sysfs_detect,
- sysfs_init,
- sysfs_cleanup,
- sysfs_scan,
- sysfs_fill_info,
- sysfs_read,
- sysfs_write,
- sysfs_read_vpd,
- NULL, /* init_dev */
- sysfs_cleanup_dev
+ .name = "linux-sysfs",
+ .help = "The sys filesystem on Linux",
+ .config = sysfs_config,
+ .detect = sysfs_detect,
+ .init = sysfs_init,
+ .cleanup = sysfs_cleanup,
+ .scan = sysfs_scan,
+ .fill_info = sysfs_fill_info,
+ .read = sysfs_read,
+ .write = sysfs_write,
+ .read_vpd = sysfs_read_vpd,
+ .cleanup_dev = sysfs_cleanup_dev,
};