Skip to content

Fixed issue #145 GPIO library doesn't free GPIO file descriptor. File descriptor leak. #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 27, 2017
Merged

Fixed issue #145 GPIO library doesn't free GPIO file descriptor. File descriptor leak. #146

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 26 additions & 18 deletions source/event_gpio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,49 +75,57 @@ int epfd = -1;

BBIO_err gpio_export(unsigned int gpio)
{
int fd, len;
int fd = 0, len = 0, ret = BBIO_GEN;
char str_gpio[10];

// already exported by us?
if (exported_gpios[gpio] != GPIO_NOT_EXPORTED) {
syslog(LOG_DEBUG, "gpio_export: %u already exported", gpio);
return BBIO_OK;
ret = BBIO_OK;
goto exit;
}

// already exported by someone else?
char gpio_path[64];
snprintf(gpio_path, sizeof(gpio_path), "/sys/class/gpio/gpio%d", gpio);

if (access(gpio_path, R_OK|W_OK|X_OK) != -1)
{
if (access(gpio_path, R_OK|W_OK|X_OK) != -1) {
exported_gpios[gpio] = GPIO_ALREADY_EXPORTED;
syslog(LOG_DEBUG, "gpio_export: %u already exported", gpio);
return BBIO_OK;
ret = BBIO_OK;
goto exit;
}

#define GPIO_EXPORT "/sys/class/gpio/export"
const char gpio_export[] = "/sys/class/gpio/export";

if ((fd = open(GPIO_EXPORT, O_WRONLY)) < 0)
{
syslog(LOG_ERR, "gpio_export: %u couldn't open '"GPIO_EXPORT"': %i-%s",
gpio, errno, strerror(errno));
return BBIO_SYSFS;
if ((fd = open(gpio_export, O_WRONLY)) < 0) {
syslog(LOG_ERR, "gpio_export: %u couldn't open \"%s\": %i-%s",
gpio, gpio_export, errno, strerror(errno));
ret = BBIO_SYSFS;
goto exit;
}

len = snprintf(str_gpio, sizeof(str_gpio), "%d", gpio);
int ret = write(fd, str_gpio, len);
close(fd);
if (ret < 0) {
syslog(LOG_ERR, "gpio_export: %u couldn't write '"GPIO_EXPORT"': %i-%s",
gpio, errno, strerror(errno));
return BBIO_SYSFS;
if(write(fd, str_gpio, len) < 0) {
syslog(LOG_ERR, "gpio_export: %u couldn't write \"%s\": %i-%s",
gpio, gpio_export, errno, strerror(errno));
ret = BBIO_SYSFS;
goto exit;
}

// add to list
exported_gpios[gpio] = GPIO_EXPORTED;

syslog(LOG_DEBUG, "gpio_export: %u OK", gpio);
return BBIO_OK;
ret = BBIO_OK;

exit:
if(fd && (ret = close(fd))) {
syslog(LOG_ERR, "gpio_export: %u couldn't close \"%s\": %i-%s",
gpio, gpio_export, errno, strerror(errno));
ret = BBIO_SYSFS;
}
return ret;
}

void close_value_fd(unsigned int gpio)
Expand Down