chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
volume_id: swap - larger PAGE_SIZE support
[elogind.git]
/
extras
/
volume_id
/
vol_id.c
diff --git
a/extras/volume_id/vol_id.c
b/extras/volume_id/vol_id.c
index 0137b84fbeac91e8a51878b057c8e4bafe82bb42..b4db5adcd86210dcebcdd6e4ca414f92a8bffa42 100644
(file)
--- a/
extras/volume_id/vol_id.c
+++ b/
extras/volume_id/vol_id.c
@@
-31,6
+31,7
@@
#include <grp.h>
#include <getopt.h>
#include <fcntl.h>
#include <grp.h>
#include <getopt.h>
#include <fcntl.h>
+#include <inttypes.h>
#include <sys/ioctl.h>
#include "../../udev/udev.h"
#include <sys/ioctl.h>
#include "../../udev/udev.h"
@@
-57,8
+58,10
@@
static void vid_log(int priority, const char *file, int line, const char *format
{
va_list args;
{
va_list args;
+ if (priority > udev_get_log_priority(udev_ctx))
+ return;
va_start(args, format);
va_start(args, format);
-
udev_log
(udev_ctx, priority, file, line, NULL, format, args);
+
log_fn
(udev_ctx, priority, file, line, NULL, format, args);
va_end(args);
return;
}
va_end(args);
return;
}
@@
-117,6
+120,7
@@
int main(int argc, char *argv[])
{ "type", no_argument, NULL, 't' },
{ "export", no_argument, NULL, 'x' },
{ "skip-raid", no_argument, NULL, 's' },
{ "type", no_argument, NULL, 't' },
{ "export", no_argument, NULL, 'x' },
{ "skip-raid", no_argument, NULL, 's' },
+ { "size", required_argument, NULL, 'S' },
{ "probe-all", no_argument, NULL, 'a' },
{ "offset", optional_argument, NULL, 'o' },
{ "debug", no_argument, NULL, 'd' },
{ "probe-all", no_argument, NULL, 'a' },
{ "offset", optional_argument, NULL, 'o' },
{ "debug", no_argument, NULL, 'd' },
@@
-135,8
+139,11
@@
int main(int argc, char *argv[])
struct volume_id *vid = NULL;
char label_safe[256];
char label_enc[256];
struct volume_id *vid = NULL;
char label_safe[256];
char label_enc[256];
+ char uuid_safe[256];
char uuid_enc[256];
char uuid_enc[256];
- uint64_t size;
+ char type_enc[256];
+ char type_version_enc[256];
+ uint64_t size = 0;
int skip_raid = 0;
int probe_all = 0;
uint64_t offset = 0;
int skip_raid = 0;
int probe_all = 0;
uint64_t offset = 0;
@@
-158,7
+165,7
@@
int main(int argc, char *argv[])
while (1) {
int option;
while (1) {
int option;
- option = getopt_long(argc, argv, "lLutxsaodh", options, NULL);
+ option = getopt_long(argc, argv, "lLutxs
S:
aodh", options, NULL);
if (option == -1)
break;
if (option == -1)
break;
@@
-189,6
+196,10
@@
int main(int argc, char *argv[])
case 'a':
probe_all = 1;
break;
case 'a':
probe_all = 1;
break;
+ case 'S':
+ if (optarg[0] != '\0')
+ size = strtoull(optarg, NULL, 0);
+ break;
case 'o':
if (optarg[0] != '\0')
offset = strtoull(optarg, NULL, 0);
case 'o':
if (optarg[0] != '\0')
offset = strtoull(optarg, NULL, 0);
@@
-203,6
+214,7
@@
int main(int argc, char *argv[])
" --skip-raid don't probe for raid\n"
" --probe-all find possibly conflicting signatures\n"
" --offset=<bytes> probe at the given offset\n"
" --skip-raid don't probe for raid\n"
" --probe-all find possibly conflicting signatures\n"
" --offset=<bytes> probe at the given offset\n"
+ " --size=<bytes> overwrite device size\n"
" --debug print debug output to stderr\n"
" --help\n\n");
goto exit;
" --debug print debug output to stderr\n"
" --help\n\n");
goto exit;
@@
-233,9
+245,11
@@
int main(int argc, char *argv[])
goto exit;
}
goto exit;
}
- if (ioctl(fd, BLKGETSIZE64, &size) != 0)
- size = 0;
- info(udev_ctx, "BLKGETSIZE64=%llu (%lluGB)\n", (unsigned long long)size, (unsigned long long)size >> 30);
+ if (size == 0) {
+ if (ioctl(fd, BLKGETSIZE64, &size) != 0)
+ size = 0;
+ info(udev_ctx, "BLKGETSIZE64=%" PRIu64 " (%" PRIu64 "GB)\n", size, size >> 30);
+ }
/* try to drop all privileges before reading disk content */
if (getuid() == 0) {
/* try to drop all privileges before reading disk content */
if (getuid() == 0) {
@@
-276,20
+290,24
@@
int main(int argc, char *argv[])
set_str(label_safe, label, sizeof(label_safe));
util_replace_chars(label_safe, ALLOWED_CHARS_INPUT);
set_str(label_safe, label, sizeof(label_safe));
util_replace_chars(label_safe, ALLOWED_CHARS_INPUT);
-
volume_id_encode_string(label, label_enc, sizeof(label_enc));
volume_id_encode_string(label, label_enc, sizeof(label_enc));
+
+ set_str(uuid_safe, uuid, sizeof(uuid_safe));
+ util_replace_chars(uuid_safe, ALLOWED_CHARS_INPUT);
volume_id_encode_string(uuid, uuid_enc, sizeof(uuid_enc));
volume_id_encode_string(uuid, uuid_enc, sizeof(uuid_enc));
+ volume_id_encode_string(type, type_enc, sizeof(type_enc));
+ volume_id_encode_string(type_version, type_version_enc, sizeof(type_version_enc));
+
switch (print) {
case PRINT_EXPORT:
printf("ID_FS_USAGE=%s\n", usage);
switch (print) {
case PRINT_EXPORT:
printf("ID_FS_USAGE=%s\n", usage);
- printf("ID_FS_TYPE=%s\n", type);
- printf("ID_FS_VERSION=%s\n", type_version);
- printf("ID_FS_UUID=%s\n", uuid);
+ printf("ID_FS_TYPE=%s\n", type
_enc
);
+ printf("ID_FS_VERSION=%s\n", type_version
_enc
);
+ printf("ID_FS_UUID=%s\n", uuid
_safe
);
printf("ID_FS_UUID_ENC=%s\n", uuid_enc);
printf("ID_FS_UUID_ENC=%s\n", uuid_enc);
- printf("ID_FS_LABEL=%s\n", label);
+ printf("ID_FS_LABEL=%s\n", label
_safe
);
printf("ID_FS_LABEL_ENC=%s\n", label_enc);
printf("ID_FS_LABEL_ENC=%s\n", label_enc);
- printf("ID_FS_LABEL_SAFE=%s\n", label_safe);
break;
case PRINT_TYPE:
printf("%s\n", type);
break;
case PRINT_TYPE:
printf("%s\n", type);