/*
* vol_id - read filesystem label and uuid
*
- * Copyright (C) 2005-2006 Kay Sievers <kay.sievers@vrfy.org>
+ * 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 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, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 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 <fcntl.h>
#include <sys/ioctl.h>
-#include "../../udev.h"
+#include "../../udev/udev.h"
#include "lib/libvolume_id.h"
#define BLKGETSIZE64 _IOR(0x12,114,size_t)
-#ifdef USE_LOG
-void log_message(int priority, const char *format, ...)
-{
- va_list args;
- static int udev_log = -1;
-
- if (udev_log == -1) {
- const char *value;
+static int debug;
+struct udev *udev_ctx;
- value = getenv("UDEV_LOG");
- if (value)
- udev_log = log_priority(value);
- else
- udev_log = LOG_ERR;
+static void log_fn(struct udev *udev, int priority,
+ const char *file, int line, const char *fn,
+ const char *format, va_list args)
+{
+ if (debug) {
+ fprintf(stderr, "%s: ", fn != NULL ? fn : file);
+ vfprintf(stderr, format, args);
+ } else {
+ vsyslog(priority, format, args);
}
-
- if (priority > udev_log)
- return;
-
- va_start(args, format);
- vsyslog(priority, format, args);
- va_end(args);
}
-#endif
static void vid_log(int priority, const char *file, int line, const char *format, ...)
{
-#ifdef USE_LOG
- char log_str[1024];
va_list args;
va_start(args, format);
- vsnprintf(log_str, sizeof(log_str), format, args);
- log_str[sizeof(log_str)-1] = '\0';
- log_message(priority, "%s:%i %s", file, line, log_str);
+ udev_log(udev_ctx, priority, file, line, NULL, format, args);
va_end(args);
-#endif
return;
}
int main(int argc, char *argv[])
{
static const struct option options[] = {
- { "label", 0, NULL, 'l' },
- { "label-raw", 0, NULL, 'L' },
- { "uuid", 0, NULL, 'u' },
- { "type", 0, NULL, 't' },
- { "export", 0, NULL, 'x' },
- { "skip-raid", 0, NULL, 's' },
- { "probe-all", 0, NULL, 'a' },
- { "offset", 1, NULL, 'o' },
- { "help", 0, NULL, 'h' },
+ { "label", no_argument, NULL, 'l' },
+ { "label-raw", no_argument, NULL, 'L' },
+ { "uuid", no_argument, NULL, 'u' },
+ { "type", no_argument, NULL, 't' },
+ { "export", no_argument, NULL, 'x' },
+ { "skip-raid", no_argument, NULL, 's' },
+ { "probe-all", no_argument, NULL, 'a' },
+ { "offset", optional_argument, NULL, 'o' },
+ { "debug", no_argument, NULL, 'd' },
+ { "help", no_argument, NULL, 'h' },
{}
};
int retval;
int rc = 0;
+ udev_ctx = udev_new();
+ if (udev_ctx == NULL)
+ goto exit;
logging_init("vol_id");
+ udev_set_log_fn(udev_ctx, log_fn);
/* hook in our debug into libvolume_id */
volume_id_log_fn = vid_log;
while (1) {
int option;
- option = getopt_long(argc, argv, "lLutxsaoh", options, NULL);
+ option = getopt_long(argc, argv, "lLutxsaodh", options, NULL);
if (option == -1)
break;
switch (option) {
+ case 'd':
+ debug = 1;
+ if (udev_get_log_priority(udev_ctx) < LOG_INFO)
+ udev_set_log_priority(udev_ctx, LOG_INFO);
+ break;
case 'l':
print = PRINT_LABEL;
break;
probe_all = 1;
break;
case 'o':
- offset = strtoull(optarg, NULL, 0);
+ if (optarg[0] != '\0')
+ offset = strtoull(optarg, NULL, 0);
break;
case 'h':
printf("Usage: vol_id [options] <device>\n"
- " --export export key/value pairs\n"
- " --type filesystem type\n"
- " --label filesystem label\n"
- " --label-raw raw label\n"
- " --uuid filesystem uuid\n"
- " --skip-raid don't probe for raid\n"
- " --probe-all find possibly conflicting signatures\n"
- " --offset skip given number of bytes of input\n"
+ " --export export key/value pairs\n"
+ " --type filesystem type\n"
+ " --label filesystem label\n"
+ " --label-raw raw label\n"
+ " --uuid filesystem uuid\n"
+ " --skip-raid don't probe for raid\n"
+ " --probe-all find possibly conflicting signatures\n"
+ " --offset=<bytes> probe at the given offset\n"
+ " --debug print debug output to stderr\n"
" --help\n\n");
goto exit;
default:
node = argv[optind];
if (!node) {
- err("no device\n");
+ err(udev_ctx, "no device\n");
fprintf(stderr, "no device\n");
rc = 1;
goto exit;
if (ioctl(fd, BLKGETSIZE64, &size) != 0)
size = 0;
- dbg("BLKGETSIZE64=%llu\n", (unsigned long long)size);
+ info(udev_ctx, "BLKGETSIZE64=%llu (%lluGB)\n", (unsigned long long)size, (unsigned long long)size >> 30);
/* try to drop all privileges before reading disk content */
if (getuid() == 0) {
if (setgroups(0, NULL) != 0 ||
setgid(pw->pw_gid) != 0 ||
setuid(pw->pw_uid) != 0)
- info("unable to drop privileges: %s\n\n", strerror(errno));
+ info(udev_ctx, "unable to drop privileges: %s\n\n", strerror(errno));
}
}
}
set_str(label_safe, label, sizeof(label_safe));
- replace_chars(label_safe, ALLOWED_CHARS_INPUT);
+ util_replace_chars(label_safe, ALLOWED_CHARS_INPUT);
volume_id_encode_string(label, label_enc, sizeof(label_enc));
volume_id_encode_string(uuid, uuid_enc, sizeof(uuid_enc));
exit:
if (vid != NULL)
volume_id_close(vid);
-
+ udev_unref(udev_ctx);
logging_close();
return rc;
}
~ianmdlvl / elogind.git / blobdiff