Changeset d858a660 in mainline for uspace/srv/volsrv/part.c


Ignore:
Timestamp:
2017-07-04T15:05:43Z (8 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9c2c7d2
Parents:
2456fd0
Message:

Fdisk should print volume labels.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/volsrv/part.c

    r2456fd0 rd858a660  
    186186                part->pcnt = vpc_fs;
    187187                part->fstype = fst->fstype;
     188                part->label = str_dup(info.label);
     189                if (part->label == NULL)
     190                        goto error;
    188191        } else {
    189192                log_msg(LOG_DEFAULT, LVL_NOTE, "Partition does not contain "
     
    198201
    199202                part->pcnt = empty ? vpc_empty : vpc_unknown;
     203                part->label = str_dup("");
     204                if (part->label == NULL)
     205                        goto error;
    200206        }
    201207
     
    327333        pinfo->pcnt = part->pcnt;
    328334        pinfo->fstype = part->fstype;
     335        str_cpy(pinfo->label, sizeof(pinfo->label), part->label);
    329336        return EOK;
    330337}
Note: See TracChangeset for help on using the changeset viewer.