wok view busybox/stuff/busybox-1.20-blkid-swap.u @ rev 13710
get-OpenOffice3: small fixes
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Mon Dec 17 20:32:43 2012 +0100 (2012-12-17) |
| parents | 1ca52b3246f2 |
| children |
line source
1 Swap partitions may have neither label nor uuid
2 --- busybox-1.20.0/util-linux/volume_id/get_devname.c
3 +++ busybox-1.20.0/util-linux/volume_id/get_devname.c
4 @@ -46,10 +46,7 @@
5 if (ioctl(/*vid->*/fd, BLKGETSIZE64, &size) != 0)
6 size = 0;
8 - if (volume_id_probe_all(vid, /*0,*/ size) != 0)
9 - goto ret;
10 -
11 - if (vid->label[0] != '\0' || vid->uuid[0] != '\0') {
12 + if (volume_id_probe_all(vid, /*0,*/ size) == 0) {
13 *label = xstrndup(vid->label, sizeof(vid->label));
14 *uuid = xstrndup(vid->uuid, sizeof(vid->uuid));
15 #if ENABLE_FEATURE_BLKID_TYPE
16 --- busybox-1.20.0/util-linux/volume_id/volume_id.c
17 +++ busybox-1.20.0/util-linux/volume_id/volume_id.c
18 @@ -192,6 +192,7 @@
19 goto ret;
20 }
22 + id->error = 1;
23 ret:
24 volume_id_free_buffer(id);
25 return (- id->error); /* 0 or -1 */