Changeset 22fb7ab in mainline for uspace/app/fdisk/fdisk.c
- Timestamp:
- 2015-06-26T16:15:31Z (9 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 28ed0d9
- Parents:
- 1356f85a
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/fdisk/fdisk.c
r1356f85a r22fb7ab 43 43 44 44 static bool quit = false; 45 static fdisk_t *fdisk; 45 46 46 47 /** Device menu actions */ … … 88 89 } 89 90 90 rc = fdisk_dev_list_get( &devlist);91 rc = fdisk_dev_list_get(fdisk, &devlist); 91 92 if (rc != EOK) { 92 93 printf("Error getting device list.\n"); … … 207 208 } 208 209 209 for (i = FDL_CREATE_LO; i < FDL_CREATE_HI; i++) {210 for (i = 0; i < LT_LIMIT; i++) { 210 211 rc = fdisk_ltype_format(i, &sltype); 211 212 if (rc != EOK) … … 229 230 } 230 231 231 rc = fdisk_label_create(dev, ( fdisk_label_type_t)sel);232 rc = fdisk_label_create(dev, (label_type_t)sel); 232 233 if (rc != EOK) { 233 234 printf("Error creating label.\n"); … … 505 506 } 506 507 507 rc = fdisk_label_get_info(dev, &linfo);508 if (rc != EOK) {509 printf("Error getting label information.\n");510 goto error;511 }512 513 rc = fdisk_ltype_format(linfo.ltype, &sltype);514 if (rc != EOK) {515 assert(rc == ENOMEM);516 printf("Out of memory.\n");517 goto error;518 }519 520 508 printf("Device: %s, %s\n", sdcap, svcname); 521 printf("Label type: %s\n", sltype);522 free(sltype);523 sltype = NULL;524 509 free(sdcap); 525 510 sdcap = NULL; 511 512 rc = fdisk_label_get_info(dev, &linfo); 513 if (rc != EOK) { 514 printf("Error getting label information.\n"); 515 goto error; 516 } 517 518 switch (linfo.dcnt) { 519 case dc_empty: 520 printf("Disk is empty.\n"); 521 break; 522 case dc_label: 523 rc = fdisk_ltype_format(linfo.ltype, &sltype); 524 if (rc != EOK) { 525 assert(rc == ENOMEM); 526 printf("Out of memory.\n"); 527 goto error; 528 } 529 530 printf("Label type: %s\n", sltype); 531 free(sltype); 532 sltype = NULL; 533 break; 534 case dc_fs: 535 printf("Disk contains a file system.\n"); 536 break; 537 case dc_unknown: 538 printf("Disk contains unknown data.\n"); 539 break; 540 } 526 541 527 542 part = fdisk_part_first(dev); … … 563 578 } 564 579 565 if (linfo. ltype != fdl_none) {580 if (linfo.dcnt == dc_label) { 566 581 rc = nchoice_add(choice, "Create partition", 567 582 (void *)devac_create_part); … … 583 598 } 584 599 585 if (linfo. ltype == fdl_none) {600 if (linfo.dcnt == dc_empty) { 586 601 rc = nchoice_add(choice, "Create label", 587 602 (void *)devac_create_label); … … 616 631 switch ((devac_t)sel) { 617 632 case devac_create_label: 618 rc = fdsk_create_label(dev); 619 if (rc != EOK) 620 goto error; 633 (void) fdsk_create_label(dev); 621 634 break; 622 635 case devac_delete_label: 623 rc = fdsk_delete_label(dev); 624 if (rc != EOK) 625 goto error; 636 (void) fdsk_delete_label(dev); 626 637 break; 627 638 case devac_create_part: 628 rc = fdsk_create_part(dev); 629 if (rc != EOK) 630 goto error; 639 (void) fdsk_create_part(dev); 631 640 break; 632 641 case devac_delete_part: 633 rc = fdsk_delete_part(dev); 634 if (rc != EOK) 635 goto error; 642 (void) fdsk_delete_part(dev); 636 643 break; 637 644 case devac_exit: … … 658 665 int rc; 659 666 667 rc = fdisk_create(&fdisk); 668 if (rc != EOK) { 669 printf("Error initializing Fdisk.\n"); 670 return 1; 671 } 672 660 673 rc = fdsk_dev_sel_choice(&svcid); 661 674 if (rc != EOK) … … 665 678 return 0; 666 679 667 rc = fdisk_dev_open( svcid, &dev);680 rc = fdisk_dev_open(fdisk, svcid, &dev); 668 681 if (rc != EOK) { 669 682 printf("Error opening device.\n"); … … 680 693 681 694 fdisk_dev_close(dev); 695 fdisk_destroy(fdisk); 682 696 683 697 return 0;
Note:
See TracChangeset
for help on using the changeset viewer.