aaru-dps/aaruremote
1
0
Fork 0
mirror of https://github.com/aaru-dps/aaruremote.git synced 2025-12-16 19:24:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add conditional for udev presence in Linux.

Browse Source
This commit is contained in:
Natalia Portillo
2019-10-20 16:34:38 +01:00
parent 5ad1aad8f5
commit beff90faa8
3 changed files with 61 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
linux/list_devices.c
View File

@@ -20,7 +20,6 @@
#include <ctype.h>
#include <dirent.h>
#include <libudev.h>
#include <stdbool.h>
#include <stddef.h>
#include <stdio.h>
@@ -28,23 +27,29 @@
#include <string.h>
#include <unistd.h>
#ifdef HAS_UDEV
#include <libudev.h>
#endif
DeviceInfoList* LinuxListDevices()
{
DIR* dir;
struct dirent* dirent;
DIR* dir;
struct dirent* dirent;
int i;
DeviceInfoList *list_start = NULL, *list_current = NULL, *list_next = NULL;
const char* tmp_string;
FILE* file;
char* line_str;
size_t n, ret;
char* chrptr;
#ifdef HAS_UDEV
int has_udev;
struct udev* udev;
int has_udev = false, i;
DeviceInfoList * list_start = NULL, *list_current = NULL, *list_next = NULL;
struct udev_device* udev_device;
const char* tmp_string;
FILE* file;
char* line_str;
size_t n, ret;
char* chrptr;
udev = udev_new();
udev = udev_new();
has_udev = udev != 0;
#endif
dir = opendir(PATH_SYS_DEVBLOCK);
if(!dir) return NULL;
@@ -66,8 +71,9 @@ DeviceInfoList* LinuxListDevices()
{
closedir(dir);
#ifdef HAS_UDEV
if(has_udev) udev_unref(udev);
#endif
return list_start;
}
@@ -77,6 +83,7 @@ DeviceInfoList* LinuxListDevices()
snprintf(list_next->this.path, 1024, "/dev/%s", dirent->d_name);
#ifdef HAS_UDEV
if(has_udev)
{
udev_device = udev_device_new_from_subsystem_sysname(udev, "block", dirent->d_name);
@@ -127,6 +134,7 @@ DeviceInfoList* LinuxListDevices()
}
}
}
#endif
tmp_string = malloc(1024);
memset((void*)tmp_string, 0, 1024);
@@ -299,7 +307,9 @@ DeviceInfoList* LinuxListDevices()
closedir(dir);
#ifdef HAS_UDEV
if(has_udev) udev_unref(udev);
#endif
return list_start;
}