X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2Futil.c;h=671f97ee271407a5a194935360e4aad4ab75027f;hp=395e81bbf3883c52dbfc418ee3807927a2d7ca27;hb=0565a00a4cfdabd325bf2e117620d5f15dd46cda;hpb=a3b836c6c22614d2aa746d89ddfaa6888e47691f diff --git a/extras/volume_id/lib/util.c b/extras/volume_id/lib/util.c index 395e81bbf..671f97ee2 100644 --- a/extras/volume_id/lib/util.c +++ b/extras/volume_id/lib/util.c @@ -3,19 +3,24 @@ * * Copyright (C) 2005-2007 Kay Sievers * - * 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 . */ #ifndef _GNU_SOURCE #define _GNU_SOURCE 1 #endif -#ifdef HAVE_CONFIG_H -# include -#endif - #include #include #include @@ -26,7 +31,7 @@ #include #include "libvolume_id.h" -#include "util.h" +#include "libvolume_id-private.h" /* count of characters used to encode one unicode char */ static int utf8_encoded_expected_len(const char *str) @@ -215,8 +220,8 @@ void volume_id_set_usage(struct volume_id *id, enum volume_id_usage usage_id) void volume_id_set_label_raw(struct volume_id *id, const uint8_t *buf, size_t count) { - if (count > sizeof(id->label)) - count = sizeof(id->label); + if (count > sizeof(id->label_raw)) + count = sizeof(id->label_raw); memcpy(id->label_raw, buf, count); id->label_raw_len = count; @@ -268,15 +273,17 @@ void volume_id_set_uuid(struct volume_id *id, const uint8_t *buf, size_t len, en count = 4; break; case UUID_64BIT_LE: - case UUID_64BIT_BE: count = 8; break; case UUID_DCE: count = 16; break; - case UUID_FOURINT: + case UUID_MD: count = 35; break; + case UUID_LVM: + count = 32; + break; } memcpy(id->uuid_raw, buf, count); id->uuid_raw_len = count; @@ -298,11 +305,6 @@ set: buf[7], buf[6], buf[5], buf[4], buf[3], buf[2], buf[1], buf[0]); break; - case UUID_64BIT_BE: - sprintf(id->uuid,"%02X%02X%02X%02X%02X%02X%02X%02X", - buf[0], buf[1], buf[2], buf[3], - buf[4], buf[5], buf[6], buf[7]); - break; case UUID_DCE: sprintf(id->uuid, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x", @@ -324,7 +326,7 @@ set: memcpy(id->uuid, buf, count); id->uuid[count] = '\0'; break; - case UUID_FOURINT: + case UUID_MD: sprintf(id->uuid, "%02x%02x%02x%02x:%02x%02x%02x%02x:%02x%02x%02x%02x:%02x%02x%02x%02x", buf[0], buf[1], buf[2], buf[3], @@ -332,6 +334,17 @@ set: buf[8], buf[9], buf[10], buf[11], buf[12], buf[13], buf[14],buf[15]); break; + case UUID_LVM: + sprintf(id->uuid, + "%c%c%c%c%c%c-%c%c%c%c-%c%c%c%c-%c%c%c%c-%c%c%c%c-%c%c%c%c-%c%c%c%c%c%c", + buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], + buf[6], buf[7], buf[8], buf[9], + buf[10], buf[11], buf[12], buf[13], + buf[14], buf[15], buf[16], buf[17], + buf[18], buf[19], buf[20], buf[21], + buf[22], buf[23], buf[24], buf[25], + buf[26], buf[27], buf[28], buf[29], buf[30], buf[31]); + break; } } @@ -339,33 +352,33 @@ uint8_t *volume_id_get_buffer(struct volume_id *id, uint64_t off, size_t len) { ssize_t buf_len; - info("get buffer off 0x%llx(%llu), len 0x%zx", (unsigned long long) off, (unsigned long long) off, len); + info("get buffer off 0x%" PRIx64 "(%" PRIu64 "), len 0x%zx\n", off, off, len); /* check if requested area fits in superblock buffer */ if (off + len <= SB_BUFFER_SIZE) { if (id->sbbuf == NULL) { id->sbbuf = malloc(SB_BUFFER_SIZE); if (id->sbbuf == NULL) { - dbg("error malloc"); + dbg("error malloc\n"); return NULL; } } /* check if we need to read */ if ((off + len) > id->sbbuf_len) { - info("read sbbuf len:0x%llx", (unsigned long long) (off + len)); + info("read sbbuf len:0x%" PRIx64 "\n", (off + len)); if (lseek(id->fd, 0, SEEK_SET) < 0) { - dbg("lseek failed (%s)", strerror(errno)); + dbg("lseek failed (%s)\n", strerror(errno)); return NULL; } buf_len = read(id->fd, id->sbbuf, off + len); if (buf_len < 0) { - dbg("read failed (%s)", strerror(errno)); + dbg("read failed (%s)\n", strerror(errno)); return NULL; } - dbg("got 0x%zx (%zi) bytes", buf_len, buf_len); + dbg("got 0x%zx (%zi) bytes\n", buf_len, buf_len); id->sbbuf_len = buf_len; if ((size_t)buf_len < off + len) { - dbg("requested 0x%zx bytes, got only 0x%zx bytes", len, buf_len); + dbg("requested 0x%zx bytes, got only 0x%zx bytes\n", len, buf_len); return NULL; } } @@ -373,7 +386,7 @@ uint8_t *volume_id_get_buffer(struct volume_id *id, uint64_t off, size_t len) return &(id->sbbuf[off]); } else { if (len > SEEK_BUFFER_SIZE) { - dbg("seek buffer too small %d", SEEK_BUFFER_SIZE); + dbg("seek buffer too small %d\n", SEEK_BUFFER_SIZE); return NULL; } @@ -381,28 +394,28 @@ uint8_t *volume_id_get_buffer(struct volume_id *id, uint64_t off, size_t len) if (id->seekbuf == NULL) { id->seekbuf = malloc(SEEK_BUFFER_SIZE); if (id->seekbuf == NULL) { - dbg("error malloc"); + dbg("error malloc\n"); return NULL; } } /* check if we need to read */ if ((off < id->seekbuf_off) || ((off + len) > (id->seekbuf_off + id->seekbuf_len))) { - info("read seekbuf off:0x%llx len:0x%zx", (unsigned long long) off, len); + info("read seekbuf off:0x%" PRIx64 " len:0x%zx\n", off, len); if (lseek(id->fd, off, SEEK_SET) < 0) { - dbg("lseek failed (%s)", strerror(errno)); + dbg("lseek failed (%s)\n", strerror(errno)); return NULL; } buf_len = read(id->fd, id->seekbuf, len); if (buf_len < 0) { - dbg("read failed (%s)", strerror(errno)); + dbg("read failed (%s)\n", strerror(errno)); return NULL; } - dbg("got 0x%zx (%zi) bytes", buf_len, buf_len); + dbg("got 0x%zx (%zi) bytes\n", buf_len, buf_len); id->seekbuf_off = off; id->seekbuf_len = buf_len; if ((size_t)buf_len < len) { - dbg("requested 0x%zx bytes, got only 0x%zx bytes", len, buf_len); + dbg("requested 0x%zx bytes, got only 0x%zx bytes\n", len, buf_len); return NULL; } }