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: never bypass our own logging framework and call vsyslog() directly from udev...
[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 6a4cf0c09e200edb7be1f7697ec2907b3efbb85b..4d9378a5c0ac32fbf6affafe38608c8a28567e28 100644
(file)
--- a/
src/udev/scsi_id/scsi_id.c
+++ b/
src/udev/scsi_id/scsi_id.c
@@
-25,7
+25,6
@@
#include <fcntl.h>
#include <errno.h>
#include <string.h>
#include <fcntl.h>
#include <errno.h>
#include <string.h>
-#include <syslog.h>
#include <ctype.h>
#include <getopt.h>
#include <sys/stat.h>
#include <ctype.h>
#include <getopt.h>
#include <sys/stat.h>
@@
-55,7
+54,6
@@
static bool dev_specified = false;
static char config_file[MAX_PATH_LEN] = "/etc/scsi_id.config";
static enum page_code default_page_code = PAGE_UNSPECIFIED;
static int sg_version = 4;
static char config_file[MAX_PATH_LEN] = "/etc/scsi_id.config";
static enum page_code default_page_code = PAGE_UNSPECIFIED;
static int sg_version = 4;
-static int debug = 0;
static bool reformat_serial = false;
static bool export = false;
static char vendor_str[64];
static bool reformat_serial = false;
static bool export = false;
static char vendor_str[64];
@@
-70,7
+68,7
@@
static void log_fn(struct udev *udev, int priority,
const char *file, int line, const char *fn,
const char *format, va_list args)
{
const char *file, int line, const char *fn,
const char *format, va_list args)
{
-
vsyslog(priority
, format, args);
+
log_metav(priority, file, line, fn
, format, args);
}
static void set_type(const char *from, char *to, size_t len)
}
static void set_type(const char *from, char *to, size_t len)
@@
-184,7
+182,7
@@
static int get_file_options(struct udev *udev,
if (errno == ENOENT)
return 1;
else {
if (errno == ENOENT)
return 1;
else {
- log_error("can't open %s: %m
\n
", config_file);
+ log_error("can't open %s: %m", config_file);
return -1;
}
}
return -1;
}
}
@@
-208,7
+206,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') {
- log_error("Config file line %d too long
\n
", lineno);
+ log_error("Config file line %d too long", lineno);
break;
}
break;
}
@@
-257,7
+255,7
@@
static int get_file_options(struct udev *udev,
* 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)) {
- log_error("Error parsing config file line %d '%s'
\n
", lineno, buffer);
+ log_error("Error parsing config file line %d '%s'", lineno, buffer);
retval = -1;
break;
}
retval = -1;
break;
}
@@
-372,7
+370,7
@@
static int set_options(struct udev *udev,
else if (streq(optarg, "pre-spc3-83"))
default_page_code = PAGE_83_PRE_SPC3;
else {
else if (streq(optarg, "pre-spc3-83"))
default_page_code = PAGE_83_PRE_SPC3;
else {
- log_error("Unknown page code '%s'
\n
", optarg);
+ log_error("Unknown page code '%s'", optarg);
return -1;
}
break;
return -1;
}
break;
@@
-380,7
+378,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) {
- log_error("Unknown SG version '%s'
\n
", optarg);
+ log_error("Unknown SG version '%s'", optarg);
return -1;
}
break;
return -1;
}
break;
@@
-390,13
+388,15
@@
static int set_options(struct udev *udev,
break;
case 'v':
break;
case 'v':
- debug++;
+ log_set_target(LOG_TARGET_CONSOLE);
+ log_set_max_level(LOG_DEBUG);
+ udev_set_log_priority(udev, LOG_DEBUG);
+ log_open();
break;
case 'V':
printf("%s\n", VERSION);
exit(0);
break;
case 'V':
printf("%s\n", VERSION);
exit(0);
- break;
case 'x':
export = true;
case 'x':
export = true;
@@
-453,13
+453,13
@@
static int per_dev_options(struct udev *udev,
} else if (streq(optarg, "pre-spc3-83")) {
*page_code = PAGE_83_PRE_SPC3;
} else {
} else if (streq(optarg, "pre-spc3-83")) {
*page_code = PAGE_83_PRE_SPC3;
} else {
- log_error("Unknown page code '%s'
\n
", optarg);
+ log_error("Unknown page code '%s'", optarg);
retval = -1;
}
break;
default:
retval = -1;
}
break;
default:
- log_error("Unknown or bad option '%c' (0x%x)
\n
", option, option);
+ log_error("Unknown or bad option '%c' (0x%x)", option, option);
retval = -1;
break;
}
retval = -1;
break;
}
@@
-584,11
+584,13
@@
int main(int argc, char **argv)
int newargc;
char **newargv = NULL;
int newargc;
char **newargv = NULL;
+ log_parse_environment();
+ log_open();
+
udev = udev_new();
if (udev == NULL)
goto exit;
udev = udev_new();
if (udev == NULL)
goto exit;
- log_open();
udev_set_log_fn(udev, log_fn);
/*
udev_set_log_fn(udev, log_fn);
/*
@@
-615,7
+617,7
@@
int main(int argc, char **argv)
exit(1);
if (!dev_specified) {
exit(1);
if (!dev_specified) {
- log_error("no device specified
\n
");
+ log_error("no device specified");
retval = 1;
goto exit;
}
retval = 1;
goto exit;
}