chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] fix devpath for netdev
[elogind.git]
/
udev_config.c
diff --git
a/udev_config.c
b/udev_config.c
index cade81cf207ccf3e1e9bbc454b8cce24a2629d9e..ba04003e909285c89349f2178c4d1f82da37dd38 100644
(file)
--- a/
udev_config.c
+++ b/
udev_config.c
@@
-34,6
+34,7
@@
#include "libsysfs/sysfs/libsysfs.h"
#include "udev.h"
#include "libsysfs/sysfs/libsysfs.h"
#include "udev.h"
+#include "udev_lib.h"
#include "udev_version.h"
#include "logging.h"
#include "namedev.h"
#include "udev_version.h"
#include "logging.h"
#include "namedev.h"
@@
-50,6
+51,7
@@
char default_owner_str[OWNER_SIZE];
char default_group_str[GROUP_SIZE];
int udev_log;
int udev_sleep;
char default_group_str[GROUP_SIZE];
int udev_log;
int udev_sleep;
+int udev_dev_d;
static int string_is_true(char *str)
static int string_is_true(char *str)
@@
-76,17
+78,21
@@
static void init_variables(void)
udev_sleep = 1;
if (getenv("UDEV_NO_SLEEP") != NULL)
udev_sleep = 0;
udev_sleep = 1;
if (getenv("UDEV_NO_SLEEP") != NULL)
udev_sleep = 0;
+
+ udev_dev_d = 1;
+ if (getenv("UDEV_NO_DEVD") != NULL)
+ udev_dev_d = 0;
}
#define set_var(_name, _var) \
if (strcasecmp(variable, _name) == 0) { \
}
#define set_var(_name, _var) \
if (strcasecmp(variable, _name) == 0) { \
- dbg_parse("%s
= '%s'", _name, value);
\
- str
ncpy(_var, value, sizeof(_var));
\
+ dbg_parse("%s
='%s'", _name, value);
\
+ str
fieldcpy(_var, value);
\
}
#define set_bool(_name, _var) \
if (strcasecmp(variable, _name) == 0) { \
}
#define set_bool(_name, _var) \
if (strcasecmp(variable, _name) == 0) { \
- dbg_parse("%s
= '%s'", _name, value);
\
+ dbg_parse("%s
='%s'", _name, value);
\
_var = string_is_true(value); \
}
_var = string_is_true(value); \
}
@@
-131,12
+137,14
@@
static int parse_config_file(void)
char *temp;
char *variable;
char *value;
char *temp;
char *variable;
char *value;
- FILE *fd;
- int lineno = 0;
+ char *buf;
+ size_t bufsize;
+ size_t cur;
+ size_t count;
+ int lineno;
int retval = 0;
int retval = 0;
-
- fd = fopen(udev_config_filename, "r");
- if (fd != NULL) {
+
+ if (file_map(udev_config_filename, &buf, &bufsize) == 0) {
dbg("reading '%s' as config file", udev_config_filename);
} else {
dbg("can't open '%s' as config file", udev_config_filename);
dbg("reading '%s' as config file", udev_config_filename);
} else {
dbg("can't open '%s' as config file", udev_config_filename);
@@
-144,13
+152,20
@@
static int parse_config_file(void)
}
/* loop through the whole file */
}
/* loop through the whole file */
+ lineno = 0;
+ cur = 0;
while (1) {
while (1) {
- /* get a line */
- temp = fgets(line, sizeof(line), fd);
- if (temp == NULL)
- goto exit;
+ count = buf_get_line(buf, bufsize, cur);
+
+ strncpy(line, buf + cur, count);
+ line[count] = '\0';
+ temp = line;
lineno++;
lineno++;
+ cur += count+1;
+ if (cur > bufsize)
+ break;
+
dbg_parse("read '%s'", temp);
/* eat the whitespace at the beginning of the line */
dbg_parse("read '%s'", temp);
/* eat the whitespace at the beginning of the line */
@@
-182,8
+197,8
@@
static int parse_config_file(void)
}
dbg_parse("%s:%d:%Zd: error parsing '%s'", udev_config_filename,
lineno, temp - line, temp);
}
dbg_parse("%s:%d:%Zd: error parsing '%s'", udev_config_filename,
lineno, temp - line, temp);
-exit:
- f
close(fd
);
+
+ f
ile_unmap(buf, bufsize
);
return retval;
}
return retval;
}