wok-6.x annotate busybox/stuff/busybox-1.20-blkid-swap.u @ rev 13749

syslinux: locale should be glibc-base compatible
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Dec 31 19:20:51 2012 +0100 (2012-12-31)
parents 1ca52b3246f2
children
rev   line source
pascal@13412 1 Swap partitions may have neither label nor uuid
pascal@13412 2 --- busybox-1.20.0/util-linux/volume_id/get_devname.c
pascal@13412 3 +++ busybox-1.20.0/util-linux/volume_id/get_devname.c
pascal@13544 4 @@ -46,10 +46,7 @@
pascal@13544 5 if (ioctl(/*vid->*/fd, BLKGETSIZE64, &size) != 0)
pascal@13544 6 size = 0;
pascal@13412 7
pascal@13544 8 - if (volume_id_probe_all(vid, /*0,*/ size) != 0)
pascal@13544 9 - goto ret;
pascal@13544 10 -
pascal@13412 11 - if (vid->label[0] != '\0' || vid->uuid[0] != '\0') {
pascal@13544 12 + if (volume_id_probe_all(vid, /*0,*/ size) == 0) {
pascal@13412 13 *label = xstrndup(vid->label, sizeof(vid->label));
pascal@13412 14 *uuid = xstrndup(vid->uuid, sizeof(vid->uuid));
pascal@13544 15 #if ENABLE_FEATURE_BLKID_TYPE
pascal@13544 16 --- busybox-1.20.0/util-linux/volume_id/volume_id.c
pascal@13544 17 +++ busybox-1.20.0/util-linux/volume_id/volume_id.c
pascal@13544 18 @@ -192,6 +192,7 @@
pascal@13544 19 goto ret;
pascal@13544 20 }
pascal@13544 21
pascal@13544 22 + id->error = 1;
pascal@13544 23 ret:
pascal@13544 24 volume_id_free_buffer(id);
pascal@13544 25 return (- id->error); /* 0 or -1 */