#include <getopt.h>
#include <sys/stat.h>
-#include "../../udev/udev.h"
+#include "libudev.h"
+#include "libudev-private.h"
#include "scsi_id.h"
static const struct option options[] = {
return 0;
}
-/*
- * format_serial: replace to whitespaces by underscores for calling
- * programs that use the serial for device naming (multipath, Suse
- * naming, etc...)
- */
-static void format_serial(char *serial)
-{
- char *p = serial, *q;
-
- q = p;
- while (*p != '\0') {
- if (isspace(*p)) {
- if (q > serial && q[-1] != '_') {
- *q = '_';
- q++;
- }
- } else {
- *q = *p;
- q++;
- }
- p++;
- }
- *q = '\0';
-}
-
/*
* scsi_id: try to get an id, if one is found, printf it to stdout.
* returns a value passed to exit() - 0 if printed an id, else 1.
retval = 1;
goto out;
}
- if (reformat_serial)
- format_serial(dev_scsi.serial);
+
+ if (reformat_serial) {
+ char serial_str[MAX_SERIAL_LEN];
+
+ udev_util_replace_whitespace(dev_scsi.serial, serial_str, sizeof(serial_str));
+ udev_util_replace_chars(serial_str, NULL);
+ printf("%s\n", serial_str);
+ goto out;
+ }
+
printf("%s\n", dev_scsi.serial);
out:
return retval;
if (udev == NULL)
goto exit;
- logging_init("scsi_id");
+ udev_log_init("scsi_id");
udev_set_log_fn(udev, log_fn);
/*
exit:
udev_unref(udev);
- logging_close();
+ udev_log_close();
return retval;
}