*
* Copyright (C) 2005-2008 Kay Sievers <kay.sievers@vrfy.org>
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation version 2 of the License.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _GNU_SOURCE
#include <linux/types.h>
#include <linux/hdreg.h>
-#include "../../udev/udev.h"
+#include "libudev.h"
+#include "libudev-private.h"
static void log_fn(struct udev *udev, int priority,
const char *file, int line, const char *fn,
vsyslog(priority, format, args);
}
-static void set_str(char *to, const char *from, size_t count)
-{
- size_t i, j, len;
-
- /* strip trailing whitespace */
- len = strnlen(from, count);
- while (len && isspace(from[len-1]))
- len--;
-
- /* strip leading whitespace */
- i = 0;
- while (isspace(from[i]) && (i < len))
- i++;
-
- j = 0;
- while (i < len) {
- /* substitute multiple whitespace */
- if (isspace(from[i])) {
- while (isspace(from[i]))
- i++;
- to[j++] = '_';
- }
- /* skip chars */
- if (from[i] == '/') {
- i++;
- continue;
- }
- to[j++] = from[i++];
- }
- to[j] = '\0';
-}
-
int main(int argc, char *argv[])
{
struct udev *udev;
struct hd_driveid id;
char model[41];
+ char model_enc[256];
char serial[21];
char revision[9];
const char *node = NULL;
int fd;
int rc = 0;
static const struct option options[] = {
- { "export", 0, NULL, 'x' },
- { "help", 0, NULL, 'h' },
+ { "export", no_argument, NULL, 'x' },
+ { "help", no_argument, NULL, 'h' },
{}
};
if (udev == NULL)
goto exit;
- logging_init("ata_id");
+ udev_log_init("ata_id");
udev_set_log_fn(udev, log_fn);
while (1) {
break;
case 'h':
printf("Usage: ata_id [--export] [--help] <device>\n"
- " --export print values as environemt keys\n"
+ " --export print values as environment keys\n"
" --help print this help text\n\n");
default:
rc = 1;
goto close;
}
- set_str(model, (char *) id.model, 40);
- set_str(serial, (char *) id.serial_no, 20);
- set_str(revision, (char *) id.fw_rev, 8);
+ memcpy (model, id.model, 40);
+ model[40] = '\0';
+ udev_util_encode_string(model, model_enc, sizeof(model_enc));
+ udev_util_replace_whitespace((char *) id.model, model, 40);
+ udev_util_replace_chars(model, NULL);
+ udev_util_replace_whitespace((char *) id.serial_no, serial, 20);
+ udev_util_replace_chars(serial, NULL);
+ udev_util_replace_whitespace((char *) id.fw_rev, revision, 8);
+ udev_util_replace_chars(revision, NULL);
if (export) {
if ((id.config >> 8) & 0x80) {
} else {
printf("ID_TYPE=disk\n");
}
+ printf("ID_BUS=ata\n");
printf("ID_MODEL=%s\n", model);
- printf("ID_SERIAL=%s\n", serial);
+ printf("ID_MODEL_ENC=%s\n", model_enc);
printf("ID_REVISION=%s\n", revision);
- printf("ID_BUS=ata\n");
+ printf("ID_SERIAL=%s_%s\n", model, serial);
+ printf("ID_SERIAL_SHORT=%s\n", serial);
} else {
if (serial[0] != '\0')
printf("%s_%s\n", model, serial);
close(fd);
exit:
udev_unref(udev);
- logging_close();
+ udev_log_close();
return rc;
}