chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: add some O_CLOEXEC
[elogind.git]
/
src
/
udev
/
scsi_id
/
scsi_id.c
diff --git
a/src/udev/scsi_id/scsi_id.c
b/src/udev/scsi_id/scsi_id.c
index 9bb0d7f538f4a28221d6497ecbe94bfc0607e8e7..6fc41e94fb3ad9bb92b274d6a6bbd388783cbaa3 100644
(file)
--- a/
src/udev/scsi_id/scsi_id.c
+++ b/
src/udev/scsi_id/scsi_id.c
@@
-78,7
+78,7
@@
static void set_type(const char *from, char *to, size_t len)
{
int type_num;
char *eptr;
{
int type_num;
char *eptr;
- char *type = "generic";
+ c
onst c
har *type = "generic";
type_num = strtoul(from, &eptr, 0);
if (eptr != from) {
type_num = strtoul(from, &eptr, 0);
if (eptr != from) {
@@
-122,10
+122,10
@@
static void set_type(const char *from, char *to, size_t len)
*/
static char *get_value(char **buffer)
{
*/
static char *get_value(char **buffer)
{
- static char *quote_string = "\"\n";
- static char *comma_string = ",\n";
+ static c
onst c
har *quote_string = "\"\n";
+ static c
onst c
har *comma_string = ",\n";
char *val;
char *val;
- char *end;
+ c
onst c
har *end;
if (**buffer == '"') {
/*
if (**buffer == '"') {
/*
@@
-180,14
+180,12
@@
static int get_file_options(struct udev *udev,
int c;
int retval = 0;
int c;
int retval = 0;
- dbg(udev, "vendor='%s'; model='%s'\n", vendor, model);
- fd = fopen(config_file, "r");
+ fd = fopen(config_file, "re");
if (fd == NULL) {
if (fd == NULL) {
- dbg(udev, "can't open %s\n", config_file);
if (errno == ENOENT) {
return 1;
} else {
if (errno == ENOENT) {
return 1;
} else {
-
err(udev,
"can't open %s: %s\n", config_file, strerror(errno));
+
log_error(
"can't open %s: %s\n", config_file, strerror(errno));
return -1;
}
}
return -1;
}
}
@@
-200,7
+198,7
@@
static int get_file_options(struct udev *udev,
buffer = malloc(MAX_BUFFER_LEN);
if (!buffer) {
fclose(fd);
buffer = malloc(MAX_BUFFER_LEN);
if (!buffer) {
fclose(fd);
-
err(udev,
"can't allocate memory\n");
+
log_error(
"can't allocate memory\n");
return -1;
}
return -1;
}
@@
-214,7
+212,7
@@
static int get_file_options(struct udev *udev,
break;
lineno++;
if (buf[strlen(buffer) - 1] != '\n') {
break;
lineno++;
if (buf[strlen(buffer) - 1] != '\n') {
-
err(udev,
"Config file line %d too long\n", lineno);
+
log_error(
"Config file line %d too long\n", lineno);
break;
}
break;
}
@@
-229,7
+227,6
@@
static int get_file_options(struct udev *udev,
if (*buf == '#')
continue;
if (*buf == '#')
continue;
- dbg(udev, "lineno %d: '%s'\n", lineno, buf);
str1 = strsep(&buf, "=");
if (str1 && strcasecmp(str1, "VENDOR") == 0) {
str1 = get_value(&buf);
str1 = strsep(&buf, "=");
if (str1 && strcasecmp(str1, "VENDOR") == 0) {
str1 = get_value(&buf);
@@
-259,22
+256,18
@@
static int get_file_options(struct udev *udev,
}
options_in = str1;
}
}
options_in = str1;
}
- dbg(udev, "config file line %d:\n"
- " vendor '%s'; model '%s'; options '%s'\n",
- lineno, vendor_in, model_in, options_in);
+
/*
* Only allow: [vendor=foo[,model=bar]]options=stuff
*/
if (!options_in || (!vendor_in && model_in)) {
/*
* Only allow: [vendor=foo[,model=bar]]options=stuff
*/
if (!options_in || (!vendor_in && model_in)) {
-
err(udev,
"Error parsing config file line %d '%s'\n", lineno, buffer);
+
log_error(
"Error parsing config file line %d '%s'\n", lineno, buffer);
retval = -1;
break;
}
if (vendor == NULL) {
retval = -1;
break;
}
if (vendor == NULL) {
- if (vendor_in == NULL) {
- dbg(udev, "matched global option\n");
+ if (vendor_in == NULL)
break;
break;
- }
} else if ((vendor_in && strncmp(vendor, vendor_in,
strlen(vendor_in)) == 0) &&
(!model_in || (strncmp(model, model_in,
} else if ((vendor_in && strncmp(vendor, vendor_in,
strlen(vendor_in)) == 0) &&
(!model_in || (strncmp(model, model_in,
@@
-286,10
+279,7
@@
static int get_file_options(struct udev *udev,
* give a partial match (that is FOO
* matches FOOBAR).
*/
* give a partial match (that is FOO
* matches FOOBAR).
*/
- dbg(udev, "matched vendor/model\n");
break;
break;
- } else {
- dbg(udev, "no match\n");
}
}
}
}
@@
-304,7
+294,7
@@
static int get_file_options(struct udev *udev,
c = argc_count(buffer) + 2;
*newargv = calloc(c, sizeof(**newargv));
if (!*newargv) {
c = argc_count(buffer) + 2;
*newargv = calloc(c, sizeof(**newargv));
if (!*newargv) {
-
err(udev,
"can't allocate memory\n");
+
log_error(
"can't allocate memory\n");
retval = -1;
} else {
*argc = c;
retval = -1;
} else {
*argc = c;
@@
-346,11
+336,6
@@
static int set_options(struct udev *udev,
if (option == -1)
break;
if (option == -1)
break;
- if (optarg)
- dbg(udev, "option '%c' arg '%s'\n", option, optarg);
- else
- dbg(udev, "option '%c'\n", option);
-
switch (option) {
case 'b':
all_good = 0;
switch (option) {
case 'b':
all_good = 0;
@@
-396,7
+381,7
@@
static int set_options(struct udev *udev,
} else if (strcmp(optarg, "pre-spc3-83") == 0) {
default_page_code = PAGE_83_PRE_SPC3;
} else {
} else if (strcmp(optarg, "pre-spc3-83") == 0) {
default_page_code = PAGE_83_PRE_SPC3;
} else {
-
err(udev,
"Unknown page code '%s'\n", optarg);
+
log_error(
"Unknown page code '%s'\n", optarg);
return -1;
}
break;
return -1;
}
break;
@@
-404,7
+389,7
@@
static int set_options(struct udev *udev,
case 's':
sg_version = atoi(optarg);
if (sg_version < 3 || sg_version > 4) {
case 's':
sg_version = atoi(optarg);
if (sg_version < 3 || sg_version > 4) {
-
err(udev,
"Unknown SG version '%s'\n", optarg);
+
log_error(
"Unknown SG version '%s'\n", optarg);
return -1;
}
break;
return -1;
}
break;
@@
-456,11
+441,6
@@
static int per_dev_options(struct udev *udev,
if (option == -1)
break;
if (option == -1)
break;
- if (optarg)
- dbg(udev, "option '%c' arg '%s'\n", option, optarg);
- else
- dbg(udev, "option '%c'\n", option);
-
switch (option) {
case 'b':
*good_bad = 0;
switch (option) {
case 'b':
*good_bad = 0;
@@
-478,13
+458,13
@@
static int per_dev_options(struct udev *udev,
} else if (strcmp(optarg, "pre-spc3-83") == 0) {
*page_code = PAGE_83_PRE_SPC3;
} else {
} else if (strcmp(optarg, "pre-spc3-83") == 0) {
*page_code = PAGE_83_PRE_SPC3;
} else {
-
err(udev,
"Unknown page code '%s'\n", optarg);
+
log_error(
"Unknown page code '%s'\n", optarg);
retval = -1;
}
break;
default:
retval = -1;
}
break;
default:
-
err(udev,
"Unknown or bad option '%c' (0x%x)\n", option, option);
+
log_error(
"Unknown or bad option '%c' (0x%x)\n", option, option);
retval = -1;
break;
}
retval = -1;
break;
}
@@
-540,7
+520,6
@@
static int scsi_id(struct udev *udev, char *maj_min_dev)
/* get per device (vendor + model) options from the config file */
per_dev_options(udev, &dev_scsi, &good_dev, &page_code);
/* get per device (vendor + model) options from the config file */
per_dev_options(udev, &dev_scsi, &good_dev, &page_code);
- dbg(udev, "per dev options: good %d; page code 0x%x\n", good_dev, page_code);
if (!good_dev) {
retval = 1;
goto out;
if (!good_dev) {
retval = 1;
goto out;
@@
-616,7
+595,7
@@
int main(int argc, char **argv)
if (udev == NULL)
goto exit;
if (udev == NULL)
goto exit;
-
udev_log_init("scsi_id"
);
+
log_open(
);
udev_set_log_fn(udev, log_fn);
/*
udev_set_log_fn(udev, log_fn);
/*
@@
-643,7
+622,7
@@
int main(int argc, char **argv)
exit(1);
if (!dev_specified) {
exit(1);
if (!dev_specified) {
-
err(udev,
"no device specified\n");
+
log_error(
"no device specified\n");
retval = 1;
goto exit;
}
retval = 1;
goto exit;
}
@@
-652,6
+631,6
@@
int main(int argc, char **argv)
exit:
udev_unref(udev);
exit:
udev_unref(udev);
-
udev_
log_close();
+ log_close();
return retval;
}
return retval;
}